diff options
713 files changed, 11512 insertions, 5378 deletions
diff --git a/Android.bp b/Android.bp index 59e903ef37d3..f6bfe6545284 100644 --- a/Android.bp +++ b/Android.bp @@ -389,7 +389,6 @@ java_defaults { // TODO(b/120066492): remove gps_debug and protolog.conf.json when the build // system propagates "required" properly. "gps_debug.conf", - "core.protolog.pb", "framework-res", // any install dependencies should go into framework-minus-apex-install-dependencies // rather than here to avoid bloating incremental build time diff --git a/Ravenwood.bp b/Ravenwood.bp index 6237e3ec0f07..c3b22c4f4331 100644 --- a/Ravenwood.bp +++ b/Ravenwood.bp @@ -30,7 +30,7 @@ java_genrule { name: "framework-minus-apex.ravenwood-base", tools: ["hoststubgen"], cmd: "$(location hoststubgen) " + - "@$(location ravenwood/ravenwood-standard-options.txt) " + + "@$(location ravenwood/texts/ravenwood-standard-options.txt) " + "--debug-log $(location hoststubgen_framework-minus-apex.log) " + "--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " + @@ -41,13 +41,13 @@ java_genrule { "--gen-input-dump-file $(location hoststubgen_dump.txt) " + "--in-jar $(location :framework-minus-apex-for-hoststubgen) " + - "--policy-override-file $(location ravenwood/framework-minus-apex-ravenwood-policies.txt) " + - "--annotation-allowed-classes-file $(location ravenwood/ravenwood-annotation-allowed-classes.txt) ", + "--policy-override-file $(location ravenwood/texts/framework-minus-apex-ravenwood-policies.txt) " + + "--annotation-allowed-classes-file $(location ravenwood/texts/ravenwood-annotation-allowed-classes.txt) ", srcs: [ ":framework-minus-apex-for-hoststubgen", - "ravenwood/framework-minus-apex-ravenwood-policies.txt", - "ravenwood/ravenwood-standard-options.txt", - "ravenwood/ravenwood-annotation-allowed-classes.txt", + "ravenwood/texts/framework-minus-apex-ravenwood-policies.txt", + "ravenwood/texts/ravenwood-standard-options.txt", + "ravenwood/texts/ravenwood-annotation-allowed-classes.txt", ], out: [ "ravenwood.jar", @@ -104,7 +104,7 @@ java_genrule { name: "services.core.ravenwood-base", tools: ["hoststubgen"], cmd: "$(location hoststubgen) " + - "@$(location ravenwood/ravenwood-standard-options.txt) " + + "@$(location ravenwood/texts/ravenwood-standard-options.txt) " + "--debug-log $(location hoststubgen_services.core.log) " + "--stats-file $(location hoststubgen_services.core_stats.csv) " + @@ -115,13 +115,13 @@ java_genrule { "--gen-input-dump-file $(location hoststubgen_dump.txt) " + "--in-jar $(location :services.core-for-hoststubgen) " + - "--policy-override-file $(location ravenwood/services.core-ravenwood-policies.txt) " + - "--annotation-allowed-classes-file $(location ravenwood/ravenwood-annotation-allowed-classes.txt) ", + "--policy-override-file $(location ravenwood/texts/services.core-ravenwood-policies.txt) " + + "--annotation-allowed-classes-file $(location ravenwood/texts/ravenwood-annotation-allowed-classes.txt) ", srcs: [ ":services.core-for-hoststubgen", - "ravenwood/services.core-ravenwood-policies.txt", - "ravenwood/ravenwood-standard-options.txt", - "ravenwood/ravenwood-annotation-allowed-classes.txt", + "ravenwood/texts/services.core-ravenwood-policies.txt", + "ravenwood/texts/ravenwood-standard-options.txt", + "ravenwood/texts/ravenwood-annotation-allowed-classes.txt", ], out: [ "ravenwood.jar", diff --git a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java index 60eb4ac61076..c74c48ce6ba8 100644 --- a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java +++ b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java @@ -2054,8 +2054,8 @@ public class JobInfo implements Parcelable { * or in a state where launching an activity is allowed, as defined * <a href= * "https://developer.android.com/guide/components/activities/background-starts#exceptions"> - * here</a>. Attempting to schedule one outside of these conditions will throw a - * {@link SecurityException}. + * here</a>. Attempting to schedule one outside of these conditions will return a + * {@link JobScheduler#RESULT_FAILURE}. * * <p> * This should <b>NOT</b> be used for automatic features. diff --git a/core/api/current.txt b/core/api/current.txt index 1cfc02531ebc..b19c3ab96bb5 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -10147,17 +10147,17 @@ package android.content { public interface ComponentCallbacks { method public void onConfigurationChanged(@NonNull android.content.res.Configuration); - method public void onLowMemory(); + method @Deprecated public void onLowMemory(); } public interface ComponentCallbacks2 extends android.content.ComponentCallbacks { method public void onTrimMemory(int); field public static final int TRIM_MEMORY_BACKGROUND = 40; // 0x28 - field public static final int TRIM_MEMORY_COMPLETE = 80; // 0x50 - field public static final int TRIM_MEMORY_MODERATE = 60; // 0x3c - field public static final int TRIM_MEMORY_RUNNING_CRITICAL = 15; // 0xf - field public static final int TRIM_MEMORY_RUNNING_LOW = 10; // 0xa - field public static final int TRIM_MEMORY_RUNNING_MODERATE = 5; // 0x5 + field @Deprecated public static final int TRIM_MEMORY_COMPLETE = 80; // 0x50 + field @Deprecated public static final int TRIM_MEMORY_MODERATE = 60; // 0x3c + field @Deprecated public static final int TRIM_MEMORY_RUNNING_CRITICAL = 15; // 0xf + field @Deprecated public static final int TRIM_MEMORY_RUNNING_LOW = 10; // 0xa + field @Deprecated public static final int TRIM_MEMORY_RUNNING_MODERATE = 5; // 0x5 field public static final int TRIM_MEMORY_UI_HIDDEN = 20; // 0x14 } diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 501203efc2ef..b7c2ee920c79 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -321,7 +321,7 @@ package android { field public static final String RECEIVE_EMERGENCY_BROADCAST = "android.permission.RECEIVE_EMERGENCY_BROADCAST"; field @FlaggedApi("android.permission.flags.voice_activation_permission_apis") public static final String RECEIVE_SANDBOXED_DETECTION_TRAINING_DATA = "android.permission.RECEIVE_SANDBOXED_DETECTION_TRAINING_DATA"; field @FlaggedApi("android.permission.flags.voice_activation_permission_apis") public static final String RECEIVE_SANDBOX_TRIGGER_AUDIO = "android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO"; - field @FlaggedApi("com.android.server.notification.flags.redact_otp_notifications_from_untrusted_listeners") public static final String RECEIVE_SENSITIVE_NOTIFICATIONS = "android.permission.RECEIVE_SENSITIVE_NOTIFICATIONS"; + field @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") public static final String RECEIVE_SENSITIVE_NOTIFICATIONS = "android.permission.RECEIVE_SENSITIVE_NOTIFICATIONS"; field public static final String RECEIVE_WIFI_CREDENTIAL_CHANGE = "android.permission.RECEIVE_WIFI_CREDENTIAL_CHANGE"; field public static final String RECORD_BACKGROUND_AUDIO = "android.permission.RECORD_BACKGROUND_AUDIO"; field public static final String RECOVERY = "android.permission.RECOVERY"; diff --git a/core/api/test-current.txt b/core/api/test-current.txt index ca5d3eb4a292..61897030a991 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -3676,6 +3676,10 @@ package android.view { field public static final int FLAG_IS_ACCESSIBILITY_EVENT = 2048; // 0x800 } + public final class PointerIcon implements android.os.Parcelable { + method @FlaggedApi("android.view.flags.enable_vector_cursors") public void setDrawNativeDropShadow(boolean); + } + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD}) public @interface RemotableViewMethod { method public abstract String asyncImpl() default ""; } diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 0ed25eb3125a..7ed10e784b1c 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -18,7 +18,7 @@ package android.app; import static android.location.flags.Flags.FLAG_LOCATION_BYPASS; -import static android.media.audio.Flags.foregroundAudioControl; +import static android.media.audio.Flags.roForegroundAudioControl; import static android.permission.flags.Flags.FLAG_OP_ENABLE_MOBILE_DATA_BY_USER; import static android.view.contentprotection.flags.Flags.FLAG_CREATE_ACCESSIBILITY_OVERLAY_APP_OP_ENABLED; import static android.view.contentprotection.flags.Flags.FLAG_RAPID_CLEAR_NOTIFICATIONS_BY_LISTENER_APP_OP_ENABLED; @@ -3246,7 +3246,7 @@ public class AppOpsManager { * @hide */ public static @Mode int opToDefaultMode(int op) { - if (op == OP_TAKE_AUDIO_FOCUS && foregroundAudioControl()) { + if (op == OP_TAKE_AUDIO_FOCUS && roForegroundAudioControl()) { // when removing the flag, change the entry in sAppOpInfos for OP_TAKE_AUDIO_FOCUS return AppOpsManager.MODE_FOREGROUND; } diff --git a/core/java/android/app/IActivityTaskManager.aidl b/core/java/android/app/IActivityTaskManager.aidl index 08636aec00cf..55ce90d00011 100644 --- a/core/java/android/app/IActivityTaskManager.aidl +++ b/core/java/android/app/IActivityTaskManager.aidl @@ -157,7 +157,6 @@ interface IActivityTaskManager { ParceledListSlice<ActivityManager.RecentTaskInfo> getRecentTasks(int maxNum, int flags, int userId); boolean isTopActivityImmersive(); - ActivityManager.TaskDescription getTaskDescription(int taskId); void reportAssistContextExtras(in IBinder assistToken, in Bundle extras, in AssistStructure structure, in AssistContent content, in Uri referrer); diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index d7b9a2c46c9b..18f16ba31c0c 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -3910,6 +3910,13 @@ public class Notification implements Parcelable /** * @hide */ + public boolean hasAppProvidedWhen() { + return when != 0 && when != creationTime; + } + + /** + * @hide + */ @UnsupportedAppUsage public boolean isGroupSummary() { return mGroupKey != null && (flags & FLAG_GROUP_SUMMARY) != 0; diff --git a/core/java/android/app/notification.aconfig b/core/java/android/app/notification.aconfig index 29ffdc5f4a55..a2cf672c1f30 100644 --- a/core/java/android/app/notification.aconfig +++ b/core/java/android/app/notification.aconfig @@ -81,4 +81,11 @@ flag { metadata { purpose: PURPOSE_BUGFIX } +} + +flag { + name: "sort_section_by_time" + namespace: "systemui" + description: "Changes notification sort order to be by time within a section" + bug: "330193582" }
\ No newline at end of file diff --git a/core/java/android/content/ComponentCallbacks.java b/core/java/android/content/ComponentCallbacks.java index 428545dbcd5e..fb9536f846aa 100644 --- a/core/java/android/content/ComponentCallbacks.java +++ b/core/java/android/content/ComponentCallbacks.java @@ -55,15 +55,11 @@ public interface ComponentCallbacks { * That is, before reaching the point of killing processes hosting * service and foreground UI that we would like to avoid killing. * - * <p>You should implement this method to release - * any caches or other unnecessary resources you may be holding on to. - * The system will perform a garbage collection for you after returning from this method. - * <p>Preferably, you should implement {@link ComponentCallbacks2#onTrimMemory} from - * {@link ComponentCallbacks2} to incrementally unload your resources based on various - * levels of memory demands. That API is available for API level 14 and higher, so you should - * only use this {@link #onLowMemory} method as a fallback for older versions, which can be - * treated the same as {@link ComponentCallbacks2#onTrimMemory} with the {@link - * ComponentCallbacks2#TRIM_MEMORY_COMPLETE} level.</p> + * @deprecated Since API level 14 this is superseded by + * {@link ComponentCallbacks2#onTrimMemory}. + * Since API level 34 this is never called. + * Apps targeting API level 34 and above may provide an empty implementation. */ + @Deprecated void onLowMemory(); } diff --git a/core/java/android/content/ComponentCallbacks2.java b/core/java/android/content/ComponentCallbacks2.java index 6576c0f9b388..a165b18a2fa4 100644 --- a/core/java/android/content/ComponentCallbacks2.java +++ b/core/java/android/content/ComponentCallbacks2.java @@ -105,14 +105,20 @@ public interface ComponentCallbacks2 extends ComponentCallbacks { * Level for {@link #onTrimMemory(int)}: the process is nearing the end * of the background LRU list, and if more memory isn't found soon it will * be killed. + * + * @deprecated Apps are not notified of this level since API level 34 */ + @Deprecated static final int TRIM_MEMORY_COMPLETE = 80; /** * Level for {@link #onTrimMemory(int)}: the process is around the middle * of the background LRU list; freeing memory can help the system keep * other processes running later in the list for better overall performance. + * + * @deprecated Apps are not notified of this level since API level 34 */ + @Deprecated static final int TRIM_MEMORY_MODERATE = 60; /** @@ -139,7 +145,10 @@ public interface ComponentCallbacks2 extends ComponentCallbacks { * will happen after this is {@link #onLowMemory()} called to report that * nothing at all can be kept in the background, a situation that can start * to notably impact the user. + * + * @deprecated Apps are not notified of this level since API level 34 */ + @Deprecated static final int TRIM_MEMORY_RUNNING_CRITICAL = 15; /** @@ -147,7 +156,10 @@ public interface ComponentCallbacks2 extends ComponentCallbacks { * background process, but the device is running low on memory. * Your running process should free up unneeded resources to allow that * memory to be used elsewhere. + * + * @deprecated Apps are not notified of this level since API level 34 */ + @Deprecated static final int TRIM_MEMORY_RUNNING_LOW = 10; /** @@ -155,17 +167,19 @@ public interface ComponentCallbacks2 extends ComponentCallbacks { * background process, but the device is running moderately low on memory. * Your running process may want to release some unneeded resources for * use elsewhere. + * + * @deprecated Apps are not notified of this level since API level 34 */ + @Deprecated static final int TRIM_MEMORY_RUNNING_MODERATE = 5; /** * Called when the operating system has determined that it is a good - * time for a process to trim unneeded memory from its process. This will - * happen for example when it goes in the background and there is not enough - * memory to keep as many background processes running as desired. You - * should never compare to exact values of the level, since new intermediate - * values may be added -- you will typically want to compare if the value - * is greater or equal to a level you are interested in. + * time for a process to trim unneeded memory from its process. + * + * You should never compare to exact values of the level, since new + * intermediate values may be added -- you will typically want to compare if + * the value is greater or equal to a level you are interested in. * * <p>To retrieve the processes current trim level at any point, you can * use {@link android.app.ActivityManager#getMyMemoryState diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 4c0da7c98488..f5bff9dc1d0e 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -4844,6 +4844,16 @@ public abstract class PackageManager { public static final String FEATURE_ROTARY_ENCODER_LOW_RES = "android.hardware.rotaryencoder.lowres"; + /** + * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device has + * support for contextual search helper. + * + * @hide + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_CONTEXTUAL_SEARCH_HELPER = + "android.software.contextualsearch"; + /** @hide */ public static final boolean APP_ENUMERATION_ENABLED_BY_DEFAULT = true; diff --git a/core/java/android/credentials/CredentialManager.java b/core/java/android/credentials/CredentialManager.java index 3a9a0f911660..93fa5d85796f 100644 --- a/core/java/android/credentials/CredentialManager.java +++ b/core/java/android/credentials/CredentialManager.java @@ -74,6 +74,11 @@ public final class CredentialManager { PROVIDER_FILTER_ALL_PROVIDERS, PROVIDER_FILTER_SYSTEM_PROVIDERS_ONLY, PROVIDER_FILTER_USER_PROVIDERS_ONLY, + // By default the returned list of providers will not include any providers that + // have been hidden by device policy. However, there are some cases where we want + // them to show up (e.g. settings) so this will return the list of providers with + // the hidden ones included. + PROVIDER_FILTER_USER_PROVIDERS_INCLUDING_HIDDEN, }) @Retention(RetentionPolicy.SOURCE) public @interface ProviderFilter {} @@ -99,6 +104,14 @@ public final class CredentialManager { */ @TestApi public static final int PROVIDER_FILTER_USER_PROVIDERS_ONLY = 2; + /** + * Returns user credential providers only. This will include providers that + * have been disabled by the device policy. + * + * @hide + */ + public static final int PROVIDER_FILTER_USER_PROVIDERS_INCLUDING_HIDDEN = 3; + private final Context mContext; private final ICredentialManager mService; diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index 8feb133e832b..ea7db4ccf5f2 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -1081,6 +1081,12 @@ public final class CameraManager { * {@link java.util.concurrent.Executor} as an argument instead of * {@link android.os.Handler}.</p> * + * <p>Do note that typically callbacks are expected to be dispatched + * by the executor in a single thread. If the executor uses two or + * more threads to dispatch callbacks, then clients must ensure correct + * synchronization and must also be able to handle potentially different + * ordering of the incoming callbacks.</p> + * * @param cameraId * The unique identifier of the camera device to open * @param executor diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java index 97c03ed8b0c7..81bb9ac33df2 100644 --- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java @@ -290,6 +290,55 @@ public class CameraDeviceImpl extends CameraDevice } }; + private class ClientStateCallback extends StateCallback { + private final Executor mClientExecutor; + private final StateCallback mClientStateCallback; + + private ClientStateCallback(@NonNull Executor clientExecutor, + @NonNull StateCallback clientStateCallback) { + mClientExecutor = clientExecutor; + mClientStateCallback = clientStateCallback; + } + + public void onClosed(@NonNull CameraDevice camera) { + mClientExecutor.execute(new Runnable() { + @Override + public void run() { + mClientStateCallback.onClosed(camera); + } + }); + } + @Override + public void onOpened(@NonNull CameraDevice camera) { + mClientExecutor.execute(new Runnable() { + @Override + public void run() { + mClientStateCallback.onOpened(camera); + } + }); + } + + @Override + public void onDisconnected(@NonNull CameraDevice camera) { + mClientExecutor.execute(new Runnable() { + @Override + public void run() { + mClientStateCallback.onDisconnected(camera); + } + }); + } + + @Override + public void onError(@NonNull CameraDevice camera, int error) { + mClientExecutor.execute(new Runnable() { + @Override + public void run() { + mClientStateCallback.onError(camera, error); + } + }); + } + } + public CameraDeviceImpl(String cameraId, StateCallback callback, Executor executor, CameraCharacteristics characteristics, Map<String, CameraCharacteristics> physicalIdsToChars, @@ -300,8 +349,13 @@ public class CameraDeviceImpl extends CameraDevice throw new IllegalArgumentException("Null argument given"); } mCameraId = cameraId; - mDeviceCallback = callback; - mDeviceExecutor = executor; + if (Flags.singleThreadExecutor()) { + mDeviceCallback = new ClientStateCallback(executor, callback); + mDeviceExecutor = Executors.newSingleThreadExecutor(); + } else { + mDeviceCallback = callback; + mDeviceExecutor = executor; + } mCharacteristics = characteristics; mPhysicalIdsToChars = physicalIdsToChars; mAppTargetSdkVersion = appTargetSdkVersion; diff --git a/core/java/android/hardware/face/FaceSensorConfigurations.java b/core/java/android/hardware/face/FaceSensorConfigurations.java index 6ef692f81069..12471681f913 100644 --- a/core/java/android/hardware/face/FaceSensorConfigurations.java +++ b/core/java/android/hardware/face/FaceSensorConfigurations.java @@ -22,11 +22,12 @@ import android.annotation.Nullable; import android.content.Context; import android.hardware.biometrics.face.IFace; import android.hardware.biometrics.face.SensorProps; +import android.os.Binder; import android.os.Parcel; import android.os.Parcelable; import android.os.RemoteException; +import android.os.ServiceManager; import android.util.Log; -import android.util.Pair; import android.util.Slog; import androidx.annotation.NonNull; @@ -36,7 +37,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.function.Function; /** * Provides the sensor props for face sensor, if available. @@ -74,22 +74,10 @@ public class FaceSensorConfigurations implements Parcelable { /** * Process AIDL instances to extract sensor props and add it to the sensor map. * @param aidlInstances available face AIDL instances - * @param getIFace function that provides the daemon for the specific instance */ - public void addAidlConfigs(@NonNull String[] aidlInstances, - @NonNull Function<String, IFace> getIFace) { + public void addAidlConfigs(@NonNull String[] aidlInstances) { for (String aidlInstance : aidlInstances) { - final String fqName = IFace.DESCRIPTOR + "/" + aidlInstance; - IFace face = getIFace.apply(fqName); - try { - if (face != null) { - mSensorPropsMap.put(aidlInstance, face.getSensorProps()); - } else { - Slog.e(TAG, "Unable to get declared service: " + fqName); - } - } catch (RemoteException e) { - Log.d(TAG, "Unable to get sensor properties!"); - } + mSensorPropsMap.put(aidlInstance, null); } } @@ -131,38 +119,31 @@ public class FaceSensorConfigurations implements Parcelable { } /** - * Return sensor props for the given instance. If instance is not available, - * then null is returned. + * Checks if {@param instance} exists. */ @Nullable - public Pair<String, SensorProps[]> getSensorPairForInstance(String instance) { - if (mSensorPropsMap.containsKey(instance)) { - return new Pair<>(instance, mSensorPropsMap.get(instance)); - } - - return null; + public boolean doesInstanceExist(String instance) { + return mSensorPropsMap.containsKey(instance); } /** - * Return the first pair of instance and sensor props, which does not correspond to the given - * If instance is not available, then null is returned. + * Return the first HAL instance, which does not correspond to the given {@param instance}. + * If another instance is not available, then null is returned. */ @Nullable - public Pair<String, SensorProps[]> getSensorPairNotForInstance(String instance) { + public String getSensorNameNotForInstance(String instance) { Optional<String> notAVirtualInstance = mSensorPropsMap.keySet().stream().filter( (instanceName) -> !instanceName.equals(instance)).findFirst(); - return notAVirtualInstance.map(this::getSensorPairForInstance).orElseGet( - this::getSensorPair); + return notAVirtualInstance.orElse(null); } /** - * Returns the first pair of instance and sensor props that has been added to the map. + * Returns the first instance that has been added to the map. */ @Nullable - public Pair<String, SensorProps[]> getSensorPair() { + public String getSensorInstance() { Optional<String> optionalInstance = mSensorPropsMap.keySet().stream().findFirst(); - return optionalInstance.map(this::getSensorPairForInstance).orElse(null); - + return optionalInstance.orElse(null); } public boolean getResetLockoutRequiresChallenge() { @@ -179,4 +160,31 @@ public class FaceSensorConfigurations implements Parcelable { dest.writeByte((byte) (mResetLockoutRequiresChallenge ? 1 : 0)); dest.writeMap(mSensorPropsMap); } + + /** + * Returns face sensor props for the HAL {@param instance}. + */ + @Nullable + public SensorProps[] getSensorPropForInstance(String instance) { + SensorProps[] props = mSensorPropsMap.get(instance); + + //Props should not be null for HIDL configs + if (props != null) { + return props; + } + + final String fqName = IFace.DESCRIPTOR + "/" + instance; + IFace face = IFace.Stub.asInterface(Binder.allowBlocking( + ServiceManager.waitForDeclaredService(fqName))); + try { + if (face != null) { + props = face.getSensorProps(); + } else { + Slog.e(TAG, "Unable to get declared service: " + fqName); + } + } catch (RemoteException e) { + Log.d(TAG, "Unable to get sensor properties!"); + } + return props; + } } diff --git a/core/java/android/hardware/fingerprint/FingerprintSensorConfigurations.java b/core/java/android/hardware/fingerprint/FingerprintSensorConfigurations.java index f214494a5d7b..43c0da9bd8ed 100644 --- a/core/java/android/hardware/fingerprint/FingerprintSensorConfigurations.java +++ b/core/java/android/hardware/fingerprint/FingerprintSensorConfigurations.java @@ -23,18 +23,18 @@ import android.annotation.Nullable; import android.content.Context; import android.hardware.biometrics.fingerprint.IFingerprint; import android.hardware.biometrics.fingerprint.SensorProps; +import android.os.Binder; import android.os.Parcel; import android.os.Parcelable; import android.os.RemoteException; +import android.os.ServiceManager; import android.util.Log; -import android.util.Pair; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.function.Function; /** * Provides the sensor props for fingerprint sensor, if available. @@ -68,23 +68,10 @@ public class FingerprintSensorConfigurations implements Parcelable { /** * Process AIDL instances to extract sensor props and add it to the sensor map. * @param aidlInstances available face AIDL instances - * @param getIFingerprint function that provides the daemon for the specific instance */ - public void addAidlSensors(@NonNull String[] aidlInstances, - @NonNull Function<String, IFingerprint> getIFingerprint) { + public void addAidlSensors(@NonNull String[] aidlInstances) { for (String aidlInstance : aidlInstances) { - try { - final String fqName = IFingerprint.DESCRIPTOR + "/" + aidlInstance; - final IFingerprint fp = getIFingerprint.apply(fqName); - if (fp != null) { - SensorProps[] props = fp.getSensorProps(); - mSensorPropsMap.put(aidlInstance, props); - } else { - Log.d(TAG, "IFingerprint null for instance " + aidlInstance); - } - } catch (RemoteException e) { - Log.d(TAG, "Unable to get sensor properties!"); - } + mSensorPropsMap.put(aidlInstance, null); } } @@ -133,38 +120,31 @@ public class FingerprintSensorConfigurations implements Parcelable { } /** - * Return sensor props for the given instance. If instance is not available, - * then null is returned. + * Checks if {@param instance} exists. */ @Nullable - public Pair<String, SensorProps[]> getSensorPairForInstance(String instance) { - if (mSensorPropsMap.containsKey(instance)) { - return new Pair<>(instance, mSensorPropsMap.get(instance)); - } - - return null; + public boolean doesInstanceExist(String instance) { + return mSensorPropsMap.containsKey(instance); } /** - * Return the first pair of instance and sensor props, which does not correspond to the given - * If instance is not available, then null is returned. + * Return the first HAL instance, which does not correspond to the given {@param instance}. + * If another instance is not available, then null is returned. */ @Nullable - public Pair<String, SensorProps[]> getSensorPairNotForInstance(String instance) { + public String getSensorNameNotForInstance(String instance) { Optional<String> notAVirtualInstance = mSensorPropsMap.keySet().stream().filter( (instanceName) -> !instanceName.equals(instance)).findFirst(); - return notAVirtualInstance.map(this::getSensorPairForInstance).orElseGet( - this::getSensorPair); + return notAVirtualInstance.orElse(null); } /** - * Returns the first pair of instance and sensor props that has been added to the map. + * Returns the first instance that has been added to the map. */ @Nullable - public Pair<String, SensorProps[]> getSensorPair() { + public String getSensorInstance() { Optional<String> optionalInstance = mSensorPropsMap.keySet().stream().findFirst(); - return optionalInstance.map(this::getSensorPairForInstance).orElse(null); - + return optionalInstance.orElse(null); } public boolean getResetLockoutRequiresHardwareAuthToken() { @@ -181,4 +161,31 @@ public class FingerprintSensorConfigurations implements Parcelable { dest.writeByte((byte) (mResetLockoutRequiresHardwareAuthToken ? 1 : 0)); dest.writeMap(mSensorPropsMap); } + + /** + * Returns fingerprint sensor props for the HAL {@param instance}. + */ + @Nullable + public SensorProps[] getSensorPropForInstance(String instance) { + SensorProps[] props = mSensorPropsMap.get(instance); + + //Props should not be null for HIDL configs + if (props != null) { + return props; + } + + try { + final String fqName = IFingerprint.DESCRIPTOR + "/" + instance; + final IFingerprint fp = IFingerprint.Stub.asInterface(Binder.allowBlocking( + ServiceManager.waitForDeclaredService(fqName))); + if (fp != null) { + props = fp.getSensorProps(); + } else { + Log.d(TAG, "IFingerprint null for instance " + instance); + } + } catch (RemoteException e) { + Log.d(TAG, "Unable to get sensor properties!"); + } + return props; + } } diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index bcef8153c691..35a3a5f32648 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -577,6 +577,11 @@ public final class Parcel { } res.mReadWriteHelper = ReadWriteHelper.DEFAULT; } + + if (res.mNativePtr == 0) { + Log.e(TAG, "Obtained Parcel object has null native pointer. Invalid state."); + } + return res; } diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index f4795f89e66d..406a1a6795ab 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -184,6 +184,22 @@ public final class PowerManager { public static final int DRAW_WAKE_LOCK = OsProtoEnums.DRAW_WAKE_LOCK; // 0x00000080 /** + * Wake lock level: Override the current screen timeout. + * <p> + * This is used by the system to allow {@code PowerManagerService} to override the current + * screen timeout by config value. + * + * config_screenTimeoutOverride in config.xml determines the screen timeout override value. + * </p><p> + * Requires the {@link android.Manifest.permission#SCREEN_TIMEOUT_OVERRIDE} permission. + * </p> + * + * @hide + */ + public static final int SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK = + OsProtoEnums.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK; // 0x00000100 + + /** * Mask for the wake lock level component of a combined wake lock level and flags integer. * * @hide @@ -1369,6 +1385,7 @@ public final class PowerManager { case PROXIMITY_SCREEN_OFF_WAKE_LOCK: case DOZE_WAKE_LOCK: case DRAW_WAKE_LOCK: + case SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK: break; default: throw new IllegalArgumentException("Must specify a valid wake lock level."); diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig index 2710df2ec982..3e4454f5243d 100644 --- a/core/java/android/permission/flags.aconfig +++ b/core/java/android/permission/flags.aconfig @@ -116,6 +116,15 @@ flag { } flag { + name: "sensitive_content_improvements" + namespace: "permissions" + description: "Improvements to sensitive content/notification features, such as the Toast UX." + bug: "301960090" + # Referenced in WM where WM starts before DeviceConfig + is_fixed_read_only: true +} + +flag { name: "device_aware_permissions_enabled" is_fixed_read_only: true namespace: "permissions" diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 363e252b8f27..7b3dee7ea8e7 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1266,6 +1266,22 @@ public final class Settings { "android.settings.BLUETOOTH_PAIRING_SETTINGS"; /** + * Activity Action: Show settings to allow pairing hearing devices. + * <p> + * In some cases, a matching Activity may not exist, so ensure you + * safeguard against this. + * <p> + * Input: Nothing. + * <p> + * Output: Nothing. + * + * @hide + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_HEARING_DEVICE_PAIRING_SETTINGS = + "android.settings.HEARING_DEVICES_PAIRING_SETTINGS"; + + /** * Activity Action: Show settings to configure input methods, in particular * allowing the user to enable input methods. * <p> @@ -12451,7 +12467,7 @@ public final class Settings { /** @hide */ public static final int PRIVATE_SPACE_AUTO_LOCK_AFTER_INACTIVITY = 1; /** @hide */ - public static final int PRIVATE_SPACE_AUTO_LOCK_NEVER = 2; + public static final int PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART = 2; /** * The different auto lock options for private space. @@ -12461,7 +12477,7 @@ public final class Settings { @IntDef(prefix = {"PRIVATE_SPACE_AUTO_LOCK_"}, value = { PRIVATE_SPACE_AUTO_LOCK_ON_DEVICE_LOCK, PRIVATE_SPACE_AUTO_LOCK_AFTER_INACTIVITY, - PRIVATE_SPACE_AUTO_LOCK_NEVER, + PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART, }) @Retention(RetentionPolicy.SOURCE) public @interface PrivateSpaceAutoLockOption { diff --git a/core/java/android/service/credentials/CredentialProviderInfoFactory.java b/core/java/android/service/credentials/CredentialProviderInfoFactory.java index 514d72252c3d..c6d3d9b6da84 100644 --- a/core/java/android/service/credentials/CredentialProviderInfoFactory.java +++ b/core/java/android/service/credentials/CredentialProviderInfoFactory.java @@ -480,8 +480,12 @@ public final class CredentialProviderInfoFactory { Set<ComponentName> primaryServices) { requireNonNull(context, "context must not be null"); - // Get the device policy. - PackagePolicy pp = getDeviceManagerPolicy(context, userId); + // Get the device policy. If the client has asked for all providers then we + // should ignore the device policy. + PackagePolicy pp = + providerFilter != CredentialManager.PROVIDER_FILTER_USER_PROVIDERS_INCLUDING_HIDDEN + ? getDeviceManagerPolicy(context, userId) + : null; // Generate the provider list. final boolean disableSystemAppVerificationForTests = false; @@ -514,8 +518,12 @@ public final class CredentialProviderInfoFactory { Set<ComponentName> primaryServices) { requireNonNull(context, "context must not be null"); - // Get the device policy. - PackagePolicy pp = getDeviceManagerPolicy(context, userId); + // Get the device policy. If the client has asked for all providers then we + // should ignore the device policy. + PackagePolicy pp = + providerFilter != CredentialManager.PROVIDER_FILTER_USER_PROVIDERS_INCLUDING_HIDDEN + ? getDeviceManagerPolicy(context, userId) + : null; // Generate the provider list. final boolean disableSystemAppVerificationForTests = true; @@ -593,7 +601,10 @@ public final class CredentialProviderInfoFactory { if (cpi.isSystemProvider()) { return mProviderFilter == CredentialManager.PROVIDER_FILTER_SYSTEM_PROVIDERS_ONLY; } else { - return mProviderFilter == CredentialManager.PROVIDER_FILTER_USER_PROVIDERS_ONLY; + return mProviderFilter == CredentialManager.PROVIDER_FILTER_USER_PROVIDERS_ONLY + || mProviderFilter + == CredentialManager + .PROVIDER_FILTER_USER_PROVIDERS_INCLUDING_HIDDEN; } } diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java index 6dcbc8ed6569..4e521d62684a 100644 --- a/core/java/android/service/dreams/DreamService.java +++ b/core/java/android/service/dreams/DreamService.java @@ -1050,12 +1050,10 @@ public class DreamService extends Service implements Window.Callback { overlay.endDream(); mOverlayConnection.unbind(); mOverlayConnection = null; - finish(); } catch (RemoteException e) { Log.e(mTag, "could not inform overlay of dream end:" + e); } }); - return; } if (mDebug) Slog.v(mTag, "finish(): mFinished=" + mFinished); diff --git a/core/java/android/service/quickaccesswallet/QuickAccessWalletServiceInfo.java b/core/java/android/service/quickaccesswallet/QuickAccessWalletServiceInfo.java index e6d8fd0e2f2b..8a3f6ceb852b 100644 --- a/core/java/android/service/quickaccesswallet/QuickAccessWalletServiceInfo.java +++ b/core/java/android/service/quickaccesswallet/QuickAccessWalletServiceInfo.java @@ -71,9 +71,11 @@ class QuickAccessWalletServiceInfo { @Nullable static QuickAccessWalletServiceInfo tryCreate(@NonNull Context context) { - String defaultAppPackageName = getDefaultWalletApp(context); + String defaultAppPackageName = null; - if (defaultAppPackageName == null) { + if (isWalletRoleAvailable(context)) { + defaultAppPackageName = getDefaultWalletApp(context); + } else { ComponentName defaultPaymentApp = getDefaultPaymentApp(context); if (defaultPaymentApp == null) { return null; @@ -103,14 +105,21 @@ class QuickAccessWalletServiceInfo { final long token = Binder.clearCallingIdentity(); try { RoleManager roleManager = context.getSystemService(RoleManager.class); - if (roleManager.isRoleAvailable(RoleManager.ROLE_WALLET)) { - List<String> roleHolders = roleManager.getRoleHolders(RoleManager.ROLE_WALLET); - return roleHolders.isEmpty() ? null : roleHolders.get(0); - } + List<String> roleHolders = roleManager.getRoleHolders(RoleManager.ROLE_WALLET); + return roleHolders.isEmpty() ? null : roleHolders.get(0); + } finally { + Binder.restoreCallingIdentity(token); + } + } + + private static boolean isWalletRoleAvailable(Context context) { + final long token = Binder.clearCallingIdentity(); + try { + RoleManager roleManager = context.getSystemService(RoleManager.class); + return roleManager.isRoleAvailable(RoleManager.ROLE_WALLET); } finally { Binder.restoreCallingIdentity(token); } - return null; } private static ComponentName getDefaultPaymentApp(Context context) { diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index f6d197ca4f93..0fc51e74d570 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -106,6 +106,7 @@ import android.window.ActivityWindowInfo; import android.window.ClientWindowFrames; import android.window.ScreenCapture; +import com.android.internal.R; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.HandlerCaller; @@ -1283,8 +1284,14 @@ public abstract class WallpaperService extends Service { .build(); SurfaceControl.Transaction transaction = new SurfaceControl.Transaction(); + final int frameRateCompat = getResources().getInteger( + R.integer.config_wallpaperFrameRateCompatibility); + if (DEBUG) { + Log.d(TAG, "Set frame rate compatibility value for Wallpaper: " + + frameRateCompat); + } transaction.setDefaultFrameRateCompatibility(mBbqSurfaceControl, - Surface.FRAME_RATE_COMPATIBILITY_MIN).apply(); + frameRateCompat).apply(); } // Propagate transform hint from WM, so we can use the right hint for the // first frame. diff --git a/core/java/android/view/InputWindowHandle.java b/core/java/android/view/InputWindowHandle.java index 9db1060abad4..de5fc7f3e358 100644 --- a/core/java/android/view/InputWindowHandle.java +++ b/core/java/android/view/InputWindowHandle.java @@ -67,6 +67,7 @@ public final class InputWindowHandle { InputConfig.SPY, InputConfig.INTERCEPTS_STYLUS, InputConfig.CLONE, + InputConfig.SENSITIVE_FOR_TRACING, }) public @interface InputConfigFlags {} diff --git a/core/java/android/view/PointerIcon.java b/core/java/android/view/PointerIcon.java index 147d56253dcf..17d14042e468 100644 --- a/core/java/android/view/PointerIcon.java +++ b/core/java/android/view/PointerIcon.java @@ -16,8 +16,10 @@ package android.view; +import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.TestApi; import android.annotation.XmlRes; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; @@ -39,6 +41,7 @@ import android.os.Parcelable; import android.os.PointerIconType; import android.util.Log; import android.util.SparseArray; +import android.view.flags.Flags; import com.android.internal.util.XmlUtils; @@ -637,4 +640,15 @@ public final class PointerIcon implements Parcelable { default: return Integer.toString(type); } } + + /** + * Sets whether drop shadow will draw in the native code. + * + * @hide + */ + @TestApi + @FlaggedApi(Flags.FLAG_ENABLE_VECTOR_CURSORS) + public void setDrawNativeDropShadow(boolean drawNativeDropShadow) { + mDrawNativeDropShadow = drawNativeDropShadow; + } } diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index b6df1bb2c870..f708c97e7eb0 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -33847,16 +33847,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, int frameRateCategory; if (Float.isNaN(mPreferredFrameRate)) { - if (mMinusTwoFrameIntervalMillis + mMinusOneFrameIntervalMillis - < INFREQUENT_UPDATE_INTERVAL_MILLIS && mAttachInfo != null) { - frameRateCategory = mSizeBasedFrameRateCategoryAndReason; - } else if (mInfrequentUpdateCount == INFREQUENT_UPDATE_COUNTS) { - frameRateCategory = - FRAME_RATE_CATEGORY_NORMAL - | FRAME_RATE_CATEGORY_REASON_INTERMITTENT; - } else { - frameRateCategory = mLastFrameRateCategory; - } + frameRateCategory = calculateFrameRateCategory(); } else if (mPreferredFrameRate < 0) { if (mPreferredFrameRate == REQUESTED_FRAME_RATE_CATEGORY_NO_PREFERENCE) { frameRateCategory = FRAME_RATE_CATEGORY_NO_PREFERENCE diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 0d9e471e77af..f37cb082fdff 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -108,6 +108,7 @@ import static android.view.accessibility.Flags.fixMergedContentChangeEventV2; import static android.view.accessibility.Flags.forceInvertColor; import static android.view.accessibility.Flags.reduceWindowContentChangedEventThrottle; import static android.view.flags.Flags.toolkitFrameRateTypingReadOnly; +import static android.view.flags.Flags.toolkitFrameRateVelocityMappingReadOnly; import static android.view.flags.Flags.toolkitMetricsForFrameRateDecision; import static android.view.flags.Flags.toolkitSetFrameRateReadOnly; import static android.view.flags.Flags.toolkitFrameRateFunctionEnablingReadOnly; @@ -1154,6 +1155,8 @@ public final class ViewRootImpl implements ViewParent, private static boolean sToolkitFrameRateFunctionEnablingReadOnlyFlagValue; private static boolean sToolkitMetricsForFrameRateDecisionFlagValue; private static boolean sToolkitFrameRateTypingReadOnlyFlagValue; + private static boolean sToolkitFrameRateVelocityMappingReadOnlyFlagValue = + toolkitFrameRateVelocityMappingReadOnly();; static { sToolkitSetFrameRateReadOnlyFlagValue = toolkitSetFrameRateReadOnly(); @@ -6571,10 +6574,15 @@ public final class ViewRootImpl implements ViewParent, // Use the newer global config and last reported override config. mPendingMergedConfiguration.setConfiguration(config, mLastReportedMergedConfiguration.getOverrideConfiguration()); + if (mPendingActivityWindowInfo != null) { + mPendingActivityWindowInfo.set(mLastReportedActivityWindowInfo); + } performConfigurationChange(new MergedConfiguration(mPendingMergedConfiguration), false /* force */, INVALID_DISPLAY /* same display */, - mLastReportedActivityWindowInfo); + mPendingActivityWindowInfo != null + ? new ActivityWindowInfo(mPendingActivityWindowInfo) + : null); } break; case MSG_CLEAR_ACCESSIBILITY_FOCUS_HOST: { setAccessibilityFocus(null, null); @@ -9016,6 +9024,7 @@ public final class ViewRootImpl implements ViewParent, mPendingActivityWindowInfo.set(outInfo); } } + mRelayoutBundle.clear(); mWinFrameInScreen.set(mTmpFrames.frame); if (mTranslator != null) { mTranslator.translateRectInScreenToAppWindow(mTmpFrames.frame); @@ -12463,7 +12472,9 @@ public final class ViewRootImpl implements ViewParent, } private void setPreferredFrameRateCategory(int preferredFrameRateCategory) { - if (!shouldSetFrameRateCategory()) { + if (!shouldSetFrameRateCategory() + || (mFrameRateCompatibility == FRAME_RATE_COMPATIBILITY_GTE + && sToolkitFrameRateVelocityMappingReadOnlyFlagValue)) { return; } int categoryFromConflictedFrameRates = FRAME_RATE_CATEGORY_NO_PREFERENCE; @@ -12558,8 +12569,12 @@ public final class ViewRootImpl implements ViewParent, } private void setPreferredFrameRate(float preferredFrameRate) { - if (!shouldSetFrameRate() || (mFrameRateCompatibility == FRAME_RATE_COMPATIBILITY_GTE - && preferredFrameRate > 0)) { + if (!shouldSetFrameRate()) { + return; + } + if (mFrameRateCompatibility == FRAME_RATE_COMPATIBILITY_GTE + && preferredFrameRate > 0 && !sToolkitFrameRateVelocityMappingReadOnlyFlagValue) { + mIsTouchBoosting = false; return; } diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 56667398265e..0d2aae0d3690 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -4370,6 +4370,22 @@ public interface WindowManager extends ViewManager { public static final int INPUT_FEATURE_SPY = 1 << 2; /** + * Input feature used to indicate that this window is sensitive for tracing. + * <p> + * A window that uses {@link LayoutParams#FLAG_SECURE} will automatically be treated as + * a sensitive for input tracing, but this input feature can be set on windows that don't + * set FLAG_SECURE. The tracing configuration will determine how these sensitive events + * are eventually traced. + * <p> + * This can only be set for trusted system overlays. + * <p> + * Note: Input tracing is only available on userdebug and eng builds. + * + * @hide + */ + public static final int INPUT_FEATURE_SENSITIVE_FOR_TRACING = 1 << 3; + + /** * An internal annotation for flags that can be specified to {@link #inputFeatures}. * * NOTE: These are not the same as {@link android.os.InputConfig} flags. @@ -4381,6 +4397,7 @@ public interface WindowManager extends ViewManager { INPUT_FEATURE_NO_INPUT_CHANNEL, INPUT_FEATURE_DISABLE_USER_ACTIVITY, INPUT_FEATURE_SPY, + INPUT_FEATURE_SENSITIVE_FOR_TRACING, }) public @interface InputFeatureFlags { } diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java index d00fc1c89d8f..abb147108cac 100644 --- a/core/java/android/widget/OverScroller.java +++ b/core/java/android/widget/OverScroller.java @@ -299,8 +299,10 @@ public class OverScroller { final int duration = mScrollerX.mDuration; if (elapsedTime < duration) { final float q = mInterpolator.getInterpolation(elapsedTime / (float) duration); - mScrollerX.updateScroll(q); - mScrollerY.updateScroll(q); + final float q2 = + mInterpolator.getInterpolation((elapsedTime - 1) / (float) duration); + mScrollerX.updateScroll(q, q2); + mScrollerY.updateScroll(q, q2); } else { abortAnimation(); } @@ -642,8 +644,11 @@ public class OverScroller { * 0.84f; // look and feel tuning } - void updateScroll(float q) { - mCurrentPosition = mStart + Math.round(q * (mFinal - mStart)); + void updateScroll(float q, float q2) { + int distance = mFinal - mStart; + mCurrentPosition = mStart + Math.round(q * distance); + // q2 is 1ms before q1 + mCurrVelocity = 1000f * (q - q2) * distance; } /* diff --git a/core/java/com/android/internal/accessibility/dialog/AccessibilityShortcutChooserActivity.java b/core/java/com/android/internal/accessibility/dialog/AccessibilityShortcutChooserActivity.java index c70febb3a7bf..34b487fe4c80 100644 --- a/core/java/com/android/internal/accessibility/dialog/AccessibilityShortcutChooserActivity.java +++ b/core/java/com/android/internal/accessibility/dialog/AccessibilityShortcutChooserActivity.java @@ -37,7 +37,6 @@ import android.view.View; import android.view.Window; import android.view.WindowManager; import android.view.accessibility.AccessibilityManager; -import android.view.accessibility.Flags; import android.widget.AdapterView; import com.android.internal.R; @@ -248,12 +247,10 @@ public class AccessibilityShortcutChooserActivity extends Activity { boolean allowEditing = isUserSetupCompleted(this); boolean showWhenLocked = false; - if (Flags.allowShortcutChooserOnLockscreen()) { - final KeyguardManager keyguardManager = getSystemService(KeyguardManager.class); - if (keyguardManager != null && keyguardManager.isKeyguardLocked()) { - allowEditing = false; - showWhenLocked = true; - } + final KeyguardManager keyguardManager = getSystemService(KeyguardManager.class); + if (keyguardManager != null && keyguardManager.isKeyguardLocked()) { + allowEditing = false; + showWhenLocked = true; } if (allowEditing) { final String positiveButtonText = diff --git a/core/java/com/android/internal/jank/Cuj.java b/core/java/com/android/internal/jank/Cuj.java index d2a533c78da6..f2d2c1b637c6 100644 --- a/core/java/com/android/internal/jank/Cuj.java +++ b/core/java/com/android/internal/jank/Cuj.java @@ -127,10 +127,17 @@ public class Cuj { public static final int CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE = 91; public static final int CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR = 92; public static final int CUJ_LAUNCHER_SAVE_APP_PAIR = 93; + public static final int CUJ_LAUNCHER_ALL_APPS_SEARCH_BACK = 95; + public static final int CUJ_LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK = 96; + public static final int CUJ_LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK = 97; + public static final int CUJ_LAUNCHER_WIDGET_PICKER_CLOSE_BACK = 98; + public static final int CUJ_LAUNCHER_WIDGET_PICKER_SEARCH_BACK = 99; + public static final int CUJ_LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK = 100; + public static final int CUJ_LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK = 101; // When adding a CUJ, update this and make sure to also update CUJ_TO_STATSD_INTERACTION_TYPE. @VisibleForTesting - static final int LAST_CUJ = CUJ_LAUNCHER_SAVE_APP_PAIR; + static final int LAST_CUJ = CUJ_LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK; /** @hide */ @IntDef({ @@ -217,7 +224,13 @@ public class Cuj { CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH, CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE, CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR, - CUJ_LAUNCHER_SAVE_APP_PAIR + CUJ_LAUNCHER_SAVE_APP_PAIR, + CUJ_LAUNCHER_ALL_APPS_SEARCH_BACK, + CUJ_LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK, + CUJ_LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK, + CUJ_LAUNCHER_WIDGET_PICKER_CLOSE_BACK, + CUJ_LAUNCHER_WIDGET_PICKER_SEARCH_BACK, + CUJ_LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK }) @Retention(RetentionPolicy.SOURCE) public @interface CujType { @@ -315,6 +328,13 @@ public class Cuj { CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE; CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR; CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_SAVE_APP_PAIR] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_SAVE_APP_PAIR; + CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_ALL_APPS_SEARCH_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_ALL_APPS_SEARCH_BACK; + CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK; + CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK; + CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_WIDGET_PICKER_CLOSE_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_WIDGET_PICKER_CLOSE_BACK; + CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_WIDGET_PICKER_SEARCH_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_WIDGET_PICKER_SEARCH_BACK; + CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK; + CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK; } private Cuj() { @@ -499,6 +519,20 @@ public class Cuj { return "LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR"; case CUJ_LAUNCHER_SAVE_APP_PAIR: return "LAUNCHER_SAVE_APP_PAIR"; + case CUJ_LAUNCHER_ALL_APPS_SEARCH_BACK: + return "LAUNCHER_ALL_APPS_SEARCH_BACK"; + case CUJ_LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK: + return "LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK"; + case CUJ_LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK: + return "LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK"; + case CUJ_LAUNCHER_WIDGET_PICKER_CLOSE_BACK: + return "LAUNCHER_WIDGET_PICKER_CLOSE_BACK"; + case CUJ_LAUNCHER_WIDGET_PICKER_SEARCH_BACK: + return "LAUNCHER_WIDGET_PICKER_SEARCH_BACK"; + case CUJ_LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK: + return "LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK"; + case CUJ_LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK: + return "LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK"; } return "UNKNOWN"; } diff --git a/core/java/com/android/internal/jank/InteractionJankMonitor.java b/core/java/com/android/internal/jank/InteractionJankMonitor.java index a288fb77749e..b86cbfb69490 100644 --- a/core/java/com/android/internal/jank/InteractionJankMonitor.java +++ b/core/java/com/android/internal/jank/InteractionJankMonitor.java @@ -168,6 +168,13 @@ public class InteractionJankMonitor { @Deprecated public static final int CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE = Cuj.CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE; @Deprecated public static final int CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR = Cuj.CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR; @Deprecated public static final int CUJ_LAUNCHER_SAVE_APP_PAIR = Cuj.CUJ_LAUNCHER_SAVE_APP_PAIR; + @Deprecated public static final int CUJ_LAUNCHER_ALL_APPS_SEARCH_BACK = Cuj.CUJ_LAUNCHER_ALL_APPS_SEARCH_BACK; + @Deprecated public static final int CUJ_LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK = Cuj.CUJ_LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK; + @Deprecated public static final int CUJ_LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK = Cuj.CUJ_LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK; + @Deprecated public static final int CUJ_LAUNCHER_WIDGET_PICKER_CLOSE_BACK = Cuj.CUJ_LAUNCHER_WIDGET_PICKER_CLOSE_BACK; + @Deprecated public static final int CUJ_LAUNCHER_WIDGET_PICKER_SEARCH_BACK = Cuj.CUJ_LAUNCHER_WIDGET_PICKER_SEARCH_BACK; + @Deprecated public static final int CUJ_LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK = Cuj.CUJ_LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK; + @Deprecated public static final int CUJ_LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK = Cuj.CUJ_LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK; private static class InstanceHolder { public static final InteractionJankMonitor INSTANCE = diff --git a/core/java/com/android/internal/os/BinderInternal.java b/core/java/com/android/internal/os/BinderInternal.java index c14d8d805d29..8063be64f36d 100644 --- a/core/java/com/android/internal/os/BinderInternal.java +++ b/core/java/com/android/internal/os/BinderInternal.java @@ -45,8 +45,8 @@ public class BinderInternal { static ArrayList<Runnable> sGcWatchers = new ArrayList<>(); static Runnable[] sTmpWatchers = new Runnable[1]; static long sLastGcTime; - static final BinderProxyLimitListenerDelegate sBinderProxyLimitListenerDelegate = - new BinderProxyLimitListenerDelegate(); + static final BinderProxyCountEventListenerDelegate sBinderProxyCountEventListenerDelegate = + new BinderProxyCountEventListenerDelegate(); static final class GcWatcher { @Override @@ -226,15 +226,24 @@ public class BinderInternal { * @param low The threshold a binder count must drop below before the callback * can be called again. (This is to avoid many repeated calls to the * callback in a brief period of time) + * @param warning The threshold between {@code high} and {@code low} where if the binder count + * exceeds that, the warning callback would be triggered. */ - public static final native void nSetBinderProxyCountWatermarks(int high, int low); + public static final native void nSetBinderProxyCountWatermarks(int high, int low, int warning); /** * Interface for callback invocation when the Binder Proxy limit is reached. onLimitReached will * be called with the uid of the app causing too many Binder Proxies */ - public interface BinderProxyLimitListener { + public interface BinderProxyCountEventListener { public void onLimitReached(int uid); + + /** + * Call when the number of binder proxies from the uid of the app reaches + * the warning threshold. + */ + default void onWarningThresholdReached(int uid) { + } } /** @@ -243,7 +252,17 @@ public class BinderInternal { * @param uid The uid of the bad behaving app sending too many binders */ public static void binderProxyLimitCallbackFromNative(int uid) { - sBinderProxyLimitListenerDelegate.notifyClient(uid); + sBinderProxyCountEventListenerDelegate.notifyLimitReached(uid); + } + + /** + * Callback used by native code to trigger a callback in java code. The callback will be + * triggered when too many binder proxies from a uid hits the warning limit. + * @param uid The uid of the bad behaving app sending too many binders + */ + @SuppressWarnings("unused") + public static void binderProxyWarningCallbackFromNative(int uid) { + sBinderProxyCountEventListenerDelegate.notifyWarningReached(uid); } /** @@ -252,41 +271,45 @@ public class BinderInternal { * @param handler must not be null, callback will be posted through the handler; * */ - public static void setBinderProxyCountCallback(BinderProxyLimitListener listener, + public static void setBinderProxyCountCallback(BinderProxyCountEventListener listener, @NonNull Handler handler) { Preconditions.checkNotNull(handler, "Must provide NonNull Handler to setBinderProxyCountCallback when setting " - + "BinderProxyLimitListener"); - sBinderProxyLimitListenerDelegate.setListener(listener, handler); + + "BinderProxyCountEventListener"); + sBinderProxyCountEventListenerDelegate.setListener(listener, handler); } /** * Clear the Binder Proxy callback */ public static void clearBinderProxyCountCallback() { - sBinderProxyLimitListenerDelegate.setListener(null, null); + sBinderProxyCountEventListenerDelegate.setListener(null, null); } - static private class BinderProxyLimitListenerDelegate { - private BinderProxyLimitListener mBinderProxyLimitListener; + private static class BinderProxyCountEventListenerDelegate { + private BinderProxyCountEventListener mBinderProxyCountEventListener; private Handler mHandler; - void setListener(BinderProxyLimitListener listener, Handler handler) { + void setListener(BinderProxyCountEventListener listener, Handler handler) { synchronized (this) { - mBinderProxyLimitListener = listener; + mBinderProxyCountEventListener = listener; mHandler = handler; } } - void notifyClient(final int uid) { + void notifyLimitReached(final int uid) { + synchronized (this) { + if (mBinderProxyCountEventListener != null) { + mHandler.post(() -> mBinderProxyCountEventListener.onLimitReached(uid)); + } + } + } + + void notifyWarningReached(final int uid) { synchronized (this) { - if (mBinderProxyLimitListener != null) { - mHandler.post(new Runnable() { - @Override - public void run() { - mBinderProxyLimitListener.onLimitReached(uid); - } - }); + if (mBinderProxyCountEventListener != null) { + mHandler.post(() -> + mBinderProxyCountEventListener.onWarningThresholdReached(uid)); } } } diff --git a/core/jni/android_os_Trace.cpp b/core/jni/android_os_Trace.cpp index 4387a4c63673..21e056dfa12b 100644 --- a/core/jni/android_os_Trace.cpp +++ b/core/jni/android_os_Trace.cpp @@ -15,6 +15,7 @@ */ #include <cutils/compiler.h> +#include <cutils/trace.h> #include <jni.h> #include <log/log.h> #include <nativehelper/JNIHelp.h> @@ -103,7 +104,9 @@ static void android_os_Trace_nativeAsyncTraceForTrackEnd(JNIEnv* env, jclass, } static void android_os_Trace_nativeSetAppTracingAllowed(JNIEnv*, jclass, jboolean allowed) { - // no-op + // TODO(b/331916606): this is load-bearing for an app to notice that it is + // traced after post-zygote-fork specialisation. + atrace_update_tags(); } static void android_os_Trace_nativeSetTracingEnabled(JNIEnv*, jclass, jboolean enabled) { diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index d2d5186eb8a1..2068bd7bc8ea 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -88,6 +88,7 @@ static struct binderinternal_offsets_t jclass mClass; jmethodID mForceGc; jmethodID mProxyLimitCallback; + jmethodID mProxyWarningCallback; } gBinderInternalOffsets; @@ -1240,7 +1241,7 @@ static void android_os_BinderInternal_handleGc(JNIEnv* env, jobject clazz) gCollectedAtRefs = gNumLocalRefsCreated + gNumDeathRefsCreated; } -static void android_os_BinderInternal_proxyLimitcallback(int uid) +static void android_os_BinderInternal_proxyLimitCallback(int uid) { JNIEnv *env = AndroidRuntime::getJNIEnv(); env->CallStaticVoidMethod(gBinderInternalOffsets.mClass, @@ -1254,6 +1255,20 @@ static void android_os_BinderInternal_proxyLimitcallback(int uid) } } +static void android_os_BinderInternal_proxyWarningCallback(int uid) +{ + JNIEnv *env = AndroidRuntime::getJNIEnv(); + env->CallStaticVoidMethod(gBinderInternalOffsets.mClass, + gBinderInternalOffsets.mProxyWarningCallback, + uid); + + if (env->ExceptionCheck()) { + ScopedLocalRef<jthrowable> excep(env, env->ExceptionOccurred()); + binder_report_exception(env, excep.get(), + "*** Uncaught exception in binderProxyWarningCallbackFromNative"); + } +} + static void android_os_BinderInternal_setBinderProxyCountEnabled(JNIEnv* env, jobject clazz, jboolean enable) { @@ -1278,9 +1293,10 @@ static jint android_os_BinderInternal_getBinderProxyCount(JNIEnv* env, jobject c } static void android_os_BinderInternal_setBinderProxyCountWatermarks(JNIEnv* env, jobject clazz, - jint high, jint low) + jint high, jint low, + jint warning) { - BpBinder::setBinderProxyCountWatermarks(high, low); + BpBinder::setBinderProxyCountWatermarks(high, low, warning); } // ---------------------------------------------------------------------------- @@ -1295,7 +1311,7 @@ static const JNINativeMethod gBinderInternalMethods[] = { { "nSetBinderProxyCountEnabled", "(Z)V", (void*)android_os_BinderInternal_setBinderProxyCountEnabled }, { "nGetBinderProxyPerUidCounts", "()Landroid/util/SparseIntArray;", (void*)android_os_BinderInternal_getBinderProxyPerUidCounts }, { "nGetBinderProxyCount", "(I)I", (void*)android_os_BinderInternal_getBinderProxyCount }, - { "nSetBinderProxyCountWatermarks", "(II)V", (void*)android_os_BinderInternal_setBinderProxyCountWatermarks} + { "nSetBinderProxyCountWatermarks", "(III)V", (void*)android_os_BinderInternal_setBinderProxyCountWatermarks} }; const char* const kBinderInternalPathName = "com/android/internal/os/BinderInternal"; @@ -1307,6 +1323,8 @@ static int int_register_android_os_BinderInternal(JNIEnv* env) gBinderInternalOffsets.mClass = MakeGlobalRefOrDie(env, clazz); gBinderInternalOffsets.mForceGc = GetStaticMethodIDOrDie(env, clazz, "forceBinderGc", "()V"); gBinderInternalOffsets.mProxyLimitCallback = GetStaticMethodIDOrDie(env, clazz, "binderProxyLimitCallbackFromNative", "(I)V"); + gBinderInternalOffsets.mProxyWarningCallback = + GetStaticMethodIDOrDie(env, clazz, "binderProxyWarningCallbackFromNative", "(I)V"); jclass SparseIntArrayClass = FindClassOrDie(env, "android/util/SparseIntArray"); gSparseIntArrayOffsets.classObject = MakeGlobalRefOrDie(env, SparseIntArrayClass); @@ -1315,7 +1333,8 @@ static int int_register_android_os_BinderInternal(JNIEnv* env) gSparseIntArrayOffsets.put = GetMethodIDOrDie(env, gSparseIntArrayOffsets.classObject, "put", "(II)V"); - BpBinder::setLimitCallback(android_os_BinderInternal_proxyLimitcallback); + BpBinder::setBinderProxyCountEventCallback(android_os_BinderInternal_proxyLimitCallback, + android_os_BinderInternal_proxyWarningCallback); return RegisterMethodsOrDie( env, kBinderInternalPathName, diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index cfe6f732e54b..d4256ca316c2 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -8120,7 +8120,7 @@ android:protectionLevel="signature|privileged" /> <!-- @hide @SystemApi - @FlaggedApi("com.android.server.notification.flags.redact_otp_notifications_from_untrusted_listeners") + @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") Allows apps with a NotificationListenerService to receive notifications with sensitive information <p>Apps with a NotificationListenerService without this permission will not be able @@ -8168,6 +8168,15 @@ <permission android:name="android.permission.RESTRICT_DISPLAY_MODES" android:protectionLevel="signature" /> + <!-- Allows internal applications to override screen timeout temporarily + <p>Protection level: signature + <p>Not for use by third-party applications. + @FlaggedApi("com.android.server.power.feature.flags.enable_early_screen_timeout_detector") + @hide + --> + <permission android:name="android.permission.SCREEN_TIMEOUT_OVERRIDE" + android:protectionLevel="signature" /> + <!-- Attribution for Geofencing service. --> <attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/> <!-- Attribution for Country Detector. --> diff --git a/core/res/res/layout/autofill_fill_dialog.xml b/core/res/res/layout/autofill_fill_dialog.xml index 196af6dfb6df..ed9961c6aefb 100644 --- a/core/res/res/layout/autofill_fill_dialog.xml +++ b/core/res/res/layout/autofill_fill_dialog.xml @@ -72,6 +72,7 @@ android:layout_marginEnd="24dp" android:clipToPadding="false" android:drawSelectorOnTop="true" + android:contentSensitivity="sensitive" android:clickable="true" android:divider="@null" android:visibility="gone" /> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index ed0504118763..7cd186f6559f 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Kan nie selnetwerk bereik nie"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Probeer die voorkeurnetwerk verander. Tik om te verander."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Noodoproepe is onbeskikbaar"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Noodoproepe vereis ’n selnetwerk."</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Opletberigte"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Oproepaanstuur"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Noodterugbel-modus"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Vee uit"</string> <string name="inputMethod" msgid="1784759500516314751">"Invoermetode"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Teksaksies"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Handskrif word nie in hierdie veld gesteun nie"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Handskrif word nie in wagwoordvelde gesteun nie"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Terug"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Wissel invoermetode"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Bergingspasie word min"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Bestuur deur <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Aan"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Af"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> demp sekere klanke"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Daar is \'n interne probleem met jou toestel en dit sal dalk onstabiel wees totdat jy \'n fabriekterugstelling doen."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Daar is \'n interne probleem met jou toestel. Kontak jou vervaardiger vir besonderhede."</string> @@ -2031,7 +2034,7 @@ <string name="pin_specific_target" msgid="7824671240625957415">"Speld <xliff:g id="LABEL">%1$s</xliff:g> vas"</string> <string name="unpin_target" msgid="3963318576590204447">"Ontspeld"</string> <string name="unpin_specific_target" msgid="3859828252160908146">"Ontspeld <xliff:g id="LABEL">%1$s</xliff:g>"</string> - <string name="app_info" msgid="6113278084877079851">"Programinligting"</string> + <string name="app_info" msgid="6113278084877079851">"Appinligting"</string> <string name="negative_duration" msgid="1938335096972945232">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="demo_starting_message" msgid="6577581216125805905">"Begin tans demonstrasie …"</string> <string name="demo_restarting_message" msgid="1160053183701746766">"Stel toestel tans terug …"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index a127ad7ffcc4..66c550276d37 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"የሞባይል አውታረ መረብን መድረስ አልተቻለም"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"ተመራጭ አውታረ መረብን ለመለወጥ ይሞክሩ። ለመለወጥ መታ ያድርጉ።"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"የአደጋ ጊዜ ጥሪ አይገኝም"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"የአደጋ ጥሪዎች የተንቀሳቃሽ ስልክ አውታረ መረብ ያስፈልጋቸዋል"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"ማንቂያዎች"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"ጥሪ ማስተላለፍ"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"የአደጋ ጊዜ ጥሪ ሁነታ"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"ሰርዝ"</string> <string name="inputMethod" msgid="1784759500516314751">"ግቤት ስልት"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"የፅሁፍ እርምጃዎች"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"የእጅ ጽሑፍ በዚህ መስክ ውስጥ አይደገፍም"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"የእጅ ጽሑፍ በይለፍ ቃል መስኮች ውስጥ አይደገፍም"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"ተመለስ"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"የግቤት ስልትን ቀይር"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"የማከማቻ ቦታ እያለቀ ነው"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"በ<xliff:g id="APP_NAME">%1$s</xliff:g> የሚተዳደር"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"በርቷል"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"ጠፍቷል"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> አንዳንድ ድምጾችን እየዘጋ ነው"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"መሣሪያዎ ላይ የውስጣዊ ችግር አለ፣ የፋብሪካ ውሂብ ዳግም እስኪያስጀምሩት ድረስ ላይረጋጋ ይችላል።"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"መሣሪያዎ ላይ የውስጣዊ ችግር አለ። ዝርዝሮችን ለማግኘት አምራችዎን ያነጋግሩ።"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index d67443ab9e79..881fb291ea7a 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -88,8 +88,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"يتعذّر الوصول إلى شبكة الجوّال."</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"حاول تغيير الشبكة المفضلة. انقر لتغييرها."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"لا تتوفر إمكانية الاتصال في حالات الطوارئ."</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"يتطلّب إجراء مكالمات الطوارئ الاتصال بشبكة جوّال"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"التنبيهات"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"إعادة توجيه المكالمة"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"وضع معاودة الاتصال بالطوارئ"</string> @@ -1188,10 +1187,8 @@ <string name="deleteText" msgid="4200807474529938112">"حذف"</string> <string name="inputMethod" msgid="1784759500516314751">"طريقة الإرسال"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"إجراءات النص"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"الكتابة بخط اليد غير متاحة في هذا الحقل"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"الكتابة بخط اليد غير متاحة في حقول كلمات المرور"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"رجوع"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"تبديل أسلوب الإدخال"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"مساحة التخزين منخفضة"</string> @@ -1290,7 +1287,7 @@ <string name="android_upgrading_starting_apps" msgid="6206161195076057075">"بدء التطبيقات."</string> <string name="android_upgrading_complete" msgid="409800058018374746">"جارٍ إعادة التشغيل."</string> <string name="fp_power_button_enrollment_message" msgid="5648173517663246140">"ضغطت على زر التشغيل، يؤدي هذا عادةً إلى إيقاف الشاشة.\n\nجرِّب النقر بخفة أثناء إعداد بصمتك."</string> - <string name="fp_power_button_enrollment_title" msgid="6976841690455338563">"لإيقاف عملية الإعداد، أغلِق الشاشة."</string> + <string name="fp_power_button_enrollment_title" msgid="6976841690455338563">"لإيقاف عملية الإعداد، أغلِق الشاشة"</string> <string name="fp_power_button_enrollment_button_text" msgid="3199783266386029200">"إيقاف"</string> <string name="fp_power_button_bp_title" msgid="5585506104526820067">"هل تريد مواصلة تأكيد بصمة إصبعك؟"</string> <string name="fp_power_button_bp_message" msgid="2983163038168903393">"ضغطت على زر التشغيل، يؤدي هذا عادةً إلى إيقاف الشاشة.\n\nجرِّب النقر بخفة لتأكيد بصمة إصبعك."</string> @@ -1936,6 +1933,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"تحت إدارة \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"مفعَّل"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"غير مفعَّل"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"يعمل <xliff:g id="THIRD_PARTY">%1$s</xliff:g> على كتم بعض الأصوات."</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"حدثت مشكلة داخلية في جهازك، وقد لا يستقر وضعه حتى إجراء إعادة الضبط على الإعدادات الأصلية."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"حدثت مشكلة داخلية في جهازك. يمكنك الاتصال بالمصنِّع للحصول على تفاصيل."</string> diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml index 6117086b561d..aaf715b78543 100644 --- a/core/res/res/values-as/strings.xml +++ b/core/res/res/values-as/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"ম’বাইল নেটৱৰ্কৰ লগত সংযোগ কৰিব পৰা নাই"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"পচন্দৰ নেটৱৰ্ক সলনি কৰি চেষ্টা কৰি চাওক। সলনি কৰিবলৈ টিপক।"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"জৰুৰীকালীন কল কৰাৰ সুবিধা উপলব্ধ নহয়"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"জৰুৰীকালীন কল কৰিবলৈ ম’বাইল নেটৱৰ্কৰ প্ৰয়োজন"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"সতৰ্কবাণীসমূহ"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"কল ফৰৱাৰ্ডিং"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"জৰুৰীকালীন ক\'লবেক ম\'ড"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"মচক"</string> <string name="inputMethod" msgid="1784759500516314751">"ইনপুট পদ্ধতি"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"পাঠ বিষয়ক কাৰ্য"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"এই ক্ষেত্ৰত হস্তলিপি সমৰ্থিত নহয়"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"পাছৱৰ্ড ক্ষেত্ৰসমূহত হস্তলিপি সমৰ্থিত নহয়"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"উভতি যাওক"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"ইনপুটৰ পদ্ধতি সলনি কৰক"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"ষ্ট’ৰেজৰ খালী ঠাই শেষ হৈ আছে"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g>এ পৰিচালনা কৰা"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"অন আছে"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"অফ আছে"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>এ কিছুমান ধ্বনি মিউট কৰি আছে"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"আপোনাৰ ডিভাইচত এটা আভ্যন্তৰীণ সমস্যা আছে আৰু আপুনি ফেক্টৰী ডেটা ৰিছেট নকৰালৈকে ই সুস্থিৰভাৱে কাম নকৰিব পাৰে।"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"আপোনাৰ ডিভাইচত এটা আভ্যন্তৰীণ সমস্যা আছে। সবিশেষ জানিবৰ বাবে আপোনাৰ ডিভাইচ নির্মাতাৰ সৈতে যোগাযোগ কৰক।"</string> @@ -1993,7 +1996,7 @@ <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"জৰুৰীকালীন"</string> <string name="set_up_screen_lock_title" msgid="8346083801616474030">"এটা স্ক্ৰীন লক ছেট কৰক"</string> <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"স্ক্ৰীন লক ছেট কৰা"</string> - <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"আপোনাৰ প্ৰাইভেট স্পেচ ব্যৱহাৰ কৰিবলৈ এই ডিভাইচটোত স্ক্ৰীন লক ছেট কৰক"</string> + <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"আপোনাৰ প্ৰাইভেট স্পে\'চ ব্যৱহাৰ কৰিবলৈ এই ডিভাইচটোত স্ক্ৰীন লক ছেট কৰক"</string> <string name="app_blocked_title" msgid="7353262160455028160">"এপ্টো উপলব্ধ নহয়"</string> <string name="app_blocked_message" msgid="542972921087873023">"এই মুহূৰ্তত <xliff:g id="APP_NAME">%1$s</xliff:g> উপলব্ধ নহয়।"</string> <string name="app_streaming_blocked_title" msgid="6090945835898766139">"<xliff:g id="ACTIVITY">%1$s</xliff:g> উপলব্ধ নহয়"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index a18681511b87..8a8b2fa9f459 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Mobil şəbəkəyə daxil olmaq mümkün deyil"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Tərcih edilən şəbəkəni dəyişin. Dəyişmək üçün klikləyin."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Təcili zəng əlçatan deyil"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Təcili zənglər üçün mobil şəbəkə tələb olunur"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Siqnallar"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Zəng yönləndirmə"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Təcili geriyə zəng rejimi"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Sil"</string> <string name="inputMethod" msgid="1784759500516314751">"Daxiletmə metodu"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Mətn əməliyyatları"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Bu xanada əlyazma dəstəklənmir"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Parol sahələrində əlyazma dəstəklənmir"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Geriyə"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Daxiletmə metodunu dəyişdirin"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Yaddaş yeri bitir"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> idarə edir"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Aktiv"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Deaktiv"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> bəzi səsləri səssiz rejimə salır"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Cihazınızın daxili problemi var və istehsalçı sıfırlanması olmayana qədər qeyri-stabil ola bilər."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Cihazınızın daxili problemi var. Əlavə məlumat üçün istehsalçı ilə əlaqə saxlayın."</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 76554fb2b5f9..5f012669c144 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Povezivanje sa mobilnom mrežom nije uspelo"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Probajte da promenite željenu mrežu. Dodirnite da biste promenili."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Hitni pozivi nisu dostupni"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Hitni pozivi zahtevaju mobilnu mrežu"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Upozorenja"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Preusmeravanje poziva"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Režim za hitan povratni poziv"</string> @@ -616,7 +615,7 @@ <string name="permlab_disableKeyguard" msgid="3605253559020928505">"onemogućavanje zaključavanja ekrana"</string> <string name="permdesc_disableKeyguard" msgid="3223710003098573038">"Dozvoljava aplikaciji da onemogući zaključavanje tastature i sve povezane bezbednosne mere sa lozinkama. Na primer, telefon onemogućava zaključavanje tastature pri prijemu dolaznog telefonskog poziva, a zatim ga ponovo omogućava po završetku poziva."</string> <string name="permlab_requestPasswordComplexity" msgid="1808977190557794109">"traženje složenosti zaključavanja ekrana"</string> - <string name="permdesc_requestPasswordComplexity" msgid="1130556896836258567">"Dozvoljava aplikaciji da sazna nivo složenosti zaključavanja ekrana (visoka, srednja, niska ili nijedna), što ukazuje na mogući opseg trajanja i tip zaključavanja ekrana. Aplikacija može i da predlaže korisnicima da ažuriraju zaključavanje ekrana na određeni nivo, ali korisnici slobodno mogu da zanemare to i da idu na druge stranice. Imajte na umu da se podaci za zaključavanje ekrana ne čuvaju kao običan tekst, pa aplikacija ne zna tačnu lozinku."</string> + <string name="permdesc_requestPasswordComplexity" msgid="1130556896836258567">"Dozvoljava aplikaciji da sazna nivo složenosti zaključavanja ekrana (visoka, srednja, niska ili nijedna), što ukazuje na mogući opseg trajanja i tip zaključavanja ekrana. Aplikacija može i da predlaže korisnicima da ažuriraju otključavanje ekrana na određeni nivo, ali korisnici slobodno mogu da zanemare to i da idu na druge stranice. Imajte na umu da se podaci za otključavanje ekrana ne čuvaju kao običan tekst, pa aplikacija ne zna tačnu lozinku."</string> <string name="permlab_postNotification" msgid="4875401198597803658">"prikazivanje obaveštenja"</string> <string name="permdesc_postNotification" msgid="5974977162462877075">"Dozvoljava aplikaciji da prikazuje obaveštenja"</string> <string name="permlab_turnScreenOn" msgid="219344053664171492">"uključivanje ekrana"</string> @@ -636,10 +635,10 @@ <string name="permlab_mediaLocation" msgid="7368098373378598066">"čitanje lokacija iz medijske kolekcije"</string> <string name="permdesc_mediaLocation" msgid="597912899423578138">"Dozvoljava aplikaciji da čita lokacije iz medijske kolekcije."</string> <string name="biometric_app_setting_name" msgid="3339209978734534457">"Koristite biometriju"</string> - <string name="biometric_or_screen_lock_app_setting_name" msgid="5348462421758257752">"Koristite biometriju ili zaključavanje ekrana"</string> + <string name="biometric_or_screen_lock_app_setting_name" msgid="5348462421758257752">"Koristite biometriju ili otključavanje ekrana"</string> <string name="biometric_dialog_default_title" msgid="55026799173208210">"Potvrdite svoj identitet"</string> <string name="biometric_dialog_default_subtitle" msgid="8457232339298571992">"Koristite biometrijski podatak da biste nastavili"</string> - <string name="biometric_or_screen_lock_dialog_default_subtitle" msgid="159539678371552009">"Koristite biometrijski podatak ili zaključavanje ekrana da biste nastavili"</string> + <string name="biometric_or_screen_lock_dialog_default_subtitle" msgid="159539678371552009">"Koristite biometrijski podatak ili otključavanje ekrana da biste nastavili"</string> <string name="biometric_error_hw_unavailable" msgid="2494077380540615216">"Biometrijski hardver nije dostupan"</string> <string name="biometric_error_user_canceled" msgid="6732303949695293730">"Potvrda identiteta je otkazana"</string> <string name="biometric_not_recognized" msgid="5106687642694635888">"Nije prepoznato"</string> @@ -647,8 +646,8 @@ <string name="biometric_error_canceled" msgid="8266582404844179778">"Potvrda identiteta je otkazana"</string> <string name="biometric_error_device_not_secured" msgid="3129845065043995924">"Niste podesili ni PIN, ni šablon, ni lozinku"</string> <string name="biometric_error_generic" msgid="6784371929985434439">"Greška pri potvrdi identiteta"</string> - <string name="screen_lock_app_setting_name" msgid="6054944352976789228">"Koristite zaključavanje ekrana"</string> - <string name="screen_lock_dialog_default_subtitle" msgid="120359538048533695">"Upotrebite zaključavanje ekrana da biste nastavili"</string> + <string name="screen_lock_app_setting_name" msgid="6054944352976789228">"Koristite otključavanje ekrana"</string> + <string name="screen_lock_dialog_default_subtitle" msgid="120359538048533695">"Upotrebite otključavanje ekrana da biste nastavili"</string> <string name="fingerprint_acquired_partial" msgid="4323789264604479684">"Čvrsto pritisnite senzor"</string> <string name="fingerprint_acquired_insufficient" msgid="2410176550915730974">"Otisak prsta nije prepoznat. Probajte ponovo."</string> <string name="fingerprint_acquired_imager_dirty" msgid="1770676120848224250">"Obrišite senzor za otisak prsta i probajte ponovo"</string> @@ -673,8 +672,8 @@ <string name="fingerprint_error_timeout" msgid="7361192266621252164">"Vreme za podešavanje otiska prsta je isteklo. Probajte ponovo."</string> <string name="fingerprint_error_canceled" msgid="5541771463159727513">"Radnja sa otiskom prsta je otkazana"</string> <string name="fingerprint_error_user_canceled" msgid="2017941773466506863">"Korisnik je otkazao radnju sa otiskom prsta"</string> - <string name="fingerprint_error_lockout" msgid="6626753679019351368">"Previše pokušaja. Koristite zaključavanje ekrana umesto toga."</string> - <string name="fingerprint_error_lockout_permanent" msgid="9060651300306264843">"Previše pokušaja. Koristite zaključavanje ekrana umesto toga."</string> + <string name="fingerprint_error_lockout" msgid="6626753679019351368">"Previše pokušaja. Koristite otključavanje ekrana umesto toga."</string> + <string name="fingerprint_error_lockout_permanent" msgid="9060651300306264843">"Previše pokušaja. Koristite otključavanje ekrana umesto toga."</string> <string name="fingerprint_error_unable_to_process" msgid="2446280592818621224">"Obrađivanje otiska prsta nije uspelo. Probajte ponovo."</string> <string name="fingerprint_error_no_fingerprints" msgid="3144806556204061862">"Nije registrovan nijedan otisak prsta"</string> <string name="fingerprint_error_hw_not_present" msgid="5898827259419366359">"Ovaj uređaj nema senzor za otisak prsta"</string> @@ -683,9 +682,9 @@ <string name="fingerprint_error_power_pressed" msgid="5479524500542129414">"Pritisnuto je dugme za uključivanje"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Prst <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Koristite otisak prsta"</string> - <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Koristite otisak prsta ili zaključavanje ekrana"</string> + <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Koristite otisak prsta ili otključavanje ekrana"</string> <string name="fingerprint_dialog_default_subtitle" msgid="3879832845486835905">"Nastavite pomoću otiska prsta"</string> - <string name="fingerprint_or_screen_lock_dialog_default_subtitle" msgid="5195808203117992200">"Koristite otisak prsta ili zaključavanje ekrana da biste nastavili"</string> + <string name="fingerprint_or_screen_lock_dialog_default_subtitle" msgid="5195808203117992200">"Koristite otisak prsta ili otključavanje ekrana da biste nastavili"</string> <string-array name="fingerprint_error_vendor"> </string-array> <string name="fingerprint_error_vendor_unknown" msgid="4170002184907291065">"Došlo je do problema. Probajte ponovo."</string> @@ -737,16 +736,16 @@ <string name="face_error_user_canceled" msgid="5766472033202928373">"Korisnik je otkazao otključavanje licem"</string> <string name="face_error_lockout" msgid="7864408714994529437">"Previše pokušaja. Probajte ponovo kasnije."</string> <string name="face_error_lockout_permanent" msgid="8533257333130473422">"Previše pokušaja. Otključavanje licem nije dostupno."</string> - <string name="face_error_lockout_screen_lock" msgid="5062609811636860928">"Previše pokušaja. Koristite zaključavanje ekrana za to."</string> + <string name="face_error_lockout_screen_lock" msgid="5062609811636860928">"Previše pokušaja. Koristite otključavanje ekrana za to."</string> <string name="face_error_unable_to_process" msgid="5723292697366130070">"Provera lica nije uspela. Probajte ponovo."</string> <string name="face_error_not_enrolled" msgid="1134739108536328412">"Niste podesili otključavanje licem"</string> <string name="face_error_hw_not_present" msgid="7940978724978763011">"Otključavanje licem nije podržano na ovom uređaju"</string> <string name="face_error_security_update_required" msgid="5076017208528750161">"Senzor je privremeno onemogućen."</string> <string name="face_name_template" msgid="3877037340223318119">"Lice <xliff:g id="FACEID">%d</xliff:g>"</string> <string name="face_app_setting_name" msgid="5854024256907828015">"Koristite otključavanje licem"</string> - <string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Koristite zaključavanje licem ili zaključavanje ekrana"</string> + <string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Koristite zaključavanje licem ili otključavanje ekrana"</string> <string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Potvrdite identitet licem da biste nastavili"</string> - <string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Koristite lice ili zaključavanje ekrana da biste nastavili"</string> + <string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Koristite lice ili otključavanje ekrana da biste nastavili"</string> <string-array name="face_error_vendor"> </string-array> <string name="face_error_vendor_unknown" msgid="7387005932083302070">"Došlo je do problema. Probajte ponovo."</string> @@ -828,7 +827,7 @@ <string name="permlab_writeVerificationStateE2eeContactKeys" msgid="3990742344778360457">"Ažuriranje statusa verifikacije ključeva za šifrovanje kontakata s kraja na kraj u vlasništvu drugih aplikacija"</string> <string name="permdesc_writeVerificationStateE2eeContactKeys" msgid="8453156829747427041">"Dozvoljava aplikaciji da ažurira statuse verifikacije ključeva za šifrovanje kontakata s kraja na kraj (E2EE) u vlasništvu drugih aplikacija"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Podešavanje pravila za lozinku"</string> - <string name="policydesc_limitPassword" msgid="4105491021115793793">"Kontroliše dužinu i znakove dozvoljene u lozinkama i PIN-ovima za zaključavanje ekrana."</string> + <string name="policydesc_limitPassword" msgid="4105491021115793793">"Kontroliše dužinu i znakove dozvoljene u lozinkama i PIN-ovima za otključavanje ekrana."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Nadzor pokušaja otključavanja ekrana"</string> <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Prati broj netačno unetih lozinki prilikom otključavanja ekrana i zaključava tablet ili briše podatke sa tableta ako je netačna lozinka uneta previše puta."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Nadgleda broj netačnih lozinki unetih pri otključavanju ekrana i zaključava Android TV uređaj ili briše sve podatke sa Android TV uređaja ako se unese previše netačnih lozinki."</string> @@ -839,7 +838,7 @@ <string name="policydesc_watchLogin_secondaryUser" product="automotive" msgid="7180857406058327941">"Nadgleda broj netačnih lozinki unetih pri otključavanju ekrana i zaključava sistem za info-zabavu ili briše sve podatke ovog profila ako se unese previše netačnih lozinki."</string> <string name="policydesc_watchLogin_secondaryUser" product="default" msgid="9177645136475155924">"Nadgleda broj netačnih lozinki unetih pri otključavanju ekrana i zaključava telefon ili briše sve podatke ovog korisnika ako se unese previše netačnih lozinki."</string> <string name="policylab_resetPassword" msgid="214556238645096520">"Promena zaključavanja ekrana"</string> - <string name="policydesc_resetPassword" msgid="4626419138439341851">"Menja zaključavanje ekrana."</string> + <string name="policydesc_resetPassword" msgid="4626419138439341851">"Menja otključavanje ekrana."</string> <string name="policylab_forceLock" msgid="7360335502968476434">"Zaključavanje ekrana"</string> <string name="policydesc_forceLock" msgid="1008844760853899693">"Kontrola načina i vremena zaključavanja ekrana."</string> <string name="policylab_wipeData" msgid="1359485247727537311">"Brisanje svih podataka"</string> @@ -856,7 +855,7 @@ <string name="policylab_setGlobalProxy" msgid="215332221188670221">"Podesite globalni proksi server uređaja"</string> <string name="policydesc_setGlobalProxy" msgid="7149665222705519604">"Podešava globalni proksi uređaja koji će se koristiti dok su smernice omogućene. Samo vlasnik uređaja može da podesi globalni proksi."</string> <string name="policylab_expirePassword" msgid="6015404400532459169">"Podesi istek. lozin. za zaklj. ekr."</string> - <string name="policydesc_expirePassword" msgid="9136524319325960675">"Menja koliko često lozinka, PIN ili šablon za zaključavanje ekrana mora da se menja."</string> + <string name="policydesc_expirePassword" msgid="9136524319325960675">"Menja koliko često lozinka, PIN ili šablon za otključavanje ekrana mora da se menja."</string> <string name="policylab_encryptedStorage" msgid="9012936958126670110">"Podešavanje šifrovanja skladišta"</string> <string name="policydesc_encryptedStorage" msgid="1102516950740375617">"Zahteva da sačuvani podaci aplikacije budu šifrovani."</string> <string name="policylab_disableCamera" msgid="5749486347810162018">"Onemogućavanje kamera"</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Izbriši"</string> <string name="inputMethod" msgid="1784759500516314751">"Metod unosa"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Radnje u vezi sa tekstom"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Pisanje rukom nije podržano u ovom polju"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Pisanje rukom nije podržano u poljima za lozinke"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Nazad"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Promenite metod unosa"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Memorijski prostor je na izmaku"</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Upravlja: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Uključeno"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Isključeno"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> isključuje neke zvuke"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Došlo je do internog problema u vezi sa uređajem i možda će biti nestabilan dok ne obavite resetovanje na fabrička podešavanja."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Došlo je do internog problema u vezi sa uređajem. Potražite detalje od proizvođača."</string> @@ -1992,9 +1995,9 @@ <string name="work_mode_off_title" msgid="6367463960165135829">"Uključiti poslovne aplikacije?"</string> <string name="work_mode_turn_on" msgid="5316648862401307800">"Ponovo aktiviraj"</string> <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"Hitan slučaj"</string> - <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Podesite zaključavanje ekrana"</string> - <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Podesi zaključavanje ekrana"</string> - <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Da biste koristili privatni prostor, podesite zaključavanje ekrana na ovom uređaju"</string> + <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Podesite otključavanje ekrana"</string> + <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Podesi otključavanje ekrana"</string> + <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Da biste koristili privatni prostor, podesite otključavanje ekrana na ovom uređaju"</string> <string name="app_blocked_title" msgid="7353262160455028160">"Aplikacija nije dostupna"</string> <string name="app_blocked_message" msgid="542972921087873023">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> trenutno nije dostupna."</string> <string name="app_streaming_blocked_title" msgid="6090945835898766139">"<xliff:g id="ACTIVITY">%1$s</xliff:g> – nije dostupno"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index c7d4224cf382..84660349f28f 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -86,8 +86,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Сетка мабільнай сувязі недаступная"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Націсніце, каб выбраць іншую сетку."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Экстранныя выклікі недаступныя"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Для экстранных выклікаў патрабуецца мабільная сетка"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Абвесткі"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Пераадрасацыя выкліку"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Рэжым экстранных зваротных выклікаў"</string> @@ -1186,10 +1185,8 @@ <string name="deleteText" msgid="4200807474529938112">"Выдалiць"</string> <string name="inputMethod" msgid="1784759500516314751">"Метад уводу"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Дзеянні з тэкстам"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Гэта поле не падтрымлівае рукапісны ўвод"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Палі для ўказання пароля не падтрымліваюць рукапісны ўвод"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Назад"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Пераключэнне рэжыму ўводу"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Месца для захавання на зыходзе"</string> @@ -1934,6 +1931,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Пад кіраваннем праграмы \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Уключана"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Выключана"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> выключае некаторыя гукі"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"На вашай прыладзе ўзнікла ўнутраная праблема, і яна можа працаваць нестабільна, пакуль вы не зробіце скід да заводскіх налад."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"На вашай прыладзе ўзнікла ўнутраная праблема. Для атрымання дадатковай інфармацыі звярніцеся да вытворцы."</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index d5b59a8c5cb8..56b429a862d8 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Не може да се установи връзка с мобилната мрежа"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Изберете друга предпочитана мрежа. Докоснете за промяна."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Няма достъп до спешните обаждания"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"За спешните обаждания се изисква мобилна мрежа"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Сигнали"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Пренасочване на обаждания"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Режим на обратно обаждане при спешност"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Изтриване"</string> <string name="inputMethod" msgid="1784759500516314751">"Метод на въвеждане"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Действия с текста"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"В това поле не се поддържа ръкописно въвеждане"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"В полета за парола не се поддържа ръкописно въвеждане"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Назад"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Превключване на метода на въвеждане"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Мястото в хранилището е на изчерпване"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Управлява се от <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Вкл."</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Изкл."</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> заглушава някои звуци"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Възникна вътрешен проблем с устройството ви. То може да е нестабилно, докато не възстановите фабричните настройки."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Възникна вътрешен проблем с устройството ви. За подробности се свържете с производителя."</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index ef021115e315..97175364606f 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"মোবাইল নেটওয়ার্কে কানেক্ট করা যাচ্ছে না"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"পছন্দের নেটওয়ার্ক পরিবর্তন করে দেখুন। অন্য নেটওয়ার্ক বেছে নিতে ট্যাপ করুন।"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"জরুরি কল করা যাবে না"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"জরুরি কলের জন্য মোবাইল নেটওয়ার্ক থাকতে হবে"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"সতর্কতা"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"কল ফরওয়ার্ড করা"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"জরুরি কলব্যাক মোড"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"মুছুন"</string> <string name="inputMethod" msgid="1784759500516314751">"ইনপুট পদ্ধতি"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"পাঠ্য ক্রিয়াগুলি"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"এই ফিল্ডে হাতের লেখা কাজ করে না"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"পাসওয়ার্ডের ফিল্ডে হাতের লেখা কাজ করে না"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"ফিরে যান"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"ইনপুট পদ্ধতি পাল্টান"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"স্টোরেজ পূর্ণ হতে চলেছে"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> ম্যানেজ করে"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"চালু আছে"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"বন্ধ আছে"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> কিছু সাউন্ডকে মিউট করে দিচ্ছে"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"আপনার ডিভাইসে একটি অভ্যন্তরীন সমস্যা হয়েছে, এবং আপনি যতক্ষণ না পর্যন্ত এটিকে ফ্যাক্টরি ডেটা রিসেট করছেন ততক্ষণ এটি ঠিকভাবে কাজ নাও করতে পারে৷"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"আপনার ডিভাইসে একটি অভ্যন্তরীন সমস্যা হয়েছে৷ বিস্তারিত জানার জন্য প্রস্তুতকারকের সাথে যোগাযোগ করুন৷"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index 9f0a387ce8ed..55a014b3fea6 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Nije moguće dosegnuti mobilnu mrežu"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Pokušajte promijeniti preferiranu mrežu. Dodirnite za promjenu."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Hitni pozivi su nedostupni"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Za hitne pozive potrebna je mreža"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Upozorenja"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Prosljeđivanje poziva"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Način rada za hitni povratni poziv"</string> @@ -829,7 +828,7 @@ <string name="permdesc_writeVerificationStateE2eeContactKeys" msgid="8453156829747427041">"Dozvoljava aplikaciji da ažurira stanja potvrđivanja E2EE kontaktnih ključeva u vlasništvu drugih aplikacija"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Postavljanje pravila za lozinke"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Kontrolira dužinu i znakove koji su dozvoljeni u lozinkama za zaključavanje ekrana i PIN-ovima."</string> - <string name="policylab_watchLogin" msgid="7599669460083719504">"Prati pokušaje otključavanja ekrana"</string> + <string name="policylab_watchLogin" msgid="7599669460083719504">"Praćenje pokušaja otključavanja ekrana"</string> <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Prati broj pogrešno unijetih lozinki prilikom otključavanja ekrana i zaključava tablet ili briše sve podatke s njega ukoliko se previše puta unese pogrešna lozinka."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Praćenje broja unosa netačnih lozinki pri otključavanju ekrana i zaključavanje Android TV uređaja ili brisanje svih podataka Android TV uređaja u slučaju prevelikog broja unosa netačnih lozinki."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"Prati koliko puta je lozinka neispravno unijeta prilikom otključavanja ekrana i zaključava informativno-zabavni sistem ili briše sve podatke informativno-zabavnog sistema ako se lozinka neispravno unese previše puta."</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Izbriši"</string> <string name="inputMethod" msgid="1784759500516314751">"Način unosa"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Akcije za tekst"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Rukopis nije podržan u ovom polju"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Rukopis nije podržan u poljima za lozinku"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Nazad"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Promjena načina unosa"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Ponestaje prostora za pohranu"</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Upravlja <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Uključeno"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Isključeno"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> isključuje neke zvukove"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Postoji problem u vašem uređaju i može biti nestabilan dok ga ne vratite na fabričke postavke."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Postoji problem u vašem uređaju. Za više informacija obratite se proizvođaču."</string> @@ -1994,7 +1997,7 @@ <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"Hitan slučaj"</string> <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Postavite zaključavanje ekrana"</string> <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Postavite zaključavanje ekrana"</string> - <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Za upotrebu privatn. prostora postavite zaklj. ekr. na uređ."</string> + <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Za upotrebu privatnog prostora postavite zaključavanje ekrana na uređaju"</string> <string name="app_blocked_title" msgid="7353262160455028160">"Aplikacija nije dostupna"</string> <string name="app_blocked_message" msgid="542972921087873023">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> trenutno nije dostupna."</string> <string name="app_streaming_blocked_title" msgid="6090945835898766139">"Nedostupno: <xliff:g id="ACTIVITY">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 7aad1a7880d0..65b0f81d2f2c 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"No es pot accedir a la xarxa mòbil"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Prova de canviar de xarxa preferent. Toca per canviar-la."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Les trucades d\'emergència no estan disponibles"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Per poder fer trucades d\'emergència, cal tenir connexió a una xarxa mòbil"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Alertes"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Desviació de trucades"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Mode de devolució de trucada d\'emergència"</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Suprimeix"</string> <string name="inputMethod" msgid="1784759500516314751">"Mètode d\'introducció de text"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Accions de text"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"L\'escriptura a mà no s\'admet en aquest camp"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"L\'escriptura a mà no s\'admet als camps de contrasenya"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Enrere"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Canvia el mètode d\'introducció de text"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"L\'espai d\'emmagatzematge s\'està esgotant"</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Gestionat per <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Activat"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Desactivat"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> està silenciant alguns sons"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"S\'ha produït un error intern al dispositiu i és possible que funcioni de manera inestable fins que restableixis les dades de fàbrica."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"S\'ha produït un error intern al dispositiu. Contacta amb el fabricant del dispositiu per obtenir més informació."</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index eba179696891..798185cb4c43 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -86,8 +86,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Mobilní síť není dostupná"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Zkuste změnit preferovanou síť. Změníte ji klepnutím."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Tísňová volání jsou nedostupná"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Tísňová volání vyžadují mobilní síť"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Upozornění"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Přesměrování hovorů"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Režim tísňového zpětného volání"</string> @@ -1186,10 +1185,8 @@ <string name="deleteText" msgid="4200807474529938112">"Smazat"</string> <string name="inputMethod" msgid="1784759500516314751">"Metoda zadávání dat"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Operace s textem"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"V tomto poli není psaní rukou podporováno"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"V polích pro hesla není psaní rukou podporováno"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Zpět"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Přepnout metodu zadávání"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"V úložišti je málo místa"</string> @@ -1934,6 +1931,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Spravováno aplikací <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Zapnuto"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Vypnuto"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> vypíná určité zvuky"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"V zařízení došlo k internímu problému. Dokud neprovedete obnovení továrních dat, může být nestabilní."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"V zařízení došlo k internímu problému. Další informace vám sdělí výrobce."</string> @@ -1993,7 +1996,7 @@ <string name="work_mode_off_title" msgid="6367463960165135829">"Zrušit pozastavení pracovních aplikací?"</string> <string name="work_mode_turn_on" msgid="5316648862401307800">"Zrušit pozastavení"</string> <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"Stav nouze"</string> - <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Nastavení zámku obrazovky"</string> + <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Nastavte si zámek obrazovky"</string> <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Nastavit zámek obrazovky"</string> <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Pokud chcete používat soukromý prostor, nastavte na tomto zařízení zámek obrazovky"</string> <string name="app_blocked_title" msgid="7353262160455028160">"Aplikace není k dispozici"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index d0dca412c582..8559d400e980 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Der er ingen forbindelse til mobilnetværket"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Prøv at skifte dit foretrukne netværk. Tryk for skifte."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Det er ikke muligt at foretage nødopkald"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Nødopkald kræver adgang til et mobilnetværk"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Underretninger"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Viderestilling af opkald"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Nødtilbagekaldstilstand"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Slet"</string> <string name="inputMethod" msgid="1784759500516314751">"Inputmetode"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Teksthandlinger"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Håndskrift understøttes ikke for dette felt"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Håndskrift understøttes ikke for adgangskodefelter"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Tilbage"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Skift indtastningsmetode"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Der er snart ikke mere lagerplads"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Administreres af <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Til"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Fra"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> slår nogle lyde fra"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Der er et internt problem med enheden, og den vil muligvis være ustabil, indtil du gendanner fabriksdataene."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Der er et internt problem med enheden. Kontakt producenten for at få yderligere oplysninger."</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index fea2777e992e..a96bcfdb7764 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Mobilfunknetz nicht erreichbar"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Versuche, das bevorzugte Netzwerk zu ändern. Tippe, um ein anderes auszuwählen."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Notrufe nicht möglich"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Für Notrufe ist ein Mobilfunknetz erforderlich"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Warnmeldungen"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Anrufweiterleitung"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Notfallrückrufmodus"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Löschen"</string> <string name="inputMethod" msgid="1784759500516314751">"Eingabemethode"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Textaktionen"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Handschrift wird in diesem Feld nicht unterstützt"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Handschrift wird in Passwortfeldern nicht unterstützt"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Zurück"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Eingabemethode wechseln"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Der Speicherplatz wird knapp"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Verwaltet von <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"An"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Aus"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"Einige Töne werden von <xliff:g id="THIRD_PARTY">%1$s</xliff:g> stummgeschaltet"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Es liegt ein internes Problem mit deinem Gerät vor. Möglicherweise verhält es sich instabil, bis du es auf die Werkseinstellungen zurücksetzt."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Es liegt ein internes Problem mit deinem Gerät vor. Bitte wende dich diesbezüglich an den Hersteller."</string> @@ -2136,7 +2139,7 @@ <string name="nas_upgrade_notification_enable_action" msgid="3046406808378726874">"OK"</string> <string name="nas_upgrade_notification_disable_action" msgid="3794833210043497982">"Ausschalten"</string> <string name="nas_upgrade_notification_learn_more_action" msgid="7011130656195423947">"Weitere Informationen"</string> - <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Die adaptiven Benachrichtigungen wurden in Android 12 durch die Funktion „Erweiterte Benachrichtigungen“ ersetzt. Diese Funktion zeigt Vorschläge für Aktionen und Antworten an und sortiert Benachrichtigungen.\n\nDie Funktion hat Zugriff auf alle Benachrichtigungen, darunter auch personenbezogene Daten wie Kontaktnamen und Nachrichten. Außerdem kann sie auf Benachrichtigungen antworten oder diese schließen und so beispielsweise Anrufe entgegennehmen oder „Bitte nicht stören“ steuern."</string> + <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Die adaptiven Benachrichtigungen wurden in Android 12 durch die Funktion „Erweiterte Benachrichtigungen“ ersetzt. Diese Funktion zeigt Vorschläge für Aktionen und Antworten an und sortiert Benachrichtigungen.\n\nDie Funktion hat Zugriff auf alle Benachrichtigungen, darunter auch personenbezogene Daten wie Namen von Kontakten und Nachrichten. Außerdem kann sie auf Benachrichtigungen antworten oder diese schließen und so unter anderem Anrufe entgegennehmen oder „Bitte nicht stören“ steuern."</string> <string name="dynamic_mode_notification_channel_name" msgid="2986926422100223328">"Infomitteilung zum Ablaufmodus"</string> <string name="dynamic_mode_notification_title" msgid="1388718452788985481">"Energiesparmodus aktiviert"</string> <string name="dynamic_mode_notification_summary" msgid="1639031262484979689">"Reduzierung der Akkunutzung, um die Akkulaufzeit zu verlängern"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index dec720f289bd..eff6d4dd8d68 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Δεν είναι δυνατή η σύνδεση στο δίκτυο κινητής τηλεφωνίας"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Δοκιμάστε να αλλάξετε το προτιμώμενο δίκτυο. Πατήστε για αλλαγή."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Οι κλήσεις έκτακτης ανάγκης δεν είναι διαθέσιμες"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Για τις κλήσεις έκτακτης ανάγκης απαιτείται δίκτυο κινητής τηλεφωνίας"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Ειδοποιήσεις"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Προώθηση κλήσης"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Λειτουργία επιστροφής κλήσης έκτακτης ανάγκης"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Διαγραφή"</string> <string name="inputMethod" msgid="1784759500516314751">"Μέθοδος εισόδου"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Ενέργειες κειμένου"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Η γραφή δεν υποστηρίζεται σε αυτό το πεδίο"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Η γραφή δεν υποστηρίζεται στα πεδία κωδικού πρόσβασης"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Πίσω"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Εναλλαγή μεθόδου εισαγωγής"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Ο αποθηκευτικός χώρος εξαντλείται"</string> @@ -1761,7 +1758,7 @@ <string name="user_switched" msgid="7249833311585228097">"Τρέχων χρήστης <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="user_switching_message" msgid="1912993630661332336">"Εναλλαγή σε <xliff:g id="NAME">%1$s</xliff:g>…"</string> <string name="user_logging_out_message" msgid="7216437629179710359">"Αποσύνδεση <xliff:g id="NAME">%1$s</xliff:g>…"</string> - <string name="owner_name" msgid="8713560351570795743">"Κάτοχο"</string> + <string name="owner_name" msgid="8713560351570795743">"Κάτοχος"</string> <string name="guest_name" msgid="8502103277839834324">"Επισκέπτης"</string> <string name="error_message_title" msgid="4082495589294631966">"Σφάλμα"</string> <string name="error_message_change_not_allowed" msgid="843159705042381454">"Αυτή η αλλαγή δεν επιτρέπεται από το διαχειριστή σας"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Διαχείριση από <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Ενεργός"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Ανενεργός"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"Το τρίτο μέρος <xliff:g id="THIRD_PARTY">%1$s</xliff:g> θέτει ορισμένους ήχους σε σίγαση"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Υπάρχει ένα εσωτερικό πρόβλημα με τη συσκευή σας και ενδέχεται να είναι ασταθής μέχρι την επαναφορά των εργοστασιακών ρυθμίσεων."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Υπάρχει ένα εσωτερικό πρόβλημα με τη συσκευή σας. Επικοινωνήστε με τον κατασκευαστή σας για λεπτομέρειες."</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index dc36c8c581c0..c869c7e10232 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Can’t reach mobile network"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Try changing preferred network. Tap to change."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Emergency calling unavailable"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Emergency calls require a mobile network"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Alerts"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Call forwarding"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Emergency callback mode"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Delete"</string> <string name="inputMethod" msgid="1784759500516314751">"Input method"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Text actions"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Handwriting is not supported in this field"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Handwriting is not supported in password fields"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Back"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Switch input method"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Storage space running out"</string> @@ -1932,6 +1929,9 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"On"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Off"</string> + <string name="zen_mode_trigger_summary_divider_text" msgid="7461583466043698862">", "</string> + <string name="zen_mode_trigger_summary_range_symbol_combination" msgid="1804900738798069619">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string> + <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Any calendar"</string> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> is muting some sounds"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"There\'s an internal problem with your device, and it may be unstable until you factory data reset."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"There\'s an internal problem with your device. Contact your manufacturer for details."</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index c1316ed10f90..b521bdb0b3f6 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -1929,6 +1929,9 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"On"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Off"</string> + <string name="zen_mode_trigger_summary_divider_text" msgid="7461583466043698862">", "</string> + <string name="zen_mode_trigger_summary_range_symbol_combination" msgid="1804900738798069619">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string> + <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Any calendar"</string> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> is muting some sounds"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"There\'s an internal problem with your device, and it may be unstable until you factory data reset."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"There\'s an internal problem with your device. Contact your manufacturer for details."</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 9f00023c6a1f..542656de782a 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Can’t reach mobile network"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Try changing preferred network. Tap to change."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Emergency calling unavailable"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Emergency calls require a mobile network"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Alerts"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Call forwarding"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Emergency callback mode"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Delete"</string> <string name="inputMethod" msgid="1784759500516314751">"Input method"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Text actions"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Handwriting is not supported in this field"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Handwriting is not supported in password fields"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Back"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Switch input method"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Storage space running out"</string> @@ -1932,6 +1929,9 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"On"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Off"</string> + <string name="zen_mode_trigger_summary_divider_text" msgid="7461583466043698862">", "</string> + <string name="zen_mode_trigger_summary_range_symbol_combination" msgid="1804900738798069619">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string> + <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Any calendar"</string> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> is muting some sounds"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"There\'s an internal problem with your device, and it may be unstable until you factory data reset."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"There\'s an internal problem with your device. Contact your manufacturer for details."</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 67ca701e5b02..589e12955012 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Can’t reach mobile network"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Try changing preferred network. Tap to change."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Emergency calling unavailable"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Emergency calls require a mobile network"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Alerts"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Call forwarding"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Emergency callback mode"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Delete"</string> <string name="inputMethod" msgid="1784759500516314751">"Input method"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Text actions"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Handwriting is not supported in this field"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Handwriting is not supported in password fields"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Back"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Switch input method"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Storage space running out"</string> @@ -1932,6 +1929,9 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"On"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Off"</string> + <string name="zen_mode_trigger_summary_divider_text" msgid="7461583466043698862">", "</string> + <string name="zen_mode_trigger_summary_range_symbol_combination" msgid="1804900738798069619">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string> + <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Any calendar"</string> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> is muting some sounds"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"There\'s an internal problem with your device, and it may be unstable until you factory data reset."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"There\'s an internal problem with your device. Contact your manufacturer for details."</string> diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml index 4abc241dd8b2..c0465eef27f6 100644 --- a/core/res/res/values-en-rXC/strings.xml +++ b/core/res/res/values-en-rXC/strings.xml @@ -1929,6 +1929,9 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"On"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Off"</string> + <string name="zen_mode_trigger_summary_divider_text" msgid="7461583466043698862">", "</string> + <string name="zen_mode_trigger_summary_range_symbol_combination" msgid="1804900738798069619">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string> + <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Any calendar"</string> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> is muting some sounds"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"There\'s an internal problem with your device, and it may be unstable until you factory data reset."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"There\'s an internal problem with your device. Contact your manufacturer for details."</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 03660cbd70af..f361dd891438 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"No se puede acceder a la red móvil"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Presiona para cambiar la red preferida."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Servicio de llamadas de emergencia no disponible"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Las llamadas de emergencia requieren una red móvil"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Alertas"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Desvío de llamada"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Modo de devolución de llamada de emergencia"</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Eliminar"</string> <string name="inputMethod" msgid="1784759500516314751">"Método de entrada"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Acciones de texto"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"La función Escritura a mano no es compatible en este campo"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"La función Escritura a mano no es compatible en los campos de contraseñas"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Atrás"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Cambiar método de entrada"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Queda poco espacio de almacenamiento"</string> @@ -1933,6 +1930,9 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Administradas por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Activado"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Desactivado"</string> + <string name="zen_mode_trigger_summary_divider_text" msgid="7461583466043698862">", "</string> + <string name="zen_mode_trigger_summary_range_symbol_combination" msgid="1804900738798069619">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string> + <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Cualquier calendario"</string> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> silencia algunos sonidos"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Existe un problema interno con el dispositivo, de modo que el dispositivo puede estar inestable hasta que restablezcas la configuración de fábrica."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Existe un problema interno con el dispositivo. Comunícate con el fabricante para obtener más información."</string> @@ -2137,7 +2137,7 @@ <string name="nas_upgrade_notification_enable_action" msgid="3046406808378726874">"Aceptar"</string> <string name="nas_upgrade_notification_disable_action" msgid="3794833210043497982">"Desactivar"</string> <string name="nas_upgrade_notification_learn_more_action" msgid="7011130656195423947">"Más información"</string> - <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Las notificaciones mejoradas reemplazaron a las notificaciones adaptables en Android 12. Esta función muestra respuestas y acciones sugeridas, y organiza tus notificaciones.\n\nLas notificaciones mejoradas pueden acceder a todo el contenido de notificaciones, lo que incluye información personal, como nombres de contactos y mensajes. También pueden descartar o responder notificaciones (como contestar llamadas) y controlar la función No interrumpir."</string> + <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Las notificaciones mejoradas reemplazaron a las notificaciones adaptables en Android 12. Esta función muestra respuestas y acciones sugeridas, y organiza tus notificaciones.\n\nLas notificaciones mejoradas pueden acceder a todo el contenido de notificaciones, incluida información personal, como nombres de contactos y mensajes. También pueden descartar o responder notificaciones (como contestar llamadas) y controlar la función No interrumpir."</string> <string name="dynamic_mode_notification_channel_name" msgid="2986926422100223328">"Notificación de información del modo de Rutinas"</string> <string name="dynamic_mode_notification_title" msgid="1388718452788985481">"Ahorro de batería activado"</string> <string name="dynamic_mode_notification_summary" msgid="1639031262484979689">"Reduciendo el uso de la batería para extender su duración"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 1554b46774c9..87a369f17804 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"No se puede establecer conexión con la red móvil"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Toca para cambiar la red preferida."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Servicio de llamadas de emergencia no disponible"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Para hacer llamadas de emergencia, necesitas conectarte a una red móvil"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Alertas"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Desvío de llamadas"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Modo de devolución de llamada de emergencia"</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Eliminar"</string> <string name="inputMethod" msgid="1784759500516314751">"Método de introducción de texto"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Acciones de texto"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Escritura a mano no está disponible en este campo"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Escritura a mano no está disponible en campos de contraseña"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Atrás"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Cambiar método de introducción de texto"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Queda poco espacio"</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Gestionado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Activado"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Desactivado"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> silencia algunos sonidos"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Se ha producido un problema interno en el dispositivo y es posible que este no sea estable hasta que restablezcas el estado de fábrica."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Se ha producido un problema interno en el dispositivo. Ponte en contacto con el fabricante para obtener más información."</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 9b9760c60eab..3b844b2f9123 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -1929,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Haldab <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Sees"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Väljas"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> vaigistab teatud helid"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Seadmes ilmnes sisemine probleem ja seade võib olla ebastabiilne seni, kuni lähtestate seadme tehase andmetele."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Seadmes ilmnes sisemine probleem. Üksikasjaliku teabe saamiseks võtke ühendust tootjaga."</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index 7f9919d1e9ee..68ed75c87602 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Ezin da konektatu sare mugikorrera"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Aldatu sare hobetsia. Sakatu aldatzeko."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Ezin da egin larrialdi-deirik"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Sare mugikorrera konektatuta egon behar duzu larrialdi-deiak egin ahal izateko"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Alertak"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Dei-desbideratzea"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Larrialdi-zerbitzuen deiak jasotzeko modua"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Ezabatu"</string> <string name="inputMethod" msgid="1784759500516314751">"Idazketa-metodoa"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Testu-ekintzak"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Eremu honetan ez da onartzen eskuzko idazketa"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Pasahitzen eremuetan ez da onartzen eskuzko idazketa"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Atzera"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Aldatu idazketa-metodoa"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Memoria betetzen ari da"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Kudeatzailea: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Aktibatuta"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Desaktibatuta"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> soinu batzuk isilarazten ari da"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Barneko arazo bat dago zure gailuan eta agian ezegonkor egongo da jatorrizko datuak berrezartzen dituzun arte."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Barneko arazo bat dago zure gailuan. Xehetasunak jakiteko, jarri fabrikatzailearekin harremanetan."</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index af97c90f8e74..d9e69070bc9b 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"شبکه تلفن همراه دردسترس نیست"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"تغییر شبکه ترجیحی را امتحان کنید. برای تغییر، ضربه بزنید."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"تماس اضطراری امکانپذیر نیست"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"برای برقراری تماس اضطراری به شبکه تلفن همراه نیاز دارید"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"هشدارها"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"بازارسال تماس"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"حالت پاسخ تماس اضطراری"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"حذف"</string> <string name="inputMethod" msgid="1784759500516314751">"روش ورودی"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"کنشهای متنی"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"در این فیلد از دستنویسی پشتیبانی نمیشود"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"در فیلدهای گذرواژه از دستنویسی پشتیبانی نمیشود"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"برگشت"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"تغییر روش ورودی"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"فضای ذخیرهسازی درحال پر شدن است"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"تحتمدیریت <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"روشن"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"خاموش"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> درحال قطع کردن بعضی از صداهاست"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"دستگاهتان یک مشکل داخلی دارد، و ممکن است تا زمانی که بازنشانی دادههای کارخانه انجام نگیرد، بیثبات بماند."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"دستگاهتان یک مشکل داخلی دارد. برای جزئیات آن با سازندهتان تماس بگیرید."</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 823a26a13930..24b414a409a1 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Mobiiliverkkoon ei saada yhteyttä"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Kokeile vaihtaa ensisijaista verkkoa. Vaihda se napauttamalla."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Hätäpuhelut eivät ole käytettävissä"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Hätäpuhelu edellyttää mobiiliverkkoa"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Ilmoitukset"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Soitonsiirto"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Hätäpuhelujen takaisinsoittotila"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Poista"</string> <string name="inputMethod" msgid="1784759500516314751">"Syöttötapa"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Tekstitoiminnot"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Käsinkirjoitusta ei tueta tässä kentässä"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Käsinkirjoitusta ei tueta salasanakentissä"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Takaisin"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Vaihda syöttötapaa"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Tallennustila loppumassa"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Ylläpitäjä: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Päällä"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Pois päältä"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> mykistää joitakin ääniä"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Laitteellasi on sisäinen ongelma, joka aiheuttaa epävakautta. Voit korjata tilanteen palauttamalla tehdasasetukset."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Laitteesi yhdistäminen ei onnistu sisäisen virheen takia. Saat lisätietoja valmistajalta."</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 87af6b049541..d2f9b47e1721 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Impossible de joindre le réseau cellulaire"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Essayez de changer de réseau préféré. Touchez l\'écran pour changer."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Le service d\'appel d\'urgence n\'est pas accessible"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Les appels d\'urgence nécessitent un réseau cellulaire"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Alertes"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Transfert d\'appel"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Mode de rappel d\'urgence"</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Supprimer"</string> <string name="inputMethod" msgid="1784759500516314751">"Mode de saisie"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Actions sur le texte"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Ce champ ne prend pas en charge l\'écriture manuscrite"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Les champs de mot de passe ne prennent pas en charge l\'écriture manuscrite"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Retour"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Changer de méthode d\'entrée"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Espace de stockage bientôt saturé"</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Géré par <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Activé"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Désactivé"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> désactive certains sons"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Un problème interne est survenu avec votre appareil. Il se peut qu\'il soit instable jusqu\'à ce que vous le réinitialisiez à ses paramètres par défaut."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Un problème interne est survenu avec votre appareil. Communiquez avec le fabricant pour obtenir plus de détails."</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 9037bb737b1a..cc9bf3fd3063 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Impossible d\'accéder au réseau mobile"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Essayez de changer le réseau préféré. Appuyez pour le modifier."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Appels d\'urgence non disponibles"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Les appels d\'urgence requièrent un réseau mobile"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Alertes"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Transfert d\'appel"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Mode de rappel d\'urgence"</string> @@ -829,7 +828,7 @@ <string name="permdesc_writeVerificationStateE2eeContactKeys" msgid="8453156829747427041">"Autorise l\'appli à mettre à jour les états de validation des clés de contact E2EE possédées par d\'autres applis."</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Définir les règles du mot de passe"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Gérer le nombre et le type de caractères autorisés dans les mots de passe et les codes d\'accès de verrouillage de l\'écran"</string> - <string name="policylab_watchLogin" msgid="7599669460083719504">"Gérer les tentatives de déverrouillage de l\'écran"</string> + <string name="policylab_watchLogin" msgid="7599669460083719504">"Contrôler les tentatives de déverrouillage de l\'écran"</string> <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Contrôler le nombre de mots de passe incorrects saisis pour le déverrouillage de l\'écran, puis verrouiller la tablette ou effacer toutes ses données si le nombre maximal de tentatives de saisie du mot de passe est atteint"</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Contrôle le nombre de fois qu\'un mot de passe incorrect est saisi lors du déverrouillage de l\'écran, et verrouille votre appareil Android TV ou en efface toutes les données si le nombre maximal de mots de passe incorrects autorisé est dépassé."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"Contrôler le nombre de mots de passe incorrects saisis pour le déverrouillage de l\'écran, puis verrouiller le système d\'infoloisirs ou effacer toutes ses données si le nombre maximal de tentatives de saisie du mot de passe est atteint."</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Supprimer"</string> <string name="inputMethod" msgid="1784759500516314751">"Mode de saisie"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Actions sur le texte"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Ce champ ne prend pas en charge l\'écriture manuscrite"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Les champs de mot de passe ne prennent pas en charge l\'écriture manuscrite"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Retour"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Changer le mode de saisie"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Espace de stockage bientôt saturé"</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Géré par <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Activé"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Désactivé"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> coupe certains sons"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Un problème interne lié à votre appareil est survenu. Ce dernier risque d\'être instable jusqu\'à ce que vous rétablissiez la configuration d\'usine."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Un problème interne lié à votre appareil est survenu. Veuillez contacter le fabricant pour en savoir plus."</string> @@ -1992,9 +1995,9 @@ <string name="work_mode_off_title" msgid="6367463960165135829">"Réactiver les applis pro ?"</string> <string name="work_mode_turn_on" msgid="5316648862401307800">"Réactiver"</string> <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"Urgence"</string> - <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Définir verrouillage écran"</string> + <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Activer verrouillage écran"</string> <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Activer verrouillage écran"</string> - <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Pour utiliser votre espace privé, définissez un verrouillage de l\'écran sur cet appareil"</string> + <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Pour utiliser votre espace privé, activez le verrouillage de l\'écran sur cet appareil"</string> <string name="app_blocked_title" msgid="7353262160455028160">"Application non disponible"</string> <string name="app_blocked_message" msgid="542972921087873023">"<xliff:g id="APP_NAME">%1$s</xliff:g> n\'est pas disponible pour le moment."</string> <string name="app_streaming_blocked_title" msgid="6090945835898766139">"<xliff:g id="ACTIVITY">%1$s</xliff:g> indisponible"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index ff819f1e6ebb..15d0720e65ee 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -1929,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Xestionada por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Activada"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Desactivada"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> está silenciando algúns sons"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Produciuse un erro interno no teu dispositivo e quizais funcione de maneira inestable ata o restablecemento dos datos de fábrica."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Produciuse un erro interno co teu dispositivo. Contacta co teu fabricante para obter máis información."</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index 49a29d241881..df92802d0332 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"મોબાઇલ નેટવર્ક સુધી પહોંચી શકાતું નથી"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"પસંદગીનું નેટવર્ક બદલવાનો પ્રયાસ કરો. બદલવા માટે ટૅપ કરો."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"કટોકટીની કૉલિંગ સેવા અનુપલબ્ધ"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"ઇમર્જન્સી કૉલ માટે મોબાઇલ નેટવર્કની આવશ્યકતા છે"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"અલર્ટ"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"કૉલ ફૉર્વર્ડિંગ"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"કટોકટી કૉલબૅક મોડ"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"ડિલીટ કરો"</string> <string name="inputMethod" msgid="1784759500516314751">"ઇનપુટ પદ્ધતિ"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"ટેક્સ્ટ ક્રિયાઓ"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"આ ફીલ્ડમાં હસ્તલેખન સપોર્ટેડ નથી"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"પાસવર્ડ ફીલ્ડમાં હસ્તલેખન સપોર્ટેડ નથી"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"પાછળ"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"ઇનપુટ પદ્ધતિ સ્વિચ કરો"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"સ્ટોરેજ સ્થાન સમાપ્ત થયું"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> દ્વારા મેનેજ કરવામાં આવે છે"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"ચાલુ છે"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"બંધ છે"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> અમુક અવાજોને મ્યૂટ કરે છે"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"તમારા ઉપકરણમાં આંતરિક સમસ્યા છે અને જ્યાં સુધી તમે ફેક્ટરી ડેટા ફરીથી સેટ કરશો નહીં ત્યાં સુધી તે અસ્થિર રહી શકે છે."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"તમારા ઉપકરણમાં આંતરિક સમસ્યા છે. વિગતો માટે તમારા નિર્માતાનો સંપર્ક કરો."</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index b3a0dce54bb5..e9f9df1065c9 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"मोबाइल नेटवर्क से कनेक्ट नहीं किया जा सका"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"पसंदीदा नेटवर्क बदलकर देखें. बदलने के लिए टैप करें."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"आपातकालीन कॉल करने की सुविधा उपलब्ध नहीं है"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"आपातकालीन कॉल के लिए मोबाइल नेटवर्क ज़रूरी है"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"सूचनाएं"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"कॉल को दूसरे नंबर पर भेजना"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"आपातकालीन कॉलबैक मोड"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"मिटाएं"</string> <string name="inputMethod" msgid="1784759500516314751">"इनपुट विधि"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"लेख क्रियाएं"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"इस फ़ील्ड में हैंडराइटिंग की सुविधा मौजूद नहीं है"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"पासवर्ड वाले फ़ील्ड में हैंडराइटिंग की सुविधा मौजूद नहीं है"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"वापस जाएं"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"इनपुट का तरीका बदलें"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"मेमोरी में जगह नहीं बची है"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"मैनेज करने वाला ऐप्लिकेशन: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"चालू है"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"बंद है"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> कुछ आवाज़ें म्यूट कर रहा है"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"आपके डिवाइस में कोई अंदरूनी समस्या है और यह तब तक ठीक नहीं होगी जब तक आप फ़ैक्टरी डेटा रीसेट नहीं करते."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"आपके डिवाइस के साथ कोई आंतरिक गड़बड़ी हुई. विवरणों के लिए अपने निर्माता से संपर्क करें."</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 2f93a539d44e..4c322a214522 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Mobilna mreža nije dostupna"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Pokušajte promijeniti preferiranu mrežu. Dodirnite da biste je promijenili."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Hitni pozivi nisu dostupni"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Za hitne pozive potrebna je mobilna mreža"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Upozorenja"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Preusmjeravanje poziva"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Način hitnog povratnog poziva"</string> @@ -331,7 +330,7 @@ <string name="permgroupdesc_microphone" msgid="1047786732792487722">"snimati zvuk"</string> <string name="permgrouplab_activityRecognition" msgid="3324466667921775766">"Tjelesna aktivnost"</string> <string name="permgroupdesc_activityRecognition" msgid="4725624819457670704">"pristupiti vašoj tjelesnoj aktivnosti"</string> - <string name="permgrouplab_camera" msgid="9090413408963547706">"Fotoaparat"</string> + <string name="permgrouplab_camera" msgid="9090413408963547706">"Kamera"</string> <string name="permgroupdesc_camera" msgid="7585150538459320326">"snimati fotografije i videozapise"</string> <string name="permgrouplab_nearby_devices" msgid="5529147543651181991">"Uređaji u blizini"</string> <string name="permgroupdesc_nearby_devices" msgid="3213561597116913508">"otkrivanje i povezivanje s uređajima u blizini"</string> @@ -1060,7 +1059,7 @@ <string name="keyguard_accessibility_widget" msgid="6776892679715699875">"<xliff:g id="WIDGET_INDEX">%1$s</xliff:g> widget."</string> <string name="keyguard_accessibility_user_selector" msgid="1466067610235696600">"Birač korisnika"</string> <string name="keyguard_accessibility_status" msgid="6792745049712397237">"Status"</string> - <string name="keyguard_accessibility_camera" msgid="7862557559464986528">"Fotoaparat"</string> + <string name="keyguard_accessibility_camera" msgid="7862557559464986528">"Kamera"</string> <string name="keygaurd_accessibility_media_controls" msgid="2267379779900620614">"Nadzor medija"</string> <string name="keyguard_accessibility_widget_reorder_start" msgid="7066213328912939191">"Pokrenuta je promjena redoslijeda widgeta."</string> <string name="keyguard_accessibility_widget_reorder_end" msgid="1083806817600593490">"Završena je promjena redoslijeda widgeta."</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Izbriši"</string> <string name="inputMethod" msgid="1784759500516314751">"Način unosa"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Radnje s tekstom"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Rukopis nije podržan u ovom polju"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Rukopis nije podržan u poljima za zaporku"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Natrag"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Promjena načina unosa"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Ponestaje prostora za pohranu"</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Upravlja <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Uključeno"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Isključeno"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> isključuje neke zvukove"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Na vašem uređaju postoji interni problem i možda neće biti stabilan dok ga ne vratite na tvorničko stanje."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Na vašem uređaju postoji interni problem. Obratite se proizvođaču za više pojedinosti."</string> @@ -1994,7 +1997,7 @@ <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"Hitni slučaj"</string> <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Postavite zaključavanje zaslona"</string> <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Postavi zaključavanje zaslona"</string> - <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Za upotrebu privatnog prostora postavite zaključavanje zaslona na ovom uređaju"</string> + <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Da biste upotrebljavali privatni prostor, postavite zaključavanje zaslona na ovom uređaju"</string> <string name="app_blocked_title" msgid="7353262160455028160">"Aplikacija nije dostupna"</string> <string name="app_blocked_message" msgid="542972921087873023">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> trenutačno nije dostupna."</string> <string name="app_streaming_blocked_title" msgid="6090945835898766139">"<xliff:g id="ACTIVITY">%1$s</xliff:g> – nije dostupno"</string> @@ -2124,7 +2127,7 @@ <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Odbaci"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sustav"</string> <string name="notification_app_name_settings" msgid="9088548800899952531">"Postavke"</string> - <string name="notification_appops_camera_active" msgid="8177643089272352083">"Fotoaparat"</string> + <string name="notification_appops_camera_active" msgid="8177643089272352083">"Kamera"</string> <string name="notification_appops_microphone_active" msgid="581333393214739332">"Mikrofon"</string> <string name="notification_appops_overlay_active" msgid="5571732753262836481">"prikazuje se preko drugih aplikacija na zaslonu"</string> <string name="notification_feedback_indicator" msgid="663476517711323016">"Slanje povratnih informacija"</string> @@ -2336,7 +2339,7 @@ <string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Uključite u Postavkama"</string> <string name="dismiss_action" msgid="1728820550388704784">"Odbaci"</string> <string name="sensor_privacy_start_use_mic_notification_content_title" msgid="2420858361276370367">"Deblokiraj mikrofon uređaja"</string> - <string name="sensor_privacy_start_use_camera_notification_content_title" msgid="7287720213963466672">"Deblokiraj fotoaparat uređaja"</string> + <string name="sensor_privacy_start_use_camera_notification_content_title" msgid="7287720213963466672">"Deblokiraj kameru uređaja"</string> <string name="sensor_privacy_start_use_notification_content_text" msgid="7595608891015777346">"Za <b><xliff:g id="APP">%s</xliff:g></b> i sve aplikacije i usluge"</string> <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7089318886628390827">"Deblokiraj"</string> <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Privatnost senzora"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 286d55e9e68b..51798b712937 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"A mobilhálózat nem érhető el"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Próbálja meg módosítani a preferált hálózatot. Koppintson a módosításhoz."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Segélyhívás nem lehetséges"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"A segélyhíváshoz mobilhálózatra van szükség"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Értesítések"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Hívásátirányítás"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Sürgősségi visszahívás mód"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Törlés"</string> <string name="inputMethod" msgid="1784759500516314751">"Beviteli mód"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Műveletek szöveggel"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"A kézírás nem támogatott ebben a mezőben"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"A kézírás nem támogatott a jelszómezőkben"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Vissza"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Beviteli módszer váltása"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Kevés a szabad terület"</string> @@ -1932,6 +1929,9 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Kezelő: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Bekapcsolva"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Kikapcsolva"</string> + <string name="zen_mode_trigger_summary_divider_text" msgid="7461583466043698862">", "</string> + <string name="zen_mode_trigger_summary_range_symbol_combination" msgid="1804900738798069619">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string> + <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Bármilyen naptár"</string> <string name="muted_by" msgid="91464083490094950">"A(z) <xliff:g id="THIRD_PARTY">%1$s</xliff:g> lenémít néhány hangot"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Belső probléma van az eszközzel, és instabil lehet, amíg vissza nem állítja a gyári adatokat."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Belső probléma van az eszközzel. A részletekért vegye fel a kapcsolatot a gyártóval."</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index 5ad441517786..61219e5aba52 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Չհաջողվեց միանալ բջջային ցանցին"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Փորձեք այլ ցանցի միանալ: Հպեք՝ նախընտրած ցանցը փոխելու համար:"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Շտապ կանչերը հասանելի չեն"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Շտապ կանչերի համար բջջային ցանց է անհրաժեշտ"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Ծանուցումներ"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Զանգի վերահասցեավորում"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Շտապ հետզանգի ռեժիմ"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Ջնջել"</string> <string name="inputMethod" msgid="1784759500516314751">"Մուտքագրման եղանակը"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Տեքստի գործողությունները"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Ձեռագիր ներածումը չի աջակցվում այս դաշտում"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Ձեռագիր ներածումը չի աջակցվում գաղտնաբառերի դաշտերում"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Հետ"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Փոխել ներածման եղանակը"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Հիշողությունը սպառվում է"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Կառավարվում է <xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածի կողմից"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Միացված է"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Անջատված է"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>-ն անջատում է որոշ ձայներ"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Սարքում ներքին խնդիր է առաջացել և այն կարող է կրկնվել, մինչև չվերականգնեք գործարանային կարգավորումները:"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Սարքում ներքին խնդիր է առաջացել: Մանրամասների համար կապվեք արտադրողի հետ:"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 3230b0258251..75b24770f3b2 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Tidak dapat menjangkau jaringan seluler"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Coba ubah jaringan pilihan. Ketuk untuk mengubah."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Panggilan darurat tidak tersedia"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Panggilan darurat memerlukan jaringan seluler"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Notifikasi"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Penerusan panggilan"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Mode telepon balik darurat"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Hapus"</string> <string name="inputMethod" msgid="1784759500516314751">"Metode masukan"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Tindakan teks"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Tulisan tangan tidak didukung di kolom ini"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Tulisan tangan tidak didukung di kolom sandi"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Kembali"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Beralih metode input"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Ruang penyimpanan hampir habis"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Dikelola oleh <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Aktif"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Nonaktif"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> mematikan beberapa suara"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Ada masalah dengan perangkat. Hal ini mungkin membuat perangkat jadi tidak stabil dan perlu dikembalikan ke setelan pabrik."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Ada masalah dengan perangkat. Hubungi produsen perangkat untuk informasi selengkapnya."</string> @@ -1993,7 +1996,7 @@ <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"Darurat"</string> <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Setel kunci layar"</string> <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Setel kunci layar"</string> - <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Untuk menggunakan ruang pribadi, setel kunci layar di perangkat ini"</string> + <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Untuk menggunakan ruang privasi, setel kunci layar di perangkat ini"</string> <string name="app_blocked_title" msgid="7353262160455028160">"Aplikasi tidak tersedia"</string> <string name="app_blocked_message" msgid="542972921087873023">"<xliff:g id="APP_NAME">%1$s</xliff:g> tidak tersedia saat ini."</string> <string name="app_streaming_blocked_title" msgid="6090945835898766139">"<xliff:g id="ACTIVITY">%1$s</xliff:g> tidak tersedia"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index 21f3bfeaf0dc..c2e138a971ec 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Ekki næst samband við farsímakerfi"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Prófaðu að velja annað símkerfi. Ýttu til að breyta."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Neyðarsímtöl eru ekki í boði"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Neyðarsímtöl krefjast farsímakerfis"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Tilkynningar"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Símtalsflutningur"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Stilling fyrir svarhringingu neyðarsímtala"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Eyða"</string> <string name="inputMethod" msgid="1784759500516314751">"Innsláttaraðferð"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Textaaðgerðir"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Handskrift er ekki studd í þessum reit"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Handskrift er ekki studd í reitum fyrir aðgangsorð"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Til baka"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Skipta um innfærsluaðferð"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Geymslurýmið er senn á þrotum"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Stýrt af <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Kveikt"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Slökkt"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> þaggar í einhverjum hljóðum"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Innra vandamál kom upp í tækinu og það kann að vera óstöðugt þangað til þú núllstillir það."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Innra vandamál kom upp í tækinu. Hafðu samband við framleiðanda til að fá nánari upplýsingar."</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 25bde8fec0d1..3d187e9322bf 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Impossibile raggiungere la rete mobile"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Prova a cambiare la rete preferita. Tocca per cambiare."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Chiamate di emergenza non disponibili"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Per le chiamate di emergenza è necessaria una rete mobile"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Avvisi"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Deviazione chiamate"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Modalità di richiamata di emergenza"</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Elimina"</string> <string name="inputMethod" msgid="1784759500516314751">"Metodo inserimento"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Azioni testo"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"La scrittura a mano libera non è supportata in questo campo"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"La scrittura a mano libera non è supportata nei campi per le password"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Indietro"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Cambia metodo di immissione"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Spazio di archiviazione in esaurimento"</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Gestione: app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"On"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Off"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> sta disattivando alcuni suoni"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Si è verificato un problema interno con il dispositivo, che potrebbe essere instabile fino al ripristino dei dati di fabbrica."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Si è verificato un problema interno con il dispositivo. Per informazioni dettagliate, contatta il produttore."</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 734f26ab52ed..ccfbd9c153e9 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"לא ניתן להתחבר לרשת הסלולרית"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"אפשר לנסות לשנות את הרשת המועדפת. יש להקיש כדי לשנות אותה."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"שיחות חירום לא זמינות"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"כדי לבצע שיחות חירום, צריך להתחבר לרשת סלולרית"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"התראות"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"העברת שיחות"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"מצב \'התקשרות חזרה בחירום\'"</string> @@ -259,7 +258,7 @@ <string name="global_action_power_options" msgid="1185286119330160073">"הפעלה"</string> <string name="global_action_restart" msgid="4678451019561687074">"הפעלה מחדש"</string> <string name="global_action_emergency" msgid="1387617624177105088">"חירום"</string> - <string name="global_action_bug_report" msgid="5127867163044170003">"דיווח על באג"</string> + <string name="global_action_bug_report" msgid="5127867163044170003">"דוח איתור באגים"</string> <string name="global_action_logout" msgid="6093581310002476511">"סיום הפעלה"</string> <string name="global_action_screenshot" msgid="2610053466156478564">"צילום מסך"</string> <string name="bugreport_title" msgid="8549990811777373050">"דיווח על באג"</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"מחיקה"</string> <string name="inputMethod" msgid="1784759500516314751">"שיטת קלט"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"פעולות טקסט"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"אין תמיכה בכתיבה ידנית בשדה הזה"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"אין תמיכה בכתיבה ידנית בשדות של הזנת סיסמה"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"חזרה"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"החלפה של שיטת הקלט"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"מקום האחסון עומד להיגמר"</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"בניהול של <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"מצב פעיל"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"מצב מושבת"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"חלק מהצלילים מושתקים על ידי <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"קיימת בעיה פנימית במכשיר שלך, וייתכן שהוא לא יתפקד כראוי עד שיבוצע איפוס לנתוני היצרן."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"קיימת בעיה פנימית במכשיר שלך. לקבלת פרטים, יש ליצור קשר עם היצרן."</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 5cff29593c86..6f9654deb4d9 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"モバイル ネットワークにアクセスできません"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"タップして、優先ネットワークを変更してください。"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"緊急通報は利用できません"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"緊急通報にはモバイル ネットワークが必要です"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"通知"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"電話の転送"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"緊急通報待機モード"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"削除"</string> <string name="inputMethod" msgid="1784759500516314751">"入力方法"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"テキスト操作"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"この欄は手書き入力には対応していません"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"パスワードの欄は手書き入力には対応していません"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"戻る"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"入力方法の切り替え"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"空き容量わずか"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> によって管理されています"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"ON"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"OFF"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> により一部の音はミュートに設定"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"デバイスで内部的な問題が発生しました。データが初期化されるまで不安定になる可能性があります。"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"デバイスで内部的な問題が発生しました。詳しくはメーカーにお問い合わせください。"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index dc8e59427411..0b7f197147c1 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"მობილურ ქსელთან დაკავშირება ვერ ხერხდება"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"ცადეთ უპირატესი ქსელის შეცვლა. შეეხეთ შესაცვლელად."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"გადაუდებელი ზარი მიუწვდომელია"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"გადაუდებელი ზარები საჭიროებს მობილურ ქსელს"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"გაფრთხილებები"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"ზარის გადამისამართება"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"გადაუდებელი გადმორეკვის რეჟიმი"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"წაშლა"</string> <string name="inputMethod" msgid="1784759500516314751">"შეყვანის მეთოდი"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"ქმედებები ტექსტზე"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"ამ ველში ხელით წერა არ არის მხარდაჭერილი"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"პაროლის ველში ხელით წერა არ არის მხარდაჭერილი"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"უკან"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"შეყვანის მეთოდის გადართვა"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"თავისუფალი ადგილი იწურება"</string> @@ -1932,6 +1929,9 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"მართავს <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"ჩართული"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"გამორთული"</string> + <string name="zen_mode_trigger_summary_divider_text" msgid="7461583466043698862">", "</string> + <string name="zen_mode_trigger_summary_range_symbol_combination" msgid="1804900738798069619">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string> + <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"ნებისმიერი კალენდარი"</string> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ზოგიერთ ხმას ადუმებს"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"ფიქსირდება თქვენი მ ოწყობილობის შიდა პრობლემა და შეიძლება არასტაბილური იყოს, სანამ ქარხნულ მონაცემების არ განაახლებთ."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"ფიქსირდება თქვენი მოწყობილობის შიდა პრობლემა. დეტალებისათვის, მიმართეთ თქვენს მწარმოებელს."</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index c91d14feafe3..d935c5302a28 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Мобильдік желіге қосылу мүмкін емес"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Таңдаулы желіні өзгертіп көріңіз. Өзгерту үшін түртіңіз."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Жедел қызметке қоңырау шалу мүмкін емес"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Құтқару қызметіне қоңырау шалу үшін мобильдік желі қажет."</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Дабылдар"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Қоңырауды басқа нөмірге бағыттау"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Шұғыл кері қоңырау шалу режимі"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Жою"</string> <string name="inputMethod" msgid="1784759500516314751">"Енгізу әдісі"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Мәтін әрекеттері"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Бұл өрісте қолмен жазу мүмкін емес."</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Құпия сөз өрістерінде қолмен жазу мүмкін емес."</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Артқа"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Енгізу әдісін ауыстыру"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Жадта орын азайып барады"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> басқарады."</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Қосулы"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Өшірулі"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> кейбір дыбыстарды өшіруде"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"There\'s an internal problem with your device, and it may be unstable until you factory data reset."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"There\'s an internal problem with your device. Contact your manufacturer for details."</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index 92c3c5a725b6..6aa927750778 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"មិនអាចភ្ជាប់បណ្ដាញទូរសព្ទចល័តបានទេ"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"សាកល្បងប្ដូរទៅបណ្ដាញដែលចង់ប្រើ។ សូមចុចដើម្បីផ្លាស់ប្ដូរ។"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"មិនអាចប្រើការហៅបន្ទាន់បានទេ"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"ការហៅទៅលេខសង្គ្រោះបន្ទាន់តម្រូវឱ្យមានបណ្ដាញទូរសព្ទចល័ត"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"ការជូនដំណឹង"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"ការបញ្ជូនការហៅទូរសព្ទបន្ត"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"មុខងារហៅត្រឡប់វិញបន្ទាន់"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"លុប"</string> <string name="inputMethod" msgid="1784759500516314751">"វិធីបញ្ចូល"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"សកម្មភាពអត្ថបទ"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"មិនអាចប្រើការសរសេរដោយដៃនៅក្នុងកន្លែងបញ្ចូលនេះបានទេ"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"មិនអាចប្រើការសរសេរដោយដៃនៅក្នុងកន្លែងបញ្ចូលពាក្យសម្ងាត់បានទេ"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"ថយក្រោយ"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"ប្ដូរវិធីសាស្ត្របញ្ចូល"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"អស់ទំហំផ្ទុក"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"គ្រប់គ្រងដោយ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"បើក"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"បិទ"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> កំពុងបិទសំឡេងមួយចំនួន"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"មានបញ្ហាខាងក្នុងឧបករណ៍របស់អ្នក ហើយវាអ្នកមិនមានស្ថេរភាព រហូតទាល់តែអ្នកកំណត់ដូចដើមវិញទាំងស្រុង។"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"មានបញ្ហាខាងក្នុងឧបករណ៍របស់អ្នក ទំនាក់ទំនងក្រុមហ៊ុនផលិតឧបករណ៍របស់អ្នកសម្រាប់ព័ត៌មានបន្ថែម។"</string> @@ -1974,7 +1977,7 @@ <string name="user_creation_account_exists" msgid="2239146360099708035">"អនុញ្ញាតឱ្យ <xliff:g id="APP">%1$s</xliff:g> បង្កើតអ្នកប្រើប្រាស់ថ្មីដោយប្រើ <xliff:g id="ACCOUNT">%2$s</xliff:g> (អ្នកប្រើប្រាស់ដែលមានគណនីនេះមានរួចហើយ) ដែរឬទេ?"</string> <string name="user_creation_adding" msgid="7305185499667958364">"អនុញ្ញាតឱ្យ <xliff:g id="APP">%1$s</xliff:g> បង្កើតអ្នកប្រើប្រាស់ថ្មីដោយប្រើ <xliff:g id="ACCOUNT">%2$s</xliff:g> ដែរឬទេ?"</string> <string name="supervised_user_creation_label" msgid="6884904353827427515">"បញ្ចូលអ្នកប្រើប្រាស់ដែលស្ថិតក្រោមការគ្រប់គ្រង"</string> - <string name="language_selection_title" msgid="52674936078683285">"បន្ថែមភាសា"</string> + <string name="language_selection_title" msgid="52674936078683285">"បញ្ចូលភាសា"</string> <string name="country_selection_title" msgid="5221495687299014379">"ចំណូលចិត្តតំបន់"</string> <string name="search_language_hint" msgid="7004225294308793583">"វាយបញ្ចូលឈ្មោះភាសា"</string> <string name="language_picker_section_suggested" msgid="6556199184638990447">"បានណែនាំ"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index d93d9b802c36..65babd09a34d 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ ತಲುಪಲು ಸಾಧ್ಯವಿಲ್ಲ"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"ಆದ್ಯತೆಗೊಳಿಸಿದ ನೆಟ್ವರ್ಕ್ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಪ್ರಯತ್ನಿಸಿ. ಬದಲಾಯಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"ತುರ್ತು ಕರೆ ಮಾಡುವಿಕೆ ಲಭ್ಯವಿಲ್ಲ"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"ತುರ್ತು ಕರೆಗಳಿಗೆ ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ನ ಅಗತ್ಯವಿದೆ"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"ಎಚ್ಚರಿಕೆಗಳು"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"ಕರೆ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"ತುರ್ತು ಕಾಲ್ಬ್ಯಾಕ್ ಮೋಡ್"</string> @@ -616,7 +615,7 @@ <string name="permdesc_disableKeyguard" msgid="3223710003098573038">"ಕೀಲಾಕ್ ಮತ್ತು ಯಾವುದೇ ಸಂಬಂಧಿತ ಭದ್ರತಾ ಪಾಸ್ವರ್ಡ್ ಭದ್ರತೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿ ನೀಡುತ್ತದೆ. ಉದಾಹರಣೆಗೆ, ಒಳಬರುವ ಕರೆಯನ್ನು ಸ್ವೀಕರಿಸುವಾಗ ಕೀಲಾಕ್ ಅನ್ನು ಫೋನ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ, ನಂತರ ಕರೆಯು ಅಂತ್ಯಗೊಂಡಾಗ ಕೀಲಾಕ್ ಅನ್ನು ಮರು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ."</string> <string name="permlab_requestPasswordComplexity" msgid="1808977190557794109">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಸಂಕೀರ್ಣತೆಯನ್ನು ವಿನಂತಿಸಿ"</string> <string name="permdesc_requestPasswordComplexity" msgid="1130556896836258567">"ಆ್ಯಪ್ಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಸಂಕೀರ್ಣತೆ ಮಟ್ಟವನ್ನು (ಅಧಿಕ, ಮಧ್ಯಮ, ಕಡಿಮೆ ಅಥವಾ ಯಾವುದೂ ಅಲ್ಲ) ತಿಳಿದುಕೊಳ್ಳಲು ಅನುಮತಿಸುತ್ತದೆ, ಅದು ಉದ್ದದ ಸಂಭವನೀಯ ಶ್ರೇಣಿ ಮತ್ತು ಸ್ಕ್ರೀನ್ ಲಾಕ್ನ ವಿಧವನ್ನು ಸೂಚಿಸುತ್ತದೆ. ಬಳಕೆದಾರರು ನಿರ್ದಿಷ್ಟ ಹಂತದವರೆಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಅನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಬಹುದು, ಆದರೆ ಅವರು ಅದನ್ನು ನಿರ್ಲಕ್ಷಿಸಬಹುದು ಮತ್ತು ಅದರಿಂದ ಹೊರಬರಬಹುದು ಎಂಬುದನ್ನು ಸಹ ಆ್ಯಪ್ ಬಳಕೆದಾರರಿಗೆ ಸೂಚಿಸುತ್ತದೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಅನ್ನು ಪಠ್ಯದ ರೂಪದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿರುವುದಿಲ್ಲ, ಇದರಿಂದಾಗಿ ಆ್ಯಪ್ಗೆ ಸರಿಯಾದ ಪಾಸ್ವರ್ಡ್ ಗೊತ್ತಿರುವುದಿಲ್ಲ ಎಂಬುದನ್ನು ಗಮನಿಸಿ."</string> - <string name="permlab_postNotification" msgid="4875401198597803658">"ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಿ"</string> + <string name="permlab_postNotification" msgid="4875401198597803658">"ನೋಟಿಫಿಕೇಶನ್ಗಳನ್ನು ತೋರಿಸಿ"</string> <string name="permdesc_postNotification" msgid="5974977162462877075">"ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಲು ಆ್ಯಪ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ"</string> <string name="permlab_turnScreenOn" msgid="219344053664171492">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ಆನ್ ಮಾಡಿ"</string> <string name="permdesc_turnScreenOn" msgid="4394606875897601559">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ಆನ್ ಮಾಡಲು ಆ್ಯಪ್ ಅನ್ನು ಅನುಮತಿಸುತ್ತದೆ."</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"ಅಳಿಸಿ"</string> <string name="inputMethod" msgid="1784759500516314751">"ಇನ್ಪುಟ್ ವಿಧಾನ"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"ಪಠ್ಯದ ಕ್ರಮಗಳು"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"ಈ ಫೀಲ್ಡ್ನಲ್ಲಿ ಕೈಬರಹವನ್ನು ಬೆಂಬಲಿಸಲಾಗುವುದಿಲ್ಲ"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"ಪಾಸ್ವರ್ಡ್ ಫೀಲ್ಡ್ಗಳಲ್ಲಿ ಕೈಬರಹವನ್ನು ಬೆಂಬಲಿಸಲಾಗುವುದಿಲ್ಲ"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"ಹಿಂದಕ್ಕೆ"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"ಇನ್ಪುಟ್ ವಿಧಾನವನ್ನು ಬದಲಿಸಿ"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"ಸಂಗ್ರಹಣೆ ಸ್ಥಳವು ತುಂಬಿದೆ"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಮೂಲಕ ನಿರ್ವಹಿಸಲಾಗಿದೆ"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"ಆನ್ ಆಗಿದೆ"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"ಆಫ್ ಆಗಿದೆ"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ಧ್ವನಿ ಮ್ಯೂಟ್ ಮಾಡುತ್ತಿದ್ದಾರೆ"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಆಂತರಿಕ ಸಮಸ್ಯೆಯಿದೆ ಹಾಗೂ ನೀವು ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾವನ್ನು ರೀಸೆಟ್ ಮಾಡುವವರೆಗೂ ಅದು ಅಸ್ಥಿರವಾಗಬಹುದು."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಆಂತರಿಕ ಸಮಸ್ಯೆಯಿದೆ. ವಿವರಗಳಿಗಾಗಿ ನಿಮ್ಮ ತಯಾರಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string> @@ -1977,7 +1980,7 @@ <string name="language_selection_title" msgid="52674936078683285">"ಭಾಷೆ ಸೇರಿಸಿ"</string> <string name="country_selection_title" msgid="5221495687299014379">"ಪ್ರದೇಶ ಪ್ರಾಶಸ್ತ್ಯ"</string> <string name="search_language_hint" msgid="7004225294308793583">"ಭಾಷೆ ಹೆಸರನ್ನು ಟೈಪ್ ಮಾಡಿ"</string> - <string name="language_picker_section_suggested" msgid="6556199184638990447">"ಸೂಚಿತ ಭಾಷೆ"</string> + <string name="language_picker_section_suggested" msgid="6556199184638990447">"ಸೂಚಿತ ಭಾಷೆಗಳು"</string> <string name="language_picker_regions_section_suggested" msgid="6080131515268225316">"ಸೂಚಿಸಲಾಗಿರುವುದು"</string> <string name="language_picker_section_suggested_bilingual" msgid="5932198319583556613">"ಸೂಚಿಸಲಾದ ಭಾಷೆಗಳು"</string> <string name="region_picker_section_suggested_bilingual" msgid="704607569328224133">"ಸೂಚಿಸಲಾದ ಪ್ರದೇಶಗಳು"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index fd15f81fc293..191bb2c510c2 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"모바일 네트워크에 연결할 수 없습니다."</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"기본 네트워크를 변경해 보세요. 탭하여 변경할 수 있습니다."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"긴급 전화를 사용할 수 없습니다."</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"긴급 전화를 걸려면 모바일 네트워크 연결이 필요함"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"알림"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"착신전환"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"긴급 콜백 모드"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"삭제"</string> <string name="inputMethod" msgid="1784759500516314751">"입력 방법"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"텍스트 작업"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"이 입력란은 필기 입력을 지원하지 않습니다."</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"비밀번호 입력란은 필기 입력을 지원하지 않습니다."</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"뒤로"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"입력 방법 전환"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"저장 공간이 부족함"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"관리자: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"사용"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"사용 중지"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>(이)가 일부 소리를 음소거함"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"사용 중인 기기 내부에 문제가 발생했습니다. 초기화할 때까지 불안정할 수 있습니다."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"사용 중인 기기 내부에 문제가 발생했습니다. 자세한 내용은 제조업체에 문의하세요."</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index 13c94d1f98d3..a6ba8cd0e250 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Мобилдик тармакка туташпай жатат"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Тандалган тармакты өзгөртүп көрүңүз. Өзгөртүү үчүн таптаңыз."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Шашылыш чалуу жеткиликсиз"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Шашылыш чалуу үчүн мобилдик тармак талап кылынат"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Шашылыш билдирүүлөр"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Чалууну башка номерге багыттоо"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Шашылыш кайра чалуу режими"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Өчүрүү"</string> <string name="inputMethod" msgid="1784759500516314751">"Киргизүү ыкмасы"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Текст боюнча иштер"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Бул талаада жазып киргизүү колдоого алынбайт"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Сырсөз талаасында жазып киргизүү колдоого алынбайт"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Артка"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Киргизүү ыкмасын өзгөртүү"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Сактагычта орун калбай баратат"</string> @@ -1932,6 +1929,9 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> башкарат"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Күйүк"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Өчүк"</string> + <string name="zen_mode_trigger_summary_divider_text" msgid="7461583466043698862">", "</string> + <string name="zen_mode_trigger_summary_range_symbol_combination" msgid="1804900738798069619">"<xliff:g id="START">%1$s</xliff:g>, <xliff:g id="END">%2$s</xliff:g>"</string> + <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Бардык жылнаамалар"</string> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> айрым үндөрдү өчүрүүдө"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Түзмөгүңүздө ички көйгөй бар жана ал баштапкы абалга кайтарылмайынча туруктуу иштебей коюшу мүмкүн."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Түзмөгүңүздө ички көйгөй бар. Анын чоо-жайын билүү үчүн өндүрүүчүңүзгө кайрылыңыз."</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index 4b78b0865e0f..1f85646e50d3 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"ບໍ່ສາມາດຕິດຕໍ່ເຄືອຂ່າຍມືຖືໄດ້"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"ໃຫ້ລອງປ່ຽນເຄືອຂ່າຍທີ່ຕ້ອງການ. ແຕະເພື່ອປ່ຽນ."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"ບໍ່ສາມາດໃຊ້ການໂທສຸກເສີນໄດ້"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"ໂທສຸກເສີນຕ້ອງໃຊ້ເຄືອຂ່າຍມືຖື"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"ການເຕືອນ"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"ການໂອນສາຍ"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"ໂໝດໂທກັບສຸກເສີນ"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"ລຶບ"</string> <string name="inputMethod" msgid="1784759500516314751">"ຮູບແບບການປ້ອນຂໍ້ມູນ"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"ການເຮັດວຽກຂອງຂໍ້ຄວາມ"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"ການຂຽນດ້ວຍມືບໍ່ຖືກຮອງຮັບໃນຊ່ອງຂໍ້ມູນນີ້"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"ການຂຽນດ້ວຍມືບໍ່ຖືກຮອງຮັບໃນຊ່ອງຂໍ້ມູນລະຫັດຜ່ານ"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"ກັບຄືນ"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"ສະຫຼັບວິທີການປ້ອນຂໍ້ມູນ"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນກຳລັງຈະເຕັມ"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"ຈັດການໂດຍ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"ເປີດຢູ່"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"ປິດຢູ່"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ປິດສຽງບາງຢ່າງໄວ້"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"ມີບັນຫາພາຍໃນກັບອຸປະກອນຂອງທ່ານ, ແລະມັນອາດຈະບໍ່ສະຖຽນຈົນກວ່າທ່ານຕັ້ງເປັນຂໍ້ມູນໂຮງງານຄືນແລ້ວ."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"ມີບັນຫາພາຍໃນກັບອຸປະກອນຂອງທ່ານ. ຕິດຕໍ່ຜູ້ຜະລິດຂອງທ່ານສຳລັບລາຍລະອຽດຕ່າງໆ."</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 46d69c7a1eff..991da27099eb 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -86,8 +86,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Nepavyko pasiekti mobiliojo ryšio tinklo"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Pabandykite pakeisti pageidaujamą tinklą. Palieskite, kad pakeistumėte."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Skambučių pagalbos numeriu paslauga nepasiekiama"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Kad būtų galima skambinti pagalbos numeriais, būtina naudoti mobiliojo ryšio tinklą"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Įspėjimai"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Skambučio peradresavimas"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Atskambinimo pagalbos numeriu režimas"</string> @@ -1186,10 +1185,8 @@ <string name="deleteText" msgid="4200807474529938112">"Ištrinti"</string> <string name="inputMethod" msgid="1784759500516314751">"Įvesties būdas"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Teksto veiksmai"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Rašymas ranka nepalaikomas šiame lauke"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Rašymas ranka nepalaikomas slaptažodžių laukuose"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Atgal"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Perjungti įvesties metodą"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Mažėja laisvos saugyklos vietos"</string> @@ -1934,6 +1931,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Tvarko „<xliff:g id="APP_NAME">%1$s</xliff:g>“"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Įjungti"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Išjungti"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"„<xliff:g id="THIRD_PARTY">%1$s</xliff:g>“ nutildo kai kuriuos garsus"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Iškilo vidinė su jūsų įrenginiu susijusi problema, todėl įrenginys gali veikti nestabiliai, kol neatkursite gamyklinių duomenų."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Iškilo vidinė su jūsų įrenginiu susijusi problema. Jei reikia išsamios informacijos, susisiekite su gamintoju."</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 7ddeb4c94cae..a5b0414257f8 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Nevar sasniegt mobilo tīklu"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Mēģiniet nomainīt vēlamo tīklu. Pieskarieties, lai to mainītu."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Nav pieejami ārkārtas izsaukumi"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Lai veiktu ārkārtas zvanus, ir nepieciešams mobilais tīkls."</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Brīdinājumi"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Zvanu pāradresācija"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Ārkārtas atzvana režīms"</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Dzēst"</string> <string name="inputMethod" msgid="1784759500516314751">"Ievades metode"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Teksta darbības"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Šajā laukā netiek atbalstīta rokraksta funkcija."</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Paroļu laukā netiek atbalstīta rokraksta funkcija."</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Atpakaļ"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Pārslēgt ievades metodi"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Paliek maz brīvas vietas"</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Pārvalda <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Ieslēgta"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Izslēgta"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> izslēdz noteiktas skaņas"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Jūsu ierīcē ir radusies iekšēja problēma, un ierīce var darboties nestabili. Lai to labotu, veiciet rūpnīcas datu atiestatīšanu."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Jūsu ierīcē ir radusies iekšēja problēma. Lai iegūtu plašāku informāciju, lūdzu, sazinieties ar ražotāju."</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index 4bef670a17d8..695cd83f2429 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Мобилната мрежа е недостапна"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Сменете ја претпочитаната мрежа. Допрете за промена."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Итните повици се недостапни"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"За итните повици е потребна мобилна мрежа"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Предупредувања"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Проследување повик"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Режим на итен повратен повик"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Избриши"</string> <string name="inputMethod" msgid="1784759500516314751">"Метод на внес"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Дејства со текст"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Ракописот не е поддржан во полево"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Ракописот не е поддржан во полињата за лозинка"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Назад"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Префрлете го методот за внесување"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Капацитетот е речиси полн"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Управувано од <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Вклучено"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Исклучено"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> исклучи некои звуци"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Настана внатрешен проблем со уредот и може да биде нестабилен сè додека не ресетирате на фабричките податоци."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Настана внатрешен проблем со уредот. Контактирајте го производителот за детали."</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 70aeaddeadbf..4c0e9fec959d 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"മൊബൈൽ നെറ്റ്വർക്കിലേക്ക് കണക്റ്റ് ചെയ്യാനാവുന്നില്ല"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"തിരഞ്ഞെടുത്ത നെറ്റ്വർക്ക് മാറ്റുന്നത് പരീക്ഷിക്കുക. മാറ്റാൻ ടാപ്പ് ചെയ്യുക."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"എമർജൻസി കോളിംഗ് ലഭ്യമല്ല"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"എമർജൻസി കോളുകൾ ചെയ്യാൻ ഒരു മൊബൈൽ നെറ്റ്വർക്ക് ആവശ്യമാണ്"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"അലേർട്ടുകൾ"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"കോൾ ഫോർവേഡിംഗ്"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"അടിയന്തര കോൾബാക്ക് മോഡ്"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"ഇല്ലാതാക്കുക"</string> <string name="inputMethod" msgid="1784759500516314751">"ടൈപ്പുചെയ്യൽ രീതി"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"ടെക്സ്റ്റ് പ്രവർത്തനങ്ങൾ"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"ഈ ഫീൽഡിൽ കയ്യെഴുത്ത് പിന്തുണയ്ക്കുന്നില്ല"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"പാസ്വേഡ് ഫീൽഡുകളിൽ കയ്യെഴുത്ത് പിന്തുണയ്ക്കുന്നില്ല"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"മടങ്ങുക"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"ഇൻപുട്ട് രീതി മാറുക"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"സംഭരണയിടം കഴിഞ്ഞു"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> മാനേജ് ചെയ്യുന്നത്"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"ഓണാണ്"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"ഓഫാണ്"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ചില ശബ്ദങ്ങൾ മ്യൂട്ട് ചെയ്യുന്നു"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"നിങ്ങളുടെ ഉപകരണത്തിൽ ഒരു ആന്തരിക പ്രശ്നമുണ്ട്, ഫാക്ടറി വിവര പുനഃസജ്ജീകരണം ചെയ്യുന്നതുവരെ ഇതു അസ്ഥിരമായിരിക്കാനിടയുണ്ട്."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"നിങ്ങളുടെ ഉപകരണത്തിൽ ഒരു ആന്തരിക പ്രശ്നമുണ്ട്. വിശദാംശങ്ങൾക്കായി നിർമ്മാതാവിനെ ബന്ധപ്പെടുക."</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index adb1f87c60cc..7f1a44d775b6 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Мобайл сүлжээнд холбогдох боломжгүй байна"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Сонгосон сүлжээг өөрчлөхөөр оролдоно уу. Өөрчлөхийн тулд товшино уу."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Яаралтай дуудлага хийх боломжгүй"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Яаралтай дуудлагуудад мобайл сүлжээ шаардлагатай"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Сануулга"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Дуудлага шилжүүлэх"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Яаралтай дуудлага хийх горим"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Устгах"</string> <string name="inputMethod" msgid="1784759500516314751">"Оруулах арга"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Текст үйлдэл"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Гараар бичихийг энэ талбарт дэмждэггүй"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Гараар бичихийг нууц үгний талбаруудад дэмждэггүй"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Буцах"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Оруулах аргыг сэлгэх"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Сангийн хэмжээ дутагдаж байна"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g>-с удирддаг"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Асаалттай"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Унтраалттай"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> зарим дууны дууг хааж байна"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Таны төхөөрөмжид дотоод алдаа байна.Та төхөөрөмжөө үйлдвэрээс гарсан төлөвт шилжүүлэх хүртэл таны төхөөрөмж чинь тогтворгүй байж болох юм."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Таны төхөөрөмжид дотоод алдаа байна. Дэлгэрэнгүй мэдээлэл авахыг хүсвэл үйлдвэрлэгчтэйгээ холбоо барина уу."</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 393f95e2f6b0..2368bdebeef0 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"मोबाइल नेटवर्क उपलब्ध नाही"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"प्राधान्य दिलेले नेटवर्क बदलण्याचा प्रयत्न करा. बदलण्यासाठी टॅप करा."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"आणीबाणी कॉलिंग अनुपलब्ध"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"आणीबाणी कॉलसाठी मोबाइल नेटवर्क आवश्यक आहे"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"अलर्ट"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"कॉल फॉरवर्डिंग"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"इमर्जन्सी कॉलबॅक मोड"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"हटवा"</string> <string name="inputMethod" msgid="1784759500516314751">"इनपुट पद्धत"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"मजकूर क्रिया"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"या फील्डमध्ये हस्तलेखनला सपोर्ट नाही"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"पासवर्ड फील्डमध्ये हस्तलेखनला सपोर्ट नाही"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"मागे जा"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"इनपुट पद्धत स्विच करा"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"संचयन स्थान संपत आहे"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"सुरू आहे"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"बंद आहे"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> काही ध्वनी म्यूट करत आहे"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"आपल्या डिव्हाइसमध्ये अंतर्गत समस्या आहे आणि तुमचा फॅक्टरी डेटा रीसेट होईपर्यंत ती अस्थिर असू शकते."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"आपल्या डिव्हाइसमध्ये अंतर्गत समस्या आहे. तपशीलांसाठी आपल्या निर्मात्याशी संपर्क साधा."</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 9274c51a6f41..a0656ab09908 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Tidak dapat mencapai rangkaian mudah alih"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Cuba tukar rangkaian pilihan. Ketik untuk menukar."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Panggilan kecemasan tidak tersedia"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Rangkaian mudah alih diperlukan untuk membuat panggilan kecemasan"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Makluman"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Pemajuan panggilan"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Mod paggil balik kecemasan"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Padam"</string> <string name="inputMethod" msgid="1784759500516314751">"Kaedah input"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Tindakan teks"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Tulisan tangan tidak disokong dalam medan ini"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Tulisan tangan tidak disokong dalam medan kata laluan"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Kembali"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Tukar kaedah masukan"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Ruang storan semakin berkurangan"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Diurus oleh <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Hidup"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Mati"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> meredamkan sesetengah bunyi"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Terdapat masalah dalaman dengan peranti anda. Peranti mungkin tidak stabil sehingga anda membuat tetapan semula data kilang."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Terdapat masalah dalaman dengan peranti anda. Hubungi pengilang untuk mengetahui butirannya."</string> @@ -1993,7 +1996,7 @@ <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"Kecemasan"</string> <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Tetapkan kunci skrin"</string> <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Tetapkan kunci skrin"</string> - <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Tetapkan kunci skrin pada peranti untuk guna ruang privasi"</string> + <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Tetapkan kunci skrin pada peranti untuk menggunakan ruang privasi"</string> <string name="app_blocked_title" msgid="7353262160455028160">"Apl tidak tersedia"</string> <string name="app_blocked_message" msgid="542972921087873023">"<xliff:g id="APP_NAME">%1$s</xliff:g> tidak tersedia sekarang."</string> <string name="app_streaming_blocked_title" msgid="6090945835898766139">"<xliff:g id="ACTIVITY">%1$s</xliff:g> tidak tersedia"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index 9e3ec9ef3518..696cf72f8caf 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"မိုဘိုင်းကွန်ရက် လိုင်းမရပါ"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"ဦးစားပေးကွန်ရက်သို့ ပြောင်းကြည့်ပါ။ ပြောင်းရန် တို့ပါ။"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"အရေးပေါ်ခေါ်ဆိုမှု မရနိုင်ပါ"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"အရေးပေါ်ဖုန်းခေါ်ရန် မိုဘိုင်းကွန်ရက် လိုအပ်သည်"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"သတိပေးချက်များ"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"အဝင်ခေါ်ဆိုမှုအား ထပ်ဆင့်ပို့ခြင်း"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"အရေးပေါ် ပြန်လည်ခေါ်ဆိုနိုင်သောမုဒ်"</string> @@ -828,7 +827,7 @@ <string name="permdesc_writeVerificationStateE2eeContactKeys" msgid="8453156829747427041">"အခြားအက်ပ်များ ပိုင်ဆိုင်သော E2EE အဆက်အသွယ်ကီးများ၏ အတည်ပြုခြင်းအခြေအနေများကို အက်ပ်အား အပ်ဒိတ်လုပ်ခွင့်ပြုသည်"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"စကားဝှက်စည်းမျဥ်းကိုသတ်မှတ်ရန်"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"မျက်နှာပြင်သော့ခတ်သည့် စကားဝှက်များနှင့် PINများရှိ ခွင့်ပြုထားသည့် စာလုံးအရေအတွက်နှင့် အက္ခရာများအား ထိန်းချုပ်ရန်။"</string> - <string name="policylab_watchLogin" msgid="7599669460083719504">"မျက်နှာပြင်လော့ခ်ဖွင့်ရန် ကြိုးပမ်းမှုများကို စောင့်ကြည့်ပါ"</string> + <string name="policylab_watchLogin" msgid="7599669460083719504">"မျက်နှာပြင်လော့ခ်ဖွင့်ရန် ကြိုးပမ်းမှုများကို စောင့်ကြည့်ခြင်း"</string> <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"မျက်နှာပြင်ကို သော့ဖွင့်ရန် အတွက် စကားဝှက် မမှန်မကန် ထည့်သွင်းမှု အရေအတွက်ကို စောင့်ကြည့်လျက်၊ စကားဝှက် ရိုက်ထည့်မှု သိပ်များနေလျှင် တက်ဘလက်ကို သော့ခတ်ရန် သို့မဟုတ် တက်ဘလက် ဒေတာ အားလုံးကို ဖျက်ရန်။"</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"မျက်နှာပြင်ကို လော့ခ်ဖွင့်သည့်အခါ စကားဝှက်မှားယွင်းစွာ ရိုက်သွင်းသည့်အကြိမ်ရေကို စောင့်ကြည့်ပြီး မှားယွင်းသည့်အကြိမ်ရေ အလွန်များလာပါက သင့် Android TV စက်ပစ္စည်းကို လော့ခ်ချခြင်း သို့မဟုတ် သင့် Android TV ရှိ အသုံးပြုသူဒေတာများအားလုံးကို ဖျက်ခြင်းတို့ ပြုလုပ်သွားပါမည်။"</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"ဖန်သားပြင်လော့ခ်ဖွင့်ရန် အတွက် စကားဝှက် မမှန်မကန် ထည့်သွင်းမှု အရေအတွက်ကို စောင့်ကြည့်လျက် စကားဝှက် မမှန်မကန် ရိုက်ထည့်မှု များနေလျှင် သတင်းနှင့်ဖျော်ဖြေရေး စနစ်ကို လော့ခ်ချသည် (သို့) ၎င်း၏ ဒေတာအားလုံးကို ဖျက်သည်။"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"ဖျက်ရန်"</string> <string name="inputMethod" msgid="1784759500516314751">"ထည့်သွင်းရန်နည်းလမ်း"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"စာတို လုပ်ဆောင်ချက်"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"ဤအကွက်တွင် လက်ရေးကို မပံ့ပိုးပါ"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"စကားဝှက်အကွက်များတွင် လက်ရေးကို မပံ့ပိုးပါ"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"နောက်သို့"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"လက်ကွက်ပြောင်းရန်"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"သိမ်းဆည်သော နေရာ နည်းနေပါသည်"</string> @@ -1903,8 +1900,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"သင်၏ စီမံခန့်ခွဲသူက အပ်ဒိတ်လုပ်ထားသည်"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"သင်၏ စီမံခန့်ခွဲသူက ဖျက်လိုက်ပါပြီ"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"‘ဘက်ထရီ အားထိန်း’ က ‘အမှောင်နောက်ခံ’ ကို ဖွင့်ပြီး နောက်ခံလုပ်ဆောင်ချက်၊ ပြသမှုဆိုင်ရာ အထူးပြုလုပ်ချက်အချို့၊ ဝန်ဆောင်မှုအချို့နှင့် ကွန်ရက်ချိတ်ဆက်မှုအချို့တို့ကို ကန့်သတ်သည် သို့မဟုတ် ပိတ်သည်။"</string> - <string name="battery_saver_description" msgid="8518809702138617167">"‘ဘက်ထရီ အားထိန်း’ က ‘အမှောင်နောက်ခံ’ ကို ဖွင့်ပြီး နောက်ခံလုပ်ဆောင်ချက်၊ ပြသမှုဆိုင်ရာ အထူးပြုလုပ်ချက်အချို့၊ ဝန်ဆောင်မှုအချို့နှင့် ကွန်ရက်ချိတ်ဆက်မှုအချို့တို့ကို ကန့်သတ်သည် သို့မဟုတ် ပိတ်သည်။"</string> + <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"‘ဘက်ထရီ အားထိန်း’ က ‘အမှောင်နောက်ခံ’ ကို ဖွင့်ပြီး နောက်ခံလုပ်ဆောင်ချက်၊ ဖန်တီးပြသချက်အချို့၊ ဝန်ဆောင်မှုအချို့နှင့် ကွန်ရက်ချိတ်ဆက်မှုအချို့တို့ကို ကန့်သတ်သည် သို့မဟုတ် ပိတ်သည်။"</string> + <string name="battery_saver_description" msgid="8518809702138617167">"‘ဘက်ထရီ အားထိန်း’ က ‘အမှောင်နောက်ခံ’ ကို ဖွင့်ပြီး နောက်ခံလုပ်ဆောင်ချက်၊ ဖန်တီးပြသချက်အချို့၊ ဝန်ဆောင်မှုအချို့နှင့် ကွန်ရက်ချိတ်ဆက်မှုအချို့တို့ကို ကန့်သတ်သည် သို့မဟုတ် ပိတ်သည်။"</string> <string name="data_saver_description" msgid="4995164271550590517">"ဒေတာအသုံးလျှော့ချနိုင်ရန်အတွက် အက်ပ်များကို နောက်ခံတွင် ဒေတာပို့ခြင်းနှင့် လက်ခံခြင်းမပြုရန် \'ဒေတာချွေတာမှု\' စနစ်က တားဆီးထားပါသည်။ ယခုအက်ပ်ဖြင့် ဒေတာအသုံးပြုနိုင်သော်လည်း အကြိမ်လျှော့၍သုံးရပါမည်။ ဥပမာ၊ သင်က မတို့မချင်း ပုံများပေါ်လာမည် မဟုတ်ပါ။"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"ဒေတာချွေတာမှုစနစ် ဖွင့်မလား။"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"ဖွင့်ရန်"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> က စီမံသည်"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"ဖွင့်"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"ပိတ်"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> သည် အချို့အသံကို ပိတ်နေသည်"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"သင့်ကိရိယာအတွင်းပိုင်းတွင် ပြဿနာရှိနေပြီး၊ မူလစက်ရုံထုတ်အခြေအနေအဖြစ် ပြန်လည်ရယူနိုင်သည်အထိ အခြေအနေမတည်ငြိမ်နိုင်ပါ။"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"သင့်ကိရိယာအတွင်းပိုင်းတွင် ပြဿနာရှိနေ၏။ အသေးစိတ်သိရန်အတွက် ပစ္စည်းထုတ်လုပ်သူအား ဆက်သွယ်ပါ။"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 551b4d584307..c5e4c2af2799 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Får ikke kontakt med mobilnettverket"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Prøv å endre foretrukket nettverk. Trykk for å endre."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Nødanrop er utilgjengelig"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Du må være koblet til et mobilnettverk for å utføre nødanrop"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Varsler"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Viderekobling"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Modusen nødsamtale-tilbakeringing"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Slett"</string> <string name="inputMethod" msgid="1784759500516314751">"Inndatametode"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Teksthandlinger"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Håndskrift støttes ikke i dette feltet"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Håndskrift støttes ikke i passordfelt"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Tilbake"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Bytt inndatametode"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Lite ledig lagringsplass"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Administreres av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"På"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Av"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> slår av noen lyder"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Det har oppstått et internt problem på enheten din, og den kan være ustabil til du tilbakestiller den til fabrikkdata."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Det har oppstått et internt problem på enheten din. Ta kontakt med produsenten for mer informasjon."</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index 24426eb800af..77e3eaa37432 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"मोबाइल नेटवर्कमाथि पहुँच राख्न सकिएन"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"रुचाइएको नेटवर्क परिवर्तन गरी हेर्नुहोस्। परिवर्तन गर्न ट्याप गर्नुहोस्।"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"आपत्कालीन कल सेवा अनुपलब्ध छ"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"आपत्कालीन कलहरू गर्न मोबाइल नेटवर्क चाहिन्छ"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"अलर्टहरू"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"कल फर्वार्ड गर्ने सेवा"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"आपत्कालीन कलब्याक मोड"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"मेट्नुहोस्"</string> <string name="inputMethod" msgid="1784759500516314751">"निवेश विधि"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"पाठ कार्यहरू"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"यो फिल्डमा हस्तलेखन गर्न मिल्दैन"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"पासवर्ड हाल्ने फिल्डहरूमा हस्तलेखन गर्न मिल्दैन"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"पछाडि"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"इनपुट विधि बदल्नुहोस्"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"भण्डारण ठाउँ सकिँदै छ"</string> @@ -1566,7 +1563,7 @@ <string name="sync_do_nothing" msgid="4528734662446469646">"अहिलेको लागि केही नगर्नुहोस्"</string> <string name="choose_account_label" msgid="5557833752759831548">"एउटा खाता छान्नुहोस्"</string> <string name="add_account_label" msgid="4067610644298737417">"खाता हाल्नुहोस्"</string> - <string name="add_account_button_label" msgid="322390749416414097">"खाता थप्नुहोस्"</string> + <string name="add_account_button_label" msgid="322390749416414097">"खाता हाल्नुहोस्"</string> <string name="number_picker_increment_button" msgid="7621013714795186298">"बढाउनुहोस्"</string> <string name="number_picker_decrement_button" msgid="5116948444762708204">"घटाउनुहोस्"</string> <string name="number_picker_increment_scroll_mode" msgid="8403893549806805985">"<xliff:g id="VALUE">%s</xliff:g> टच एण्ड होल्ड गर्नुहोस्।"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले व्यवस्थापन गरेको"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"अन छ"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"अफ छ"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ले केही ध्वनिहरू म्युट गर्दै छ"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"तपाईंको यन्त्रसँग आन्तरिक समस्या छ, र तपाईंले फ्याक्ट्री डाटा रिसेट नगर्दासम्म यो अस्थिर रहन्छ।"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"तपाईंको यन्त्रसँग आन्तरिक समस्या छ। विवरणहरूको लागि आफ्नो निर्मातासँग सम्पर्क गर्नुहोस्।"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index fbf93be248a9..b5f2beac053d 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Kan mobiel netwerk niet bereiken"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Probeer een ander voorkeursnetwerk. Tik om te wijzigen."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Noodoproepen niet beschikbaar"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Voor noodoproepen is een mobiel netwerk vereist"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Meldingen"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Gesprek doorschakelen"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Modus voor noodoproepen"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Verwijderen"</string> <string name="inputMethod" msgid="1784759500516314751">"Invoermethode"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Tekstacties"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Handschrift wordt in dit veld niet ondersteund"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Handschrift wordt niet ondersteund in wachtwoordvelden"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Terug"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Invoermethode wijzigen"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Opslagruimte is bijna vol"</string> @@ -1651,7 +1648,7 @@ <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefoon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dockluidsprekers"</string> <string name="default_audio_route_name_external_device" msgid="8124229858618975">"Extern apparaat"</string> - <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Hoofdtelefoon"</string> + <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Koptelefoon"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Systeem"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="4214648773120426288">"Bluetooth-audio"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Beheerd door <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Aan"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Uit"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> zet sommige geluiden uit"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Er is een intern probleem met je apparaat. Het apparaat kan instabiel zijn totdat u het apparaat terugzet naar de fabrieksinstellingen."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Er is een intern probleem met je apparaat. Neem contact op met de fabrikant voor meer informatie."</string> @@ -1993,7 +1996,7 @@ <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"Noodgeval"</string> <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Schermvergrendeling instellen"</string> <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Schermvergrendeling instellen"</string> - <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Als je je privéruimte wilt gebruiken, stel je een schermvergrendeling op dit apparaat in"</string> + <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Als je je privégedeelte wilt gebruiken, stel je een schermvergrendeling op dit apparaat in"</string> <string name="app_blocked_title" msgid="7353262160455028160">"App is niet beschikbaar"</string> <string name="app_blocked_message" msgid="542972921087873023">"<xliff:g id="APP_NAME">%1$s</xliff:g> is momenteel niet beschikbaar."</string> <string name="app_streaming_blocked_title" msgid="6090945835898766139">"<xliff:g id="ACTIVITY">%1$s</xliff:g> niet beschikbaar"</string> @@ -2334,7 +2337,7 @@ <string name="window_magnification_prompt_content" msgid="8159173903032344891">"Je kunt nu een deel van je scherm vergroten"</string> <string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Aanzetten in Instellingen"</string> <string name="dismiss_action" msgid="1728820550388704784">"Sluiten"</string> - <string name="sensor_privacy_start_use_mic_notification_content_title" msgid="2420858361276370367">"Blokkeren van apparaatmicrofoon opheffen"</string> + <string name="sensor_privacy_start_use_mic_notification_content_title" msgid="2420858361276370367">"Microfoon van apparaat niet meer blokkeren"</string> <string name="sensor_privacy_start_use_camera_notification_content_title" msgid="7287720213963466672">"Blokkeren van apparaatcamera opheffen"</string> <string name="sensor_privacy_start_use_notification_content_text" msgid="7595608891015777346">"Voor <b><xliff:g id="APP">%s</xliff:g></b> en alle andere apps en services"</string> <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7089318886628390827">"Niet meer blokkeren"</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index 2b12d820df96..b84297e0d3ea 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"ମୋବାଇଲ୍ ନେଟ୍ୱର୍କ ମିଳୁନାହିଁ"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"ନିଜ ପସନ୍ଦର ନେଟ୍ୱର୍କକୁ ଯିବାପାଇଁ ଚେଷ୍ଟା କରନ୍ତୁ। ବଦଳାଇବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"ଜରୁରୀକାଳୀନ କଲ୍ ଉପଲବ୍ଧ ନାହିଁ"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"ଜରୁରୀକାଳୀନ କଲ କରିବା ପାଇଁ ଏକ ମୋବାଇଲ ନେଟୱାର୍କ ଆବଶ୍ୟକ"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"ଆଲର୍ଟ"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"କଲ୍ ଫରୱାର୍ଡିଂ"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"ଜରୁରୀକାଳୀନ କଲବ୍ୟାକ୍ ମୋଡ୍"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"ଡିଲିଟ କରନ୍ତୁ"</string> <string name="inputMethod" msgid="1784759500516314751">"ଇନପୁଟ୍ ପଦ୍ଧତି"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"ଟେକ୍ସଟ୍ କାର୍ଯ୍ୟ"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"ଏହି ଫିଲ୍ଡରେ ହେଣ୍ଡରାଇଟିଂ ସମର୍ଥିତ ନୁହେଁ"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"ପାସୱାର୍ଡ ଫିଲ୍ଡଗୁଡ଼ିକରେ ହେଣ୍ଡରାଇଟିଂ ସମର୍ଥିତ ନୁହେଁ"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"ପଛକୁ ଫେରନ୍ତୁ"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"ଇନପୁଟ ପଦ୍ଧତି ସ୍ୱିଚ କରନ୍ତୁ"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"ଷ୍ଟୋରେଜ୍ ସ୍ପେସ୍ ଶେଷ ହେବାରେ ଲାଗିଛି"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଦ୍ୱାରା ପରିଚାଳିତ"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"ଚାଲୁ ଅଛି"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"ବନ୍ଦ ଅଛି"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> କିଛି ସାଉଣ୍ଡକୁ ମ୍ୟୁଟ୍ କରୁଛି"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"ଆପଣଙ୍କ ଡିଭାଇସ୍ରେ ଏକ ସମସ୍ୟା ରହିଛି ଏବଂ ଆପଣ ଫ୍ୟାକ୍ଟୋରୀ ଡାଟା ରିସେଟ୍ ନକରିବା ପର୍ଯ୍ୟନ୍ତ ଏହା ଅସ୍ଥିର ରହିପାରେ।"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"ଆପଣଙ୍କ ଡିଭାଇସରେ ଏକ ସମସ୍ୟା ରହିଛି। ବିବରଣୀ ପାଇଁ ଆପଣଙ୍କ ଉତ୍ପାଦକଙ୍କ ସହ କଣ୍ଟାକ୍ଟ କରନ୍ତୁ।"</string> @@ -1976,7 +1979,7 @@ <string name="supervised_user_creation_label" msgid="6884904353827427515">"ନିରୀକ୍ଷିତ ୟୁଜର ଯୋଗ କରନ୍ତୁ"</string> <string name="language_selection_title" msgid="52674936078683285">"ଏକ ଭାଷା ଯୋଗ କରନ୍ତୁ"</string> <string name="country_selection_title" msgid="5221495687299014379">"ପସନ୍ଦର ଅଞ୍ଚଳ"</string> - <string name="search_language_hint" msgid="7004225294308793583">"ଭାଷାର ନାମ ଟାଇପ୍ କରନ୍ତୁ"</string> + <string name="search_language_hint" msgid="7004225294308793583">"ଭାଷାର ନାମ ଟାଇପ କରନ୍ତୁ"</string> <string name="language_picker_section_suggested" msgid="6556199184638990447">"ପ୍ରସ୍ତାବିତ"</string> <string name="language_picker_regions_section_suggested" msgid="6080131515268225316">"ପ୍ରସ୍ତାବିତ"</string> <string name="language_picker_section_suggested_bilingual" msgid="5932198319583556613">"ପ୍ରସ୍ତାବିତ ଭାଷାଗୁଡ଼ିକ"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index 8e2264459110..b83492a3adfd 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਨੂੰ ਬਦਲ ਕੇ ਦੇਖੋ। ਬਦਲਣ ਲਈ ਟੈਪ ਕਰੋ।"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"ਸੰਕਟਕਾਲੀਨ ਕਾਲਿੰਗ ਉਪਲਬਧ ਨਹੀਂ"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"ਐਮਰਜੈਂਸੀ ਕਾਲਾਂ ਲਈ ਕਿਸੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"ਅਲਰਟ"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"ਕਾਲ ਫਾਰਵਰਡਿੰਗ"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"ਸੰਕਟਕਾਲੀਨ ਕਾਲਬੈਕ ਮੋਡ"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"ਮਿਟਾਓ"</string> <string name="inputMethod" msgid="1784759500516314751">"ਇਨਪੁੱਟ ਵਿਧੀ"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"ਟੈਕਸਟ ਕਿਰਿਆਵਾਂ"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"ਇਸ ਖੇਤਰ ਵਿੱਚ ਲਿਖਾਈ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"ਪਾਸਵਰਡ ਖੇਤਰਾਂ ਵਿੱਚ ਲਿਖਾਈ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"ਪਿੱਛੇ"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"ਇਨਪੁੱਟ ਵਿਧੀ ਨੂੰ ਸਵਿੱਚ ਕਰੋ"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"ਸਟੋਰੇਜ ਦੀ ਜਗ੍ਹਾ ਖਤਮ ਹੋ ਰਹੀ ਹੈ"</string> @@ -1564,7 +1561,7 @@ <string name="sync_really_delete" msgid="5657871730315579051">"ਆਈਟਮਾਂ ਹਟਾਓ"</string> <string name="sync_undo_deletes" msgid="5786033331266418896">"ਮਿਟਾਏ ਗਏ ਨੂੰ ਅਣਕੀਤਾ ਕਰੋ"</string> <string name="sync_do_nothing" msgid="4528734662446469646">"ਹੁਣ ਕੁਝ ਨਾ ਕਰੋ"</string> - <string name="choose_account_label" msgid="5557833752759831548">"ਇੱਕ ਖਾਤਾ ਚੁਣੋ"</string> + <string name="choose_account_label" msgid="5557833752759831548">"ਕੋਈ ਖਾਤਾ ਚੁਣੋ"</string> <string name="add_account_label" msgid="4067610644298737417">"ਇੱਕ ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string> <string name="add_account_button_label" msgid="322390749416414097">"ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string> <string name="number_picker_increment_button" msgid="7621013714795186298">"ਵਧਾਓ"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਪ੍ਰਬੰਧਿਤ"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"ਚਾਲੂ ਹੈ"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"ਬੰਦ ਹੈ"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ਕੁਝ ਧੁਨੀਆਂ ਨੂੰ ਮਿਊਟ ਕਰ ਰਹੀ ਹੈ"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨਾਲ ਇੱਕ ਅੰਦਰੂਨੀ ਸਮੱਸਿਆ ਹੈ ਅਤੇ ਇਹ ਅਸਥਿਰ ਹੋ ਸਕਦੀ ਹੈ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈੱਟ ਨਹੀਂ ਕਰਦੇ।"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨਾਲ ਇੱਕ ਅੰਦਰੂਨੀ ਸਮੱਸਿਆ ਸੀ। ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਨਿਰਮਾਤਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index bb7ccaa36d54..92068a2989b2 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -1317,7 +1317,7 @@ <string name="volume_unknown" msgid="4041914008166576293">"Głośność"</string> <string name="volume_icon_description_bluetooth" msgid="7540388479345558400">"Głośność Bluetooth"</string> <string name="volume_icon_description_ringer" msgid="2187800636867423459">"Głośność dzwonka"</string> - <string name="volume_icon_description_incall" msgid="4491255105381227919">"Głośność w czasie połączenia"</string> + <string name="volume_icon_description_incall" msgid="4491255105381227919">"Głośność połączeń"</string> <string name="volume_icon_description_media" msgid="4997633254078171233">"Głośność multimediów"</string> <string name="volume_icon_description_notification" msgid="579091344110747279">"Głośność powiadomień"</string> <string name="ringtone_default" msgid="9118299121288174597">"Dzwonek domyślny"</string> @@ -1931,6 +1931,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Zarządzana przez aplikację <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Włączono"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Wyłączono"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> wycisza niektóre dźwięki"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"W Twoim urządzeniu wystąpił problem wewnętrzny. Może być ono niestabilne, dopóki nie przywrócisz danych fabrycznych."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"W Twoim urządzeniu wystąpił problem wewnętrzny. Skontaktuj się z jego producentem, by otrzymać szczegółowe informacje."</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 1da396567535..74f341fb6d2d 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Não foi possível acessar a rede móvel"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Tente alterar a rede preferencial. Toque para alterar."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Chamadas de emergência indisponíveis"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"As chamadas de emergência exigem uma rede móvel"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Alertas"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Encaminhamento de chamada"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Modo de retorno de chamada de emergência"</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Excluir"</string> <string name="inputMethod" msgid="1784759500516314751">"Método de entrada"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Ações de texto"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Não há suporte para escrita à mão neste campo"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Não há suporte para escrita à mão em campos de senha"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Voltar"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Mudar o método de entrada"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Pouco espaço de armazenamento"</string> @@ -1746,7 +1743,7 @@ <string name="leave_accessibility_shortcut_on" msgid="6543362062336990814">"Usar atalho"</string> <string name="color_inversion_feature_name" msgid="2672824491933264951">"Inversão de cores"</string> <string name="color_correction_feature_name" msgid="7975133554160979214">"Correção de cor"</string> - <string name="one_handed_mode_feature_name" msgid="2334330034828094891">"Modo para uma mão"</string> + <string name="one_handed_mode_feature_name" msgid="2334330034828094891">"Modo uma mão"</string> <string name="reduce_bright_colors_feature_name" msgid="3222994553174604132">"Escurecer a tela"</string> <string name="hearing_aids_feature_name" msgid="1125892105105852542">"Aparelhos auditivos"</string> <string name="accessibility_shortcut_enabling_service" msgid="5473495203759847687">"Teclas de volume pressionadas. Serviço <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ativado."</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Gerenciada pelo app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Ativada"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Desativada"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> está silenciando alguns sons"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Há um problema interno com seu dispositivo. Ele pode ficar instável até que você faça a redefinição para configuração original."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Há um problema interno com seu dispositivo. Entre em contato com o fabricante para saber mais detalhes."</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 70862a88a0dc..d6329c29275a 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -1148,7 +1148,7 @@ <string name="duration_days_shortest_future" msgid="3392722163935571543">"em <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"em <xliff:g id="COUNT">%d</xliff:g> a"</string> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Há # minuto}many{Há # minutos}other{Há # minutos}}"</string> - <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Há # hora}many{Há # horas}other{Há # horas}}"</string> + <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{há # hora}many{há # horas}other{há # horas}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Há # dia}many{Há # dias}other{Há # dias}}"</string> <string name="duration_years_relative" msgid="8731202348869424370">"{count,plural, =1{Há # ano}many{Há # anos}other{Há # anos}}"</string> <string name="duration_minutes_relative_future" msgid="5259574171747708115">"{count,plural, =1{# minuto}many{# minutos}other{# minutos}}"</string> @@ -1312,13 +1312,13 @@ <string name="volume_call" msgid="7625321655265747433">"Volume da chamada recebida"</string> <string name="volume_bluetooth_call" msgid="2930204618610115061">"Volume de chamada recebida em Bluetooth"</string> <string name="volume_alarm" msgid="4486241060751798448">"Volume do alarme"</string> - <string name="volume_notification" msgid="6864412249031660057">"Volume de notificações"</string> + <string name="volume_notification" msgid="6864412249031660057">"Volume das notificações"</string> <string name="volume_unknown" msgid="4041914008166576293">"Volume"</string> <string name="volume_icon_description_bluetooth" msgid="7540388479345558400">"Volume de Bluetooth"</string> <string name="volume_icon_description_ringer" msgid="2187800636867423459">"Volume do toque"</string> <string name="volume_icon_description_incall" msgid="4491255105381227919">"Volume de chamadas"</string> <string name="volume_icon_description_media" msgid="4997633254078171233">"Volume de multimédia"</string> - <string name="volume_icon_description_notification" msgid="579091344110747279">"Volume de notificações"</string> + <string name="volume_icon_description_notification" msgid="579091344110747279">"Volume das notificações"</string> <string name="ringtone_default" msgid="9118299121288174597">"Toque predefinido"</string> <string name="ringtone_default_with_actual" msgid="2709686194556159773">"Predefinição (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> <string name="ringtone_silent" msgid="397111123930141876">"Nenhum"</string> @@ -1930,6 +1930,9 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Gerido por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Ativada"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Desativada"</string> + <string name="zen_mode_trigger_summary_divider_text" msgid="7461583466043698862">", "</string> + <string name="zen_mode_trigger_summary_range_symbol_combination" msgid="1804900738798069619">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string> + <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Qualquer calendário"</string> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> está a desativar alguns sons."</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Existe um problema interno no seu dispositivo e pode ficar instável até efetuar uma reposição de dados de fábrica."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Existe um problema interno no seu dispositivo. Contacte o fabricante para obter mais informações."</string> @@ -1991,7 +1994,7 @@ <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"Emergência"</string> <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Defina um bloqueio de ecrã"</string> <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Definir bloqueio de ecrã"</string> - <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Para usar espaço privado, defina bloqueio de ecrã no disp."</string> + <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Defina um bloqueio para usar o espaço privado"</string> <string name="app_blocked_title" msgid="7353262160455028160">"A app não está disponível"</string> <string name="app_blocked_message" msgid="542972921087873023">"De momento, a app <xliff:g id="APP_NAME">%1$s</xliff:g> não está disponível."</string> <string name="app_streaming_blocked_title" msgid="6090945835898766139">"<xliff:g id="ACTIVITY">%1$s</xliff:g> indisponível"</string> @@ -2068,7 +2071,7 @@ <string name="autofill_update_title_with_2types" msgid="1797514386321086273">"Quer atualizar <xliff:g id="TYPE_0">%1$s</xliff:g> e <xliff:g id="TYPE_1">%2$s</xliff:g> em "<b>"<xliff:g id="LABEL">%3$s</xliff:g>"</b>"?"</string> <string name="autofill_update_title_with_3types" msgid="8285767070604652626">"Atualizar estes itens no serviço "<b>"<xliff:g id="LABEL">%4$s</xliff:g>"</b>": <xliff:g id="TYPE_0">%1$s</xliff:g>, <xliff:g id="TYPE_1">%2$s</xliff:g> e <xliff:g id="TYPE_2">%3$s</xliff:g>?"</string> <string name="autofill_save_yes" msgid="8035743017382012850">"Guardar"</string> - <string name="autofill_save_no" msgid="9212826374207023544">"Não, obrigado"</string> + <string name="autofill_save_no" msgid="9212826374207023544">"Não"</string> <string name="autofill_save_notnow" msgid="2853932672029024195">"Agora não"</string> <string name="autofill_save_never" msgid="6821841919831402526">"Nunca"</string> <string name="autofill_update_yes" msgid="4608662968996874445">"Atualizar"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 1da396567535..74f341fb6d2d 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Não foi possível acessar a rede móvel"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Tente alterar a rede preferencial. Toque para alterar."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Chamadas de emergência indisponíveis"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"As chamadas de emergência exigem uma rede móvel"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Alertas"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Encaminhamento de chamada"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Modo de retorno de chamada de emergência"</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Excluir"</string> <string name="inputMethod" msgid="1784759500516314751">"Método de entrada"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Ações de texto"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Não há suporte para escrita à mão neste campo"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Não há suporte para escrita à mão em campos de senha"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Voltar"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Mudar o método de entrada"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Pouco espaço de armazenamento"</string> @@ -1746,7 +1743,7 @@ <string name="leave_accessibility_shortcut_on" msgid="6543362062336990814">"Usar atalho"</string> <string name="color_inversion_feature_name" msgid="2672824491933264951">"Inversão de cores"</string> <string name="color_correction_feature_name" msgid="7975133554160979214">"Correção de cor"</string> - <string name="one_handed_mode_feature_name" msgid="2334330034828094891">"Modo para uma mão"</string> + <string name="one_handed_mode_feature_name" msgid="2334330034828094891">"Modo uma mão"</string> <string name="reduce_bright_colors_feature_name" msgid="3222994553174604132">"Escurecer a tela"</string> <string name="hearing_aids_feature_name" msgid="1125892105105852542">"Aparelhos auditivos"</string> <string name="accessibility_shortcut_enabling_service" msgid="5473495203759847687">"Teclas de volume pressionadas. Serviço <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ativado."</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Gerenciada pelo app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Ativada"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Desativada"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> está silenciando alguns sons"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Há um problema interno com seu dispositivo. Ele pode ficar instável até que você faça a redefinição para configuração original."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Há um problema interno com seu dispositivo. Entre em contato com o fabricante para saber mais detalhes."</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 2ca2082d2ecd..d37907c76ec4 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Nu se poate stabili conexiunea la rețeaua mobilă"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Încearcă să schimbi rețeaua preferată. Atinge pentru a schimba."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Apelurile de urgență nu sunt disponibile"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Apelurile de urgență necesită o rețea mobilă"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Alerte"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Redirecționarea apelurilor"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Mod de apelare inversă de urgență"</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Șterge"</string> <string name="inputMethod" msgid="1784759500516314751">"Metodă de intrare"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Acțiuni pentru text"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Scrierea de mână nu este acceptată în acest câmp"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Scrierea de mână nu este acceptată în câmpurile pentru parole"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Înapoi"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Schimbă metoda de introducere"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Spațiul de stocare aproape ocupat"</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Gestionat de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Activată"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Dezactivată"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> dezactivează anumite sunete"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"A apărut o problemă internă pe dispozitiv, iar acesta poate fi instabil până la revenirea la setările din fabrică."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"A apărut o problemă internă pe dispozitiv. Pentru detalii, contactează producătorul."</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 58754505fad0..723672d4cac0 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -86,8 +86,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Мобильная сеть недоступна"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Нажмите, чтобы выбрать другую сеть."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Экстренные вызовы недоступны"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Для экстренных вызовов нужна мобильная сеть."</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Оповещения"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Переадресация вызовов"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Режим экстренных обратных вызовов"</string> @@ -1186,10 +1185,8 @@ <string name="deleteText" msgid="4200807474529938112">"Удалить"</string> <string name="inputMethod" msgid="1784759500516314751">"Способ ввода"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Операции с текстом"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Это поле не поддерживает рукописный ввод"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Поля для указания пароля не поддерживают рукописный ввод"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Назад"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Сменить способ ввода"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Недостаточно памяти"</string> @@ -1934,6 +1931,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Под управлением приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Включено"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Отключено"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> приглушает некоторые звуки."</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Произошла внутренняя ошибка, и устройство может работать нестабильно, пока вы не выполните сброс настроек."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Произошла внутренняя ошибка. Обратитесь к производителю устройства за подробными сведениями."</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index 58ef9198169b..58866396fd10 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"ජංගම ජාලය වෙත ළඟා විය නොහැකිය"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"කැමති ජාලය වෙනස් කිරීමට උත්සාහ කරන්න. වෙනස් කිරීමට තට්ටු කරන්න."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"හදිසි ඇමතුම් ලබා ගත නොහැකිය"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"හදිසි ඇමතුම් සඳහා ජංගම ජාලයක් අවශ්ය වේ"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"ඇඟවීම්"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"ඇමතුම ප්රතියොමු කිරීම"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"හදිසි අවස්ථා පසු ඇමතුම් ප්රකාරය"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"මකන්න"</string> <string name="inputMethod" msgid="1784759500516314751">"ආදාන ක්රමය"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"පෙළ ක්රියාවන්"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"මෙම ක්ෂේත්රය අත් අකුරු සඳහා සහය නොදක්වයි"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"මුරපද ක්ෂේත්ර අත් අකුරු සඳහා සහය නොදක්වයි"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"ආපසු"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"ආදාන ක්රමය මාරු කිරීම"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"ආචයනය ඉඩ ප්රමාණය අඩු වී ඇත"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> විසින් කළමනාකරණය කරයි"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"ක්රියාත්මකයි"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"ක්රියාවිරහිතයි"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> සමහර ශබ්ද නිහඬ කරමින්"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"ඔබේ උපාංගය සමගින් ගැටලුවක් ඇති අතර, ඔබේ කර්මාන්තශාලා දත්ත යළි සකසන තෙක් එය අස්ථායි විය හැකිය."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"ඔබේ උපාංගය සමගින් අභ්යන්තර ගැටලුවක් ඇත. විස්තර සඳහා ඔබේ නිෂ්පාදක අමතන්න."</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 915c5eb25e6a..5ec599aacb64 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -86,8 +86,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Nepodarilo sa pripojiť k mobilnej sieti"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Skúste zmeniť predvolenú sieť. Zmeníte ju klepnutím."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Tiesňové volania nie sú k dispozícii"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Tiesňové volania vyžadujú mobilnú sieť"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Upozornenia"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Presmerovanie hovorov"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Režim tiesňového spätného volania"</string> @@ -1186,10 +1185,8 @@ <string name="deleteText" msgid="4200807474529938112">"Odstrániť"</string> <string name="inputMethod" msgid="1784759500516314751">"Metóda vstupu"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Operácie s textom"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Ručné písanie nie je v tomto poli podporované"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"V poliach pre heslá nie je ručné písanie podporované"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Späť"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Prepnúť metódu vstupu"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Nedostatok ukladacieho priestoru"</string> @@ -1934,6 +1931,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Spravované aplikáciou <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Zapnuté"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Vypnuté"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> vypína niektoré zvuky"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Vo vašom zariadení došlo k internému problému. Môže byť nestabilné, kým neobnovíte jeho výrobné nastavenia."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Vo vašom zariadení došlo k internému problému. Ak chcete získať podrobné informácie, obráťte sa na jeho výrobcu."</string> @@ -1994,7 +1997,7 @@ <string name="work_mode_turn_on" msgid="5316648862401307800">"Zrušiť pozastavenie"</string> <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"Tiesňová linka"</string> <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Nastavte zámku obrazovky"</string> - <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Nastavte zámku obrazovky"</string> + <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Nastaviť zámku obrazovky"</string> <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Ak chcete používať súkromný priestor, nastavte v tomto zariadení zámku obrazovky"</string> <string name="app_blocked_title" msgid="7353262160455028160">"Aplikácia nie je dostupná"</string> <string name="app_blocked_message" msgid="542972921087873023">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> nie je teraz dostupná."</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 4c13c009948a..2a66253c5dff 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -86,8 +86,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Mobilnega omrežja ni mogoče doseči"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Poskusite spremeniti prednostno omrežje. Dotaknite se, če ga želite spremeniti."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Klicanje v sili ni na voljo"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Za klice v sili potrebujete mobilno omrežje"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Opozorila"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Preusmerjanje klicev"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Način za povratni klic v sili"</string> @@ -1186,10 +1185,8 @@ <string name="deleteText" msgid="4200807474529938112">"Izbriši"</string> <string name="inputMethod" msgid="1784759500516314751">"Način vnosa"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Besedilna dejanja"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Rokopis ni podprt v tem polju"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Rokopis ni podprt v poljih za vnos gesla"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Nazaj"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Preklop načina vnosa"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Prostor za shranjevanje bo pošel"</string> @@ -1934,6 +1931,9 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Upravlja <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Vklopljeno"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Izklopljeno"</string> + <string name="zen_mode_trigger_summary_divider_text" msgid="7461583466043698862">", "</string> + <string name="zen_mode_trigger_summary_range_symbol_combination" msgid="1804900738798069619">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string> + <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Kateri koli koledar"</string> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> izklaplja nekatere zvoke"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Vaša naprava ima notranjo napako in bo morda nestabilna, dokler je ne ponastavite na tovarniške nastavitve."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Vaša naprava ima notranjo napako. Če želite več informacij, se obrnite na proizvajalca."</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index c344c7d8f8eb..0e1e791dbb37 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Rrjeti celular është i paarritshëm"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Provo të ndryshosh rrjetin e preferuar. Trokit për ta ndryshuar."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Telefonatat e urgjencës nuk ofrohen"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Telefonatat e urgjencës kërkojnë një rrjet celular"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Sinjalizimet"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Transferimi i telefonatave"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Modaliteti i \"Kthimit të telefonatës së urgjencës\""</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Fshi"</string> <string name="inputMethod" msgid="1784759500516314751">"Metoda e hyrjes"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Veprimet e tekstit"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Shkrimi i dorës nuk mbështetet në këtë fushë"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Shkrimi i dorës nuk mbështetet në fushat e fjalëkalimeve"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Pas"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Ndërro metodën e hyrjes"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Hapësira ruajtëse po mbaron"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Menaxhohet nga <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Aktivizuar"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Çaktivizuar"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> po çaktivizon disa tinguj"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Ka një problem të brendshëm me pajisjen tënde. Ajo mund të jetë e paqëndrueshme derisa të rivendosësh të dhënat në gjendje fabrike."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Ka një problem të brendshëm me pajisjen tënde. Kontakto prodhuesin tënd për detaje."</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 0c5557f2011b..cb037ccafc8b 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -85,8 +85,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Повезивање са мобилном мрежом није успело"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Пробајте да промените жељену мрежу. Додирните да бисте променили."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Хитни позиви нису доступни"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Хитни позиви захтевају мобилну мрежу"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Упозорења"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Преусмеравање позива"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Режим за хитан повратни позив"</string> @@ -616,7 +615,7 @@ <string name="permlab_disableKeyguard" msgid="3605253559020928505">"онемогућавање закључавања екрана"</string> <string name="permdesc_disableKeyguard" msgid="3223710003098573038">"Дозвољава апликацији да онемогући закључавање тастатуре и све повезане безбедносне мере са лозинкама. На пример, телефон онемогућава закључавање тастатуре при пријему долазног телефонског позива, а затим га поново омогућава по завршетку позива."</string> <string name="permlab_requestPasswordComplexity" msgid="1808977190557794109">"тражење сложености закључавања екрана"</string> - <string name="permdesc_requestPasswordComplexity" msgid="1130556896836258567">"Дозвољава апликацији да сазна ниво сложености закључавања екрана (висока, средња, ниска или ниједна), што указује на могући опсег трајања и тип закључавања екрана. Апликација може и да предлаже корисницима да ажурирају закључавање екрана на одређени ниво, али корисници слободно могу да занемаре то и да иду на друге странице. Имајте на уму да се подаци за закључавање екрана не чувају као обичан текст, па апликација не зна тачну лозинку."</string> + <string name="permdesc_requestPasswordComplexity" msgid="1130556896836258567">"Дозвољава апликацији да сазна ниво сложености закључавања екрана (висока, средња, ниска или ниједна), што указује на могући опсег трајања и тип закључавања екрана. Апликација може и да предлаже корисницима да ажурирају откључавање екрана на одређени ниво, али корисници слободно могу да занемаре то и да иду на друге странице. Имајте на уму да се подаци за откључавање екрана не чувају као обичан текст, па апликација не зна тачну лозинку."</string> <string name="permlab_postNotification" msgid="4875401198597803658">"приказивање обавештења"</string> <string name="permdesc_postNotification" msgid="5974977162462877075">"Дозвољава апликацији да приказује обавештења"</string> <string name="permlab_turnScreenOn" msgid="219344053664171492">"укључивање екрана"</string> @@ -636,10 +635,10 @@ <string name="permlab_mediaLocation" msgid="7368098373378598066">"читање локација из медијске колекције"</string> <string name="permdesc_mediaLocation" msgid="597912899423578138">"Дозвољава апликацији да чита локације из медијске колекције."</string> <string name="biometric_app_setting_name" msgid="3339209978734534457">"Користите биометрију"</string> - <string name="biometric_or_screen_lock_app_setting_name" msgid="5348462421758257752">"Користите биометрију или закључавање екрана"</string> + <string name="biometric_or_screen_lock_app_setting_name" msgid="5348462421758257752">"Користите биометрију или откључавање екрана"</string> <string name="biometric_dialog_default_title" msgid="55026799173208210">"Потврдите свој идентитет"</string> <string name="biometric_dialog_default_subtitle" msgid="8457232339298571992">"Користите биометријски податак да бисте наставили"</string> - <string name="biometric_or_screen_lock_dialog_default_subtitle" msgid="159539678371552009">"Користите биометријски податак или закључавање екрана да бисте наставили"</string> + <string name="biometric_or_screen_lock_dialog_default_subtitle" msgid="159539678371552009">"Користите биометријски податак или откључавање екрана да бисте наставили"</string> <string name="biometric_error_hw_unavailable" msgid="2494077380540615216">"Биометријски хардвер није доступан"</string> <string name="biometric_error_user_canceled" msgid="6732303949695293730">"Потврда идентитета је отказана"</string> <string name="biometric_not_recognized" msgid="5106687642694635888">"Није препознато"</string> @@ -647,8 +646,8 @@ <string name="biometric_error_canceled" msgid="8266582404844179778">"Потврда идентитета је отказана"</string> <string name="biometric_error_device_not_secured" msgid="3129845065043995924">"Нисте подесили ни PIN, ни шаблон, ни лозинку"</string> <string name="biometric_error_generic" msgid="6784371929985434439">"Грешка при потврди идентитета"</string> - <string name="screen_lock_app_setting_name" msgid="6054944352976789228">"Користите закључавање екрана"</string> - <string name="screen_lock_dialog_default_subtitle" msgid="120359538048533695">"Употребите закључавање екрана да бисте наставили"</string> + <string name="screen_lock_app_setting_name" msgid="6054944352976789228">"Користите откључавање екрана"</string> + <string name="screen_lock_dialog_default_subtitle" msgid="120359538048533695">"Употребите откључавање екрана да бисте наставили"</string> <string name="fingerprint_acquired_partial" msgid="4323789264604479684">"Чврсто притисните сензор"</string> <string name="fingerprint_acquired_insufficient" msgid="2410176550915730974">"Отисак прста није препознат. Пробајте поново."</string> <string name="fingerprint_acquired_imager_dirty" msgid="1770676120848224250">"Обришите сензор за отисак прста и пробајте поново"</string> @@ -673,8 +672,8 @@ <string name="fingerprint_error_timeout" msgid="7361192266621252164">"Време за подешавање отиска прста је истекло. Пробајте поново."</string> <string name="fingerprint_error_canceled" msgid="5541771463159727513">"Радња са отиском прста је отказана"</string> <string name="fingerprint_error_user_canceled" msgid="2017941773466506863">"Корисник је отказао радњу са отиском прста"</string> - <string name="fingerprint_error_lockout" msgid="6626753679019351368">"Превише покушаја. Користите закључавање екрана уместо тога."</string> - <string name="fingerprint_error_lockout_permanent" msgid="9060651300306264843">"Превише покушаја. Користите закључавање екрана уместо тога."</string> + <string name="fingerprint_error_lockout" msgid="6626753679019351368">"Превише покушаја. Користите откључавање екрана уместо тога."</string> + <string name="fingerprint_error_lockout_permanent" msgid="9060651300306264843">"Превише покушаја. Користите откључавање екрана уместо тога."</string> <string name="fingerprint_error_unable_to_process" msgid="2446280592818621224">"Обрађивање отиска прста није успело. Пробајте поново."</string> <string name="fingerprint_error_no_fingerprints" msgid="3144806556204061862">"Није регистрован ниједан отисак прста"</string> <string name="fingerprint_error_hw_not_present" msgid="5898827259419366359">"Овај уређај нема сензор за отисак прста"</string> @@ -683,9 +682,9 @@ <string name="fingerprint_error_power_pressed" msgid="5479524500542129414">"Притиснуто је дугме за укључивање"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Прст <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Користите отисак прста"</string> - <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Користите отисак прста или закључавање екрана"</string> + <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Користите отисак прста или откључавање екрана"</string> <string name="fingerprint_dialog_default_subtitle" msgid="3879832845486835905">"Наставите помоћу отиска прста"</string> - <string name="fingerprint_or_screen_lock_dialog_default_subtitle" msgid="5195808203117992200">"Користите отисак прста или закључавање екрана да бисте наставили"</string> + <string name="fingerprint_or_screen_lock_dialog_default_subtitle" msgid="5195808203117992200">"Користите отисак прста или откључавање екрана да бисте наставили"</string> <string-array name="fingerprint_error_vendor"> </string-array> <string name="fingerprint_error_vendor_unknown" msgid="4170002184907291065">"Дошло је до проблема. Пробајте поново."</string> @@ -737,16 +736,16 @@ <string name="face_error_user_canceled" msgid="5766472033202928373">"Корисник је отказао откључавање лицем"</string> <string name="face_error_lockout" msgid="7864408714994529437">"Превише покушаја. Пробајте поново касније."</string> <string name="face_error_lockout_permanent" msgid="8533257333130473422">"Превише покушаја. Откључавање лицем није доступно."</string> - <string name="face_error_lockout_screen_lock" msgid="5062609811636860928">"Превише покушаја. Користите закључавање екрана за то."</string> + <string name="face_error_lockout_screen_lock" msgid="5062609811636860928">"Превише покушаја. Користите откључавање екрана за то."</string> <string name="face_error_unable_to_process" msgid="5723292697366130070">"Провера лица није успела. Пробајте поново."</string> <string name="face_error_not_enrolled" msgid="1134739108536328412">"Нисте подесили откључавање лицем"</string> <string name="face_error_hw_not_present" msgid="7940978724978763011">"Откључавање лицем није подржано на овом уређају"</string> <string name="face_error_security_update_required" msgid="5076017208528750161">"Сензор је привремено онемогућен."</string> <string name="face_name_template" msgid="3877037340223318119">"Лице <xliff:g id="FACEID">%d</xliff:g>"</string> <string name="face_app_setting_name" msgid="5854024256907828015">"Користите откључавање лицем"</string> - <string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Користите закључавање лицем или закључавање екрана"</string> + <string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Користите закључавање лицем или откључавање екрана"</string> <string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Потврдите идентитет лицем да бисте наставили"</string> - <string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Користите лице или закључавање екрана да бисте наставили"</string> + <string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Користите лице или откључавање екрана да бисте наставили"</string> <string-array name="face_error_vendor"> </string-array> <string name="face_error_vendor_unknown" msgid="7387005932083302070">"Дошло је до проблема. Пробајте поново."</string> @@ -828,7 +827,7 @@ <string name="permlab_writeVerificationStateE2eeContactKeys" msgid="3990742344778360457">"Ажурирање статуса верификације кључева за шифровање контаката с краја на крај у власништву других апликација"</string> <string name="permdesc_writeVerificationStateE2eeContactKeys" msgid="8453156829747427041">"Дозвољава апликацији да ажурира статусе верификације кључева за шифровање контаката с краја на крај (E2EE) у власништву других апликација"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Подешавање правила за лозинку"</string> - <string name="policydesc_limitPassword" msgid="4105491021115793793">"Контролише дужину и знакове дозвољене у лозинкама и PIN-овима за закључавање екрана."</string> + <string name="policydesc_limitPassword" msgid="4105491021115793793">"Контролише дужину и знакове дозвољене у лозинкама и PIN-овима за откључавање екрана."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Надзор покушаја откључавања екрана"</string> <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Прати број нетачно унетих лозинки приликом откључавања екрана и закључава таблет или брише податке са таблета ако је нетачна лозинка унета превише пута."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Надгледа број нетачних лозинки унетих при откључавању екрана и закључава Android TV уређај или брише све податке са Android TV уређаја ако се унесе превише нетачних лозинки."</string> @@ -839,7 +838,7 @@ <string name="policydesc_watchLogin_secondaryUser" product="automotive" msgid="7180857406058327941">"Надгледа број нетачних лозинки унетих при откључавању екрана и закључава систем за инфо-забаву или брише све податке овог профила ако се унесе превише нетачних лозинки."</string> <string name="policydesc_watchLogin_secondaryUser" product="default" msgid="9177645136475155924">"Надгледа број нетачних лозинки унетих при откључавању екрана и закључава телефон или брише све податке овог корисника ако се унесе превише нетачних лозинки."</string> <string name="policylab_resetPassword" msgid="214556238645096520">"Промена закључавања екрана"</string> - <string name="policydesc_resetPassword" msgid="4626419138439341851">"Мења закључавање екрана."</string> + <string name="policydesc_resetPassword" msgid="4626419138439341851">"Мења откључавање екрана."</string> <string name="policylab_forceLock" msgid="7360335502968476434">"Закључавање екрана"</string> <string name="policydesc_forceLock" msgid="1008844760853899693">"Контрола начина и времена закључавања екрана."</string> <string name="policylab_wipeData" msgid="1359485247727537311">"Брисање свих података"</string> @@ -856,7 +855,7 @@ <string name="policylab_setGlobalProxy" msgid="215332221188670221">"Подесите глобални прокси сервер уређаја"</string> <string name="policydesc_setGlobalProxy" msgid="7149665222705519604">"Подешава глобални прокси уређаја који ће се користити док су смернице омогућене. Само власник уређаја може да подеси глобални прокси."</string> <string name="policylab_expirePassword" msgid="6015404400532459169">"Подеси истек. лозин. за закљ. екр."</string> - <string name="policydesc_expirePassword" msgid="9136524319325960675">"Мења колико често лозинка, PIN или шаблон за закључавање екрана мора да се мења."</string> + <string name="policydesc_expirePassword" msgid="9136524319325960675">"Мења колико често лозинка, PIN или шаблон за откључавање екрана мора да се мења."</string> <string name="policylab_encryptedStorage" msgid="9012936958126670110">"Подешавање шифровања складишта"</string> <string name="policydesc_encryptedStorage" msgid="1102516950740375617">"Захтева да сачувани подаци апликације буду шифровани."</string> <string name="policylab_disableCamera" msgid="5749486347810162018">"Онемогућавање камера"</string> @@ -1185,10 +1184,8 @@ <string name="deleteText" msgid="4200807474529938112">"Избриши"</string> <string name="inputMethod" msgid="1784759500516314751">"Метод уноса"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Радње у вези са текстом"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Писање руком није подржано у овом пољу"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Писање руком није подржано у пољима за лозинке"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Назад"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Промените метод уноса"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Меморијски простор је на измаку"</string> @@ -1933,6 +1930,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Управља: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Укључено"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Искључено"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> искључује неке звуке"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Дошло је до интерног проблема у вези са уређајем и можда ће бити нестабилан док не обавите ресетовање на фабричка подешавања."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Дошло је до интерног проблема у вези са уређајем. Потражите детаље од произвођача."</string> @@ -1992,9 +1995,9 @@ <string name="work_mode_off_title" msgid="6367463960165135829">"Укључити пословне апликације?"</string> <string name="work_mode_turn_on" msgid="5316648862401307800">"Поново активирај"</string> <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"Хитан случај"</string> - <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Подесите закључавање екрана"</string> - <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Подеси закључавање екрана"</string> - <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Да бисте користили приватни простор, подесите закључавање екрана на овом уређају"</string> + <string name="set_up_screen_lock_title" msgid="8346083801616474030">"Подесите откључавање екрана"</string> + <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"Подеси откључавање екрана"</string> + <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"Да бисте користили приватни простор, подесите откључавање екрана на овом уређају"</string> <string name="app_blocked_title" msgid="7353262160455028160">"Апликација није доступна"</string> <string name="app_blocked_message" msgid="542972921087873023">"Апликација <xliff:g id="APP_NAME">%1$s</xliff:g> тренутно није доступна."</string> <string name="app_streaming_blocked_title" msgid="6090945835898766139">"<xliff:g id="ACTIVITY">%1$s</xliff:g> – није доступно"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 4abc6f6fbb1a..d3198d6c54e3 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Det går inte att nå mobilnätverket"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Testa att byta föredraget nätverk. Tryck om du vill ändra."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Det går inte att ringa nödsamtal"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Mobilnätverk krävs för att ringa nödsamtal"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Aviseringar"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Vidarekoppla samtal"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Läget Återuppringning vid nödsamtal"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Ta bort"</string> <string name="inputMethod" msgid="1784759500516314751">"Indatametod"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Textåtgärder"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Handskrift stöds inte i det här fältet"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Handskrift stöds inte i lösenordsfält"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Tillbaka"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Byt inmatningsmetod"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Lagringsutrymmet börjar ta slut"</string> @@ -1530,10 +1527,10 @@ <string name="vpn_title_long" msgid="6834144390504619998">"VPN aktiveras av <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="2275388920267251078">"Knacka lätt för att hantera nätverket."</string> <string name="vpn_text_long" msgid="278540576806169831">"Ansluten till <xliff:g id="SESSION">%s</xliff:g>. Knacka lätt för att hantera nätverket."</string> - <string name="vpn_lockdown_connecting" msgid="6096725311950342607">"Ansluter till Always-on VPN ..."</string> - <string name="vpn_lockdown_connected" msgid="2853127976590658469">"Ansluten till Always-on VPN"</string> - <string name="vpn_lockdown_disconnected" msgid="5573611651300764955">"Frånkopplad från Always-on VPN"</string> - <string name="vpn_lockdown_error" msgid="4453048646854247947">"Det gick inte att ansluta till Always-on VPN"</string> + <string name="vpn_lockdown_connecting" msgid="6096725311950342607">"Ansluter till Alltid på-VPN ..."</string> + <string name="vpn_lockdown_connected" msgid="2853127976590658469">"Ansluten till Alltid på-VPN"</string> + <string name="vpn_lockdown_disconnected" msgid="5573611651300764955">"Frånkopplad från Alltid på-VPN"</string> + <string name="vpn_lockdown_error" msgid="4453048646854247947">"Det gick inte att ansluta till Alltid på-VPN"</string> <string name="vpn_lockdown_config" msgid="8331697329868252169">"Ändra inställningarna för nätverk eller VPN"</string> <string name="upload_file" msgid="8651942222301634271">"Välj fil"</string> <string name="no_file_chosen" msgid="4146295695162318057">"Ingen fil har valts"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Hanteras av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"På"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Av"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> stänger av vissa ljud"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Ett internt problem har uppstått i enheten, och det kan hända att problemet kvarstår tills du återställer standardinställningarna."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Ett internt problem har uppstått i enheten. Kontakta tillverkaren om du vill veta mer."</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 95a9b73920cf..d1738ef91f43 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Imeshindwa kufikia mtandao wa simu"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Jaribu kutumia mtandao unaopendelea. Gusa ili ubadilishe."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Huduma ya kupiga simu za dharura haipatikani"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Huduma ya kupiga simu za dharura inahitaji mtandao wa simu"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Arifa"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Kupeleka simu kwenye namba nyingine"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Hali ya kupiga simu za dharura"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Futa"</string> <string name="inputMethod" msgid="1784759500516314751">"Mbinu ya uingizaji"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Vitendo vya maandishi"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Huwezi kuandika kwa mkono kwenye sehemu hii"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Huwezi kuandika kwa mkono kwenye sehemu za kuweka nenosiri"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Rudi nyuma"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Badilisha mbinu ya kuingiza data"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Nafasi ya kuhifadhi inakaribia kujaa"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Inadhibitiwa na <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Imewashwa"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Imezimwa"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> inazima baadhi ya sauti"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Kuna hitilafu ya ndani ya kifaa chako, na huenda kisiwe thabiti mpaka urejeshe mipangilio ya kiwandani."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Kuna hitilafu ya ndani ya kifaa chako. Wasiliana na mtengenezaji wa kifaa chako kwa maelezo."</string> @@ -1976,7 +1979,7 @@ <string name="supervised_user_creation_label" msgid="6884904353827427515">"Weka mtumiaji anayesimamiwa"</string> <string name="language_selection_title" msgid="52674936078683285">"Ongeza lugha"</string> <string name="country_selection_title" msgid="5221495687299014379">"Mapendeleo ya eneo"</string> - <string name="search_language_hint" msgid="7004225294308793583">"Weka jina la lugha"</string> + <string name="search_language_hint" msgid="7004225294308793583">"Andika jina la lugha"</string> <string name="language_picker_section_suggested" msgid="6556199184638990447">"Zinazopendekezwa"</string> <string name="language_picker_regions_section_suggested" msgid="6080131515268225316">"Yanayopendekezwa"</string> <string name="language_picker_section_suggested_bilingual" msgid="5932198319583556613">"Lugha zinazopendekezwa"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 85640a65759e..3c4c457ead56 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"மொபைல் நெட்வொர்க் கிடைக்கவில்லை"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"விருப்ப நெட்வொர்க்கை மாற்றவும். மாற்ற, தட்டவும்."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"அவசர அழைப்பைச் செய்ய முடியாது"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"அவசர அழைப்புகளுக்கு மொபைல் நெட்வொர்க் தேவை"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"விழிப்பூட்டல்கள்"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"அழைப்பு திருப்பிவிடுதல்"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"அவசரகாலத் திரும்ப அழைக்கும் பயன்முறை"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"நீக்கு"</string> <string name="inputMethod" msgid="1784759500516314751">"உள்ளீட்டு முறை"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"உரை நடவடிக்கைகள்"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"இந்தப் புலத்தில் கையெழுத்து ஆதரிக்கப்படவில்லை"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"கடவுச்சொல் புலங்களில் கையெழுத்து ஆதரிக்கப்படவில்லை"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"பின்செல்லும்"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"உள்ளீட்டு முறையை மாற்றும்"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"சேமிப்பிடம் குறைகிறது"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"நிர்வகிப்பது: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"ஆன்"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"ஆஃப்"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> சில ஒலிகளை முடக்குகிறது"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"சாதனத்தில் அகச் சிக்கல் இருக்கிறது, அதனை ஆரம்பநிலைக்கு மீட்டமைக்கும் வரை நிலையற்று இயங்கலாம்."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"சாதனத்தில் அகச் சிக்கல் இருக்கிறது. விவரங்களுக்கு சாதன தயாரிப்பாளரைத் தொடர்புகொள்ளவும்."</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index c0c7806e0f01..2d6241d4d183 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"మొబైల్ నెట్వర్క్ అందుబాటులో లేదు"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"ప్రాధాన్య నెట్వర్క్ను మార్చుకోవడానికి ప్రయత్నించండి. మార్చడానికి నొక్కండి."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"అత్యవసర కాలింగ్ అందుబాటులో లేదు"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"ఎమర్జెన్సీ కాల్స్కు మొబైల్ నెట్వర్క్ అవసరమవుతుంది"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"అలర్ట్లు"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"కాల్ ఫార్వార్డింగ్"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"అత్యవసర కాల్బ్యాక్ మోడ్"</string> @@ -828,7 +827,7 @@ <string name="permdesc_writeVerificationStateE2eeContactKeys" msgid="8453156829747427041">"మీకు సంబంధించిన ఇతర యాప్లలోని E2EE కాంటాక్ట్ కీల వెరిఫికేషన్ స్టేట్లను అప్డేట్ చేయడానికి యాప్ను అనుమతిస్తుంది"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"పాస్వర్డ్ నియమాలను సెట్ చేయండి"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"స్క్రీన్ లాక్ పాస్వర్డ్లు మరియు PINల్లో అనుమతించబడిన పొడవు మరియు అక్షరాలను నియంత్రిస్తుంది."</string> - <string name="policylab_watchLogin" msgid="7599669460083719504">"స్క్రీన్ అన్లాక్ ప్రయత్నాలను పర్యవేక్షించండి"</string> + <string name="policylab_watchLogin" msgid="7599669460083719504">"స్క్రీన్ను అన్లాక్ చేయడానికి చేస్తున్న ప్రయత్నాలను మానిటర్ చేయడానికి"</string> <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"టైప్ చేసిన చెల్లని పాస్వర్డ్ల సంఖ్యను పర్యవేక్షిస్తుంది. స్క్రీన్ను అన్లాక్ చేస్తున్నప్పుడు, అనేక సార్లు చెల్లని పాస్వర్డ్లను టైప్ చేస్తే టాబ్లెట్ లాక్ చేయబడుతుంది లేదా టాబ్లెట్లోని మొత్తం డేటా ఎరేజ్ చేయబడుతుంది."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"స్క్రీన్ను అన్లాక్ చేస్తున్నప్పుడు పాస్వర్డ్లను ఎన్నిసార్లు తప్పుగా టైప్ చేశారో పర్యవేక్షిస్తుంది, అలాగే చాలా ఎక్కువసార్లు పాస్వర్డ్లను తప్పుగా టైప్ చేసి ఉంటే మీ Android TV పరికరాన్ని లాక్ చేస్తుంది లేదా మీ Android TV డేటా మొత్తాన్ని తొలగిస్తుంది."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"స్క్రీన్ను అన్లాక్ చేస్తున్నప్పుడు, పాస్వర్డ్ను ఎన్నిసార్లు తప్పుగా టైప్ చేశారో పర్యవేక్షిస్తుంది. ఒకవేళ చాలా ఎక్కువ సార్లు పాస్వర్డ్ను తప్పుగా టైప్ చేసి ఉంటే, సమాచారంతో కూడిన వినోదం సిస్టమ్ను లాక్ చేస్తుంది లేదా సమాచారంతో కూడిన వినోదం సిస్టమ్ డేటాను తొలగించి ఫ్యాక్టరీ రీసెట్ చేస్తుంది."</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"తొలగించండి"</string> <string name="inputMethod" msgid="1784759500516314751">"ఇన్పుట్ పద్ధతి"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"వచనానికి సంబంధించిన చర్యలు"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"ఈ ఫీల్డ్లో చేతిరాతకు సపోర్ట్ లేదు"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"పాస్వర్డ్ ఫీల్డ్లలో చేతిరాతకు సపోర్ట్ లేదు"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"వెనుకకు"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"ఇన్పుట్ విధానాన్ని మార్చండి"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"స్టోరేజ్ ఖాళీ అయిపోతోంది"</string> @@ -1247,10 +1244,10 @@ <string name="aerr_process_repeated" msgid="1153152413537954974">"<xliff:g id="PROCESS">%1$s</xliff:g> పునరావృతంగా ఆపివేయబడుతోంది"</string> <string name="aerr_restart" msgid="2789618625210505419">"యాప్ను మళ్లీ తెరువు"</string> <string name="aerr_report" msgid="3095644466849299308">"ఫీడ్బ్యాక్ను పంపు"</string> - <string name="aerr_close" msgid="3398336821267021852">"మూసివేయి"</string> + <string name="aerr_close" msgid="3398336821267021852">"మూసివేయండి"</string> <string name="aerr_mute" msgid="2304972923480211376">"పరికరం పునఃప్రారంభమయ్యే వరకు మ్యూట్ చేయి"</string> <string name="aerr_wait" msgid="3198677780474548217">"వేచి ఉండండి"</string> - <string name="aerr_close_app" msgid="8318883106083050970">"యాప్ను మూసివేయి"</string> + <string name="aerr_close_app" msgid="8318883106083050970">"యాప్ను మూసివేయండి"</string> <string name="anr_title" msgid="7290329487067300120"></string> <string name="anr_activity_application" msgid="8121716632960340680">"<xliff:g id="APPLICATION">%2$s</xliff:g> ప్రతిస్పందించడం లేదు"</string> <string name="anr_activity_process" msgid="3477362583767128667">"<xliff:g id="ACTIVITY">%1$s</xliff:g> ప్రతిస్పందించడం లేదు"</string> @@ -1928,10 +1925,16 @@ <string name="zen_mode_default_weeknights_name" msgid="7902108149994062847">"వారపు రోజుల్లో రాత్రి"</string> <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"వారాంతం"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"ఈవెంట్"</string> - <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"నిద్రావస్థ"</string> + <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"నిద్ర"</string> <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> ద్వారా మేనేజ్ చేయబడుతోంది"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"ఆన్లో ఉంది"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"ఆఫ్లో ఉంది"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> కొన్ని ధ్వనులను మ్యూట్ చేస్తోంది"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"మీ పరికరంతో అంతర్గత సమస్య ఏర్పడింది మరియు మీరు ఫ్యాక్టరీ డేటా రీసెట్ చేసే వరకు అస్థిరంగా ఉంటుంది."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"మీ పరికరంతో అంతర్గత సమస్య ఏర్పడింది. వివరాల కోసం మీ తయారీదారుని సంప్రదించండి."</string> @@ -1958,7 +1961,7 @@ <string name="floating_toolbar_open_overflow_description" msgid="2260297653578167367">"మరిన్ని ఆప్షన్లు"</string> <string name="floating_toolbar_close_overflow_description" msgid="3949818077708138098">"అతివ్యాప్తిని మూసివేస్తుంది"</string> <string name="maximize_button_text" msgid="4258922519914732645">"గరిష్టీకరించు"</string> - <string name="close_button_text" msgid="10603510034455258">"మూసివేయి"</string> + <string name="close_button_text" msgid="10603510034455258">"మూసివేయండి"</string> <string name="notification_messaging_title_template" msgid="772857526770251989">"<xliff:g id="CONVERSATION_TITLE">%1$s</xliff:g>: <xliff:g id="SENDER_NAME">%2$s</xliff:g>"</string> <string name="call_notification_answer_action" msgid="5999246836247132937">"పికప్ చేయండి"</string> <string name="call_notification_answer_video_action" msgid="2086030940195382249">"వీడియో కాల్"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index c3a3c6dceae1..e75cfe18031f 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"เชื่อมต่อเครือข่ายมือถือไม่ได้"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"ลองเปลี่ยนเครือข่ายที่ต้องการ แตะเพื่อเปลี่ยน"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"โทรหาหมายเลขฉุกเฉินไม่ได้"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"การโทรหาหมายเลขฉุกเฉินต้องใช้เครือข่ายมือถือ"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"การแจ้งเตือน"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"การโอนสาย"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"โหมดติดต่อกลับฉุกเฉิน"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"ลบ"</string> <string name="inputMethod" msgid="1784759500516314751">"วิธีป้อนข้อมูล"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"การทำงานของข้อความ"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"ช่องนี้ไม่รองรับการเขียนด้วยลายมือ"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"ช่องรหัสผ่านไม่รองรับการเขียนด้วยลายมือ"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"กลับ"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"สลับวิธีการป้อนข้อมูล"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"พื้นที่จัดเก็บเหลือน้อย"</string> @@ -1300,12 +1297,12 @@ <string name="new_app_action" msgid="547772182913269801">"เปิด <xliff:g id="NEW_APP">%1$s</xliff:g>"</string> <string name="new_app_description" msgid="1958903080400806644">"<xliff:g id="OLD_APP">%1$s</xliff:g> จะปิดโดยไม่บันทึก"</string> <string name="dump_heap_notification" msgid="5316644945404825032">"<xliff:g id="PROC">%1$s</xliff:g> เกินขีดจำกัดของหน่วยความจำ"</string> - <string name="dump_heap_ready_notification" msgid="2302452262927390268">"ฮีพดัมพ์ <xliff:g id="PROC">%1$s</xliff:g> พร้อมแล้ว"</string> - <string name="dump_heap_notification_detail" msgid="8431586843001054050">"รวบรวมฮีพดัมพ์แล้ว แตะเพื่อแชร์"</string> - <string name="dump_heap_title" msgid="4367128917229233901">"แชร์ฮีพดัมพ์ไหม"</string> - <string name="dump_heap_text" msgid="1692649033835719336">"กระบวนการ <xliff:g id="PROC">%1$s</xliff:g> ใช้หน่วยความจำเกินขีดจำกัดขนาด <xliff:g id="SIZE">%2$s</xliff:g> มีฮีพดัมพ์พร้อมให้แชร์กับนักพัฒนาซอฟต์แวร์ โปรดระวัง: ฮีพดัมพ์นี้อาจมีข้อมูลส่วนบุคคลที่มีความละเอียดอ่อนซึ่งแอปพลิเคชันเข้าถึงได้"</string> - <string name="dump_heap_system_text" msgid="6805155514925350849">"กระบวนการ <xliff:g id="PROC">%1$s</xliff:g> ใช้หน่วยความจำเกินขีดจำกัดขนาด <xliff:g id="SIZE">%2$s</xliff:g> มีฮีพดัมพ์พร้อมให้แชร์ โปรดระวัง: ฮีพดัมพ์นี้อาจมีข้อมูลส่วนบุคคลที่มีความละเอียดอ่อนซึ่งกระบวนการดังกล่าวเข้าถึงได้ ซึ่งอาจรวมถึงข้อมูลต่างๆ ที่คุณพิมพ์ไว้"</string> - <string name="dump_heap_ready_text" msgid="5849618132123045516">"มีฮีพดัมพ์ของกระบวนการ <xliff:g id="PROC">%1$s</xliff:g> พร้อมให้แชร์ โปรดระวัง: ฮีพดัมพ์นี้อาจมีข้อมูลส่วนบุคคลที่มีความละเอียดอ่อนซึ่งกระบวนการดังกล่าวเข้าถึงได้ ซึ่งอาจรวมถึงข้อมูลต่างๆ ที่คุณพิมพ์ไว้"</string> + <string name="dump_heap_ready_notification" msgid="2302452262927390268">"ฮีปดัมป์ <xliff:g id="PROC">%1$s</xliff:g> พร้อมแล้ว"</string> + <string name="dump_heap_notification_detail" msgid="8431586843001054050">"รวบรวมฮีปดัมป์แล้ว แตะเพื่อแชร์"</string> + <string name="dump_heap_title" msgid="4367128917229233901">"แชร์ฮีปดัมป์ไหม"</string> + <string name="dump_heap_text" msgid="1692649033835719336">"กระบวนการ <xliff:g id="PROC">%1$s</xliff:g> ใช้หน่วยความจำเกินขีดจำกัดขนาด <xliff:g id="SIZE">%2$s</xliff:g> มีฮีปดัมป์พร้อมให้แชร์กับนักพัฒนาซอฟต์แวร์ โปรดระวัง: ฮีปดัมป์นี้อาจมีข้อมูลส่วนบุคคลที่มีความละเอียดอ่อนซึ่งแอปพลิเคชันเข้าถึงได้"</string> + <string name="dump_heap_system_text" msgid="6805155514925350849">"กระบวนการ <xliff:g id="PROC">%1$s</xliff:g> ใช้หน่วยความจำเกินขีดจำกัดขนาด <xliff:g id="SIZE">%2$s</xliff:g> มีฮีปดัมป์พร้อมให้แชร์ โปรดระวัง: ฮีปดัมป์นี้อาจมีข้อมูลส่วนบุคคลที่มีความละเอียดอ่อนซึ่งกระบวนการดังกล่าวเข้าถึงได้ ซึ่งอาจรวมถึงข้อมูลต่างๆ ที่คุณพิมพ์ไว้"</string> + <string name="dump_heap_ready_text" msgid="5849618132123045516">"มีฮีปดัมป์ของกระบวนการ <xliff:g id="PROC">%1$s</xliff:g> พร้อมให้แชร์ โปรดระวัง: ฮีปดัมป์นี้อาจมีข้อมูลส่วนบุคคลที่มีความละเอียดอ่อนซึ่งกระบวนการดังกล่าวเข้าถึงได้ ซึ่งอาจรวมถึงข้อมูลต่างๆ ที่คุณพิมพ์ไว้"</string> <string name="sendText" msgid="493003724401350724">"เลือกการทำงานกับข้อความ"</string> <string name="volume_ringtone" msgid="134784084629229029">"ระดับความดังเสียงเรียกเข้า"</string> <string name="volume_music" msgid="7727274216734955095">"ระดับเสียงของสื่อ"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"จัดการโดย <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"เปิด"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"ปิด"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> กำลังปิดเสียงบางรายการ"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"อุปกรณ์ของคุณเกิดปัญหาภายในเครื่อง อุปกรณ์อาจทำงานไม่เสถียรจนกว่าคุณจะรีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"อุปกรณ์ของคุณเกิดปัญหาภายในเครื่อง โปรดติดต่อผู้ผลิตเพื่อขอรายละเอียดเพิ่มเติม"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 717b9e0ca01e..0ba3fc38919d 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Hindi makakonekta sa mobile network"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Subukang baguhin ang gustong network. I-tap para baguhin."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Hindi available ang pang-emergency na pagtawag"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Kailangan ng mobile network para sa mga emergency na tawag"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Mga Alerto"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Pagpasa ng tawag"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Emergency callback mode"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"I-delete"</string> <string name="inputMethod" msgid="1784759500516314751">"Pamamaraan ng pag-input"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Pagkilos ng teksto"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Hindi sinusuportahan ang sulat-kamay sa field na ito"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Hindi sinusuportahan ang sulat-kamay sa mga field ng password"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Bumalik"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Magpalit ng pamamaraan ng pag-input"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Nauubusan na ang puwang ng storage"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Pinapamahalaan ng <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Naka-on"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Naka-off"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"Minu-mute ng <xliff:g id="THIRD_PARTY">%1$s</xliff:g> ang ilang tunog"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"May internal na problema sa iyong device, at maaaring hindi ito maging stable hanggang sa i-reset mo ang factory data."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"May internal na problema sa iyong device. Makipag-ugnayan sa iyong manufacturer upang malaman ang mga detalye."</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 03a65779dd3b..b3b59fce4216 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Mobil ağa erişilemiyor"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Tercih edilen ağı değiştirmeyi deneyin. Değiştirmek için dokunun."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Acil durum çağrısı kullanılamaz"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Acil durum aramaları için mobil ağ gereklidir"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Uyarılar"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Çağrı yönlendirme"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Acil geri arama modu"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Sil"</string> <string name="inputMethod" msgid="1784759500516314751">"Giriş yöntemi"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Metin eylemleri"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"El yazısı bu alanda desteklenmiyor"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"El yazısı, şifre alanlarında desteklenmiyor"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Geri"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Giriş yöntemini değiştir"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Depolama alanı bitiyor"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> tarafından yönetiliyor"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Açık"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Kapalı"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> bazı sesleri kapatıyor"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Cihazınızla ilgili dahili bir sorun oluştu ve fabrika verilerine sıfırlama işlemi gerçekleştirilene kadar kararsız çalışabilir."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Cihazınızla ilgili dahili bir sorun oluştu. Ayrıntılı bilgi için üreticinizle iletişim kurun."</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index a8c86d4502f5..528b403e9be7 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -86,8 +86,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Не вдається під’єднатися до мобільної мережі"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Спробуйте змінити вибрану мережу. Торкніться, щоб це зробити."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Екстрені виклики недоступні"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Щоб здійснювати екстрені виклики, потрібне з’єднання з мобільною мережею"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Сповіщення"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Переадресація виклику"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Режим екстреного зворотного виклику"</string> @@ -1186,10 +1185,8 @@ <string name="deleteText" msgid="4200807474529938112">"Видалити"</string> <string name="inputMethod" msgid="1784759500516314751">"Метод введення"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Дії з текстом"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Рукописне введення не підтримується в цьому полі"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Рукописне введення не підтримується в полях паролів"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Назад"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Змінити метод введення"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Закінчується пам’ять"</string> @@ -1934,6 +1931,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Керує додаток <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Увімкнено"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Вимкнено"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> вимикає деякі звуки"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Через внутрішню помилку ваш пристрій може працювати нестабільно. Відновіть заводські налаштування."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"На пристрої сталася внутрішня помилка. Зв’яжіться з виробником пристрою, щоб дізнатися більше."</string> @@ -2138,7 +2141,7 @@ <string name="nas_upgrade_notification_enable_action" msgid="3046406808378726874">"OK"</string> <string name="nas_upgrade_notification_disable_action" msgid="3794833210043497982">"Вимкнути"</string> <string name="nas_upgrade_notification_learn_more_action" msgid="7011130656195423947">"Докладніше"</string> - <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"В Android 12 адаптивні сповіщення замінено на покращені. Ця функція допомагає впорядковувати сповіщення й показує в них пропоновані дії та відповіді.\n\nПокращені сповіщення надають доступ до вмісту сповіщень, зокрема до такої особистої інформації, як повідомлення й імена контактів. Ця функція може автоматично закривати сповіщення чи реагувати на них, наприклад відповідати на телефонні дзвінки або керувати режимом \"Не турбувати\"."</string> + <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"В Android 12 адаптивні сповіщення замінено на покращені. Ця функція допомагає впорядковувати сповіщення й показує в них пропоновані дії і відповіді.\n\nПокращені сповіщення надають доступ до вмісту сповіщень, зокрема до такої особистої інформації, як повідомлення й імена контактів. Ця функція може автоматично закривати сповіщення чи реагувати на них, наприклад відповідати на телефонні дзвінки або керувати режимом \"Не турбувати\"."</string> <string name="dynamic_mode_notification_channel_name" msgid="2986926422100223328">"Сповіщення про програму"</string> <string name="dynamic_mode_notification_title" msgid="1388718452788985481">"Режим енергозбереження ввімкнено"</string> <string name="dynamic_mode_notification_summary" msgid="1639031262484979689">"Заряд використовується економно, щоб подовжити час роботи акумулятора"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index 05184fc5ae59..48c20f5d3612 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"موبائل نیٹ ورک تک رسائی نہیں ہو سکتی"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"ترجیحی نیٹ ورک تبدیل کر کے دیکھیں۔ تبدیل کرنے کے لیے تھپتھپائیں۔"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"ایمرجنسی کالنگ دستیاب نہیں ہے"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"ہنگامی کالز کو موبائل نیٹ ورک کی ضرورت ہے"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"الرٹس"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"کال فارورڈنگ"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"ایمرجنسی کال بیک وضع"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"حذف کریں"</string> <string name="inputMethod" msgid="1784759500516314751">"اندراج کا طریقہ"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"متن کی کارروائیاں"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"اس فیلڈ میں ہینڈ رائٹنگ تعاون یافتہ نہیں ہے"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"ہینڈ رائٹنگ پاس ورڈ فیلڈز میں تعاون یافتہ نہیں ہے"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"پیچھے"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"اندراج کا طریقہ سوئچ کریں"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"اسٹوریج کی جگہ ختم ہو رہی ہے"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے زیر انتظام ہے"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"آن ہے"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"آف ہے"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> کچھ آوازوں کو خاموش کر رہا ہے"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"آپ کے آلہ میں ایک داخلی مسئلہ ہے اور جب تک آپ فیکٹری ڈیٹا کو دوبارہ ترتیب نہیں دے دیتے ہیں، ہوسکتا ہے کہ یہ غیر مستحکم رہے۔"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"آپ کے آلہ میں ایک داخلی مسئلہ ہے۔ تفصیلات کیلئے اپنے مینوفیکچرر سے رابطہ کریں۔"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index dc31f001224c..d7152b5c23f2 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Mobil tarmoqqa ulanib bo‘lmadi"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Tarmoq turini almashtiring. Almashtirish uchun bosing."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Favqulodda chaqiruv ishlamayapti"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Favqulodda chaqiruvlar uchun mobil tarmoq zarur"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Ogohlantirishlar"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Chaqiruvlarni uzatish"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Favqulodda qaytarib chaqirish rejimi"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"O‘chirish"</string> <string name="inputMethod" msgid="1784759500516314751">"Kiritish uslubi"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Matn yozish"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Bu qatorda qoʻlyozma ishlatish imkonsiz"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Parol qatorlarida qoʻlyozma ishlatish imkonsiz"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Orqaga"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Matn kiritish usulini almashtirish"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Xotirada joy yetarli emas"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"<xliff:g id="APP_NAME">%1$s</xliff:g> tomonidan boshqariladi"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Yoniq"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Oʻchiq"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ayrim tovushlarni ovozsiz qilgan"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Qurilmangiz bilan bog‘liq ichki muammo mavjud. U zavod sozlamalari tiklanmaguncha barqaror ishlamasligi mumkin."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Qurilmangiz bilan bog‘liq ichki muammo mavjud. Tafsilotlar uchun qurilmangiz ishlab chiqaruvchisiga murojaat qiling."</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index d82487ec883b..0d0ba4aae5d0 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"Không thể kết nối với mạng di động"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"Hãy thử thay đổi mạng ưu tiên. Nhấn để thay đổi."</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"Không có dịch vụ gọi khẩn cấp"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"Cần có mạng di động để thực hiện các cuộc gọi khẩn cấp"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"Thông báo"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"Chuyển tiếp cuộc gọi"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"Chế độ gọi lại khẩn cấp"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"Xóa"</string> <string name="inputMethod" msgid="1784759500516314751">"Phương thức nhập"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"Tác vụ văn bản"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"Trường này không hỗ trợ tính năng Viết tay"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"Các trường mật khẩu không hỗ trợ tính năng Viết tay"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"Quay lại"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Chuyển phương thức nhập"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Sắp hết dung lượng lưu trữ"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Do <xliff:g id="APP_NAME">%1$s</xliff:g> quản lý"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Bật"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Tắt"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> đang tắt một số âm thanh"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Đã xảy ra sự cố nội bộ với thiết bị của bạn và thiết bị có thể sẽ không ổn định cho tới khi bạn thiết lập lại dữ liệu ban đầu."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Đã xảy ra sự cố nội bộ với thiết bị. Hãy liên hệ với nhà sản xuất của bạn để biết chi tiết."</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index d1f7d32cd4be..958e465fb40f 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"无法连接到移动网络"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"请尝试更改首选网络。点按即可更改。"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"无法使用紧急呼救服务"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"紧急呼叫需要使用移动网络"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"提醒"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"来电转接"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"紧急回拨模式"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"删除"</string> <string name="inputMethod" msgid="1784759500516314751">"输入法"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"文字操作"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"无法在此字段中使用手写功能"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"无法在密码字段中使用手写功能"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"返回"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"切换输入法"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"存储空间不足"</string> @@ -1286,7 +1283,7 @@ <string name="android_upgrading_starting_apps" msgid="6206161195076057075">"正在启动应用。"</string> <string name="android_upgrading_complete" msgid="409800058018374746">"即将完成启动。"</string> <string name="fp_power_button_enrollment_message" msgid="5648173517663246140">"您已按电源按钮，这通常会关闭屏幕。\n\n请尝试在设置指纹时轻轻按一下。"</string> - <string name="fp_power_button_enrollment_title" msgid="6976841690455338563">"若要结束设置，请关闭屏幕"</string> + <string name="fp_power_button_enrollment_title" msgid="6976841690455338563">"结束设置，请关闭屏幕"</string> <string name="fp_power_button_enrollment_button_text" msgid="3199783266386029200">"关闭"</string> <string name="fp_power_button_bp_title" msgid="5585506104526820067">"要继续验证您的指纹吗？"</string> <string name="fp_power_button_bp_message" msgid="2983163038168903393">"您已按电源按钮，这通常会关闭屏幕。\n\n请尝试轻轻按一下来验证您的指纹。"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"由<xliff:g id="APP_NAME">%1$s</xliff:g>管理"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"已启用"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"已停用"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>正在将某些音效设为静音"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"您的设备内部出现了问题。如果不将设备恢复出厂设置，设备运行可能会不稳定。"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"您的设备内部出现了问题。请联系您的设备制造商了解详情。"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index c914fd1955f7..df49fd6f3431 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"無法連線至流動網絡"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"請嘗試變更偏好的網絡。輕按即可變更。"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"無法撥打緊急電話"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"撥打緊急電話需要使用流動網絡"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"通知"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"來電轉駁"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"緊急回撥模式"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"刪除"</string> <string name="inputMethod" msgid="1784759500516314751">"輸入法"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"文字操作"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"此欄位無法使用手寫功能"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"密碼欄位無法使用手寫功能"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"返回"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"切換輸入方法"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"儲存空間即將用盡"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"由<xliff:g id="APP_NAME">%1$s</xliff:g>管理"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"已開啟"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"已關閉"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>正將某些音效設為靜音"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"你裝置的系統發生問題，回復原廠設定後即可解決該問題。"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"你裝置的系統發生問題，請聯絡你的製造商瞭解詳情。"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 8ac4531b9512..cc99d912fd35 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -84,8 +84,7 @@ <string name="NetworkPreferenceSwitchTitle" msgid="1008329951315753038">"無法連上行動網路"</string> <string name="NetworkPreferenceSwitchSummary" msgid="2086506181486324860">"請嘗試變更偏好的網路。輕觸即可變更。"</string> <string name="EmergencyCallWarningTitle" msgid="1615688002899152860">"無法撥打緊急電話"</string> - <!-- no translation found for EmergencyCallWarningSummary (9102799172089265268) --> - <skip /> + <string name="EmergencyCallWarningSummary" msgid="9102799172089265268">"撥打緊急電話需要使用行動網路"</string> <string name="notification_channel_network_alert" msgid="4788053066033851841">"快訊"</string> <string name="notification_channel_call_forward" msgid="8230490317314272406">"來電轉接"</string> <string name="notification_channel_emergency_callback" msgid="54074839059123159">"緊急回撥模式"</string> @@ -1184,10 +1183,8 @@ <string name="deleteText" msgid="4200807474529938112">"刪除"</string> <string name="inputMethod" msgid="1784759500516314751">"輸入法"</string> <string name="editTextMenuTitle" msgid="857666911134482176">"文字動作"</string> - <!-- no translation found for error_handwriting_unsupported (7809438534946014050) --> - <skip /> - <!-- no translation found for error_handwriting_unsupported_password (5095401146106891087) --> - <skip /> + <string name="error_handwriting_unsupported" msgid="7809438534946014050">"這個欄位無法使用手寫功能"</string> + <string name="error_handwriting_unsupported_password" msgid="5095401146106891087">"密碼欄位無法使用手寫功能"</string> <string name="input_method_nav_back_button_desc" msgid="3655838793765691787">"返回"</string> <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"切換輸入法"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"儲存空間即將用盡"</string> @@ -1932,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"由「<xliff:g id="APP_NAME">%1$s</xliff:g>」管理"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"已啟用"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"已停用"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"「<xliff:g id="THIRD_PARTY">%1$s</xliff:g>」正在關閉部分音效"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"你的裝置發生內部問題，必須將裝置恢復原廠設定才能解除不穩定狀態。"</string> <string name="system_error_manufacturer" msgid="703545241070116315">"你的裝置發生內部問題，詳情請洽裝置製造商。"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index eb75d2a501c1..3de26845b428 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -1929,6 +1929,12 @@ <string name="zen_mode_implicit_trigger_description" msgid="5714956693073007111">"Iphethwe yi-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="zen_mode_implicit_activated" msgid="2634285680776672994">"Kuvuliwe"</string> <string name="zen_mode_implicit_deactivated" msgid="8688441768371501750">"Kuvaliwe"</string> + <!-- no translation found for zen_mode_trigger_summary_divider_text (7461583466043698862) --> + <skip /> + <!-- no translation found for zen_mode_trigger_summary_range_symbol_combination (1804900738798069619) --> + <skip /> + <!-- no translation found for zen_mode_trigger_event_calendar_any (2086784607921121803) --> + <skip /> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ithulisa eminye imisindo"</string> <string name="system_error_wipe_data" msgid="5910572292172208493">"Kukhona inkinga yangaphakathi ngedivayisi yakho, futhi ingase ibe engazinzile kuze kube yilapho usetha kabusha yonke idatha."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"Kukhona inkinga yangaphakathi ngedivayisi yakho. Xhumana nomkhiqizi wakho ukuze uthole imininingwane."</string> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index a926a705bc07..d2f74b292552 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2883,6 +2883,13 @@ --> <integer name="config_minimumScreenOffTimeout">10000</integer> + <!-- User activity timeout: Screen timeout override in milliseconds. + + This value must be greater than 0, otherwise the invalid value will not apply to + the screen timeout override policy. + --> + <integer name="config_screenTimeoutOverride">-1</integer> + <!-- User activity timeout: Maximum screen dim duration in milliseconds. Sets an upper bound for how long the screen will dim before the device goes @@ -6990,4 +6997,8 @@ <!-- Whether desktop mode is supported on the current device --> <bool name="config_isDesktopModeSupported">false</bool> + + <!-- Frame rate compatibility value for Wallpaper + FRAME_RATE_COMPATIBILITY_MIN (102) is used by default for lower power consumption --> + <integer name="config_wallpaperFrameRateCompatibility">102</integer> </resources> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index c6706cb4283f..f3aa27f9b264 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -6443,6 +6443,9 @@ ul.</string> <!-- Notification action title used instead of a notification's normal title sensitive [CHAR_LIMIT=NOTIF_BODY] --> <string name="redacted_notification_action_title"></string> + <!-- Toast when an app's content is hidden from screen share (user can still see content) due to potential security risks of showing the content (such as a password or OTP) - [CHAR_LIMIT=TOAST] --> + <string name="screen_not_shared_sensitive_content">App content hidden from screen share for security</string> + <!-- Satellite related messages --> <!-- Notification title when satellite service is connected. --> <string name="satellite_notification_title">Auto connected to satellite</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index fe4e4f0488e3..08f377b0fe0f 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2285,6 +2285,7 @@ <java-symbol type="bool" name="config_powerDecoupleAutoSuspendModeFromDisplay" /> <java-symbol type="bool" name="config_powerDecoupleInteractiveModeFromDisplay" /> <java-symbol type="integer" name="config_minimumScreenOffTimeout" /> + <java-symbol type="integer" name="config_screenTimeoutOverride" /> <java-symbol type="integer" name="config_maximumScreenDimDuration" /> <java-symbol type="fraction" name="config_maximumScreenDimRatio" /> <java-symbol type="integer" name="config_attentiveTimeout" /> @@ -5206,9 +5207,10 @@ <java-symbol type="string" name="keyboard_layout_notification_multiple_selected_title"/> <java-symbol type="string" name="keyboard_layout_notification_multiple_selected_message"/> - <!-- For redacted notifications --> + <!-- For redacted notifications and screen sharing--> <java-symbol type="string" name="redacted_notification_message"/> <java-symbol type="string" name="redacted_notification_action_title"/> + <java-symbol type="string" name="screen_not_shared_sensitive_content"/> <java-symbol type="bool" name="config_batteryStatsResetOnUnplugHighBatteryLevel" /> <java-symbol type="bool" name="config_batteryStatsResetOnUnplugAfterSignificantCharge" /> @@ -5394,4 +5396,7 @@ <!-- Whether desktop mode is supported on the current device --> <java-symbol type="bool" name="config_isDesktopModeSupported" /> + + <!-- Frame rate compatibility value for Wallpaper --> + <java-symbol type="integer" name="config_wallpaperFrameRateCompatibility" /> </resources> diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp index 24031cad0a3e..48082048691c 100644 --- a/core/tests/coretests/Android.bp +++ b/core/tests/coretests/Android.bp @@ -134,6 +134,8 @@ android_test { ":BinderDeathRecipientHelperApp1", ":BinderDeathRecipientHelperApp2", ":com.android.cts.helpers.aosp", + ":BinderProxyCountingTestApp", + ":BinderProxyCountingTestService", ], } diff --git a/core/tests/coretests/AndroidTest.xml b/core/tests/coretests/AndroidTest.xml index 05b309b2cd52..bf2a5b875dba 100644 --- a/core/tests/coretests/AndroidTest.xml +++ b/core/tests/coretests/AndroidTest.xml @@ -22,6 +22,8 @@ <option name="test-file-name" value="FrameworksCoreTests.apk" /> <option name="test-file-name" value="BinderDeathRecipientHelperApp1.apk" /> <option name="test-file-name" value="BinderDeathRecipientHelperApp2.apk" /> + <option name="test-file-name" value="BinderProxyCountingTestApp.apk" /> + <option name="test-file-name" value="BinderProxyCountingTestService.apk" /> </target_preparer> <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> diff --git a/core/tests/coretests/BinderProxyCountingTestApp/AndroidManifest.xml b/core/tests/coretests/BinderProxyCountingTestApp/AndroidManifest.xml index a971730f389d..c8407b80cfac 100644 --- a/core/tests/coretests/BinderProxyCountingTestApp/AndroidManifest.xml +++ b/core/tests/coretests/BinderProxyCountingTestApp/AndroidManifest.xml @@ -16,6 +16,9 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.frameworks.coretests.binderproxycountingtestapp"> + <queries> + <package android:name="com.android.frameworks.coretests.binderproxycountingtestservice" /> + </queries> <application> <service android:name=".BpcTestAppCmdService" android:exported="true"/> diff --git a/core/tests/coretests/BinderProxyCountingTestApp/src/com/android/frameworks/coretests/binderproxycountingtestapp/BpcTestAppCmdService.java b/core/tests/coretests/BinderProxyCountingTestApp/src/com/android/frameworks/coretests/binderproxycountingtestapp/BpcTestAppCmdService.java index 5aae1203e559..a7e97d3cd54e 100644 --- a/core/tests/coretests/BinderProxyCountingTestApp/src/com/android/frameworks/coretests/binderproxycountingtestapp/BpcTestAppCmdService.java +++ b/core/tests/coretests/BinderProxyCountingTestApp/src/com/android/frameworks/coretests/binderproxycountingtestapp/BpcTestAppCmdService.java @@ -17,14 +17,15 @@ package com.android.frameworks.coretests.binderproxycountingtestapp; import android.app.Service; -import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.content.ServiceConnection; +import android.database.ContentObserver; +import android.os.Handler; import android.os.IBinder; import android.os.RemoteException; +import android.provider.Settings; import android.util.Log; import com.android.frameworks.coretests.aidl.IBinderProxyCountingService; @@ -49,24 +50,20 @@ public class BpcTestAppCmdService extends Service { private IBpcTestAppCmdService.Stub mBinder = new IBpcTestAppCmdService.Stub() { - private ArrayList<BroadcastReceiver> mBrList = new ArrayList(); + private ArrayList<ContentObserver> mCoList = new ArrayList(); private ArrayList<ITestRemoteCallback> mTrcList = new ArrayList(); + private Handler mHandler = new Handler(); @Override public void createSystemBinders(int count) { int i = 0; while (i++ < count) { - BroadcastReceiver br = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - - } - }; - IntentFilter filt = new IntentFilter(Intent.ACTION_POWER_DISCONNECTED); - synchronized (mBrList) { - mBrList.add(br); + final ContentObserver co = new ContentObserver(mHandler) {}; + synchronized (mCoList) { + mCoList.add(co); } - registerReceiver(br, filt); + getContentResolver().registerContentObserver( + Settings.System.CONTENT_URI, false, co); } } @@ -74,11 +71,11 @@ public class BpcTestAppCmdService extends Service { public void releaseSystemBinders(int count) { int i = 0; while (i++ < count) { - BroadcastReceiver br; - synchronized (mBrList) { - br = mBrList.remove(0); + ContentObserver co; + synchronized (mCoList) { + co = mCoList.remove(0); } - unregisterReceiver(br); + getContentResolver().unregisterContentObserver(co); } } @@ -117,9 +114,9 @@ public class BpcTestAppCmdService extends Service { @Override public void releaseAllBinders() { - synchronized (mBrList) { - while (mBrList.size() > 0) { - unregisterReceiver(mBrList.remove(0)); + synchronized (mCoList) { + while (mCoList.size() > 0) { + getContentResolver().unregisterContentObserver(mCoList.remove(0)); } } synchronized (mTrcList) { @@ -179,4 +176,4 @@ public class BpcTestAppCmdService extends Service { public IBinder onBind(Intent intent) { return mBinder; } -}
\ No newline at end of file +} diff --git a/core/tests/coretests/BinderProxyCountingTestService/src/com/android/frameworks/coretests/binderproxycountingtestservice/BpcTestServiceCmdService.java b/core/tests/coretests/BinderProxyCountingTestService/src/com/android/frameworks/coretests/binderproxycountingtestservice/BpcTestServiceCmdService.java index 6bed2a2ec53f..0f1accc4a7e9 100644 --- a/core/tests/coretests/BinderProxyCountingTestService/src/com/android/frameworks/coretests/binderproxycountingtestservice/BpcTestServiceCmdService.java +++ b/core/tests/coretests/BinderProxyCountingTestService/src/com/android/frameworks/coretests/binderproxycountingtestservice/BpcTestServiceCmdService.java @@ -55,8 +55,8 @@ public class BpcTestServiceCmdService extends Service { } @Override - public void setBinderProxyWatermarks(int high, int low) { - BinderInternal.nSetBinderProxyCountWatermarks(high, low); + public void setBinderProxyWatermarks(int high, int low, int warning) { + BinderInternal.nSetBinderProxyCountWatermarks(high, low, warning); } @Override @@ -68,12 +68,23 @@ public class BpcTestServiceCmdService extends Service { public void setBinderProxyCountCallback(IBpcCallbackObserver observer) { if (observer != null) { BinderInternal.setBinderProxyCountCallback( - new BinderInternal.BinderProxyLimitListener() { + new BinderInternal.BinderProxyCountEventListener() { @Override public void onLimitReached(int uid) { try { synchronized (observer) { - observer.onCallback(uid); + observer.onLimitReached(uid); + } + } catch (Exception e) { + Log.e(TAG, e.toString()); + } + } + + @Override + public void onWarningThresholdReached(int uid) { + try { + synchronized (observer) { + observer.onWarningThresholdReached(uid); } } catch (Exception e) { Log.e(TAG, e.toString()); @@ -98,4 +109,4 @@ public class BpcTestServiceCmdService extends Service { mHandlerThread.start(); mHandler = new Handler(mHandlerThread.getLooper()); } -}
\ No newline at end of file +} diff --git a/core/tests/coretests/aidl/com/android/frameworks/coretests/aidl/IBpcCallbackObserver.aidl b/core/tests/coretests/aidl/com/android/frameworks/coretests/aidl/IBpcCallbackObserver.aidl index c4ebd56bed6c..ada7d92c89e1 100644 --- a/core/tests/coretests/aidl/com/android/frameworks/coretests/aidl/IBpcCallbackObserver.aidl +++ b/core/tests/coretests/aidl/com/android/frameworks/coretests/aidl/IBpcCallbackObserver.aidl @@ -17,5 +17,6 @@ package com.android.frameworks.coretests.aidl; interface IBpcCallbackObserver { - void onCallback(int uid); -}
\ No newline at end of file + void onLimitReached(int uid); + void onWarningThresholdReached(int uid); +} diff --git a/core/tests/coretests/aidl/com/android/frameworks/coretests/aidl/IBpcTestServiceCmdService.aidl b/core/tests/coretests/aidl/com/android/frameworks/coretests/aidl/IBpcTestServiceCmdService.aidl index abdab41ce537..cdcda9d93bd2 100644 --- a/core/tests/coretests/aidl/com/android/frameworks/coretests/aidl/IBpcTestServiceCmdService.aidl +++ b/core/tests/coretests/aidl/com/android/frameworks/coretests/aidl/IBpcTestServiceCmdService.aidl @@ -20,7 +20,7 @@ import com.android.frameworks.coretests.aidl.IBpcCallbackObserver; interface IBpcTestServiceCmdService { void forceGc(); int getBinderProxyCount(int uid); - void setBinderProxyWatermarks(int high, int low); + void setBinderProxyWatermarks(int high, int low, int warning); void enableBinderProxyLimit(boolean enable); void setBinderProxyCountCallback(IBpcCallbackObserver observer); -}
\ No newline at end of file +} diff --git a/core/tests/coretests/res/layout/activity_horizontal_scroll_view.xml b/core/tests/coretests/res/layout/activity_horizontal_scroll_view.xml index 502921263462..44dc1f89d6d6 100644 --- a/core/tests/coretests/res/layout/activity_horizontal_scroll_view.xml +++ b/core/tests/coretests/res/layout/activity_horizontal_scroll_view.xml @@ -22,7 +22,7 @@ <HorizontalScrollView android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:id="@+id/horizontal_scroll_view"> <LinearLayout @@ -133,31 +133,31 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="vertical"> + android:orientation="horizontal"> <View android:background="#00F" - android:layout_width="90dp" - android:layout_height="50dp"/> + android:layout_width="100dp" + android:layout_height="90dp"/> <View android:background="#0FF" - android:layout_width="90dp" - android:layout_height="50dp"/> + android:layout_width="100dp" + android:layout_height="90dp"/> <View android:background="#0F0" - android:layout_width="90dp" - android:layout_height="50dp"/> + android:layout_width="100dp" + android:layout_height="90dp"/> <View android:background="#FF0" - android:layout_width="90dp" - android:layout_height="50dp"/> + android:layout_width="100dp" + android:layout_height="90dp"/> <View android:background="#F00" - android:layout_width="90dp" - android:layout_height="50dp"/> + android:layout_width="100dp" + android:layout_height="90dp"/> <View android:background="#F0F" - android:layout_width="90dp" - android:layout_height="50dp"/> + android:layout_width="100dp" + android:layout_height="90dp"/> </LinearLayout> </view> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/core/tests/coretests/res/layout/activity_scroll_view.xml b/core/tests/coretests/res/layout/activity_scroll_view.xml index db8cd026e71a..0d4afd51e305 100644 --- a/core/tests/coretests/res/layout/activity_scroll_view.xml +++ b/core/tests/coretests/res/layout/activity_scroll_view.xml @@ -18,10 +18,10 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="horizontal"> <ScrollView - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="match_parent" android:id="@+id/scroll_view"> diff --git a/core/tests/coretests/src/android/hardware/face/FaceSensorConfigurationsTest.java b/core/tests/coretests/src/android/hardware/face/FaceSensorConfigurationsTest.java index b61104d6f389..7d7f8ed25869 100644 --- a/core/tests/coretests/src/android/hardware/face/FaceSensorConfigurationsTest.java +++ b/core/tests/coretests/src/android/hardware/face/FaceSensorConfigurationsTest.java @@ -18,13 +18,10 @@ package android.hardware.face; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; -import android.hardware.biometrics.face.IFace; -import android.hardware.biometrics.face.SensorProps; import android.os.RemoteException; import android.platform.test.annotations.Presubmit; @@ -37,8 +34,6 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import java.util.function.Function; - @Presubmit @SmallTest public class FaceSensorConfigurationsTest { @@ -48,10 +43,6 @@ public class FaceSensorConfigurationsTest { private Context mContext; @Mock private Resources mResources; - @Mock - private IFace mFace; - @Mock - private Function<String, IFace> mGetIFace; private final String[] mAidlInstances = new String[]{"default", "virtual"}; private String[] mHidlConfigStrings = new String[]{"0:2:15", "0:8:15"}; @@ -59,15 +50,13 @@ public class FaceSensorConfigurationsTest { @Before public void setUp() throws RemoteException { - when(mGetIFace.apply(anyString())).thenReturn(mFace); - when(mFace.getSensorProps()).thenReturn(new SensorProps[]{}); when(mContext.getResources()).thenReturn(mResources); } @Test public void testAidlInstanceSensorProps() { mFaceSensorConfigurations = new FaceSensorConfigurations(false); - mFaceSensorConfigurations.addAidlConfigs(mAidlInstances, mGetIFace); + mFaceSensorConfigurations.addAidlConfigs(mAidlInstances); assertThat(mFaceSensorConfigurations.hasSensorConfigurations()).isTrue(); assertThat(!mFaceSensorConfigurations.isSingleSensorConfigurationPresent()).isTrue(); diff --git a/core/tests/coretests/src/android/hardware/fingerprint/FingerprintSensorConfigurationsTest.java b/core/tests/coretests/src/android/hardware/fingerprint/FingerprintSensorConfigurationsTest.java index f058c160373c..b2f8299a8a35 100644 --- a/core/tests/coretests/src/android/hardware/fingerprint/FingerprintSensorConfigurationsTest.java +++ b/core/tests/coretests/src/android/hardware/fingerprint/FingerprintSensorConfigurationsTest.java @@ -18,13 +18,10 @@ package android.hardware.fingerprint; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; -import android.hardware.biometrics.fingerprint.IFingerprint; -import android.hardware.biometrics.fingerprint.SensorProps; import android.os.RemoteException; import android.platform.test.annotations.Presubmit; @@ -37,8 +34,6 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import java.util.function.Function; - @Presubmit @SmallTest public class FingerprintSensorConfigurationsTest { @@ -48,10 +43,6 @@ public class FingerprintSensorConfigurationsTest { private Context mContext; @Mock private Resources mResources; - @Mock - private IFingerprint mFingerprint; - @Mock - private Function<String, IFingerprint> mGetIFingerprint; private final String[] mAidlInstances = new String[]{"default", "virtual"}; private String[] mHidlConfigStrings = new String[]{"0:2:15", "0:8:15"}; @@ -59,8 +50,6 @@ public class FingerprintSensorConfigurationsTest { @Before public void setUp() throws RemoteException { - when(mGetIFingerprint.apply(anyString())).thenReturn(mFingerprint); - when(mFingerprint.getSensorProps()).thenReturn(new SensorProps[]{}); when(mContext.getResources()).thenReturn(mResources); } @@ -68,7 +57,7 @@ public class FingerprintSensorConfigurationsTest { public void testAidlInstanceSensorProps() { mFingerprintSensorConfigurations = new FingerprintSensorConfigurations( true /* resetLockoutRequiresHardwareAuthToken */); - mFingerprintSensorConfigurations.addAidlSensors(mAidlInstances, mGetIFingerprint); + mFingerprintSensorConfigurations.addAidlSensors(mAidlInstances); assertThat(mFingerprintSensorConfigurations.hasSensorConfigurations()).isTrue(); assertThat(!mFingerprintSensorConfigurations.isSingleSensorConfigurationPresent()) diff --git a/core/tests/coretests/src/android/os/BinderProxyCountingTest.java b/core/tests/coretests/src/android/os/BinderProxyCountingTest.java index bcd9521019e4..84d299592f26 100644 --- a/core/tests/coretests/src/android/os/BinderProxyCountingTest.java +++ b/core/tests/coretests/src/android/os/BinderProxyCountingTest.java @@ -88,9 +88,10 @@ public class BinderProxyCountingTest { private static final int BIND_SERVICE_TIMEOUT_SEC = 5; private static final int TOO_MANY_BINDERS_TIMEOUT_SEC = 2; + private static final int TOO_MANY_BINDERS_WITH_KILL_TIMEOUT_SEC = 30; - // Keep in sync with sBinderProxyCountLimit in BpBinder.cpp - private static final int BINDER_PROXY_LIMIT = 2500; + // Keep in sync with BINDER_PROXY_HIGH_WATERMARK in ActivityManagerService.java + private static final int BINDER_PROXY_LIMIT = 6000; private static Context sContext; private static UiDevice sUiDevice; @@ -175,18 +176,26 @@ public class BinderProxyCountingTest { } } - private CountDownLatch createBinderLimitLatch() throws RemoteException { - final CountDownLatch latch = new CountDownLatch(1); + private CountDownLatch[] createBinderLimitLatch() throws RemoteException { + final CountDownLatch[] latches = new CountDownLatch[] { + new CountDownLatch(1), new CountDownLatch(1) + }; sBpcTestServiceCmdService.setBinderProxyCountCallback( new IBpcCallbackObserver.Stub() { @Override - public void onCallback(int uid) { + public void onLimitReached(int uid) { if (uid == sTestPkgUid) { - latch.countDown(); + latches[0].countDown(); + } + } + @Override + public void onWarningThresholdReached(int uid) { + if (uid == sTestPkgUid) { + latches[1].countDown(); } } }); - return latch; + return latches; } /** @@ -227,6 +236,7 @@ public class BinderProxyCountingTest { @Test public void testBinderProxyLimitBoundary() throws Exception { final int binderProxyLimit = 2000; + final int binderProxyWarning = 1900; final int rearmThreshold = 1800; try { sTestAppConnection = bindService(sTestAppConsumer, sTestAppIntent); @@ -238,19 +248,33 @@ public class BinderProxyCountingTest { // Get the baseline of binders naturally held by the test Package int baseBinderCount = sBpcTestServiceCmdService.getBinderProxyCount(sTestPkgUid); - final CountDownLatch binderLimitLatch = createBinderLimitLatch(); - sBpcTestServiceCmdService.setBinderProxyWatermarks(binderProxyLimit, rearmThreshold); + final CountDownLatch[] binderLatches = createBinderLimitLatch(); + sBpcTestServiceCmdService.setBinderProxyWatermarks(binderProxyLimit, rearmThreshold, + binderProxyWarning); + + // Create Binder Proxies up to the warning; + sBpcTestAppCmdService.createTestBinders(binderProxyWarning - baseBinderCount); + if (binderLatches[1].await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { + fail("Received BinderProxyLimitCallback for uid " + sTestPkgUid + + " when proxy warning should not have been triggered"); + } + + // Create one more Binder to trigger the warning + sBpcTestAppCmdService.createTestBinders(1); + if (!binderLatches[1].await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { + fail("Timed out waiting for uid " + sTestPkgUid + " to trigger the warning"); + } // Create Binder Proxies up to the limit - sBpcTestAppCmdService.createTestBinders(binderProxyLimit - baseBinderCount); - if (binderLimitLatch.await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { + sBpcTestAppCmdService.createTestBinders(binderProxyLimit - binderProxyWarning - 1); + if (binderLatches[0].await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { fail("Received BinderProxyLimitCallback for uid " + sTestPkgUid + " when proxy limit should not have been reached"); } // Create one more Binder to cross the limit sBpcTestAppCmdService.createTestBinders(1); - if (!binderLimitLatch.await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { + if (!binderLatches[0].await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { fail("Timed out waiting for uid " + sTestPkgUid + " to hit limit"); } @@ -274,12 +298,20 @@ public class BinderProxyCountingTest { sBpcTestServiceCmdService.forceGc(); int baseBinderCount = sBpcTestServiceCmdService.getBinderProxyCount(sTestPkgUid); for (int testLimit : testLimits) { - final CountDownLatch binderLimitLatch = createBinderLimitLatch(); + final CountDownLatch[] binderLatches = createBinderLimitLatch(); // Change the BinderProxyLimit - sBpcTestServiceCmdService.setBinderProxyWatermarks(testLimit, baseBinderCount + 10); + sBpcTestServiceCmdService.setBinderProxyWatermarks(testLimit, baseBinderCount + 10, + testLimit - 10); + + // Trigger the new Binder Proxy warning + sBpcTestAppCmdService.createTestBinders(testLimit - 9 - baseBinderCount); + if (!binderLatches[1].await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { + fail("Timed out waiting for uid " + sTestPkgUid + " to trigger the warning"); + } + // Exceed the new Binder Proxy Limit - sBpcTestAppCmdService.createTestBinders(testLimit + 1); - if (!binderLimitLatch.await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { + sBpcTestAppCmdService.createTestBinders(10); + if (!binderLatches[0].await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { fail("Timed out waiting for uid " + sTestPkgUid + " to hit limit"); } @@ -297,6 +329,7 @@ public class BinderProxyCountingTest { public void testRearmCallbackThreshold() throws Exception { final int binderProxyLimit = 2000; final int exceedBinderProxyLimit = binderProxyLimit + 10; + final int binderProxyWarning = 1900; final int rearmThreshold = 1800; try { sTestAppConnection = bindService(sTestAppConsumer, sTestAppIntent); @@ -305,11 +338,19 @@ public class BinderProxyCountingTest { sBpcTestServiceCmdService.enableBinderProxyLimit(true); sBpcTestServiceCmdService.forceGc(); - final CountDownLatch firstBinderLimitLatch = createBinderLimitLatch(); - sBpcTestServiceCmdService.setBinderProxyWatermarks(binderProxyLimit, rearmThreshold); + int baseBinderCount = sBpcTestServiceCmdService.getBinderProxyCount(sTestPkgUid); + final CountDownLatch[] firstBinderLatches = createBinderLimitLatch(); + sBpcTestServiceCmdService.setBinderProxyWatermarks(binderProxyLimit, rearmThreshold, + binderProxyWarning); + // Trigger the Binder Proxy Waring + sBpcTestAppCmdService.createTestBinders(binderProxyWarning - baseBinderCount + 1); + if (!firstBinderLatches[1].await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { + fail("Timed out waiting for uid " + sTestPkgUid + " to trigger warning"); + } + // Exceed the Binder Proxy Limit - sBpcTestAppCmdService.createTestBinders(exceedBinderProxyLimit); - if (!firstBinderLimitLatch.await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { + sBpcTestAppCmdService.createTestBinders(exceedBinderProxyLimit - binderProxyWarning); + if (!firstBinderLatches[0].await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { fail("Timed out waiting for uid " + sTestPkgUid + " to hit limit"); } @@ -321,11 +362,20 @@ public class BinderProxyCountingTest { sBpcTestServiceCmdService.forceGc(); currentBinderCount = sBpcTestServiceCmdService.getBinderProxyCount(sTestPkgUid); - final CountDownLatch secondBinderLimitLatch = createBinderLimitLatch(); + final CountDownLatch[] secondBinderLatches = createBinderLimitLatch(); + + // Exceed the Binder Proxy warning which should not cause a callback since there has + // been no rearm + sBpcTestAppCmdService.createTestBinders(binderProxyWarning - currentBinderCount + 1); + if (secondBinderLatches[1].await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { + fail("Received BinderProxyLimitCallback for uid " + sTestPkgUid + + " when the callback has not been rearmed yet"); + } + // Exceed the Binder Proxy limit which should not cause a callback since there has // been no rearm - sBpcTestAppCmdService.createTestBinders(exceedBinderProxyLimit - currentBinderCount); - if (secondBinderLimitLatch.await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { + sBpcTestAppCmdService.createTestBinders(exceedBinderProxyLimit - binderProxyWarning); + if (secondBinderLatches[0].await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { fail("Received BinderProxyLimitCallback for uid " + sTestPkgUid + " when the callback has not been rearmed yet"); } @@ -337,10 +387,16 @@ public class BinderProxyCountingTest { sBpcTestServiceCmdService.forceGc(); currentBinderCount = sBpcTestServiceCmdService.getBinderProxyCount(sTestPkgUid); + // Trigger the Binder Proxy Waring + sBpcTestAppCmdService.createTestBinders(binderProxyWarning - currentBinderCount + 1); + if (!secondBinderLatches[1].await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { + fail("Timed out waiting for uid " + sTestPkgUid + " to trigger warning"); + } + // Exceed the Binder Proxy limit for the last time sBpcTestAppCmdService.createTestBinders(exceedBinderProxyLimit - currentBinderCount); - if (!secondBinderLimitLatch.await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { + if (!secondBinderLatches[0].await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { fail("Timed out waiting for uid " + sTestPkgUid + " to hit limit"); } sBpcTestAppCmdService.releaseTestBinders(currentBinderCount); @@ -373,7 +429,7 @@ public class BinderProxyCountingTest { // is not unexpected } - if (!binderDeathLatch.await(TOO_MANY_BINDERS_TIMEOUT_SEC, TimeUnit.SECONDS)) { + if (!binderDeathLatch.await(TOO_MANY_BINDERS_WITH_KILL_TIMEOUT_SEC, TimeUnit.SECONDS)) { sBpcTestAppCmdService.releaseSystemBinders(exceedBinderProxyLimit); fail("Timed out waiting for uid " + sTestPkgUid + " to die."); } diff --git a/core/tests/coretests/src/android/view/ViewFrameRateTest.java b/core/tests/coretests/src/android/view/ViewFrameRateTest.java index dcdb8b0d264c..36e270eb9ee7 100644 --- a/core/tests/coretests/src/android/view/ViewFrameRateTest.java +++ b/core/tests/coretests/src/android/view/ViewFrameRateTest.java @@ -19,6 +19,8 @@ package android.view; import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH; import static android.view.Surface.FRAME_RATE_CATEGORY_LOW; import static android.view.Surface.FRAME_RATE_CATEGORY_NORMAL; +import static android.view.Surface.FRAME_RATE_COMPATIBILITY_GTE; +import static android.view.flags.Flags.FLAG_TOOLKIT_FRAME_RATE_VELOCITY_MAPPING_READ_ONLY; import static android.view.flags.Flags.FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY; import static android.view.flags.Flags.FLAG_VIEW_VELOCITY_API; import static android.view.flags.Flags.toolkitFrameRateBySizeReadOnly; @@ -115,6 +117,44 @@ public class ViewFrameRateTest { }); } + @Test + @RequiresFlagsEnabled({FLAG_VIEW_VELOCITY_API, + FLAG_TOOLKIT_FRAME_RATE_VELOCITY_MAPPING_READ_ONLY}) + public void lowVelocity60() throws Throwable { + mActivityRule.runOnUiThread(() -> { + ViewGroup.LayoutParams layoutParams = mMovingView.getLayoutParams(); + layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT; + layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT; + mMovingView.setLayoutParams(layoutParams); + }); + waitForFrameRateCategoryToSettle(); + mActivityRule.runOnUiThread(() -> { + mMovingView.setFrameContentVelocity(1f); + mMovingView.invalidate(); + assertEquals(60f, mViewRoot.getPreferredFrameRate(), 0f); + assertEquals(FRAME_RATE_COMPATIBILITY_GTE, mViewRoot.getFrameRateCompatibility()); + }); + } + + @Test + @RequiresFlagsEnabled({FLAG_VIEW_VELOCITY_API, + FLAG_TOOLKIT_FRAME_RATE_VELOCITY_MAPPING_READ_ONLY}) + public void highVelocity140() throws Throwable { + mActivityRule.runOnUiThread(() -> { + ViewGroup.LayoutParams layoutParams = mMovingView.getLayoutParams(); + layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT; + layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT; + mMovingView.setLayoutParams(layoutParams); + }); + waitForFrameRateCategoryToSettle(); + mActivityRule.runOnUiThread(() -> { + mMovingView.setFrameContentVelocity(1_000_000_000f); + mMovingView.invalidate(); + assertEquals(140f, mViewRoot.getPreferredFrameRate(), 0f); + assertEquals(FRAME_RATE_COMPATIBILITY_GTE, mViewRoot.getFrameRateCompatibility()); + }); + } + private void waitForFrameRateCategoryToSettle() throws Throwable { for (int i = 0; i < 5; i++) { final CountDownLatch drawLatch = new CountDownLatch(1); diff --git a/core/tests/coretests/src/android/view/ViewRootImplTest.java b/core/tests/coretests/src/android/view/ViewRootImplTest.java index a034f3ba4f5d..6f107a9be891 100644 --- a/core/tests/coretests/src/android/view/ViewRootImplTest.java +++ b/core/tests/coretests/src/android/view/ViewRootImplTest.java @@ -19,6 +19,7 @@ package android.view; import static android.view.accessibility.Flags.FLAG_FORCE_INVERT_COLOR; import static android.view.flags.Flags.FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY; import static android.view.flags.Flags.FLAG_TOOLKIT_FRAME_RATE_BY_SIZE_READ_ONLY; +import static android.view.flags.Flags.FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY; import static android.view.flags.Flags.FLAG_VIEW_VELOCITY_API; import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH; import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH_HINT; @@ -82,7 +83,6 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -464,8 +464,8 @@ public class ViewRootImplTest { */ @UiThreadTest @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_getDefaultValues() { ViewRootImpl viewRootImpl = new ViewRootImpl(sContext, sContext.getDisplayNoVerify()); @@ -481,9 +481,9 @@ public class ViewRootImplTest { * Also, mIsFrameRateBoosting should be true when the visibility becomes visible */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, - FLAG_TOOLKIT_FRAME_RATE_BY_SIZE_READ_ONLY}) + FLAG_TOOLKIT_FRAME_RATE_BY_SIZE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_voteFrameRateCategory_visibility_bySize() { View view = new View(sContext); attachViewToWindow(view); @@ -515,9 +515,9 @@ public class ViewRootImplTest { * <7%: FRAME_RATE_CATEGORY_LOW */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, - FLAG_TOOLKIT_FRAME_RATE_BY_SIZE_READ_ONLY}) + FLAG_TOOLKIT_FRAME_RATE_BY_SIZE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_voteFrameRateCategory_smallSize_bySize() { View view = new View(sContext); WindowManager.LayoutParams wmlp = new WindowManager.LayoutParams(TYPE_APPLICATION_OVERLAY); @@ -544,9 +544,9 @@ public class ViewRootImplTest { * >=7% : FRAME_RATE_CATEGORY_NORMAL */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, - FLAG_TOOLKIT_FRAME_RATE_BY_SIZE_READ_ONLY}) + FLAG_TOOLKIT_FRAME_RATE_BY_SIZE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_voteFrameRateCategory_normalSize_bySize() { View view = new View(sContext); WindowManager.LayoutParams wmlp = new WindowManager.LayoutParams(TYPE_APPLICATION_OVERLAY); @@ -577,8 +577,8 @@ public class ViewRootImplTest { * Also, mIsFrameRateBoosting should be true when the visibility becomes visible */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_voteFrameRateCategory_visibility_defaultHigh() { View view = new View(sContext); attachViewToWindow(view); @@ -611,8 +611,8 @@ public class ViewRootImplTest { * <7%: FRAME_RATE_CATEGORY_NORMAL */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_voteFrameRateCategory_smallSize_defaultHigh() { View view = new View(sContext); WindowManager.LayoutParams wmlp = new WindowManager.LayoutParams(TYPE_APPLICATION_OVERLAY); @@ -639,8 +639,8 @@ public class ViewRootImplTest { * >=7% : FRAME_RATE_CATEGORY_HIGH */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_voteFrameRateCategory_normalSize_defaultHigh() { View view = new View(sContext); WindowManager.LayoutParams wmlp = new WindowManager.LayoutParams(TYPE_APPLICATION_OVERLAY); @@ -671,8 +671,8 @@ public class ViewRootImplTest { * It should take the max value among all of the voted categories per frame. */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_voteFrameRateCategory_aggregate() { View view = new View(sContext); attachViewToWindow(view); @@ -717,8 +717,8 @@ public class ViewRootImplTest { * prioritize 60Hz.. */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_voteFrameRate_aggregate() { View view = new View(sContext); attachViewToWindow(view); @@ -776,8 +776,8 @@ public class ViewRootImplTest { * submit your preferred choice to the ViewRootImpl. */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_voteFrameRate_category() { View view = new View(sContext); attachViewToWindow(view); @@ -816,8 +816,8 @@ public class ViewRootImplTest { * Also, we shouldn't call setFrameRate. */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, FLAG_VIEW_VELOCITY_API}) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_VIEW_VELOCITY_API, FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_voteFrameRateCategory_velocityToHigh() { View view = new View(sContext); WindowManager.LayoutParams wmlp = new WindowManager.LayoutParams(TYPE_APPLICATION_OVERLAY); @@ -848,8 +848,8 @@ public class ViewRootImplTest { * We should boost the frame rate if the value of mInsetsAnimationRunning is true. */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_insetsAnimation() { View view = new View(sContext); WindowManager.LayoutParams wmlp = new WindowManager.LayoutParams(TYPE_APPLICATION_OVERLAY); @@ -885,8 +885,8 @@ public class ViewRootImplTest { * Test FrameRateBoostOnTouchEnabled API */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_frameRateBoostOnTouch() { View view = new View(sContext); attachViewToWindow(view); @@ -918,8 +918,8 @@ public class ViewRootImplTest { * mPreferredFrameRate should be set to 0. */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_voteFrameRateTimeOut() throws InterruptedException { final long delay = 200L; @@ -956,8 +956,8 @@ public class ViewRootImplTest { * A View should either vote a frame rate or a frame rate category instead of both. */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_voteFrameRateOnly() { View view = new View(sContext); float frameRate = 20; @@ -999,8 +999,8 @@ public class ViewRootImplTest { * - otherwise, use the previous category value. */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_infrequentLayer_defaultHigh() throws InterruptedException { final long delay = 200L; @@ -1068,8 +1068,8 @@ public class ViewRootImplTest { * Test the IsFrameRatePowerSavingsBalanced values are properly set */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_isFrameRatePowerSavingsBalanced() { View view = new View(sContext); attachViewToWindow(view); @@ -1101,8 +1101,8 @@ public class ViewRootImplTest { * 2. If FT2-FT1 > 15ms && FT3-FT2 > 15ms -> vote for NORMAL category */ @Test - @Ignore("Can be enabled only after b/330596920 is ready") - @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY) + @RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY, + FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY}) public void votePreferredFrameRate_applyTextureViewHeuristic() throws InterruptedException { final long delay = 30L; diff --git a/core/tests/coretests/src/android/widget/HorizontalScrollViewFunctionalTest.java b/core/tests/coretests/src/android/widget/HorizontalScrollViewFunctionalTest.java index cd38bd68a26b..5d62f1c49208 100644 --- a/core/tests/coretests/src/android/widget/HorizontalScrollViewFunctionalTest.java +++ b/core/tests/coretests/src/android/widget/HorizontalScrollViewFunctionalTest.java @@ -99,13 +99,29 @@ public class HorizontalScrollViewFunctionalTest { mMyHorizontalScrollView.setFrameContentVelocity(0); }); // set setFrameContentVelocity shouldn't do anything. - assertEquals(mMyHorizontalScrollView.isSetVelocityCalled, false); + assertTrue(mMyHorizontalScrollView.isSetVelocityCalled); + assertEquals(0f, mMyHorizontalScrollView.velocity, 0f); + mMyHorizontalScrollView.isSetVelocityCalled = false; mActivityRule.runOnUiThread(() -> { mMyHorizontalScrollView.fling(100); }); // set setFrameContentVelocity should be called when fling. - assertEquals(mMyHorizontalScrollView.isSetVelocityCalled, true); + assertTrue(mMyHorizontalScrollView.isSetVelocityCalled); + assertTrue(mMyHorizontalScrollView.velocity > 0f); + } + + @Test + @RequiresFlagsEnabled(FLAG_VIEW_VELOCITY_API) + public void hasVelocityInSmoothScrollBy() throws Throwable { + int maxScroll = mMyHorizontalScrollView.getChildAt(0).getWidth() + - mMyHorizontalScrollView.getWidth(); + mActivityRule.runOnUiThread(() -> { + mMyHorizontalScrollView.smoothScrollTo(maxScroll, 0); + }); + PollingCheck.waitFor(() -> mMyHorizontalScrollView.getScrollX() != 0); + assertTrue(mMyHorizontalScrollView.isSetVelocityCalled); + assertTrue(mMyHorizontalScrollView.velocity > 0f); } static class WatchedEdgeEffect extends EdgeEffect { @@ -122,9 +138,10 @@ public class HorizontalScrollViewFunctionalTest { } } - public static class MyHorizontalScrollView extends ScrollView { + public static class MyHorizontalScrollView extends HorizontalScrollView { public boolean isSetVelocityCalled; + public float velocity; public MyHorizontalScrollView(Context context) { super(context); @@ -140,9 +157,8 @@ public class HorizontalScrollViewFunctionalTest { @Override public void setFrameContentVelocity(float pixelsPerSecond) { - if (pixelsPerSecond != 0) { - isSetVelocityCalled = true; - } + isSetVelocityCalled = true; + velocity = pixelsPerSecond; } } } diff --git a/core/tests/coretests/src/android/widget/ScrollViewFunctionalTest.java b/core/tests/coretests/src/android/widget/ScrollViewFunctionalTest.java index a60b2a13e2eb..6d0bab54be24 100644 --- a/core/tests/coretests/src/android/widget/ScrollViewFunctionalTest.java +++ b/core/tests/coretests/src/android/widget/ScrollViewFunctionalTest.java @@ -19,6 +19,7 @@ package android.widget; import static android.view.flags.Flags.FLAG_VIEW_VELOCITY_API; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import android.content.Context; @@ -98,13 +99,28 @@ public class ScrollViewFunctionalTest { mMyScrollView.setFrameContentVelocity(0); }); // set setFrameContentVelocity shouldn't do anything. - assertEquals(mMyScrollView.isSetVelocityCalled, false); + assertTrue(mMyScrollView.isSetVelocityCalled); + assertEquals(0f, mMyScrollView.velocity, 0f); + mMyScrollView.isSetVelocityCalled = false; mActivityRule.runOnUiThread(() -> { mMyScrollView.fling(100); }); // set setFrameContentVelocity should be called when fling. - assertEquals(mMyScrollView.isSetVelocityCalled, true); + assertTrue(mMyScrollView.isSetVelocityCalled); + assertNotEquals(0f, mMyScrollView.velocity, 0.01f); + } + + @Test + @RequiresFlagsEnabled(FLAG_VIEW_VELOCITY_API) + public void hasVelocityInSmoothScrollBy() throws Throwable { + int maxScroll = mMyScrollView.getChildAt(0).getHeight() - mMyScrollView.getHeight(); + mActivityRule.runOnUiThread(() -> { + mMyScrollView.smoothScrollTo(0, maxScroll); + }); + PollingCheck.waitFor(() -> mMyScrollView.getScrollY() != 0); + assertTrue(mMyScrollView.isSetVelocityCalled); + assertTrue(mMyScrollView.velocity > 0f); } static class WatchedEdgeEffect extends EdgeEffect { @@ -125,6 +141,8 @@ public class ScrollViewFunctionalTest { public boolean isSetVelocityCalled; + public float velocity; + public MyScrollView(Context context) { super(context); } @@ -139,9 +157,8 @@ public class ScrollViewFunctionalTest { @Override public void setFrameContentVelocity(float pixelsPerSecond) { - if (pixelsPerSecond != 0) { - isSetVelocityCalled = true; - } + isSetVelocityCalled = true; + velocity = pixelsPerSecond; } } } diff --git a/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutChooserActivityTest.java b/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutChooserActivityTest.java index 745390d1648e..9f5ed294eca2 100644 --- a/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutChooserActivityTest.java +++ b/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutChooserActivityTest.java @@ -53,7 +53,6 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.os.Bundle; import android.os.Handler; -import android.platform.test.annotations.RequiresFlagsEnabled; import android.platform.test.flag.junit.CheckFlagsRule; import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.support.test.uiautomator.By; @@ -63,7 +62,6 @@ import android.support.test.uiautomator.Until; import android.view.View; import android.view.WindowManager; import android.view.accessibility.AccessibilityManager; -import android.view.accessibility.Flags; import android.view.accessibility.IAccessibilityManager; import android.widget.Button; @@ -298,7 +296,6 @@ public class AccessibilityShortcutChooserActivityTest { } @Test - @RequiresFlagsEnabled(Flags.FLAG_ALLOW_SHORTCUT_CHOOSER_ON_LOCKSCREEN) public void createDialog_onLockscreen_hasExpectedContent() { when(mKeyguardManager.isKeyguardLocked()).thenReturn(true); launchActivity(); diff --git a/data/etc/core.protolog.pb b/data/etc/core.protolog.pb Binary files differindex e1670be94767..826adc39c19a 100644 --- a/data/etc/core.protolog.pb +++ b/data/etc/core.protolog.pb diff --git a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml index 49935ada4656..ba24d7b3eb07 100644 --- a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml @@ -52,10 +52,10 @@ <string name="accessibility_split_right" msgid="8441001008181296837">"Dividir para a direita"</string> <string name="accessibility_split_top" msgid="2789329702027147146">"Dividir para cima"</string> <string name="accessibility_split_bottom" msgid="8694551025220868191">"Dividir para baixo"</string> - <string name="one_handed_tutorial_title" msgid="4583241688067426350">"Como usar o modo para uma mão"</string> + <string name="one_handed_tutorial_title" msgid="4583241688067426350">"Como usar o modo uma mão"</string> <string name="one_handed_tutorial_description" msgid="3486582858591353067">"Para sair, deslize de baixo para cima na tela ou toque em qualquer lugar acima do app"</string> - <string name="accessibility_action_start_one_handed" msgid="5070337354072861426">"Iniciar o modo para uma mão"</string> - <string name="accessibility_action_stop_one_handed" msgid="1369940261782179442">"Sair do modo para uma mão"</string> + <string name="accessibility_action_start_one_handed" msgid="5070337354072861426">"Iniciar o modo uma mão"</string> + <string name="accessibility_action_stop_one_handed" msgid="1369940261782179442">"Sair do modo uma mão"</string> <string name="bubbles_settings_button_description" msgid="1301286017420516912">"Configurações de balões do <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubble_overflow_button_content_description" msgid="8160974472718594382">"Menu flutuante"</string> <string name="bubble_accessibility_action_add_back" msgid="1830101076853540953">"Devolver à pilha"</string> diff --git a/libs/WindowManager/Shell/res/values-pt/strings.xml b/libs/WindowManager/Shell/res/values-pt/strings.xml index 49935ada4656..ba24d7b3eb07 100644 --- a/libs/WindowManager/Shell/res/values-pt/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt/strings.xml @@ -52,10 +52,10 @@ <string name="accessibility_split_right" msgid="8441001008181296837">"Dividir para a direita"</string> <string name="accessibility_split_top" msgid="2789329702027147146">"Dividir para cima"</string> <string name="accessibility_split_bottom" msgid="8694551025220868191">"Dividir para baixo"</string> - <string name="one_handed_tutorial_title" msgid="4583241688067426350">"Como usar o modo para uma mão"</string> + <string name="one_handed_tutorial_title" msgid="4583241688067426350">"Como usar o modo uma mão"</string> <string name="one_handed_tutorial_description" msgid="3486582858591353067">"Para sair, deslize de baixo para cima na tela ou toque em qualquer lugar acima do app"</string> - <string name="accessibility_action_start_one_handed" msgid="5070337354072861426">"Iniciar o modo para uma mão"</string> - <string name="accessibility_action_stop_one_handed" msgid="1369940261782179442">"Sair do modo para uma mão"</string> + <string name="accessibility_action_start_one_handed" msgid="5070337354072861426">"Iniciar o modo uma mão"</string> + <string name="accessibility_action_stop_one_handed" msgid="1369940261782179442">"Sair do modo uma mão"</string> <string name="bubbles_settings_button_description" msgid="1301286017420516912">"Configurações de balões do <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubble_overflow_button_content_description" msgid="8160974472718594382">"Menu flutuante"</string> <string name="bubble_accessibility_action_add_back" msgid="1830101076853540953">"Devolver à pilha"</string> diff --git a/libs/WindowManager/Shell/res/values-te/strings.xml b/libs/WindowManager/Shell/res/values-te/strings.xml index 593c8fc28a0d..9be3f3354635 100644 --- a/libs/WindowManager/Shell/res/values-te/strings.xml +++ b/libs/WindowManager/Shell/res/values-te/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="pip_phone_close" msgid="5783752637260411309">"మూసివేయి"</string> + <string name="pip_phone_close" msgid="5783752637260411309">"మూసివేయండి"</string> <string name="pip_phone_expand" msgid="2579292903468287504">"విస్తరింపజేయి"</string> <string name="pip_phone_settings" msgid="5468987116750491918">"సెట్టింగ్లు"</string> <string name="pip_menu_title" msgid="5393619322111827096">"మెనూ"</string> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java index ad3be3d0b022..59c841f63498 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java @@ -686,7 +686,11 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont } } - private void dispatchOnBackCancelled(IOnBackInvokedCallback callback) { + private void tryDispatchOnBackCancelled(IOnBackInvokedCallback callback) { + if (!mOnBackStartDispatched) { + Log.e(TAG, "Skipping dispatching onBackCancelled. Start was never dispatched."); + return; + } if (callback == null) { return; } @@ -745,7 +749,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont if (touchTracker.getTriggerBack()) { dispatchOrAnimateOnBackInvoked(callback, touchTracker); } else { - dispatchOnBackCancelled(callback); + tryDispatchOnBackCancelled(callback); } } finishBackNavigation(touchTracker.getTriggerBack()); @@ -824,7 +828,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont if (mCurrentTracker.getTriggerBack()) { dispatchOrAnimateOnBackInvoked(mActiveCallback, mCurrentTracker); } else { - dispatchOnBackCancelled(mActiveCallback); + tryDispatchOnBackCancelled(mActiveCallback); } } @@ -876,7 +880,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont if (mCurrentTracker.isInInitialState()) { if (mBackGestureStarted) { mBackGestureStarted = false; - dispatchOnBackCancelled(mActiveCallback); + tryDispatchOnBackCancelled(mActiveCallback); finishBackNavigation(false); ProtoLog.d(WM_SHELL_BACK_PREVIEW, "resetTouchTracker -> reset an unfinished gesture"); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt index 3253cac23ce8..772eae72ac38 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt @@ -65,7 +65,7 @@ class CrossActivityBackAnimation @Inject constructor( private val targetEnteringRect = RectF() private val currentEnteringRect = RectF() - private val taskBoundsRect = Rect() + private val backAnimRect = Rect() private val cornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context) @@ -109,10 +109,10 @@ class CrossActivityBackAnimation @Inject constructor( transaction.setAnimationTransaction() // Offset start rectangle to align task bounds. - taskBoundsRect.set(closingTarget!!.windowConfiguration.bounds) - taskBoundsRect.offsetTo(0, 0) + backAnimRect.set(closingTarget!!.localBounds) + backAnimRect.offsetTo(0, 0) - startClosingRect.set(taskBoundsRect) + startClosingRect.set(backAnimRect) // scale closing target into the middle for rhs and to the right for lhs targetClosingRect.set(startClosingRect) @@ -154,7 +154,7 @@ class CrossActivityBackAnimation @Inject constructor( } private fun getYOffset(centeredRect: RectF, touchY: Float): Float { - val screenHeight = taskBoundsRect.height() + val screenHeight = backAnimRect.height() // Base the window movement in the Y axis on the touch movement in the Y axis. val rawYDelta = touchY - initialTouchPos.y val yDirection = (if (rawYDelta < 0) -1 else 1) @@ -181,8 +181,8 @@ class CrossActivityBackAnimation @Inject constructor( // off the animator startClosingRect.set(currentClosingRect) startEnteringRect.set(currentEnteringRect) - targetEnteringRect.set(taskBoundsRect) - targetClosingRect.set(taskBoundsRect) + targetEnteringRect.set(backAnimRect) + targetClosingRect.set(backAnimRect) targetClosingRect.offset(currentClosingRect.left + enteringStartOffset, 0f) val valueAnimator = ValueAnimator.ofFloat(1f, 0f).setDuration(POST_ANIMATION_DURATION) @@ -240,13 +240,13 @@ class CrossActivityBackAnimation @Inject constructor( private fun applyTransform(leash: SurfaceControl?, rect: RectF, alpha: Float) { if (leash == null || !leash.isValid) return - val scale = rect.width() / taskBoundsRect.width() + val scale = rect.width() / backAnimRect.width() transformMatrix.reset() transformMatrix.setScale(scale, scale) transformMatrix.postTranslate(rect.left, rect.top) transaction.setAlpha(leash, alpha) .setMatrix(leash, transformMatrix, tmpFloat9) - .setCrop(leash, taskBoundsRect) + .setCrop(leash, backAnimRect) .setCornerRadius(leash, cornerRadius) } @@ -267,6 +267,7 @@ class CrossActivityBackAnimation @Inject constructor( transaction .setColor(scrimLayer, colorComponents) .setAlpha(scrimLayer!!, maxScrimAlpha) + .setCrop(scrimLayer!!, closingTarget!!.localBounds) .setRelativeLayer(scrimLayer!!, closingTarget!!.leash, -1) .show(scrimLayer) } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip2Module.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip2Module.java index ae07812a2427..b86e39fca742 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip2Module.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip2Module.java @@ -93,8 +93,9 @@ public abstract class Pip2Module { @Provides static PipScheduler providePipScheduler(Context context, PipBoundsState pipBoundsState, - @ShellMainThread ShellExecutor mainExecutor) { - return new PipScheduler(context, pipBoundsState, mainExecutor); + @ShellMainThread ShellExecutor mainExecutor, + ShellTaskOrganizer shellTaskOrganizer) { + return new PipScheduler(context, pipBoundsState, mainExecutor, shellTaskOrganizer); } @WMSingleton diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt index 7c8fcbb16711..99a00b8d33c4 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt @@ -20,6 +20,7 @@ import android.graphics.Region import android.util.ArrayMap import android.util.ArraySet import android.util.SparseArray +import android.view.Display.INVALID_DISPLAY import androidx.core.util.forEach import androidx.core.util.keyIterator import androidx.core.util.valueIterator @@ -226,6 +227,14 @@ class DesktopModeTaskRepository { displayData[otherDisplayId].visibleTasks.size) } } + } else if (displayId == INVALID_DISPLAY) { + // Task has vanished. Check which display to remove the task from. + displayData.forEach { displayId, data -> + if (data.visibleTasks.remove(taskId)) { + notifyVisibleTaskListeners(displayId, data.visibleTasks.size) + } + } + return } val prevCount = getVisibleTaskCount(displayId) @@ -236,6 +245,7 @@ class DesktopModeTaskRepository { } val newCount = getVisibleTaskCount(displayId) + // Check if count changed if (prevCount != newCount) { KtProtoLog.d( WM_SHELL_DESKTOP_MODE, @@ -244,10 +254,6 @@ class DesktopModeTaskRepository { visible, displayId ) - } - - // Check if count changed - if (prevCount != newCount) { KtProtoLog.d( WM_SHELL_DESKTOP_MODE, "DesktopTaskRepo: visibleTaskCount has changed from %d to %d", 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 cdeb00b7b9e1..c16eac8d895e 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 @@ -1957,6 +1957,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, } if (mPipTransitionState.getTransitionState() == PipTransitionState.UNDEFINED) { // Avoid double removal, which is fatal. + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: trying to remove overlay (%s) while in UNDEFINED state", TAG, surface); return; } if (surface == null || !surface.isValid()) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java index 4c69cc3cc61d..1e18b8c002db 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java @@ -245,9 +245,9 @@ public class PipController implements ConfigurationChangeListener, Rect destinationBounds, SurfaceControl overlay, Rect appBounds) { ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, "onSwipePipToHomeAnimationStart: %s", componentName); - mPipScheduler.setInSwipePipToHomeTransition(true); + mPipScheduler.onSwipePipToHomeAnimationStart(taskId, componentName, destinationBounds, + overlay, appBounds); mPipRecentsAnimationListener.onPipAnimationStarted(); - // TODO: cache the overlay if provided for reparenting later. } // diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipScheduler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipScheduler.java index 6665013aa68d..b4ca7df10292 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipScheduler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipScheduler.java @@ -21,6 +21,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static com.android.wm.shell.transition.Transitions.TRANSIT_EXIT_PIP; import android.content.BroadcastReceiver; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -30,9 +31,11 @@ import android.window.WindowContainerToken; import android.window.WindowContainerTransaction; import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; +import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.pip.PipBoundsState; import com.android.wm.shell.common.pip.PipUtils; @@ -52,6 +55,7 @@ public class PipScheduler { private final Context mContext; private final PipBoundsState mPipBoundsState; private final ShellExecutor mMainExecutor; + private final ShellTaskOrganizer mShellTaskOrganizer; private PipSchedulerReceiver mSchedulerReceiver; private PipTransitionController mPipTransitionController; @@ -66,6 +70,16 @@ public class PipScheduler { // true if Launcher has started swipe PiP to home animation private boolean mInSwipePipToHomeTransition; + // Overlay leash potentially used during swipe PiP to home transition; + // if null while mInSwipePipToHomeTransition is true, then srcRectHint was invalid. + @Nullable + SurfaceControl mSwipePipToHomeOverlay; + + // App bounds used when as a starting point to swipe PiP to home animation in Launcher; + // these are also used to calculate the app icon overlay buffer size. + @NonNull + final Rect mSwipePipToHomeAppBounds = new Rect(); + /** * Temporary PiP CUJ codes to schedule PiP related transitions directly from Shell. * This is used for a broadcast receiver to resolve intents. This should be removed once @@ -101,11 +115,14 @@ public class PipScheduler { } } - public PipScheduler(Context context, PipBoundsState pipBoundsState, - ShellExecutor mainExecutor) { + public PipScheduler(Context context, + PipBoundsState pipBoundsState, + ShellExecutor mainExecutor, + ShellTaskOrganizer shellTaskOrganizer) { mContext = context; mPipBoundsState = pipBoundsState; mMainExecutor = mainExecutor; + mShellTaskOrganizer = shellTaskOrganizer; if (PipUtils.isPip2ExperimentEnabled()) { // temporary broadcast receiver to initiate exit PiP via expand @@ -115,6 +132,10 @@ public class PipScheduler { } } + ShellExecutor getMainExecutor() { + return mMainExecutor; + } + void setPipTransitionController(PipTransitionController pipTransitionController) { mPipTransitionController = pipTransitionController; } @@ -171,6 +192,24 @@ public class PipScheduler { mPipTransitionController.startResizeTransition(wct, onFinishResizeCallback); } + void onSwipePipToHomeAnimationStart(int taskId, ComponentName componentName, + Rect destinationBounds, SurfaceControl overlay, Rect appBounds) { + mInSwipePipToHomeTransition = true; + mSwipePipToHomeOverlay = overlay; + mSwipePipToHomeAppBounds.set(appBounds); + if (overlay != null) { + // Shell transitions might use a root animation leash, which will be removed when + // the Recents transition is finished. Launcher attaches the overlay leash to this + // animation target leash; thus, we need to reparent it to the actual Task surface now. + // PipTransition is responsible to fade it out and cleanup when finishing the enter PIP + // transition. + SurfaceControl.Transaction tx = new SurfaceControl.Transaction(); + mShellTaskOrganizer.reparentChildSurfaceToTask(taskId, overlay, tx); + tx.setLayer(overlay, Integer.MAX_VALUE); + tx.apply(); + } + } + void setInSwipePipToHomeTransition(boolean inSwipePipToHome) { mInSwipePipToHomeTransition = inSwipePipToHome; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java index d15da4a43db4..b179b5bc3cf6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java @@ -24,6 +24,9 @@ import static android.view.WindowManager.TRANSIT_TO_FRONT; import static com.android.wm.shell.transition.Transitions.TRANSIT_EXIT_PIP; import static com.android.wm.shell.transition.Transitions.TRANSIT_RESIZE_PIP; +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.ValueAnimator; import android.annotation.NonNull; import android.app.ActivityManager; import android.app.PictureInPictureParams; @@ -44,6 +47,7 @@ import com.android.wm.shell.common.pip.PipBoundsAlgorithm; import com.android.wm.shell.common.pip.PipBoundsState; import com.android.wm.shell.common.pip.PipMenuController; import com.android.wm.shell.common.pip.PipUtils; +import com.android.wm.shell.pip.PipContentOverlay; import com.android.wm.shell.pip.PipTransitionController; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.Transitions; @@ -55,6 +59,11 @@ import java.util.function.Consumer; */ public class PipTransition extends PipTransitionController { private static final String TAG = PipTransition.class.getSimpleName(); + /** + * The fixed start delay in ms when fading out the content overlay from bounds animation. + * The fadeout animation is guaranteed to start after the client has drawn under the new config. + */ + private static final int CONTENT_OVERLAY_FADE_OUT_DELAY_MS = 400; private final Context mContext; private final PipScheduler mPipScheduler; @@ -230,10 +239,13 @@ public class PipTransition extends PipTransitionController { PictureInPictureParams params = pipChange.getTaskInfo().pictureInPictureParams; Rect srcRectHint = params.getSourceRectHint(); + Rect startBounds = pipChange.getStartAbsBounds(); Rect destinationBounds = pipChange.getEndAbsBounds(); + WindowContainerTransaction finishWct = new WindowContainerTransaction(); + if (PipBoundsAlgorithm.isSourceRectHintValidForEnterPip(srcRectHint, destinationBounds)) { - float scale = (float) destinationBounds.width() / srcRectHint.width(); + final float scale = (float) destinationBounds.width() / srcRectHint.width(); startTransaction.setWindowCrop(pipLeash, srcRectHint); startTransaction.setPosition(pipLeash, destinationBounds.left - srcRectHint.left * scale, @@ -244,13 +256,62 @@ public class PipTransition extends PipTransitionController { // in multi-activity case, reparenting yields new reset scales coming from pinned task. startTransaction.setScale(pipLeash, scale, scale); } else { - // TODO(b/325481148): handle the case with invalid srcRectHint (using overlay). + final float scaleX = (float) destinationBounds.width() / startBounds.width(); + final float scaleY = (float) destinationBounds.height() / startBounds.height(); + final int overlaySize = PipContentOverlay.PipAppIconOverlay + .getOverlaySize(mPipScheduler.mSwipePipToHomeAppBounds, destinationBounds); + SurfaceControl overlayLeash = mPipScheduler.mSwipePipToHomeOverlay; + + startTransaction.setPosition(pipLeash, destinationBounds.left, destinationBounds.top) + .setScale(pipLeash, scaleX, scaleY) + .setWindowCrop(pipLeash, startBounds) + .reparent(overlayLeash, pipLeash) + .setLayer(overlayLeash, Integer.MAX_VALUE); + + if (mPipTaskToken != null) { + SurfaceControl.Transaction tx = new SurfaceControl.Transaction(); + tx.addTransactionCommittedListener(mPipScheduler.getMainExecutor(), + this::onClientDrawAtTransitionEnd) + .setScale(overlayLeash, 1f, 1f) + .setPosition(overlayLeash, + (destinationBounds.width() - overlaySize) / 2f, + (destinationBounds.height() - overlaySize) / 2f); + finishWct.setBoundsChangeTransaction(mPipTaskToken, tx); + } } startTransaction.apply(); - finishCallback.onTransitionFinished(null); + + // Note that finishWct should be free of any actual WM state changes; we are using + // it for syncing with the client draw after delayed configuration changes are dispatched. + finishCallback.onTransitionFinished(finishWct.isEmpty() ? null : finishWct); return true; } + private void onClientDrawAtTransitionEnd() { + startOverlayFadeoutAnimation(); + } + + private void startOverlayFadeoutAnimation() { + ValueAnimator animator = ValueAnimator.ofFloat(1f, 0f); + animator.setDuration(CONTENT_OVERLAY_FADE_OUT_DELAY_MS); + animator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + SurfaceControl.Transaction tx = new SurfaceControl.Transaction(); + tx.remove(mPipScheduler.mSwipePipToHomeOverlay); + tx.apply(); + mPipScheduler.mSwipePipToHomeOverlay = null; + } + }); + animator.addUpdateListener(animation -> { + float alpha = (float) animation.getAnimatedValue(); + SurfaceControl.Transaction tx = new SurfaceControl.Transaction(); + tx.setAlpha(mPipScheduler.mSwipePipToHomeOverlay, alpha).apply(); + }); + animator.start(); + } + private boolean startBoundsTypeEnterAnimation(@NonNull TransitionInfo info, @NonNull SurfaceControl.Transaction startTransaction, @NonNull SurfaceControl.Transaction finishTransaction, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java index c3261bbc7351..088bb4814491 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java @@ -138,6 +138,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, public static final int EXIT_REASON_RECREATE_SPLIT = 10; public static final int EXIT_REASON_FULLSCREEN_SHORTCUT = 11; public static final int EXIT_REASON_DESKTOP_MODE = 12; + public static final int EXIT_REASON_FULLSCREEN_REQUEST = 13; @IntDef(value = { EXIT_REASON_UNKNOWN, EXIT_REASON_APP_DOES_NOT_SUPPORT_MULTIWINDOW, @@ -151,7 +152,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, EXIT_REASON_CHILD_TASK_ENTER_PIP, EXIT_REASON_RECREATE_SPLIT, EXIT_REASON_FULLSCREEN_SHORTCUT, - EXIT_REASON_DESKTOP_MODE + EXIT_REASON_DESKTOP_MODE, + EXIT_REASON_FULLSCREEN_REQUEST }) @Retention(RetentionPolicy.SOURCE) @interface ExitReason{} @@ -1054,6 +1056,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, return "RECREATE_SPLIT"; case EXIT_REASON_DESKTOP_MODE: return "DESKTOP_MODE"; + case EXIT_REASON_FULLSCREEN_REQUEST: + return "FULLSCREEN_REQUEST"; default: return "unknown reason, reason int = " + exitReason; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index d5434e3ad3d0..fadc9706af6a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -59,6 +59,7 @@ import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_DESKTOP_MODE; import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_DEVICE_FOLDED; import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_DRAG_DIVIDER; +import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_FULLSCREEN_REQUEST; import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_FULLSCREEN_SHORTCUT; import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_RECREATE_SPLIT; import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_RETURN_HOME; @@ -2615,6 +2616,13 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, prepareEnterSplitScreen(out); mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(), TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering); + } else if (inFullscreen && isSplitScreenVisible()) { + // If the trigger task is in fullscreen and in split, exit split and place + // task on top + final int stageType = getStageOfTask(triggerTask.taskId); + prepareExitSplitScreen(stageType, out); + mSplitTransitions.setDismissTransition(transition, stageType, + EXIT_REASON_FULLSCREEN_REQUEST); } } else if (isOpening && inFullscreen) { final int activityType = triggerTask.getActivityType(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java index 6d2109ca037e..dd09bb91d425 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java @@ -25,6 +25,7 @@ import static android.view.InputDevice.SOURCE_TOUCHSCREEN; import static android.view.MotionEvent.ACTION_CANCEL; import static android.view.MotionEvent.ACTION_HOVER_ENTER; import static android.view.MotionEvent.ACTION_HOVER_EXIT; +import static android.view.MotionEvent.ACTION_MOVE; import static android.view.MotionEvent.ACTION_UP; import static android.view.WindowInsets.Type.statusBars; @@ -493,6 +494,12 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { (int) e.getRawX(), (int) e.getRawY()); final boolean isTransparentCaption = TaskInfoKt.isTransparentCaptionBarAppearance(decoration.mTaskInfo); + // MotionEvent's coordinates are relative to view, we want location in window + // to offset position relative to caption as a whole. + int[] viewLocation = new int[2]; + v.getLocationInWindow(viewLocation); + final boolean isResizeEvent = decoration.shouldResizeListenerHandleEvent(e, + new Point(viewLocation[0], viewLocation[1])); // The caption window may be a spy window when the caption background is // transparent, which means events will fall through to the app window. Make // sure to cancel these events if they do not happen in the intersection of the @@ -500,11 +507,11 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { // the drag-move or other caption gestures should take priority outside those // regions. mShouldPilferCaptionEvents = !(downInCustomizableCaptionRegion - && downInExclusionRegion && isTransparentCaption); + && downInExclusionRegion && isTransparentCaption) && !isResizeEvent; } if (!mShouldPilferCaptionEvents) { - // The event will be handled by a window below. + // The event will be handled by a window below or pilfered by resize handler. return false; } // Otherwise pilfer so that windows below receive cancellations for this gesture, and @@ -604,7 +611,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { // prevent the button's ripple effect from showing. return !touchingButton; } - case MotionEvent.ACTION_MOVE: { + case ACTION_MOVE: { // If a decor's resize drag zone is active, don't also try to reposition it. if (decoration.isHandlingDragResize()) break; decoration.closeMaximizeMenu(); @@ -863,7 +870,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { break; } - case MotionEvent.ACTION_MOVE: { + case ACTION_MOVE: { if (relevantDecor == null) { return; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java index ad290c6aeaa3..c21f8f686be5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java @@ -421,6 +421,10 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin return mHandleMenu != null; } + boolean shouldResizeListenerHandleEvent(MotionEvent e, Point offset) { + return mDragResizeListener.shouldHandleEvent(e, offset); + } + boolean isHandlingDragResize() { return mDragResizeListener != null && mDragResizeListener.isHandlingDragResize(); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java index e83e5d1ef5a5..97eb4a425238 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java @@ -31,6 +31,7 @@ import static com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE import static com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE_TOP; import android.content.Context; +import android.graphics.Point; import android.graphics.Rect; import android.graphics.Region; import android.hardware.input.InputManager; @@ -321,6 +322,10 @@ class DragResizeInputListener implements AutoCloseable { } } + boolean shouldHandleEvent(MotionEvent e, Point offset) { + return mInputEventReceiver.shouldHandleEvent(e, offset); + } + boolean isHandlingDragResize() { return mInputEventReceiver.isHandlingEvents(); } @@ -408,18 +413,14 @@ class DragResizeInputListener implements AutoCloseable { boolean result = false; // Check if this is a touch event vs mouse event. // Touch events are tracked in four corners. Other events are tracked in resize edges. - boolean isTouch = (e.getSource() & SOURCE_TOUCHSCREEN) == SOURCE_TOUCHSCREEN; + boolean isTouch = isTouchEvent(e); switch (e.getActionMasked()) { case MotionEvent.ACTION_DOWN: { - float x = e.getX(0); - float y = e.getY(0); - if (isTouch) { - mShouldHandleEvents = isInCornerBounds(x, y); - } else { - mShouldHandleEvents = isInResizeHandleBounds(x, y); - } + mShouldHandleEvents = shouldHandleEvent(e, isTouch, new Point() /* offset */); if (mShouldHandleEvents) { mDragPointerId = e.getPointerId(0); + float x = e.getX(0); + float y = e.getY(0); float rawX = e.getRawX(0); float rawY = e.getRawY(0); int ctrlType = calculateCtrlType(isTouch, x, y); @@ -447,7 +448,6 @@ class DragResizeInputListener implements AutoCloseable { } case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: { - mInputManager.pilferPointers(mInputChannel.getToken()); if (mShouldHandleEvents) { int dragPointerIndex = e.findPointerIndex(mDragPointerId); final Rect taskBounds = mCallback.onDragPositioningEnd( @@ -638,5 +638,25 @@ class DragResizeInputListener implements AutoCloseable { mLastCursorType = cursorType; } } + + private boolean shouldHandleEvent(MotionEvent e, Point offset) { + return shouldHandleEvent(e, isTouchEvent(e), offset); + } + + private boolean shouldHandleEvent(MotionEvent e, boolean isTouch, Point offset) { + boolean result; + final float x = e.getX(0) + offset.x; + final float y = e.getY(0) + offset.y; + if (isTouch) { + result = isInCornerBounds(x, y); + } else { + result = isInResizeHandleBounds(x, y); + } + return result; + } + + private boolean isTouchEvent(MotionEvent e) { + return (e.getSource() & SOURCE_TOUCHSCREEN) == SOURCE_TOUCHSCREEN; + } } } diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/NetflixEnterPipTest.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/NetflixEnterPipTest.kt index 9b5153875987..847fc3dfd3b0 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/NetflixEnterPipTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/NetflixEnterPipTest.kt @@ -26,6 +26,7 @@ import android.tools.flicker.junit.FlickerParametersRunnerFactory import android.tools.flicker.legacy.FlickerBuilder import android.tools.flicker.legacy.LegacyFlickerTest import android.tools.flicker.legacy.LegacyFlickerTestFactory +import android.tools.helpers.WindowUtils import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.statusBarLayerPositionAtEnd import org.junit.Assume @@ -62,6 +63,8 @@ import org.junit.runners.Parameterized @FixMethodOrder(MethodSorters.NAME_ASCENDING) open class NetflixEnterPipTest(flicker: LegacyFlickerTest) : AppsEnterPipTransition(flicker) { override val standardAppHelper: NetflixAppHelper = NetflixAppHelper(instrumentation) + private val startingBounds = WindowUtils.getDisplayBounds(Rotation.ROTATION_90) + private val endingBounds = WindowUtils.getDisplayBounds(Rotation.ROTATION_0) override val permissions: Array<String> = arrayOf(Manifest.permission.POST_NOTIFICATIONS) @@ -134,6 +137,31 @@ open class NetflixEnterPipTest(flicker: LegacyFlickerTest) : AppsEnterPipTransit // Netflix plays in immersive fullscreen mode, so taskbar will be gone at some point } + @Postsubmit + @Test + override fun pipWindowRemainInsideVisibleBounds() { + // during the transition we assert the center point is within the display bounds, since it + // might go outside of bounds as we resize from landscape fullscreen to destination bounds, + // and once the animation is over we assert that it's fully within the display bounds, at + // which point the device also performs orientation change from landscape to portrait + flicker.assertWmVisibleRegion(standardAppHelper.packageNameMatcher) { + regionsCenterPointInside(startingBounds).then().coversAtMost(endingBounds) + } + } + + @Postsubmit + @Test + override fun pipLayerOrOverlayRemainInsideVisibleBounds() { + // during the transition we assert the center point is within the display bounds, since it + // might go outside of bounds as we resize from landscape fullscreen to destination bounds, + // and once the animation is over we assert that it's fully within the display bounds, at + // which point the device also performs orientation change from landscape to portrait + // since Netflix uses source rect hint, there is no PiP overlay present + flicker.assertLayersVisibleRegion(standardAppHelper.packageNameMatcher) { + regionsCenterPointInside(startingBounds).then().coversAtMost(endingBounds) + } + } + companion object { /** * Creates the test configurations. diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/YouTubeEnterPipToOtherOrientationTest.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/YouTubeEnterPipToOtherOrientationTest.kt new file mode 100644 index 000000000000..165ed55afc5b --- /dev/null +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/YouTubeEnterPipToOtherOrientationTest.kt @@ -0,0 +1,165 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.flicker.pip.apps + +import android.Manifest +import android.platform.test.annotations.Postsubmit +import android.tools.NavBar +import android.tools.Rotation +import android.tools.traces.component.ComponentNameMatcher +import android.tools.device.apphelpers.YouTubeAppHelper +import android.tools.flicker.junit.FlickerParametersRunnerFactory +import android.tools.flicker.legacy.FlickerBuilder +import android.tools.flicker.legacy.LegacyFlickerTest +import android.tools.flicker.legacy.LegacyFlickerTestFactory +import android.tools.helpers.WindowUtils +import androidx.test.filters.RequiresDevice +import com.android.server.wm.flicker.statusBarLayerPositionAtEnd +import org.junit.Assume +import org.junit.FixMethodOrder +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.MethodSorters +import org.junit.runners.Parameterized + +/** + * Test entering pip from YouTube app by interacting with the app UI + * + * To run this test: `atest WMShellFlickerTests:YouTubeEnterPipTest` + * + * Actions: + * ``` + * Launch YouTube and start playing a video + * Make the video fullscreen, aka immersive mode + * Go home to enter PiP + * ``` + * + * Notes: + * ``` + * 1. Some default assertions (e.g., nav bar, status bar and screen covered) + * are inherited from [PipTransition] + * 2. Part of the test setup occurs automatically via + * [android.tools.flicker.legacy.runner.TransitionRunner], + * including configuring navigation mode, initial orientation and ensuring no + * apps are running before setup + * ``` + */ +@RequiresDevice +@RunWith(Parameterized::class) +@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +open class YouTubeEnterPipToOtherOrientationTest(flicker: LegacyFlickerTest) : + YouTubeEnterPipTest(flicker) { + override val standardAppHelper: YouTubeAppHelper = YouTubeAppHelper(instrumentation) + private val startingBounds = WindowUtils.getDisplayBounds(Rotation.ROTATION_90) + private val endingBounds = WindowUtils.getDisplayBounds(Rotation.ROTATION_0) + + override val permissions: Array<String> = arrayOf(Manifest.permission.POST_NOTIFICATIONS) + + override val defaultEnterPip: FlickerBuilder.() -> Unit = { + setup { + standardAppHelper.launchViaIntent( + wmHelper, + YouTubeAppHelper.getYoutubeVideoIntent("HPcEAtoXXLA"), + ComponentNameMatcher(YouTubeAppHelper.PACKAGE_NAME, "") + ) + standardAppHelper.enterFullscreen() + standardAppHelper.waitForVideoPlaying() + } + } + + override val thisTransition: FlickerBuilder.() -> Unit = { + transitions { tapl.goHomeFromImmersiveFullscreenApp() } + } + + @Postsubmit + @Test + override fun taskBarLayerIsVisibleAtStartAndEnd() { + Assume.assumeTrue(flicker.scenario.isTablet) + // YouTube starts in immersive fullscreen mode, so taskbar bar is not visible at start + flicker.assertLayersStart { this.isInvisible(ComponentNameMatcher.TASK_BAR) } + flicker.assertLayersEnd { this.isVisible(ComponentNameMatcher.TASK_BAR) } + } + + @Postsubmit + @Test + override fun pipWindowRemainInsideVisibleBounds() { + // during the transition we assert the center point is within the display bounds, since it + // might go outside of bounds as we resize from landscape fullscreen to destination bounds, + // and once the animation is over we assert that it's fully within the display bounds, at + // which point the device also performs orientation change from landscape to portrait + flicker.assertWmVisibleRegion(standardAppHelper.packageNameMatcher) { + regionsCenterPointInside(startingBounds).then().coversAtMost(endingBounds) + } + } + + @Postsubmit + @Test + override fun pipLayerOrOverlayRemainInsideVisibleBounds() { + // during the transition we assert the center point is within the display bounds, since it + // might go outside of bounds as we resize from landscape fullscreen to destination bounds, + // and once the animation is over we assert that it's fully within the display bounds, at + // which point the device also performs orientation change from landscape to portrait + // since YouTube uses source rect hint, there is no PiP overlay present + flicker.assertLayersVisibleRegion(standardAppHelper.packageNameMatcher) { + regionsCenterPointInside(startingBounds).then().coversAtMost(endingBounds) + } + } + + @Postsubmit + @Test + override fun taskBarWindowIsAlwaysVisible() { + // YouTube plays in immersive fullscreen mode, so taskbar will be gone at some point + } + + @Postsubmit + @Test + override fun statusBarLayerIsVisibleAtStartAndEnd() { + // YouTube starts in immersive fullscreen mode, so status bar is not visible at start + flicker.assertLayersStart { this.isInvisible(ComponentNameMatcher.STATUS_BAR) } + flicker.assertLayersEnd { this.isVisible(ComponentNameMatcher.STATUS_BAR) } + } + + @Postsubmit + @Test + override fun statusBarLayerPositionAtStartAndEnd() { + // YouTube starts in immersive fullscreen mode, so status bar is not visible at start + flicker.statusBarLayerPositionAtEnd() + } + + @Postsubmit + @Test + override fun statusBarWindowIsAlwaysVisible() { + // YouTube plays in immersive fullscreen mode, so taskbar will be gone at some point + } + + companion object { + /** + * Creates the test configurations. + * + * See [LegacyFlickerTestFactory.nonRotationTests] for configuring repetitions, screen + * orientation and navigation modes. + */ + @Parameterized.Parameters(name = "{0}") + @JvmStatic + fun getParams() = + LegacyFlickerTestFactory.nonRotationTests( + supportedRotations = listOf(Rotation.ROTATION_0), + supportedNavigationModes = listOf(NavBar.MODE_GESTURAL) + ) + } +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java index 2919782a758a..d839eae27171 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java @@ -557,6 +557,23 @@ public class BackAnimationControllerTest extends ShellTestCase { } @Test + public void skipsCancelWithoutStart() throws RemoteException { + final int type = BackNavigationInfo.TYPE_CALLBACK; + final ResultListener result = new ResultListener(); + createNavigationInfo(new BackNavigationInfo.Builder() + .setType(type) + .setOnBackInvokedCallback(mAppCallback) + .setOnBackNavigationDone(new RemoteCallback(result))); + doMotionEvent(MotionEvent.ACTION_CANCEL, 0); + mShellExecutor.flushAll(); + + verify(mAppCallback, never()).onBackStarted(any()); + verify(mAppCallback, never()).onBackProgressed(any()); + verify(mAppCallback, never()).onBackInvoked(); + verify(mAppCallback, never()).onBackCancelled(); + } + + @Test public void testBackToActivity() throws RemoteException { final CrossActivityBackAnimation animation = new CrossActivityBackAnimation( mContext, mAnimationBackground, mRootTaskDisplayAreaOrganizer); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt index 445f74a52b0d..9f3a4d9c135d 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt @@ -18,6 +18,7 @@ package com.android.wm.shell.desktopmode import android.testing.AndroidTestingRunner import android.view.Display.DEFAULT_DISPLAY +import android.view.Display.INVALID_DISPLAY import androidx.test.filters.SmallTest import com.android.wm.shell.ShellTestCase import com.android.wm.shell.TestShellExecutor @@ -237,6 +238,27 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { assertThat(listener.visibleChangesOnDefaultDisplay).isEqualTo(4) } + /** + * When a task vanishes, the displayId of the task is set to INVALID_DISPLAY. + * This tests that task is removed from the last parent display when it vanishes. + */ + @Test + fun updateVisibleFreeformTasks_removeVisibleTasksRemovesTaskWithInvalidDisplay() { + val listener = TestVisibilityListener() + val executor = TestShellExecutor() + repo.addVisibleTasksListener(listener, executor) + repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 1, visible = true) + repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 2, visible = true) + executor.flushAll() + + assertThat(listener.visibleTasksCountOnDefaultDisplay).isEqualTo(2) + repo.updateVisibleFreeformTasks(INVALID_DISPLAY, taskId = 1, visible = false) + executor.flushAll() + + assertThat(listener.visibleChangesOnDefaultDisplay).isEqualTo(3) + assertThat(listener.visibleTasksCountOnDefaultDisplay).isEqualTo(1) + } + @Test fun getVisibleTaskCount() { // No tasks, count is 0 diff --git a/packages/CompanionDeviceManager/res/values-ky/strings.xml b/packages/CompanionDeviceManager/res/values-ky/strings.xml index 1f623e112777..932b5c5339d5 100644 --- a/packages/CompanionDeviceManager/res/values-ky/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ky/strings.xml @@ -45,7 +45,7 @@ <string name="summary_generic" msgid="1761976003668044801">"Бул колдонмо маалыматты шайкештире алат, мисалы, чалып жаткан кишинин атын телефон жана тандалган түзмөк менен шайкештирет"</string> <string name="consent_yes" msgid="8344487259618762872">"Ооба"</string> <string name="consent_no" msgid="2640796915611404382">"Уруксат берилбесин"</string> - <string name="consent_cancel" msgid="5655005528379285841">"Жокко чыгаруу"</string> + <string name="consent_cancel" msgid="5655005528379285841">"Жок"</string> <string name="consent_back" msgid="2560683030046918882">"Артка"</string> <string name="permission_expand" msgid="893185038020887411">"<xliff:g id="PERMISSION_TYPE">%1$s</xliff:g> жайып көрсөтүү"</string> <string name="permission_collapse" msgid="3320833884220844084">"<xliff:g id="PERMISSION_TYPE">%1$s</xliff:g> жыйыштыруу"</string> diff --git a/packages/CredentialManager/res/values-af/strings.xml b/packages/CredentialManager/res/values-af/strings.xml index c12b685f1dae..a24134b3ff3f 100644 --- a/packages/CredentialManager/res/values-af/strings.xml +++ b/packages/CredentialManager/res/values-af/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Wagwoorde sal steeds saam met toegangsleutels beskikbaar wees terwyl ons na ’n wagwoordlose toekoms beweeg."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Kies waar om jou <xliff:g id="CREATETYPES">%1$s</xliff:g> te stoor"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Kies ’n wagwoordbestuurder om jou inligting te stoor en volgende keer vinniger aan te meld"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Skep toegangsleutel om by <xliff:g id="APP_NAME">%1$s</xliff:g> aan te meld?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Stoor wagwoord om by <xliff:g id="APP_NAME">%1$s</xliff:g> aan te meld?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Stoor aanmeldinligting vir <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"toegangsleutel"</string> <string name="password" msgid="6738570945182936667">"wagwoord"</string> <string name="passkeys" msgid="5733880786866559847">"toegangsleutels"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Maak toe"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Gebruik jou gestoorde toegangsleutel vir <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Gebruik jou gestoorde wagwoord vir <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Gebruik jou skermslot om met <xliff:g id="USERNAME">%2$s</xliff:g> by <xliff:g id="APP_NAME">%1$s</xliff:g> aan te meld"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Gebruik jou aanmelding vir <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Ontsluit aanmeldingopsies vir <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Kies ’n gestoorde toegangsleutel vir <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-am/strings.xml b/packages/CredentialManager/res/values-am/strings.xml index fac267a21e0f..0554d81c0d6b 100644 --- a/packages/CredentialManager/res/values-am/strings.xml +++ b/packages/CredentialManager/res/values-am/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"ወደ የይለፍ ቃል የሌለው ወደፊት ስንሄድ የይለፍ ቃላት ከይለፍ ቁልፎች ጎን ለጎን ይገኛሉ።"</string> <string name="choose_provider_title" msgid="8870795677024868108">"የእርስዎን <xliff:g id="CREATETYPES">%1$s</xliff:g> የት እንደሚያስቀምጡ ይምረጡ"</string> <string name="choose_provider_body" msgid="4967074531845147434">"መረጃዎን ለማስቀመጥ እና በቀጣይ ጊዜ በፍጥነት በመለያ ለመግባት የሚስጥር ቁልፍ አስተዳዳሪን ይምረጡ"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"ወደ <xliff:g id="APP_NAME">%1$s</xliff:g> ለመግባት የይለፍ ቁልፍ ይፈጠር?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"ወደ <xliff:g id="APP_NAME">%1$s</xliff:g> ለመግባት የይለፍ ቃል ይቀመጥ?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"የ<xliff:g id="APP_NAME">%1$s</xliff:g> የመግቢያ መረጃ ይቀመጥ?"</string> <string name="passkey" msgid="632353688396759522">"የይለፍ ቁልፍ"</string> <string name="password" msgid="6738570945182936667">"የይለፍ ቃል"</string> <string name="passkeys" msgid="5733880786866559847">"የይለፍ ቁልፎች"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"አሰናብት"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"የተቀመጠ የይለፍ ቁልፍዎን ለ<xliff:g id="APP_NAME">%1$s</xliff:g> ይጠቀሙ?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"ለ<xliff:g id="APP_NAME">%1$s</xliff:g> የተቀመጠውን የይለፍ ቃልዎን ይጠቀሙ?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"በ<xliff:g id="USERNAME">%2$s</xliff:g> ወደ <xliff:g id="APP_NAME">%1$s</xliff:g> ለመግባት የማያ ገጽ መቆለፊያዎን ይጠቀሙ"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"ለ<xliff:g id="APP_NAME">%1$s</xliff:g> መግቢያዎ ጥቅም ላይ ይዋል?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"ለ<xliff:g id="APP_NAME">%1$s</xliff:g> የመግቢያ አማራጮች ይከፈቱ?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"ለ<xliff:g id="APP_NAME">%1$s</xliff:g> የተቀመጠ የይለፍ ቁልፍ ይምረጡ"</string> diff --git a/packages/CredentialManager/res/values-ar/strings.xml b/packages/CredentialManager/res/values-ar/strings.xml index 835ecebe75ca..5e089fe5a301 100644 --- a/packages/CredentialManager/res/values-ar/strings.xml +++ b/packages/CredentialManager/res/values-ar/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"بينما ننطلق نحو مستقبل بدون كلمات مرور، ستظل كلمات المرور متوفّرة إلى جانب مفاتيح المرور."</string> <string name="choose_provider_title" msgid="8870795677024868108">"اختيار المكان الذي تريد حفظ <xliff:g id="CREATETYPES">%1$s</xliff:g> فيه"</string> <string name="choose_provider_body" msgid="4967074531845147434">"اختَر مدير كلمات مرور لحفظ معلوماتك وتسجيل الدخول بشكل أسرع في المرة القادمة."</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"هل تريد إنشاء مفتاح مرور لتسجيل الدخول إلى \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"؟"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"هل تريد حفظ كلمة المرور لتسجيل الدخول إلى \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"؟"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"هل تريد حفظ معلومات تسجيل الدخول إلى \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"؟"</string> <string name="passkey" msgid="632353688396759522">"مفتاح المرور"</string> <string name="password" msgid="6738570945182936667">"كلمة المرور"</string> <string name="passkeys" msgid="5733880786866559847">"مفاتيح المرور"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"إغلاق"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"هل تريد استخدام مفتاح المرور المحفوظ لتطبيق \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"؟"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"هل تريد استخدام كلمة المرور المحفوظة لتطبيق \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"؟"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"استخدِم قفل الشاشة لتسجيل الدخول إلى \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" باستخدام <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"هل تريد استخدام معلومات تسجيل دخولك لتطبيق \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"؟"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"هل تريد فتح القفل لاستعادة خيارات تسجيل الدخول لتطبيق \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"؟"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"اختيار مفتاح مرور محفوظ لتطبيق \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> diff --git a/packages/CredentialManager/res/values-as/strings.xml b/packages/CredentialManager/res/values-as/strings.xml index c65e734bc853..95a0e1b6a36d 100644 --- a/packages/CredentialManager/res/values-as/strings.xml +++ b/packages/CredentialManager/res/values-as/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"আমি পাছৱৰ্ডবিহীন ভৱিষ্যতৰ দিশে আগবঢ়াৰ লগে লগে পাছকীৰ লগতে পাছৱৰ্ডসমূহো উপলব্ধ হ’ব।"</string> <string name="choose_provider_title" msgid="8870795677024868108">"আপোনাৰ <xliff:g id="CREATETYPES">%1$s</xliff:g> ক’ত ছেভ কৰিব লাগে সেয়া বাছনি কৰক"</string> <string name="choose_provider_body" msgid="4967074531845147434">"আপোনাৰ তথ্য ছেভ কৰি পৰৱৰ্তী সময়ত দ্ৰুতভাৱে ছাইন ইন কৰিবলৈ এটা পাছৱৰ্ড পৰিচালক বাছনি কৰক"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g>ত ছাইন ইন কৰিবলৈ পাছকী সৃষ্টি কৰিবনে?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g>ত ছাইন ইন কৰিবলৈ পাছৱৰ্ড ছেভ কৰিবনে?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বাবে ছাইন ইনৰ তথ্য ছেভ কৰিবনে?"</string> <string name="passkey" msgid="632353688396759522">"পাছকী"</string> <string name="password" msgid="6738570945182936667">"পাছৱৰ্ড"</string> <string name="passkeys" msgid="5733880786866559847">"পাছকী"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"অগ্ৰাহ্য কৰক"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বাবে আপোনাৰ ছেভ হৈ থকা পাছকী ব্যৱহাৰ কৰিবনে?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বাবে আপোনাৰ ছেভ কৰি থোৱা পাছৱৰ্ড ব্যৱহাৰ কৰিবনে?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="USERNAME">%2$s</xliff:g>ৰ জৰিয়তে <xliff:g id="APP_NAME">%1$s</xliff:g>ত ছাইন ইন কৰিবলৈ আপোনাৰ স্ক্ৰীন লক ব্যৱহাৰ কৰক"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বাবে ছাইন ইন কৰিবলৈ আপোনাৰ ক্ৰিডেনশ্বিয়েল ব্যৱহাৰ কৰিবনে?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বাবে ছাইন ইনৰ বিকল্পসমূহ আনলক কৰিবনে?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বাবে ছেভ হৈ থকা এটা পাছকী বাছনি কৰক"</string> diff --git a/packages/CredentialManager/res/values-az/strings.xml b/packages/CredentialManager/res/values-az/strings.xml index 7df31b808398..00a671847a38 100644 --- a/packages/CredentialManager/res/values-az/strings.xml +++ b/packages/CredentialManager/res/values-az/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Parolsuz gələcəyə doğru irəlilədikcə parollar hələ də açarlar ilə yanaşı əlçatan olacaq."</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g> elementinin saxlanacağı yeri seçin"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Məlumatlarınızı yadda saxlamaq və növbəti dəfə daha sürətli daxil olmaq üçün parol meneceri seçin"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqinə daxil olmaq üçün giriş açarı yaradılsın?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqinə daxil olmaq üçün parol yadda saxlansın?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> üçün giriş məlumatları yadda saxlansın?"</string> <string name="passkey" msgid="632353688396759522">"açar"</string> <string name="password" msgid="6738570945182936667">"parol"</string> <string name="passkeys" msgid="5733880786866559847">"açarlar"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"İmtina edin"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> üçün yadda saxlanmış giriş açarı istifadə edilsin?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> üçün yadda saxlanmış parol istifadə edilsin?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqinə <xliff:g id="USERNAME">%2$s</xliff:g> ilə daxil olmaq üçün ekran kilidindən istifadə edin"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> üçün giriş istifadə edilsin?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> üçün giriş seçimləri kiliddən çıxarılsın?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> üçün yadda saxlanmış giriş açarı seçin"</string> diff --git a/packages/CredentialManager/res/values-b+sr+Latn/strings.xml b/packages/CredentialManager/res/values-b+sr+Latn/strings.xml index e1c92c3c1c7c..390c7742cde6 100644 --- a/packages/CredentialManager/res/values-b+sr+Latn/strings.xml +++ b/packages/CredentialManager/res/values-b+sr+Latn/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Kako se krećemo ka budućnosti bez lozinki, lozinke će i dalje biti dostupne uz pristupne kodove."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Odaberite gde ćete sačuvati: <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Izaberite menadžera lozinki da biste sačuvali podatke i brže se prijavili sledeći put"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Želite da napravite pristupni ključ da biste se prijavili u <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Želite da sačuvate lozinku da biste se prijavili u <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Želite da sačuvate podatke za prijavljivanje za: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"pristupni kôd"</string> <string name="password" msgid="6738570945182936667">"lozinka"</string> <string name="passkeys" msgid="5733880786866559847">"pristupni kodovi"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Odbaci"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Želite da koristite sačuvani pristupni kôd za: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Želite da koristite sačuvanu lozinku za: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Koristite otključavanje ekrana da biste se prijavili u <xliff:g id="APP_NAME">%1$s</xliff:g> kao <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Želite li da koristite svoje podatke za prijavljivanje za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Želite da otključate opcije prijavljivanja za: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Izaberite sačuvan pristupni ključ za: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-be/strings.xml b/packages/CredentialManager/res/values-be/strings.xml index ef0c12d5b06e..6922e7052d91 100644 --- a/packages/CredentialManager/res/values-be/strings.xml +++ b/packages/CredentialManager/res/values-be/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Хоць мы ўжо рухаемся ў бок будучыні без выкарыстання пароляў, яны па-ранейшаму застануцца даступнымі нароўні з ключамі доступу."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Выберыце, куды захаваць <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Выберыце менеджар пароляў, каб захаваць свае даныя і забяспечыць хуткі ўваход у наступныя разы"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Стварыць ключ доступу для ўваходу ў праграму \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Захаваць пароль для ўваходу ў праграму \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Захаваць даныя для ўваходу ў праграму \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> <string name="passkey" msgid="632353688396759522">"ключ доступу"</string> <string name="password" msgid="6738570945182936667">"пароль"</string> <string name="passkeys" msgid="5733880786866559847">"ключы доступу"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Закрыць"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Скарыстаць захаваны ключ доступу для праграмы \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Выкарыстоўваць пароль, захаваны для праграмы \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Выкарыстайце сродак разблакіроўкі экрана для ўваходу ў праграму \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" як <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Скарыстаць ваш спосаб уваходу для праграмы <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Разблакіраваць варыянты ўваходу для праграмы\"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Выберыце захаваны ключ доступу для праграмы \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> diff --git a/packages/CredentialManager/res/values-bg/strings.xml b/packages/CredentialManager/res/values-bg/strings.xml index fc6932ed18fe..3d33c8fd91f4 100644 --- a/packages/CredentialManager/res/values-bg/strings.xml +++ b/packages/CredentialManager/res/values-bg/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Паролите ще продължат да са налице заедно с ключовете за достъп по пътя ни към бъдеще без пароли."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Изберете къде да запазите своите <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Изберете мениджър на пароли, в който да се запазят данните ви, така че следващия път да влезете по-бързо в профила си"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Искате ли да създадете ключ за достъп, с който да влизате в(ъв) <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Искате ли да запазите паролата за влизане в(ъв) <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Искате ли да запазите данните за вход за <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"код за достъп"</string> <string name="password" msgid="6738570945182936667">"парола"</string> <string name="passkeys" msgid="5733880786866559847">"ключове за достъп"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Отхвърляне"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Да се използва ли запазеният ви код за достъп за <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Искате ли да използвате запазената си парола за <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Използвайте опцията си за заключване на екрана, за да влизате в(ъв) <xliff:g id="APP_NAME">%1$s</xliff:g> с профила <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Да се използват ли вашите данни за вход за <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Искате ли да отключите опциите за влизане в профила за <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Изберете запазен ключ за достъп за <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-bn/strings.xml b/packages/CredentialManager/res/values-bn/strings.xml index 329189ea2edc..fe42ed6f2ad1 100644 --- a/packages/CredentialManager/res/values-bn/strings.xml +++ b/packages/CredentialManager/res/values-bn/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"আমরা পাসওয়ার্ডবিহীন ভবিষ্যতের দিকে এগিয়ে গেলেও, এখনও \'পাসকী\'-এর পাশাপাশি পাসওয়ার্ড ব্যবহার করা যাবে।"</string> <string name="choose_provider_title" msgid="8870795677024868108">"আপনার <xliff:g id="CREATETYPES">%1$s</xliff:g> কোথায় সেভ করবেন তা বেছে নিন"</string> <string name="choose_provider_body" msgid="4967074531845147434">"আপনার তথ্য সেভ করতে একটি Password Manager বেছে নিন এবং পরের বার আরও দ্রুত সাইন-ইন করুন"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> অ্যাপে সাইন-ইন করার জন্য পাসকী তৈরি করবেন?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> অ্যাপে সাইন-ইন করার জন্য পাসওয়ার্ড সেভ করবেন?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> অ্যাপের জন্য সাইন-ইন সংক্রান্ত তথ্য সেভ করবেন?"</string> <string name="passkey" msgid="632353688396759522">"পাসকী"</string> <string name="password" msgid="6738570945182936667">"পাসওয়ার্ড"</string> <string name="passkeys" msgid="5733880786866559847">"পাসকী"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"বাতিল করুন"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এর জন্য আপনার সেভ করা পাসকী ব্যবহার করবেন?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"আপনার সেভ করা পাসওয়ার্ড <xliff:g id="APP_NAME">%1$s</xliff:g>-এর জন্য ব্যবহার করবেন?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"আপনার স্ক্রিন লক ব্যবহার করে <xliff:g id="USERNAME">%2$s</xliff:g>-এর মাধ্যমে <xliff:g id="APP_NAME">%1$s</xliff:g> অ্যাপে সাইন-ইন করুন"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এর জন্য আপনার সাইন-ইন ক্রেডেনশিয়াল ব্যবহার করবেন?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এর জন্য সাইন-ইন করার বিকল্প আনলক করতে চান?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এর জন্য সেভ করা পাসকী বেছে নিন"</string> diff --git a/packages/CredentialManager/res/values-bs/strings.xml b/packages/CredentialManager/res/values-bs/strings.xml index 05f0f1e1e94a..f6e6d811f2a6 100644 --- a/packages/CredentialManager/res/values-bs/strings.xml +++ b/packages/CredentialManager/res/values-bs/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Kako se krećemo prema budućnosti bez lozinki, lozinke će i dalje biti dostupne uz pristupne ključeve."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Odaberite gdje će se pohranjivati <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Odaberite upravitelja lozinki da sačuvate svoje informacije i brže se prijavite sljedeći put"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Kreirati pristupni ključ da se prijavite u aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Sačuvati lozinku da se prijavite u aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Sačuvati podatke za prijavu u aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"pristupni ključ"</string> <string name="password" msgid="6738570945182936667">"lozinka"</string> <string name="passkeys" msgid="5733880786866559847">"pristupni ključevi"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Odbacivanje"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Koristiti sačuvani pristupni ključ za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Koristiti sačuvanu lozinku za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Koristite zaključavanje ekrana da se prijavite u aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g> s korisničkim imenom <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Koristiti prijavu za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Otključati opcije prijave za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Odaberite sačuvani pristupni ključ za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-cs/strings.xml b/packages/CredentialManager/res/values-cs/strings.xml index 27277379c0a0..6e6857c209d9 100644 --- a/packages/CredentialManager/res/values-cs/strings.xml +++ b/packages/CredentialManager/res/values-cs/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Ačkoliv směřujeme k budoucnosti bez hesel, vedle přístupových klíčů budou stále k dispozici i hesla."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Určete, kam ukládat <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Vyberte správce hesel k uložení svých údajů, abyste se příště mohli přihlásit rychleji"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Vytvořit přístupový klíč k přihlašování do aplikace <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Uložit heslo k přihlašování do aplikace <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Uložit přihlašovací údaje pro aplikaci <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"přístupový klíč"</string> <string name="password" msgid="6738570945182936667">"heslo"</string> <string name="passkeys" msgid="5733880786866559847">"přístupové klíče"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Zavřít"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Použít uložený přístupový klíč pro aplikaci <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Použít pro aplikaci <xliff:g id="APP_NAME">%1$s</xliff:g> uložené heslo?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Přihlašovat se do aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> uživatelským jménem <xliff:g id="USERNAME">%2$s</xliff:g> pomocí zámku obrazovky"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Použít přihlášení pro <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Odemknout možnosti přihlášení pro aplikaci <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Vyberte uložený přístupový klíč pro aplikaci <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-da/strings.xml b/packages/CredentialManager/res/values-da/strings.xml index d3ff9e7d6b7f..ae7c3cfaf96e 100644 --- a/packages/CredentialManager/res/values-da/strings.xml +++ b/packages/CredentialManager/res/values-da/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Selvom vi nærmer os en fremtid, hvor adgangskoder er mindre fremtrædende, kan de stadig bruges i samspil med adgangsnøgler."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Vælg, hvor du vil gemme dine <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Vælg en adgangskodeadministrator for at gemme dine oplysninger, så du kan logge ind hurtigere næste gang"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Vil du oprette en adgangsnøgle for at logge ind på <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Vil du gemme adgangskoden for at logge ind på <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Vil du gemme loginoplysningerne til <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"adgangsnøgle"</string> <string name="password" msgid="6738570945182936667">"adgangskode"</string> <string name="passkeys" msgid="5733880786866559847">"adgangsnøgler"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Luk"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Vil du bruge din gemte adgangsnøgle til <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Vil du bruge din gemte adgangskode til <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Brug din skærmlås til at logge ind på <xliff:g id="APP_NAME">%1$s</xliff:g> med <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Vil du bruge dine loginoplysninger til <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Vil du låse enheden op for at se loginmetoder for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Vælg en gemt adgangsnøgle til <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-de/strings.xml b/packages/CredentialManager/res/values-de/strings.xml index cb011390c596..4fa669baa9d9 100644 --- a/packages/CredentialManager/res/values-de/strings.xml +++ b/packages/CredentialManager/res/values-de/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Auch wenn wir uns auf eine passwortlose Zukunft zubewegen, werden neben Passkeys weiter Passwörter verfügbar sein."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Wähle aus, wo deine <xliff:g id="CREATETYPES">%1$s</xliff:g> gespeichert werden sollen"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Du kannst einen Passwortmanager auswählen, um deine Anmeldedaten zu speichern, damit du dich nächstes Mal schneller anmelden kannst"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Passkey zur Anmeldung in <xliff:g id="APP_NAME">%1$s</xliff:g> erstellen?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Passwort zur Anmeldung in <xliff:g id="APP_NAME">%1$s</xliff:g> speichern?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Anmeldedaten für <xliff:g id="APP_NAME">%1$s</xliff:g> speichern?"</string> <string name="passkey" msgid="632353688396759522">"Passkey"</string> <string name="password" msgid="6738570945182936667">"Passwort"</string> <string name="passkeys" msgid="5733880786866559847">"Passkeys"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Schließen"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Gespeicherten Passkey für <xliff:g id="APP_NAME">%1$s</xliff:g> verwenden?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Soll dein gespeichertes Passwort für <xliff:g id="APP_NAME">%1$s</xliff:g> verwendet werden?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Du kannst die Displaysperre verwenden, um dich in <xliff:g id="APP_NAME">%1$s</xliff:g> als <xliff:g id="USERNAME">%2$s</xliff:g> anzumelden"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Anmeldedaten für <xliff:g id="APP_NAME">%1$s</xliff:g> verwenden?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Anmeldeoptionen für <xliff:g id="APP_NAME">%1$s</xliff:g> freischalten?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Einen gespeicherten Passkey für <xliff:g id="APP_NAME">%1$s</xliff:g> auswählen"</string> diff --git a/packages/CredentialManager/res/values-el/strings.xml b/packages/CredentialManager/res/values-el/strings.xml index c8e4099918c5..b6b2728b8961 100644 --- a/packages/CredentialManager/res/values-el/strings.xml +++ b/packages/CredentialManager/res/values-el/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Καθώς κινούμαστε προς ένα μέλλον χωρίς κωδικούς πρόσβασης, οι κωδικοί πρόσβασης θα εξακολουθούν να είναι διαθέσιμοι μαζί με τα κλειδιά πρόσβασης."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Επιλέξτε πού θα αποθηκεύονται τα <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Επιλέξτε ένα πρόγραμμα διαχείρισης κωδικών πρόσβασης για να αποθηκεύσετε τα στοιχεία σας και να συνδεθείτε πιο γρήγορα την επόμενη φορά."</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Δημιουργία κλειδιού πρόσβασης για σύνδεση στην εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>;"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Αποθήκευση κωδικού πρόσβασης για σύνδεση στην εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>;"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Αποθήκευση πληροφοριών σύνδεσης για την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>;"</string> <string name="passkey" msgid="632353688396759522">"κλειδί πρόσβασης"</string> <string name="password" msgid="6738570945182936667">"κωδικός πρόσβασης"</string> <string name="passkeys" msgid="5733880786866559847">"κλειδιά πρόσβασης"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Παράβλεψη"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Να χρησιμοποιηθεί το αποθηκευμένο κλειδί πρόσβασης για την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>;"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Χρήση του αποθηκευμένου κωδικού πρόσβασης για την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>;"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Χρησιμοποιήστε το κλείδωμα οθόνης για να συνδεθείτε στην εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> με το όνομα χρήστη <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Χρήση της σύνδεσής σας για την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>;"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Ξεκλείδωμα των επιλογών σύνδεσης για την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>;"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Επιλογή αποθηκευμένου κλειδιού πρόσβασης για την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-en-rAU/strings.xml b/packages/CredentialManager/res/values-en-rAU/strings.xml index f30b856050fe..f177cf981e8c 100644 --- a/packages/CredentialManager/res/values-en-rAU/strings.xml +++ b/packages/CredentialManager/res/values-en-rAU/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"As we move towards a passwordless future, passwords will still be available alongside passkeys."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choose where to save your <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Select a password manager to save your info and sign in faster next time"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Create passkey to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Save password to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Save sign-in info for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"passkey"</string> <string name="password" msgid="6738570945182936667">"password"</string> <string name="passkeys" msgid="5733880786866559847">"passkeys"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Dismiss"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Use your saved passkey for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Use your saved password for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Use your screen lock to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g> with <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Use your sign-in for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Unlock sign-in options for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Choose a saved passkey for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-en-rCA/strings.xml b/packages/CredentialManager/res/values-en-rCA/strings.xml index 5eb63c6981c6..df4cd86e6d20 100644 --- a/packages/CredentialManager/res/values-en-rCA/strings.xml +++ b/packages/CredentialManager/res/values-en-rCA/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"As we move towards a passwordless future, passwords will still be available alongside passkeys."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choose where to save your <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Select a password manager to save your info and sign in faster next time"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Create passkey to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Save password to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Save sign-in info for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"passkey"</string> <string name="password" msgid="6738570945182936667">"password"</string> <string name="passkeys" msgid="5733880786866559847">"passkeys"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Dismiss"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Use your saved passkey for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Use your saved password for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Use your screen lock to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g> with <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Use your sign-in for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Unlock sign-in options for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Choose a saved passkey for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-en-rGB/strings.xml b/packages/CredentialManager/res/values-en-rGB/strings.xml index f30b856050fe..f177cf981e8c 100644 --- a/packages/CredentialManager/res/values-en-rGB/strings.xml +++ b/packages/CredentialManager/res/values-en-rGB/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"As we move towards a passwordless future, passwords will still be available alongside passkeys."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choose where to save your <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Select a password manager to save your info and sign in faster next time"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Create passkey to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Save password to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Save sign-in info for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"passkey"</string> <string name="password" msgid="6738570945182936667">"password"</string> <string name="passkeys" msgid="5733880786866559847">"passkeys"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Dismiss"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Use your saved passkey for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Use your saved password for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Use your screen lock to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g> with <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Use your sign-in for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Unlock sign-in options for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Choose a saved passkey for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-en-rIN/strings.xml b/packages/CredentialManager/res/values-en-rIN/strings.xml index f30b856050fe..f177cf981e8c 100644 --- a/packages/CredentialManager/res/values-en-rIN/strings.xml +++ b/packages/CredentialManager/res/values-en-rIN/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"As we move towards a passwordless future, passwords will still be available alongside passkeys."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choose where to save your <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Select a password manager to save your info and sign in faster next time"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Create passkey to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Save password to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Save sign-in info for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"passkey"</string> <string name="password" msgid="6738570945182936667">"password"</string> <string name="passkeys" msgid="5733880786866559847">"passkeys"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Dismiss"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Use your saved passkey for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Use your saved password for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Use your screen lock to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g> with <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Use your sign-in for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Unlock sign-in options for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Choose a saved passkey for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-en-rXC/strings.xml b/packages/CredentialManager/res/values-en-rXC/strings.xml index 067d1062acaf..77ae53afc700 100644 --- a/packages/CredentialManager/res/values-en-rXC/strings.xml +++ b/packages/CredentialManager/res/values-en-rXC/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"As we move towards a passwordless future, passwords will still be available alongside passkeys."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choose where to save your <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Select a password manager to save your info and sign in faster next time"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Create passkey to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Save password to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Save sign-in info for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"passkey"</string> <string name="password" msgid="6738570945182936667">"password"</string> <string name="passkeys" msgid="5733880786866559847">"passkeys"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Dismiss"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Use your saved passkey for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Use your saved password for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Use your screen lock to sign in to <xliff:g id="APP_NAME">%1$s</xliff:g> with <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Use your sign-in for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Unlock sign-in options for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Choose a saved passkey for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-es-rUS/strings.xml b/packages/CredentialManager/res/values-es-rUS/strings.xml index 41918f2338d1..6ccfec3d8a15 100644 --- a/packages/CredentialManager/res/values-es-rUS/strings.xml +++ b/packages/CredentialManager/res/values-es-rUS/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"A medida que avanzamos hacia un futuro sin contraseñas, estas seguirán estando disponibles junto a las llaves de acceso."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Elige dónde guardar tus <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecciona un administrador de contraseñas para guardar tu información y acceder más rápido la próxima vez"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"¿Quieres crear una llave de acceso para acceder a <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"¿Quieres guardar la contraseña para acceder a <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"¿Quieres guardar la información de acceso para <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"llave de acceso"</string> <string name="password" msgid="6738570945182936667">"contraseña"</string> <string name="passkeys" msgid="5733880786866559847">"llaves de acceso"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Descartar"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"¿Quieres usar tu llave de acceso guardada para <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"¿Quieres usar la contraseña guardada para <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Usar el bloqueo de pantalla para acceder a <xliff:g id="APP_NAME">%1$s</xliff:g> con <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"¿Quieres usar tu acceso para <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"¿Quieres desbloquear las opciones de acceso para <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Elige una llave de acceso guardada para <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-es/strings.xml b/packages/CredentialManager/res/values-es/strings.xml index 35f9cadedda0..b2c1c6fe4915 100644 --- a/packages/CredentialManager/res/values-es/strings.xml +++ b/packages/CredentialManager/res/values-es/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Aunque nos dirigimos hacia un mundo sin contraseñas, estas seguirán estando disponibles junto con las llaves de acceso."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Elige dónde guardar tus <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecciona un gestor de contraseñas para guardar tu información e iniciar sesión más rápido la próxima vez"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"¿Crear llave de acceso para iniciar sesión en <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"¿Guardar contraseña para iniciar sesión en <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"¿Guardar la información de inicio de sesión de <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"llave de acceso"</string> <string name="password" msgid="6738570945182936667">"contraseña"</string> <string name="passkeys" msgid="5733880786866559847">"llaves de acceso"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Cerrar"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"¿Usar la llave de acceso guardada para <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"¿Usar la contraseña que tienes guardada para <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Usa tu bloqueo de pantalla para iniciar sesión en <xliff:g id="APP_NAME">%1$s</xliff:g> con el usuario <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"¿Usar tu inicio de sesión en <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"¿Desbloquear las opciones de inicio de sesión de <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Elige una llave de acceso guardada para <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-et/strings.xml b/packages/CredentialManager/res/values-et/strings.xml index d9581bd1d655..823a016e8d8f 100644 --- a/packages/CredentialManager/res/values-et/strings.xml +++ b/packages/CredentialManager/res/values-et/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Liikudes paroolivaba tuleviku poole, jäävad paroolid pääsuvõtmete kõrval siiski kättesaadavaks."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Valige, kuhu soovite oma <xliff:g id="CREATETYPES">%1$s</xliff:g> salvestada"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Valige paroolihaldur, et salvestada oma teave ja järgmisel korral kiiremini sisse logida"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Kas luua rakendusse <xliff:g id="APP_NAME">%1$s</xliff:g> sisselogimiseks pääsuvõti?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Kas salvestada rakendusse <xliff:g id="APP_NAME">%1$s</xliff:g> sisselogimiseks parool?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Kas salvestada rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> jaoks sisselogimisteave?"</string> <string name="passkey" msgid="632353688396759522">"pääsuvõti"</string> <string name="password" msgid="6738570945182936667">"parool"</string> <string name="passkeys" msgid="5733880786866559847">"pääsuvõtmed"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Loobu"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Kas kasutada rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> jaoks salvestatud pääsuvõtit?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Kas kasutada rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> puhul salvestatud parooli?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Kasutage rakendusse <xliff:g id="APP_NAME">%1$s</xliff:g> kasutajanimega <xliff:g id="USERNAME">%2$s</xliff:g> sisselogimiseks ekraanilukku"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Kas soovite rakendusse <xliff:g id="APP_NAME">%1$s</xliff:g> sisselogimiseks kasutada oma mandaati?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Kas avada rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> jaoks sisselogimisvalikud?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Valige rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> jaoks salvestatud pääsuvõti"</string> diff --git a/packages/CredentialManager/res/values-eu/strings.xml b/packages/CredentialManager/res/values-eu/strings.xml index ffe20915adcd..8507b3f21997 100644 --- a/packages/CredentialManager/res/values-eu/strings.xml +++ b/packages/CredentialManager/res/values-eu/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Pasahitzik gabeko etorkizun baterantz goazen arren, pasahitzek sarbide-gakoen bizikide izaten jarraituko dute."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Aukeratu non gorde <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Hautatu informazioa gordetzeko pasahitz-kudeatzaile bat eta hasi saioa bizkorrago hurrengoan"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioan saioa hasteko sarbide-gako bat sortu nahi duzu?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioan saioa hasteko pasahitza gorde nahi duzu?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioan saioa hasteko informazioa gorde nahi duzu?"</string> <string name="passkey" msgid="632353688396759522">"sarbide-gakoa"</string> <string name="password" msgid="6738570945182936667">"pasahitza"</string> <string name="passkeys" msgid="5733880786866559847">"sarbide-gakoak"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Baztertu"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikaziorako gorde duzun sarbide-gakoa erabili nahi duzu?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikaziorako gordetako pasahitza erabili nahi duzu?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Erabili pantailaren blokeoa <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioan <xliff:g id="USERNAME">%2$s</xliff:g> kontuarekin saioa hasteko"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> zerbitzuan saioa hasteko kredentzialak erabili nahi dituzu?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioan saioa hasteko aukerak desblokeatu nahi dituzu?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Aukeratu <xliff:g id="APP_NAME">%1$s</xliff:g> aplikaziorako gordetako sarbide-gakoa"</string> diff --git a/packages/CredentialManager/res/values-fa/strings.xml b/packages/CredentialManager/res/values-fa/strings.xml index 5d3198c390cc..656c789a72b8 100644 --- a/packages/CredentialManager/res/values-fa/strings.xml +++ b/packages/CredentialManager/res/values-fa/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"درحالیکه بهسوی آیندهای بیگذرواژه حرکت میکنیم، گذرواژهها همچنان در کنار گذرکلیدها دردسترس خواهند بود"</string> <string name="choose_provider_title" msgid="8870795677024868108">"جایی را برای ذخیره کردن <xliff:g id="CREATETYPES">%1$s</xliff:g> انتخاب کنید"</string> <string name="choose_provider_body" msgid="4967074531845147434">"مدیر گذرواژهای انتخاب کنید تا اطلاعاتتان را ذخیره کنید و دفعه بعد سریعتر به سیستم وارد شوید"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"برای ورود به سیستم <xliff:g id="APP_NAME">%1$s</xliff:g>، گذرکلید ایجاد شود؟"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"برای ورود به سیستم <xliff:g id="APP_NAME">%1$s</xliff:g>، گذرواژه ذخیره شود؟"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"اطلاعات ورود به سیستم <xliff:g id="APP_NAME">%1$s</xliff:g> ذخیره شود؟"</string> <string name="passkey" msgid="632353688396759522">"گذرکلید"</string> <string name="password" msgid="6738570945182936667">"گذرواژه"</string> <string name="passkeys" msgid="5733880786866559847">"گذرکلیدها"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"بستن"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"از گذرکلید ذخیرهشده برای «<xliff:g id="APP_NAME">%1$s</xliff:g>» استفاده شود؟"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"از گذرواژه ذخیرهشدهتان برای <xliff:g id="APP_NAME">%1$s</xliff:g> استفاده شود؟"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"برای ورود به سیستم <xliff:g id="APP_NAME">%1$s</xliff:g> با <xliff:g id="USERNAME">%2$s</xliff:g> از قفل صفحه استفاده کنید"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"از روش ورود به سیستم شما برای <xliff:g id="APP_NAME">%1$s</xliff:g> استفاده شود؟"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"گزینههای ورود به سیستم برای <xliff:g id="APP_NAME">%1$s</xliff:g> باز شود؟"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"گذرکلید ذخیرهشدهای را برای <xliff:g id="APP_NAME">%1$s</xliff:g> انتخاب کنید"</string> diff --git a/packages/CredentialManager/res/values-fi/strings.xml b/packages/CredentialManager/res/values-fi/strings.xml index 7091da87034e..f2f1bfbb4d1e 100644 --- a/packages/CredentialManager/res/values-fi/strings.xml +++ b/packages/CredentialManager/res/values-fi/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Kehitys kulkee kohti salasanatonta tulevaisuutta, mutta salasanat ovat edelleen käytettävissä avainkoodien ohella."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Valitse, minne <xliff:g id="CREATETYPES">%1$s</xliff:g> tallennetaan"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Valitse salasanojen ylläpitotyökalu, niin voit tallentaa tietosi ja kirjautua ensi kerralla nopeammin sisään"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Luodaanko avainkoodi sisäänkirjautumista (<xliff:g id="APP_NAME">%1$s</xliff:g>) varten?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Tallennetaanko salasana sisäänkirjautumista (<xliff:g id="APP_NAME">%1$s</xliff:g>) varten?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Tallennetaanko kirjautumistiedot (<xliff:g id="APP_NAME">%1$s</xliff:g>)?"</string> <string name="passkey" msgid="632353688396759522">"avainkoodi"</string> <string name="password" msgid="6738570945182936667">"salasana"</string> <string name="passkeys" msgid="5733880786866559847">"avainkoodit"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Sulje"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Käytetäänkö tallennettua avainkoodiasi täällä: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Käytetäänkö tallennettua salasanaasi sovelluksessa <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Kirjaudu sisään (<xliff:g id="APP_NAME">%1$s</xliff:g>) käyttämällä näytön lukitusta tilillä <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Käytetäänkö kirjautumistapaa: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Avataanko kirjautumisvaihtoehdot (<xliff:g id="APP_NAME">%1$s</xliff:g>)?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g>: valitse tallennettu avainkoodi"</string> diff --git a/packages/CredentialManager/res/values-fr-rCA/strings.xml b/packages/CredentialManager/res/values-fr-rCA/strings.xml index ac7b77cda09b..891e98791449 100644 --- a/packages/CredentialManager/res/values-fr-rCA/strings.xml +++ b/packages/CredentialManager/res/values-fr-rCA/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"À mesure que nous nous dirigeons vers un avenir sans mot de passe, ils resteront toujours utilisés parallèlement aux clés d\'accès."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choisir où enregistrer vos <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Sélectionnez un gestionnaire de mots de passe pour enregistrer vos renseignements et vous connecter plus rapidement la prochaine fois"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Créer une clé d\'accès pour se connecter à <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Enregistrer un mot de passe pour se connecter à <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Enregistrer les renseignements de connexion pour <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"clé d\'accès"</string> <string name="password" msgid="6738570945182936667">"mot de passe"</string> <string name="passkeys" msgid="5733880786866559847">"clés d\'accès"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Fermer"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Utiliser votre clé d\'accès enregistrée pour <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Utiliser votre mot de passe enregistré pour <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Utilisez votre verrouillage d\'écran pour vous connecter à <xliff:g id="APP_NAME">%1$s</xliff:g> avec <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Utiliser votre identifiant de connexion pour <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Déverrouiller les options de connexion pour <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Choisissez une clé d\'accès enregistrée pour <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-fr/strings.xml b/packages/CredentialManager/res/values-fr/strings.xml index a6b2fe2a56ed..f2ca1fc4028c 100644 --- a/packages/CredentialManager/res/values-fr/strings.xml +++ b/packages/CredentialManager/res/values-fr/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Nous nous dirigeons vers un futur sans mots de passe, mais ceux-ci resteront disponibles en plus des clés d\'accès."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Choisissez où enregistrer vos <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Sélectionnez un gestionnaire de mots de passe pour enregistrer vos informations et vous connecter plus rapidement la prochaine fois"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Créer une clé d\'accès pour se connecter à <xliff:g id="APP_NAME">%1$s</xliff:g> ?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Enregistrer un mot de passe pour se connecter à <xliff:g id="APP_NAME">%1$s</xliff:g> ?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Enregistrer les informations de connexion pour <xliff:g id="APP_NAME">%1$s</xliff:g> ?"</string> <string name="passkey" msgid="632353688396759522">"clé d\'accès"</string> <string name="password" msgid="6738570945182936667">"mot de passe"</string> <string name="passkeys" msgid="5733880786866559847">"clés d\'accès"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Fermer"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Utiliser votre clé d\'accès enregistrée pour <xliff:g id="APP_NAME">%1$s</xliff:g> ?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Utiliser votre mot de passe enregistré pour <xliff:g id="APP_NAME">%1$s</xliff:g> ?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Utiliser le verrouillage de l\'écran pour se connecter à <xliff:g id="APP_NAME">%1$s</xliff:g> avec <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Utiliser vos infos de connexion pour <xliff:g id="APP_NAME">%1$s</xliff:g> ?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Déverrouiller les options de connexion pour <xliff:g id="APP_NAME">%1$s</xliff:g> ?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Choisir une clé d\'accès enregistrée pour <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-gl/strings.xml b/packages/CredentialManager/res/values-gl/strings.xml index 76a9d4b4ec67..7117e1c00794 100644 --- a/packages/CredentialManager/res/values-gl/strings.xml +++ b/packages/CredentialManager/res/values-gl/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Durante este percorrido cara a un futuro sen contrasinais, estes seguirán estando dispoñibles a canda as claves de acceso."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Escolle onde queres gardar: <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecciona un xestor de contrasinais para gardar a túa información e iniciar sesión máis rápido a próxima vez"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Queres crear unha clave de acceso para iniciar sesión en <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Queres gardar o contrasinal para iniciar sesión en <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Queres gardar a información de inicio de sesión de <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"clave de acceso"</string> <string name="password" msgid="6738570945182936667">"contrasinal"</string> <string name="passkeys" msgid="5733880786866559847">"claves de acceso"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Pechar"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Queres usar a clave de acceso gardada para <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Queres usar o contrasinal gardado para <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Usa o bloqueo de pantalla para iniciar sesión en <xliff:g id="APP_NAME">%1$s</xliff:g> con <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Queres usar o teu inicio de sesión para <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Queres desbloquear as opcións de inicio de sesión para <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Escolle unha clave de acceso gardada para <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-gu/strings.xml b/packages/CredentialManager/res/values-gu/strings.xml index 11d1df6c21ab..98b4686716ec 100644 --- a/packages/CredentialManager/res/values-gu/strings.xml +++ b/packages/CredentialManager/res/values-gu/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"આપણે પાસવર્ડ રહિત ભવિષ્ય તરફ આગળ વધી રહ્યાં છીએ, છતાં પાસકીની સાથોસાથ હજી પણ પાસવર્ડ ઉપલબ્ધ રહેશે."</string> <string name="choose_provider_title" msgid="8870795677024868108">"તમારી <xliff:g id="CREATETYPES">%1$s</xliff:g> ક્યાં સાચવવી તે પસંદ કરો"</string> <string name="choose_provider_body" msgid="4967074531845147434">"તમારી માહિતી સાચવવા માટે પાસવર્ડ મેનેજર પસંદ કરો અને આગલી વખતે વધુ ઝડપથી સાઇન ઇન કરો"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g>માં સાઇન ઇન કરવા માટે પાસકી બનાવીએ?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g>માં સાઇન ઇન કરવા માટે પાસવર્ડ સાચવીએ?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> માટે સાઇન-ઇન કરવાની માહિતી સાચવીએ?"</string> <string name="passkey" msgid="632353688396759522">"પાસકી"</string> <string name="password" msgid="6738570945182936667">"પાસવર્ડ"</string> <string name="passkeys" msgid="5733880786866559847">"પાસકી"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"છોડી દો"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> માટે શું તમારી સાચવેલી પાસકીનો ઉપયોગ કરીએ?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"શું <xliff:g id="APP_NAME">%1$s</xliff:g> માટે તમારા સાચવેલા પાસવર્ડનો ઉપયોગ કરીએ?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="USERNAME">%2$s</xliff:g> વડે <xliff:g id="APP_NAME">%1$s</xliff:g>માં સાઇન ઇન કરવા માટે તમારા સ્ક્રીન લૉકનો ઉપયોગ કરો"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"શું <xliff:g id="APP_NAME">%1$s</xliff:g>માં સાઇન ઇન કરવા માટે તમારી આ લૉગ ઇન વિગતોનો ઉપયોગ કરીએ?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> માટે સાઇન ઇન વિકલ્પો અનલૉક કરીએ?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> માટે કોઈ સાચવેલી પાસકી પસંદ કરો"</string> diff --git a/packages/CredentialManager/res/values-hi/strings.xml b/packages/CredentialManager/res/values-hi/strings.xml index 0e9e10641d72..9bc5feb6e9e9 100644 --- a/packages/CredentialManager/res/values-hi/strings.xml +++ b/packages/CredentialManager/res/values-hi/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"आने वाले समय में बिना पासवर्ड वाली टेक्नोलॉजी यानी पासकी का इस्तेमाल बढ़ेगा, हालांकि इसके साथ-साथ पासवर्ड भी इस्तेमाल किए जा सकेंगे."</string> <string name="choose_provider_title" msgid="8870795677024868108">"चुनें कि अपनी <xliff:g id="CREATETYPES">%1$s</xliff:g> कहां सेव करनी हैं"</string> <string name="choose_provider_body" msgid="4967074531845147434">"अपनी जानकारी सेव करने के लिए, पासवर्ड मैनेजर चुनें और अगली बार ज़्यादा तेज़ी से साइन इन करें"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"क्या आपको <xliff:g id="APP_NAME">%1$s</xliff:g> में साइन इन करने के लिए पासकी बनानी है?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"क्या आपको <xliff:g id="APP_NAME">%1$s</xliff:g> में साइन इन करने के लिए पासवर्ड सेव करना है?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"क्या आपको <xliff:g id="APP_NAME">%1$s</xliff:g> के लिए साइन-इन की जानकारी सेव करनी है?"</string> <string name="passkey" msgid="632353688396759522">"पासकी"</string> <string name="password" msgid="6738570945182936667">"पासवर्ड"</string> <string name="passkeys" msgid="5733880786866559847">"पासकी"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"खारिज करें"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"क्या आपको <xliff:g id="APP_NAME">%1$s</xliff:g> पर साइन इन करने के लिए, सेव की गई पासकी का इस्तेमाल करना है?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"क्या आपको <xliff:g id="APP_NAME">%1$s</xliff:g> के लिए सेव किया हुआ पासवर्ड इस्तेमाल करना है?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="USERNAME">%2$s</xliff:g> से <xliff:g id="APP_NAME">%1$s</xliff:g> में साइन इन करने के लिए, स्क्रीन लॉक का इस्तेमाल करें"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"क्या आपको <xliff:g id="APP_NAME">%1$s</xliff:g> के लिए अपने साइन-इन क्रेडेंशियल का इस्तेमाल करना है?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"क्या आपको <xliff:g id="APP_NAME">%1$s</xliff:g> में साइन इन करने के विकल्पों को अनलॉक करना है?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> के लिए सेव की गई पासकी चुनें"</string> diff --git a/packages/CredentialManager/res/values-hr/strings.xml b/packages/CredentialManager/res/values-hr/strings.xml index 61a16b7de809..968a7472d58e 100644 --- a/packages/CredentialManager/res/values-hr/strings.xml +++ b/packages/CredentialManager/res/values-hr/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Kako idemo u smjeru budućnosti bez zaporki, one će i dalje biti dostupne uz pristupne ključeve."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Odaberite gdje će se spremati <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Odaberite upravitelja zaporki kako biste spremili svoje informacije i drugi se put brže prijavili"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Želite li izraditi pristupni ključ za prijavu u aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Želite li spremiti zaporku za prijavu u aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Želite li spremiti informacije o prijavi za <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"pristupni ključ"</string> <string name="password" msgid="6738570945182936667">"zaporka"</string> <string name="passkeys" msgid="5733880786866559847">"pristupni ključevi"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Odbaci"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Želite li upotrijebiti spremljeni pristupni ključ za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Želite li upotrijebiti spremljenu zaporku za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Upotrijebite zaključavanje zaslona da biste se prijavili u aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g> korisničkim imenom <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Želite li upotrijebiti prijavu za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Želite li otključati opcije za prijavu za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Odaberite spremljeni pristupni ključ za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-hu/strings.xml b/packages/CredentialManager/res/values-hu/strings.xml index f9c58614b466..e601da676a2f 100644 --- a/packages/CredentialManager/res/values-hu/strings.xml +++ b/packages/CredentialManager/res/values-hu/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Miközben a jelszó nélküli jövő felé haladunk, a jelszavak továbbra is rendelkezésre állnak majd az azonosítókulcsok mellett."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Válassza ki, hogy hova szeretné menteni <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Válasszon jelszókezelőt, hogy menthesse az adatait, és gyorsabban jelentkezhessen be a következő alkalommal."</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Létrehoz azonosítókulcsot a következőbe való bejelentkezéshez: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Menti a jelszót a következőbe való bejelentkezéshez: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Menti a bejelentkezési adatokat a következőhöz: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"azonosítókulcs"</string> <string name="password" msgid="6738570945182936667">"jelszó"</string> <string name="passkeys" msgid="5733880786866559847">"azonosítókulcsait"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Elvetés"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Szeretné a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> alkalmazáshoz mentett azonosítókulcsot használni?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Szeretné az elmentett jelszavát használni a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> alkalmazáshoz?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"A képernyőzár használata a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> alkalmazásba való bejelentkezéshez a következő felhasználónévvel: <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Szeretné használni bejelentkezési adatait a következőhöz: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Feloldja a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> bejelentkezési lehetőségeit?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Mentett azonosítókulcs kiválasztása a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> alkalmazáshoz"</string> diff --git a/packages/CredentialManager/res/values-in/strings.xml b/packages/CredentialManager/res/values-in/strings.xml index 77b2e43dd8a0..e7556b01d730 100644 --- a/packages/CredentialManager/res/values-in/strings.xml +++ b/packages/CredentialManager/res/values-in/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Sandi akan tetap tersedia bersama kunci sandi seiring perjalanan menuju era di mana sandi tidak diperlukan lagi."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Pilih tempat penyimpanan <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Pilih pengelola sandi untuk menyimpan info Anda dan login lebih cepat lain kali"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Buat kunci sandi untuk login ke <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Simpan sandi untuk login ke <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Simpan info login untuk <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"kunci sandi"</string> <string name="password" msgid="6738570945182936667">"sandi"</string> <string name="passkeys" msgid="5733880786866559847">"kunci sandi"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Tutup"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Gunakan kunci sandi tersimpan untuk <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Gunakan sandi tersimpan untuk <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Gunakan kunci layar untuk login ke <xliff:g id="APP_NAME">%1$s</xliff:g> dengan <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Gunakan login Anda untuk <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Autentikasi opsi login untuk <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Pilih kunci sandi tersimpan untuk <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-is/strings.xml b/packages/CredentialManager/res/values-is/strings.xml index fd8c7fd10543..970a2e647c8a 100644 --- a/packages/CredentialManager/res/values-is/strings.xml +++ b/packages/CredentialManager/res/values-is/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Við stefnum að framtíð án aðgangsorða en aðgangsorð verða áfram í boði samhliða aðgangslyklum."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Veldu hvar þú vilt vista <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Veldu aðgangsorðastjórnun til að vista upplýsingarnar og vera fljótari að skrá þig inn næst"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Búa til aðgangslykil til að skrá þig inn á <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Vista aðgangsorð til að skrá þig inn á <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Viltu vista innskráningarupplýsingar fyrir <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"aðgangslykill"</string> <string name="password" msgid="6738570945182936667">"aðgangsorð"</string> <string name="passkeys" msgid="5733880786866559847">"aðgangslykla"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Hunsa"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Nota vistaðan aðgangslykil fyrir <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Nota vistaða aðgangsorðið þitt fyrir <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Notaðu skjálásinn þinn til að skrá þig inn á <xliff:g id="APP_NAME">%1$s</xliff:g> með <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Nota innskráningu fyrir <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Opna fyrir innskráningarvalkosti fyrir <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Veldu vistaðan aðgangslykil fyrir <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-it/strings.xml b/packages/CredentialManager/res/values-it/strings.xml index 515e860ecdfa..a04a840b5148 100644 --- a/packages/CredentialManager/res/values-it/strings.xml +++ b/packages/CredentialManager/res/values-it/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Il futuro sarà senza password, ma per ora saranno ancora disponibili insieme alle passkey."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Scegli dove salvare le <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Seleziona un gestore delle password per salvare i tuoi dati e accedere più velocemente la prossima volta"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Creare passkey per accedere all\'app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Salvare password per accedere all\'app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Vuoi salvare i dati di accesso di <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"passkey"</string> <string name="password" msgid="6738570945182936667">"password"</string> <string name="passkeys" msgid="5733880786866559847">"passkey"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Chiudi"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Vuoi usare la passkey salvata per <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Vuoi usare la password salvata per <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Usa il blocco schermo per accedere a <xliff:g id="APP_NAME">%1$s</xliff:g> con <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Vuoi usare il tuo accesso per <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Vuoi sbloccare le opzioni di accesso per <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Scegli una passkey salvata per <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-iw/strings.xml b/packages/CredentialManager/res/values-iw/strings.xml index 8016afc028ec..87dee5fa8d5f 100644 --- a/packages/CredentialManager/res/values-iw/strings.xml +++ b/packages/CredentialManager/res/values-iw/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"אנחנו מתקדמים לעבר עתיד ללא סיסמאות, אבל עדיין אפשר יהיה להשתמש בסיסמאות וגם במפתחות גישה."</string> <string name="choose_provider_title" msgid="8870795677024868108">"בחירת המקום לשמירה של <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"אפשר לבחור באחד משירותי ניהול הסיסמאות כדי לשמור את הפרטים ולהיכנס לחשבון מהר יותר בפעם הבאה"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"ליצור מפתח גישה כדי להיכנס לחשבון ב-<xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"לשמור את הסיסמה כדי להיכנס לחשבון ב-<xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"לשמור את פרטי הכניסה של <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"מפתח גישה"</string> <string name="password" msgid="6738570945182936667">"סיסמה"</string> <string name="passkeys" msgid="5733880786866559847">"מפתחות גישה"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"סגירה"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"להשתמש במפתח גישה שנשמר עבור <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"להשתמש בסיסמה השמורה של <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"שימוש בשיטה לביטול נעילת המסך כדי להיכנס לחשבון של <xliff:g id="USERNAME">%2$s</xliff:g> ב-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"להשתמש בחשבון שלך כדי להיכנס אל <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"לבטל את הנעילה של אפשרויות הכניסה אל <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"בחירת מפתח גישה שמור ל-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-ja/strings.xml b/packages/CredentialManager/res/values-ja/strings.xml index 72dc1562693f..71746dc63994 100644 --- a/packages/CredentialManager/res/values-ja/strings.xml +++ b/packages/CredentialManager/res/values-ja/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"将来的にパスワードレスに移行するにあたり、パスワードもパスキーと並行して引き続きご利用いただけます。"</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g>の保存先を選択"</string> <string name="choose_provider_body" msgid="4967074531845147434">"パスワード マネージャーを選択して情報を保存しておくと、次回からすばやくログインできます"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> にログインするためにパスキーを作成しますか？"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> にログインするためにパスワードを保存しますか？"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> のログイン情報を保存しますか？"</string> <string name="passkey" msgid="632353688396759522">"パスキー"</string> <string name="password" msgid="6738570945182936667">"パスワード"</string> <string name="passkeys" msgid="5733880786866559847">"パスキー"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"閉じる"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> の保存したパスキーを使用しますか？"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> の保存したパスワードを使用しますか？"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"画面ロックを使用して <xliff:g id="USERNAME">%2$s</xliff:g> で <xliff:g id="APP_NAME">%1$s</xliff:g> にログインできます"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"この認証情報を使用して <xliff:g id="APP_NAME">%1$s</xliff:g> にログインしますか？"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> がログイン方法を使用できるようにしますか？"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> に使用するパスキーを選択してください"</string> diff --git a/packages/CredentialManager/res/values-ka/strings.xml b/packages/CredentialManager/res/values-ka/strings.xml index 0ba8d2d17d14..51f1332eba1d 100644 --- a/packages/CredentialManager/res/values-ka/strings.xml +++ b/packages/CredentialManager/res/values-ka/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"უპაროლო მომავალში პაროლები კვლავ ხელმისაწვდომი იქნება, წვდომის გასაღებებთან ერთად."</string> <string name="choose_provider_title" msgid="8870795677024868108">"აირჩიეთ სად შეინახოთ თქვენი <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"აირჩიეთ პაროლების მმართველი თქვენი ინფორმაციის შესანახად, რომ მომავალში უფრო სწრაფად შეხვიდეთ."</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"შესასვლელად წვდომის გასაღების შექმნა: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"შესასვლელი პაროლის შენახვა: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"აპში შესვლის ინფორმაციის შენახვა: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="passkey" msgid="632353688396759522">"წვდომის გასაღები"</string> <string name="password" msgid="6738570945182936667">"პაროლი"</string> <string name="passkeys" msgid="5733880786866559847">"წვდომის გასაღები"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"დახურვა"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"გსურთ თქვენი დამახსოვრებული წვდომის გასაღების გამოყენება აპისთვის: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"გამოიყენებთ შენახულ პაროლს <xliff:g id="APP_NAME">%1$s</xliff:g>-სთვის?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"გამოიყენეთ თქვენი ეკრანის დაბლოკვის ფუნქცია <xliff:g id="APP_NAME">%1$s</xliff:g>-ში <xliff:g id="USERNAME">%2$s</xliff:g>-ით შესასვლელად"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"გსურთ შესვლის <xliff:g id="APP_NAME">%1$s</xliff:g>-ისთვის გამოყენება?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"გსურთ შესვლის ვარიანტების განბლოკვა <xliff:g id="APP_NAME">%1$s</xliff:g>-სთვის?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"აირჩიეთ შენახული წვდომის გასაღები <xliff:g id="APP_NAME">%1$s</xliff:g>-სთვის"</string> diff --git a/packages/CredentialManager/res/values-kk/strings.xml b/packages/CredentialManager/res/values-kk/strings.xml index e45d34ca278b..7393ca08c1bc 100644 --- a/packages/CredentialManager/res/values-kk/strings.xml +++ b/packages/CredentialManager/res/values-kk/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Құпия сөзсіз болашақ жақын болғанына қарамастан, келешекте құпия сөздерді кіру кілттерімен қатар қолдана беруге болады."</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g> қайда сақталатынын таңдаңыз"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Мәліметіңізді сақтап, келесіде жылдам кіру үшін құпия сөз менеджерін таңдаңыз."</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасына кіру үшін кіру кілті жасалсын ба?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасына кіру үшін құпия сөз сақталсын ба?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> үшін кіру мәліметін сақтау керек пе?"</string> <string name="passkey" msgid="632353688396759522">"Кіру кілті"</string> <string name="password" msgid="6738570945182936667">"құпия сөз"</string> <string name="passkeys" msgid="5733880786866559847">"кіру кілттері"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Жабу"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> үшін сақталған кіру кілті пайдаланылсын ба?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> үшін сақталған құпия сөзіңізді пайдаланасыз ба?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасына <xliff:g id="USERNAME">%2$s</xliff:g> аккаунтымен кіру үшін экран құлпын қолданыңыз."</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасына кіру деректерін пайдаланасыз ба?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> үшін кіру опциялары ашылсын ба?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> үшін сақталған кіру кілтін таңдаңыз"</string> diff --git a/packages/CredentialManager/res/values-km/strings.xml b/packages/CredentialManager/res/values-km/strings.xml index b004c5695b3a..ac0d42704389 100644 --- a/packages/CredentialManager/res/values-km/strings.xml +++ b/packages/CredentialManager/res/values-km/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"នៅពេលដែលយើងឈានទៅរកអនាគតដែលគ្មានពាក្យសម្ងាត់ ពាក្យសម្ងាត់នៅតែអាចប្រើបានរួមជាមួយកូដសម្ងាត់។"</string> <string name="choose_provider_title" msgid="8870795677024868108">"ជ្រើសរើសកន្លែងដែលត្រូវរក្សាទុក<xliff:g id="CREATETYPES">%1$s</xliff:g>របស់អ្នក"</string> <string name="choose_provider_body" msgid="4967074531845147434">"ជ្រើសរើសកម្មវិធីគ្រប់គ្រងពាក្យសម្ងាត់ ដើម្បីរក្សាទុកព័ត៌មានរបស់អ្នក និងចូលគណនីបានកាន់តែរហ័សនៅពេលលើកក្រោយ"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"បង្កើតកូដសម្ងាត់ ដើម្បីចូលគណនី <xliff:g id="APP_NAME">%1$s</xliff:g> ឬ?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"រក្សាទុកពាក្យសម្ងាត់ ដើម្បីចូលគណនី <xliff:g id="APP_NAME">%1$s</xliff:g> ឬ?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"រក្សាទុកព័ត៌មានចូលគណនីសម្រាប់ <xliff:g id="APP_NAME">%1$s</xliff:g> ឬ?"</string> <string name="passkey" msgid="632353688396759522">"កូដសម្ងាត់"</string> <string name="password" msgid="6738570945182936667">"ពាក្យសម្ងាត់"</string> <string name="passkeys" msgid="5733880786866559847">"កូដសម្ងាត់"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"ច្រានចោល"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"ប្រើកូដសម្ងាត់ដែលបានរក្សាទុករបស់អ្នកសម្រាប់ <xliff:g id="APP_NAME">%1$s</xliff:g> ឬ?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"ប្រើពាក្យសម្ងាត់ដែលអ្នកបានរក្សាទុកសម្រាប់ <xliff:g id="APP_NAME">%1$s</xliff:g> ឬ?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"ប្រើមុខងារចាក់សោអេក្រង់របស់អ្នក ដើម្បីចូល <xliff:g id="APP_NAME">%1$s</xliff:g> ដោយប្រើ <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"ប្រើការចូលគណនីរបស់អ្នកសម្រាប់ <xliff:g id="APP_NAME">%1$s</xliff:g> ឬ?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"ដោះសោជម្រើសចូលគណនីសម្រាប់ <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"ជ្រើសរើសកូដសម្ងាត់ដែលបានរក្សាទុកសម្រាប់ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-kn/strings.xml b/packages/CredentialManager/res/values-kn/strings.xml index b6f5340929a3..031fa65114bf 100644 --- a/packages/CredentialManager/res/values-kn/strings.xml +++ b/packages/CredentialManager/res/values-kn/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"ನಾವು ಪಾಸ್ವರ್ಡ್ ರಹಿತ ತಂತ್ರಜ್ಞಾನದ ಕಡೆಗೆ ಸಾಗುತ್ತಿರುವಾಗ, ಪಾಸ್ಕೀಗಳ ಜೊತೆಗೆ ಪಾಸ್ವರ್ಡ್ಗಳು ಇನ್ನೂ ಲಭ್ಯವಿರುತ್ತವೆ."</string> <string name="choose_provider_title" msgid="8870795677024868108">"ನಿಮ್ಮ <xliff:g id="CREATETYPES">%1$s</xliff:g> ಎಲ್ಲಿ ಸೇವ್ ಆಗಬೇಕು ಎಂಬುದನ್ನು ಆರಿಸಿ"</string> <string name="choose_provider_body" msgid="4967074531845147434">"ನಿಮ್ಮ ಮಾಹಿತಿಯನ್ನು ಉಳಿಸಲು ಪಾಸ್ವರ್ಡ್ ನಿರ್ವಾಹಕವನ್ನು ಆಯ್ಕೆಮಾಡಿ ಹಾಗೂ ಮುಂದಿನ ಬಾರಿ ವೇಗವಾಗಿ ಸೈನ್ ಇನ್ ಮಾಡಿ"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಪಾಸ್ಕೀ ಯನ್ನು ರಚಿಸಬೇಕೇ?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಪಾಸ್ವರ್ಡ್ ಅನ್ನು ಸೇವ್ ಮಾಡಬೇಕೇ?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಗಾಗಿ ಸೈನ್-ಇನ್ ಮಾಹಿತಿಯನ್ನು ಸೇವ್ ಮಾಡಬೇಕೇ?"</string> <string name="passkey" msgid="632353688396759522">"ಪಾಸ್ಕೀ"</string> <string name="password" msgid="6738570945182936667">"ಪಾಸ್ವರ್ಡ್"</string> <string name="passkeys" msgid="5733880786866559847">"ಪಾಸ್ಕೀಗಳು"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"ವಜಾಗೊಳಿಸಿ"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಗಾಗಿ ಉಳಿಸಲಾದ ನಿಮ್ಮ ಪಾಸ್ಕೀ ಅನ್ನು ಬಳಸಬೇಕೆ?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಗಾಗಿ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಪಾಸ್ವರ್ಡ್ ಅನ್ನು ಬಳಸಬೇಕೇ?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಗೆ <xliff:g id="USERNAME">%2$s</xliff:g> ಮೂಲಕ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಅನ್ನು ಬಳಸಿ"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಗಾಗಿ ನಿಮ್ಮ ಸೈನ್ ಇನ್ ಅನ್ನು ಬಳಸಬೇಕೇ?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಗಾಗಿ ಸೈನ್-ಇನ್ ಆಯ್ಕೆಗಳನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಬೇಕೇ?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಗಾಗಿ ಉಳಿಸಲಾದ ಪಾಸ್ಕೀ ಅನ್ನು ಆರಿಸಿ"</string> diff --git a/packages/CredentialManager/res/values-ko/strings.xml b/packages/CredentialManager/res/values-ko/strings.xml index 8e2c3333e2f3..e29ae68f7dc9 100644 --- a/packages/CredentialManager/res/values-ko/strings.xml +++ b/packages/CredentialManager/res/values-ko/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"비밀번호 없는 미래로 나아가는 과정에서 비밀번호는 여전히 패스키와 함께 사용될 것입니다."</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g> 저장 위치 선택"</string> <string name="choose_provider_body" msgid="4967074531845147434">"정보를 저장해서 다음에 더 빠르게 로그인하려면 비밀번호 관리자를 선택하세요."</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"패스키를 생성하여 <xliff:g id="APP_NAME">%1$s</xliff:g>에 로그인하시겠습니까?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"비밀번호를 저장하여 <xliff:g id="APP_NAME">%1$s</xliff:g>에 로그인하시겠습니까?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g>의 로그인 정보를 저장하시겠습니까?"</string> <string name="passkey" msgid="632353688396759522">"패스키"</string> <string name="password" msgid="6738570945182936667">"비밀번호"</string> <string name="passkeys" msgid="5733880786866559847">"패스키"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"닫기"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> 앱용으로 저장된 패스키를 사용하시겠습니까?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"저장된 비밀번호를 <xliff:g id="APP_NAME">%1$s</xliff:g>에 사용할까요?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"화면 잠금을 사용하여 <xliff:g id="USERNAME">%2$s</xliff:g> 계정으로 <xliff:g id="APP_NAME">%1$s</xliff:g>에 로그인합니다."</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g>에 로그인을 사용하시겠습니까?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g>에 대해 로그인 옵션을 잠금 해제하시겠습니까?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g>에 대해 저장된 패스키 선택"</string> diff --git a/packages/CredentialManager/res/values-ky/strings.xml b/packages/CredentialManager/res/values-ky/strings.xml index d65e5d21278b..5e48ae5b2b2e 100644 --- a/packages/CredentialManager/res/values-ky/strings.xml +++ b/packages/CredentialManager/res/values-ky/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Сырсөзсүз келечекти көздөй баратсак да, аларды киргизүүчү ачкычтар менен бирге колдоно берүүгө болот."</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g> кайда сакталарын тандаңыз"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Маалыматыңызды сактоо жана кийинки жолу тезирээк кирүү үчүн сырсөздөрдү башкаргычты тандаңыз"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосуна кирүү үчүн киргизүүчү ачкычты түзөсүзбү?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосуна кирүү үчүн сырсөздү сактайсызбы?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> үчүн кирүү маалыматы сакталсынбы?"</string> <string name="passkey" msgid="632353688396759522">"киргизүүчү ачкыч"</string> <string name="password" msgid="6738570945182936667">"сырсөз"</string> <string name="passkeys" msgid="5733880786866559847">"киргизүүчү ачкычтар"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Жабуу"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосуна кирүү үчүн сакталган ачкычты колдоносузбу?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> үчүн сакталган сырсөздү колдоносузбу?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосуна <xliff:g id="USERNAME">%2$s</xliff:g> аккаунту менен кирүү үчүн экрандын кулпусун колдонуңуз"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосуна төмөнкү аккаунт менен киресизби?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> үчүн кирүү параметрлеринин кулпусу ачылсынбы?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> үчүн сакталган киргизүүчү ачкычты тандаңыз"</string> diff --git a/packages/CredentialManager/res/values-lo/strings.xml b/packages/CredentialManager/res/values-lo/strings.xml index 594bac3b5c45..c3733a3ef1c3 100644 --- a/packages/CredentialManager/res/values-lo/strings.xml +++ b/packages/CredentialManager/res/values-lo/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"ໃນຂະນະທີ່ພວກເຮົາກ້າວໄປສູ່ອະນາຄົດທີ່ບໍ່ຕ້ອງໃຊ້ລະຫັດຜ່ານ, ລະຫັດຜ່ານຈະຍັງຄົງໃຊ້ໄດ້ຄວບຄູ່ໄປກັບກະແຈຜ່ານ."</string> <string name="choose_provider_title" msgid="8870795677024868108">"ເລືອກບ່ອນທີ່ຈະບັນທຶກ <xliff:g id="CREATETYPES">%1$s</xliff:g> ຂອງທ່ານ"</string> <string name="choose_provider_body" msgid="4967074531845147434">"ເລືອກຕົວຈັດການລະຫັດຜ່ານເພື່ອບັນທຶກຂໍ້ມູນຂອງທ່ານ ແລະ ເຂົ້າສູ່ລະບົບໄວຂຶ້ນໃນເທື່ອຕໍ່ໄປ"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"ສ້າງກະແຈຜ່ານເພື່ອເຂົ້າສູ່ລະບົບ <xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"ບັນທຶກລະຫັດຜ່ານເພື່ອເຂົ້າສູ່ລະບົບ <xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"ບັນທຶກຂໍ້ມູນການເຂົ້າສູ່ລະບົບສຳລັບ <xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ?"</string> <string name="passkey" msgid="632353688396759522">"ກະແຈຜ່ານ"</string> <string name="password" msgid="6738570945182936667">"ລະຫັດຜ່ານ"</string> <string name="passkeys" msgid="5733880786866559847">"ກະແຈຜ່ານ"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"ປິດໄວ້"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"ໃຊ້ກະແຈຜ່ານທີ່ບັນທຶກໄວ້ຂອງທ່ານສຳລັບ <xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"ໃຊ້ລະຫັດຜ່ານທີ່ບັນທຶກໄວ້ຂອງທ່ານສຳລັບ <xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"ໃຊ້ການລັອກໜ້າຈໍຂອງທ່ານເພື່ອເຂົ້າສູ່ລະບົບ <xliff:g id="APP_NAME">%1$s</xliff:g> ດ້ວຍ <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"ເລືອກການເຂົ້າສູ່ລະບົບຂອງທ່ານສຳລັບ <xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"ປົດລັອກຕົວເລືອກການເຂົ້າສູ່ລະບົບສຳລັບ <xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"ເລືອກກະແຈຜ່ານທີ່ບັນທຶກໄວ້ສຳລັບ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-lt/strings.xml b/packages/CredentialManager/res/values-lt/strings.xml index 4d4a2599e0db..453a0e0236eb 100644 --- a/packages/CredentialManager/res/values-lt/strings.xml +++ b/packages/CredentialManager/res/values-lt/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Kol stengiamės padaryti, kad ateityje nereikėtų naudoti slaptažodžių, jie vis dar bus pasiekiami kartu su prieigos raktais."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Pasirinkite, kur išsaugoti „<xliff:g id="CREATETYPES">%1$s</xliff:g>“"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Pasirinkite slaptažodžių tvarkyklę, kurią naudodami galėsite išsaugoti informaciją ir kitą kartą prisijungti greičiau"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Sukurti prieigos raktą, skirtą prisijungti prie „<xliff:g id="APP_NAME">%1$s</xliff:g>“?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Sukurti slaptažodį, skirtą prisijungti prie „<xliff:g id="APP_NAME">%1$s</xliff:g>“?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Išsaugoti prisijungimo prie „<xliff:g id="APP_NAME">%1$s</xliff:g>“ informaciją?"</string> <string name="passkey" msgid="632353688396759522">"„passkey“"</string> <string name="password" msgid="6738570945182936667">"slaptažodis"</string> <string name="passkeys" msgid="5733880786866559847">"prieigos raktas"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Atsisakyti"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Naudoti išsaugotą „passkey“ programai „<xliff:g id="APP_NAME">%1$s</xliff:g>“?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Naudoti išsaugotą slaptažodį programai „<xliff:g id="APP_NAME">%1$s</xliff:g>“?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Naudodami ekrano užraktą prisijunkite prie „<xliff:g id="APP_NAME">%1$s</xliff:g>“ kaip <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Naudoti prisijungimo informaciją programai „<xliff:g id="APP_NAME">%1$s</xliff:g>“?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Atrakinti prisijungimo prie „<xliff:g id="APP_NAME">%1$s</xliff:g>“ parinktis?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Išsaugoto prieigos rakto, skirto „<xliff:g id="APP_NAME">%1$s</xliff:g>“, pasirinkimas"</string> diff --git a/packages/CredentialManager/res/values-lv/strings.xml b/packages/CredentialManager/res/values-lv/strings.xml index f76d120c6bb2..4da1051fe8fd 100644 --- a/packages/CredentialManager/res/values-lv/strings.xml +++ b/packages/CredentialManager/res/values-lv/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Lai arī pamazām notiek pāreja uz darbu bez parolēm, tās joprojām būs pieejamas līdzās piekļuves atslēgām."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Izvēlieties, kur saglabāt savas <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Lai saglabātu informāciju un nākamreiz varētu pierakstīties ātrāk, atlasiet paroļu pārvaldnieku."</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Vai izveidot piekļuves atslēgu, lai pierakstītos lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Vai saglabāt paroli, lai pierakstītos lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Vai saglabāt pierakstīšanās informāciju lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"piekļuves atslēga"</string> <string name="password" msgid="6738570945182936667">"parole"</string> <string name="passkeys" msgid="5733880786866559847">"piekļuves atslēgas"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Nerādīt"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Vai izmantot saglabāto piekļuves atslēgu lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Vai izmantot jūsu saglabāto paroli lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Izmantot ekrāna bloķēšanu, lai lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g> pierakstītos ar kontu <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Vai izmantot jūsu pierakstīšanās informāciju lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Vai vēlaties atbloķēt lietotnes <xliff:g id="APP_NAME">%1$s</xliff:g> pierakstīšanās opcijas?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Saglabātas piekļuves atslēgas izvēle lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-ml/strings.xml b/packages/CredentialManager/res/values-ml/strings.xml index e686117887cb..eccfb511b16c 100644 --- a/packages/CredentialManager/res/values-ml/strings.xml +++ b/packages/CredentialManager/res/values-ml/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"നമ്മൾ പാസ്വേഡ് രഹിത ഭാവിയിലേക്ക് ചുവടുവെച്ചുകൊണ്ടിരിക്കുകയാണ് എങ്കിലും, പാസ്കീകൾക്കൊപ്പം പാസ്വേഡുകൾ തുടർന്നും ലഭ്യമായിരിക്കും."</string> <string name="choose_provider_title" msgid="8870795677024868108">"നിങ്ങളുടെ <xliff:g id="CREATETYPES">%1$s</xliff:g> എവിടെയാണ് സംരക്ഷിക്കേണ്ടതെന്ന് തിരഞ്ഞെടുക്കുക"</string> <string name="choose_provider_body" msgid="4967074531845147434">"നിങ്ങളുടെ വിവരങ്ങൾ സംരക്ഷിക്കാനും അടുത്ത തവണ വേഗത്തിൽ സൈൻ ഇൻ ചെയ്യാനും ഒരു പാസ്വേഡ് മാനേജർ തിരഞ്ഞെടുക്കുക"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിലേക്ക് സൈൻ ഇൻ ചെയ്യാൻ പാസ്കീ സൃഷ്ടിക്കണോ?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിലേക്ക് സൈൻ ഇൻ ചെയ്യാൻ പാസ്വേഡ് സംരക്ഷിക്കണോ?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിനായി സൈൻ ഇൻ വിവരങ്ങൾ സംരക്ഷിക്കണോ?"</string> <string name="passkey" msgid="632353688396759522">"പാസ്കീ"</string> <string name="password" msgid="6738570945182936667">"പാസ്വേഡ്"</string> <string name="passkeys" msgid="5733880786866559847">"പാസ്കീകൾ"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"ഡിസ്മിസ് ചെയ്യുക"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിനായി നിങ്ങൾ സംരക്ഷിച്ച പാസ്കീ ഉപയോഗിക്കണോ?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിനായി നിങ്ങളുടെ സംരക്ഷിച്ച പാസ്വേഡ് ഉപയോഗിക്കണോ?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="USERNAME">%2$s</xliff:g> എന്നയാളായി <xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിലേക്ക് സൈൻ ഇൻ ചെയ്യാൻ നിങ്ങളുടെ സ്ക്രീൻ ലോക്ക് ഉപയോഗിക്കുക"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> ആപ്പിനുള്ള നിങ്ങളുടെ സൈൻ ഇൻ ക്രെഡൻഷ്യലുകൾ ഉപയോഗിക്കണോ?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിനായി സൈൻ ഇൻ ഓപ്ഷനുകൾ അൺലോക്ക് ചെയ്യണോ?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിനായി ഒരു സംരക്ഷിച്ച പാസ്കീ തിരഞ്ഞെടുക്കുക"</string> diff --git a/packages/CredentialManager/res/values-mn/strings.xml b/packages/CredentialManager/res/values-mn/strings.xml index 72cda9fa2331..5b1cbe90c63a 100644 --- a/packages/CredentialManager/res/values-mn/strings.xml +++ b/packages/CredentialManager/res/values-mn/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Бид нууц үггүй ирээдүй рүү урагшлахын хэрээр нууц үг нь нэвтрэх түлхүүрийн хамтаар боломжтой хэвээр байх болно."</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g>-г хаана хадгалахаа сонгоно уу"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Мэдээллээ хадгалж, дараагийн удаа илүү хурдан нэвтрэхийн тулд нууц үгний менежерийг сонгоно уу"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g>-д нэвтрэхийн тулд нэвтрэх түлхүүр үүсгэх үү?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g>-д нэвтрэхийн тулд нууц үгийг хадгалах уу?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g>-н нэвтрэх мэдээллийг хадгалах уу?"</string> <string name="passkey" msgid="632353688396759522">"passkey"</string> <string name="password" msgid="6738570945182936667">"нууц үг"</string> <string name="passkeys" msgid="5733880786866559847">"нэвтрэх түлхүүрүүд"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Хаах"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g>-д өөрийн хадгалсан passkey-г ашиглах уу?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g>-д хадгалсан нууц үгээ ашиглах уу?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="APP_NAME">%1$s</xliff:g>-д <xliff:g id="USERNAME">%2$s</xliff:g>-р нэвтрэхийн тулд дэлгэцийн түгжээгээ ашиглана уу"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g>-н нэвтрэлтээ ашиглах уу?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g>-д нэвтрэлтийн сонголтын түгжээг тайлах уу?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g>-д хадгалсан нэвтрэх түлхүүр сонгоно уу"</string> diff --git a/packages/CredentialManager/res/values-mr/strings.xml b/packages/CredentialManager/res/values-mr/strings.xml index 2d72bc035310..a0a4a7de1146 100644 --- a/packages/CredentialManager/res/values-mr/strings.xml +++ b/packages/CredentialManager/res/values-mr/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"पासवर्ड न वापरणाऱ्या भविष्यात पुढे जाताना, पासवर्ड तरीही पासकीच्या बरोबरीने उपलब्ध असतील."</string> <string name="choose_provider_title" msgid="8870795677024868108">"तुमची <xliff:g id="CREATETYPES">%1$s</xliff:g> कुठे सेव्ह करायची ते निवडा"</string> <string name="choose_provider_body" msgid="4967074531845147434">"तुमची माहिती सेव्ह करण्यासाठी आणि पुढच्या वेळी जलद साइन इन करण्याकरिता Password Manager निवडा"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> मध्ये साइन इन करण्यासाठी पासकी तयार करायची आहे का?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> मध्ये साइन इन करण्यासाठी पासवर्ड सेव्ह करायचा आहे का?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी साइन-इनसंबंधित माहिती सेव्ह करायची का?"</string> <string name="passkey" msgid="632353688396759522">"पासकी"</string> <string name="password" msgid="6738570945182936667">"पासवर्ड"</string> <string name="passkeys" msgid="5733880786866559847">"पासकी"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"डिसमिस करा"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी तुमची सेव्ह केलेली पासकी वापरायची का?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"तुमचा सेव्ह केलेला पासवर्ड <xliff:g id="APP_NAME">%1$s</xliff:g> साठी वापरायचा आहे का?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="USERNAME">%2$s</xliff:g> सह <xliff:g id="APP_NAME">%1$s</xliff:g> मध्ये साइन इन करण्यासाठी तुमचे स्क्रीन लॉक वापरा"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी तुमचे साइन-इन वापरायचे आहे का?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी साइन-इन पर्याय अनलॉक करायचे आहेत का?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी सेव्ह केलेली पासकी निवडा"</string> diff --git a/packages/CredentialManager/res/values-ms/strings.xml b/packages/CredentialManager/res/values-ms/strings.xml index 2a42b87601a5..c866013d9478 100644 --- a/packages/CredentialManager/res/values-ms/strings.xml +++ b/packages/CredentialManager/res/values-ms/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Meskipun masa depan kita nanti tidak memerlukan kata laluan, kata laluan masih akan tersedia bersama dengan kunci laluan."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Pilih tempat untuk menyimpan <xliff:g id="CREATETYPES">%1$s</xliff:g> anda"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Pilih Password Manager untuk menyimpan maklumat anda dan log masuk lebih pantas pada kali seterusnya"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Buat kunci laluan untuk log masuk ke <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Simpan kata laluan untuk log masuk ke <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Simpan maklumat log masuk untuk <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"kunci laluan"</string> <string name="password" msgid="6738570945182936667">"kata laluan"</string> <string name="passkeys" msgid="5733880786866559847">"kunci laluan"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Ketepikan"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Gunakan kunci laluan anda yang telah disimpan untuk <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Gunakan kata laluan anda yang disimpan untuk <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Gunakan kunci skrin anda untuk log masuk ke <xliff:g id="APP_NAME">%1$s</xliff:g> dengan <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Gunakan log masuk anda untuk <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Buka kunci pilihan log masuk untuk <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Pilih kunci laluan yang disimpan untuk <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-my/strings.xml b/packages/CredentialManager/res/values-my/strings.xml index a40d9733f19d..a66e7b67c85e 100644 --- a/packages/CredentialManager/res/values-my/strings.xml +++ b/packages/CredentialManager/res/values-my/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"စကားဝှက်မသုံးခြင်း အနာဂတ်ဆီသို့ ရှေ့ဆက်ရာတွင် လျှို့ဝှက်ကီးများနှင့်အတူ စကားဝှက်များကို ဆက်လက်အသုံးပြုနိုင်ပါမည်။"</string> <string name="choose_provider_title" msgid="8870795677024868108">"သင်၏ <xliff:g id="CREATETYPES">%1$s</xliff:g> သိမ်းရန်နေရာ ရွေးခြင်း"</string> <string name="choose_provider_body" msgid="4967074531845147434">"သင့်အချက်အလက်သိမ်းပြီး နောက်တစ်ကြိမ်၌ ပိုမိုမြန်ဆန်စွာ လက်မှတ်ထိုးဝင်ရန် စကားဝှက်မန်နေဂျာကို ရွေးပါ"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> သို့ လက်မှတ်ထိုးဝင်ရန် လျှို့ဝှက်ကီး ပြုလုပ်မလား။"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> သို့ လက်မှတ်ထိုးဝင်ရန် စကားဝှက်ကို သိမ်းမလား။"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> အတွက် လက်မှတ်ထိုးဝင်ရန် အချက်အလက်ကို သိမ်းမလား။"</string> <string name="passkey" msgid="632353688396759522">"လျှို့ဝှက်ကီး"</string> <string name="password" msgid="6738570945182936667">"စကားဝှက်"</string> <string name="passkeys" msgid="5733880786866559847">"လျှို့ဝှက်ကီးများ"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"ပယ်ရန်"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"သိမ်းထားသောလျှို့ဝှက်ကီးကို <xliff:g id="APP_NAME">%1$s</xliff:g> အတွက် သုံးမလား။"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> အတွက် သိမ်းထားသောစကားဝှက် သုံးမလား။"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="APP_NAME">%1$s</xliff:g> သို့ <xliff:g id="USERNAME">%2$s</xliff:g> ဖြင့် လက်မှတ်ထိုးဝင်ရန် သင့်ဖန်သားပြင်လော့ခ်ကို သုံးနိုင်သည်"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> အတွက် သင့်လက်မှတ်ထိုးဝင်မှုကို သုံးမလား။"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> အတွက် လက်မှတ်ထိုးဝင်မှု ရွေးစရာကို ဖွင့်မလား။"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> အတွက် သိမ်းထားသော လျှို့ဝှက်ကီး ရွေးပါ"</string> diff --git a/packages/CredentialManager/res/values-nb/strings.xml b/packages/CredentialManager/res/values-nb/strings.xml index 09157bd47367..7f4fa6ba8dfb 100644 --- a/packages/CredentialManager/res/values-nb/strings.xml +++ b/packages/CredentialManager/res/values-nb/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Vi går mot en fremtid uten passord, men passord fortsetter å være tilgjengelige ved siden av passnøkler."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Velg hvor du vil lagre <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Velg et verktøy for passordlagring for å lagre informasjonen din og logge på raskere neste gang"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Vil du opprette en passnøkkel for å logge på <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Vil du lagre passordet for å logge på <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Vil du lagre påloggingsinformasjon for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"passnøkkel"</string> <string name="password" msgid="6738570945182936667">"passord"</string> <string name="passkeys" msgid="5733880786866559847">"passnøkler"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Lukk"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Vil du bruke den lagrede tilgangsnøkkelen for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Vil du bruke det lagrede passordet ditt for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Bruk skjermlåsen til å logge på <xliff:g id="APP_NAME">%1$s</xliff:g> med <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Vil du bruke påloggingen for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Vil du låse opp påloggingsalternativene for <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Velg en lagret passnøkkel for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-ne/strings.xml b/packages/CredentialManager/res/values-ne/strings.xml index 813ecadd426f..6e6947626ff0 100644 --- a/packages/CredentialManager/res/values-ne/strings.xml +++ b/packages/CredentialManager/res/values-ne/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"हामी पासवर्डरहित भविष्यतर्फ बढ्दै गर्दा पासकीका साथसाथै पासवर्ड पनि उपलब्ध हुने छ।"</string> <string name="choose_provider_title" msgid="8870795677024868108">"तपाईं आफ्ना <xliff:g id="CREATETYPES">%1$s</xliff:g> कहाँ सेभ गर्न चाहनुहुन्छ भन्ने कुरा छनौट गर्नुहोस्"</string> <string name="choose_provider_body" msgid="4967074531845147434">"कुनै पासवर्ड म्यानेजरमा आफ्नो जानकारी सेभ गरी अर्को पटक अझ छिटो साइन इन गर्नुहोस्"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> मा साइन इन गर्न पासकी बनाउने हो?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> मा साइन इन गर्न पासवर्ड सेभ गर्ने हो?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> मा साइन गर्न प्रयोग गरिने जानकारी सेभ गर्ने हो?"</string> <string name="passkey" msgid="632353688396759522">"पासकी"</string> <string name="password" msgid="6738570945182936667">"पासवर्ड"</string> <string name="passkeys" msgid="5733880786866559847">"पासकीहरू"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"हटाउनुहोस्"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"आफूले सेभ गरेको पासकी प्रयोग गरी <xliff:g id="APP_NAME">%1$s</xliff:g> मा साइन इन गर्ने हो?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> मा साइन इन गर्न सेभ गरिएको पासवर्ड प्रयोग गर्ने हो?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="USERNAME">%2$s</xliff:g> प्रयोग गरी <xliff:g id="APP_NAME">%1$s</xliff:g> मा साइन इन गर्न आफ्नो स्क्रिन लक प्रयोग गर्नुहोस्"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> मा साइन इन गर्नका लागि तपाईंका क्रिडेन्सियलहरू प्रयोग गर्ने हो?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> का साइन इनसम्बन्धी विकल्पहरू अनलक गर्ने हो?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> मा साइन इन गर्न सेभ गरिएको पासकी छनौट गर्नुहोस्"</string> diff --git a/packages/CredentialManager/res/values-nl/strings.xml b/packages/CredentialManager/res/values-nl/strings.xml index 3e46cc980f61..50eefc7e5e9b 100644 --- a/packages/CredentialManager/res/values-nl/strings.xml +++ b/packages/CredentialManager/res/values-nl/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"We zijn op weg naar een wachtwoordloze toekomst, maar naast toegangssleutels kun je nog steeds gebruikmaken van wachtwoorden."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Kiezen waar je je <xliff:g id="CREATETYPES">%1$s</xliff:g> wilt opslaan"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecteer een wachtwoordmanager om je informatie op te slaan en de volgende keer sneller in te loggen"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Toegangssleutel maken om in te loggen bij <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Wachtwoord opslaan om in te loggen bij <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Inloggegevens opslaan voor <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"Toegangssleutel"</string> <string name="password" msgid="6738570945182936667">"wachtwoord"</string> <string name="passkeys" msgid="5733880786866559847">"toegangssleutels"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Sluiten"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Je opgeslagen toegangssleutel gebruiken voor <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Je opgeslagen wachtwoord voor <xliff:g id="APP_NAME">%1$s</xliff:g> gebruiken?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Gebruik je schermvergrendeling om in te loggen bij <xliff:g id="APP_NAME">%1$s</xliff:g> met <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Je login voor <xliff:g id="APP_NAME">%1$s</xliff:g> gebruiken?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Inlogopties voor <xliff:g id="APP_NAME">%1$s</xliff:g> ontgrendelen?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Opgeslagen toegangssleutel kiezen voor <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-or/strings.xml b/packages/CredentialManager/res/values-or/strings.xml index 5bf4627eaad0..56e585d015bd 100644 --- a/packages/CredentialManager/res/values-or/strings.xml +++ b/packages/CredentialManager/res/values-or/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"ଆମେ ଏକ ପାସୱାର୍ଡବିହୀନ ଭବିଷ୍ୟତ ଆଡ଼କୁ ମୁଭ କରୁଥିବା ଯୋଗୁଁ ଏବେ ବି ପାସକୀଗୁଡ଼ିକ ସହିତ ପାସୱାର୍ଡ ଉପଲବ୍ଧ ହେବ।"</string> <string name="choose_provider_title" msgid="8870795677024868108">"ଆପଣଙ୍କ <xliff:g id="CREATETYPES">%1$s</xliff:g> କେଉଁଠାରେ ସେଭ କରିବେ ତାହା ବାଛନ୍ତୁ"</string> <string name="choose_provider_body" msgid="4967074531845147434">"ଆପଣଙ୍କ ସୂଚନା ସେଭ କରି ପରବର୍ତ୍ତୀ ସମୟରେ ଶୀଘ୍ର ସାଇନ ଇନ କରିବା ପାଇଁ ଏକ Password Manager ଚୟନ କରନ୍ତୁ"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g>ରେ ସାଇନ ଇନ କରିବାକୁ ପାସକୀ ତିଆରି କରିବେ?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g>ରେ ସାଇନ ଇନ କରିବାକୁ ପାସୱାର୍ଡ ସେଭ କରିବେ?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> ପାଇଁ ସାଇନ-ଇନର ସୂଚନା ସେଭ କରିବେ?"</string> <string name="passkey" msgid="632353688396759522">"ପାସକୀ"</string> <string name="password" msgid="6738570945182936667">"ପାସୱାର୍ଡ"</string> <string name="passkeys" msgid="5733880786866559847">"ପାସକୀଗୁଡ଼ିକ"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"ଖାରଜ କରନ୍ତୁ"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> ପାଇଁ ସେଭ କରାଯାଇଥିବା ଆପଣଙ୍କ ପାସକୀ ବ୍ୟବହାର କରିବେ?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> ପାଇଁ ଆପଣଙ୍କ ସେଭ କରାଯାଇଥିବା ପାସୱାର୍ଡକୁ ବ୍ୟବହାର କରିବେ?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="USERNAME">%2$s</xliff:g> ମାଧ୍ୟମରେ <xliff:g id="APP_NAME">%1$s</xliff:g>ରେ ସାଇନ ଇନ କରିବା ପାଇଁ ଆପଣଙ୍କ ସ୍କ୍ରିନ ଲକ ବ୍ୟବହାର କରନ୍ତୁ"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> ପାଇଁ ଆପଣଙ୍କ ସାଇନ-ଇନ ବ୍ୟବହାର କରିବେ?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> ପାଇଁ ସାଇନ-ଇନ ବିକଳ୍ପଗୁଡ଼ିକୁ ଅନଲକ କରିବେ?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> ପାଇଁ ସେଭ କରାଯାଇଥିବା ଏକ ପାସକୀ ବାଛନ୍ତୁ"</string> diff --git a/packages/CredentialManager/res/values-pa/strings.xml b/packages/CredentialManager/res/values-pa/strings.xml index aba05c40c1a8..d23d20956b11 100644 --- a/packages/CredentialManager/res/values-pa/strings.xml +++ b/packages/CredentialManager/res/values-pa/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"ਹਾਲਾਂਕਿ, ਅਸੀਂ ਪਾਸਵਰਡ ਰਹਿਤ ਭਵਿੱਖ ਵੱਲ ਵਧ ਰਹੇ ਹਾਂ, ਪਰ ਪਾਸਕੀਆਂ ਦੇ ਨਾਲ ਪਾਸਵਰਡ ਹਾਲੇ ਵੀ ਉਪਲਬਧ ਹੋਣਗੇ।"</string> <string name="choose_provider_title" msgid="8870795677024868108">"ਚੁਣੋ ਕਿ ਆਪਣੀਆਂ <xliff:g id="CREATETYPES">%1$s</xliff:g> ਨੂੰ ਕਿੱਥੇ ਰੱਖਿਅਤ ਕਰਨਾ ਹੈ"</string> <string name="choose_provider_body" msgid="4967074531845147434">"ਆਪਣੀ ਜਾਣਕਾਰੀ ਨੂੰ ਰੱਖਿਅਤ ਕਰਨ ਅਤੇ ਅਗਲੀ ਵਾਰ ਤੇਜ਼ੀ ਨਾਲ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਪ੍ਰਬੰਧਕ ਚੁਣੋ"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"ਕੀ <xliff:g id="APP_NAME">%1$s</xliff:g> ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਪਾਸਕੀ ਬਣਾਉਣੀ ਹੈ?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"ਕੀ <xliff:g id="APP_NAME">%1$s</xliff:g> ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਰੱਖਿਅਤ ਕਰਨਾ ਹੈ?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"ਕੀ <xliff:g id="APP_NAME">%1$s</xliff:g> ਲਈ ਸਾਈਨ-ਇਨ ਜਾਣਕਾਰੀ ਰੱਖਿਅਤ ਕਰਨੀ ਹੈ?"</string> <string name="passkey" msgid="632353688396759522">"ਪਾਸਕੀ"</string> <string name="password" msgid="6738570945182936667">"ਪਾਸਵਰਡ"</string> <string name="passkeys" msgid="5733880786866559847">"ਪਾਸਕੀਆਂ"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"ਖਾਰਜ ਕਰੋ"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"ਕੀ <xliff:g id="APP_NAME">%1$s</xliff:g> ਲਈ ਆਪਣੀ ਰੱਖਿਅਤ ਕੀਤੀ ਪਾਸਕੀ ਦੀ ਵਰਤੋਂ ਕਰਨੀ ਹੈ?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"ਕੀ <xliff:g id="APP_NAME">%1$s</xliff:g> ਲਈ ਤੁਹਾਡਾ ਰੱਖਿਅਤ ਕੀਤਾ ਪਾਸਵਰਡ ਵਰਤਣਾ ਹੈ?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="USERNAME">%2$s</xliff:g> ਨਾਲ <xliff:g id="APP_NAME">%1$s</xliff:g> ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"ਕੀ <xliff:g id="APP_NAME">%1$s</xliff:g> ਲਈ ਆਪਣਾ ਸਾਈਨ-ਇਨ ਕਰਨ ਦਾ ਵਿਕਲਪ ਵਰਤਣਾ ਹੈ?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"ਕੀ <xliff:g id="APP_NAME">%1$s</xliff:g> ਲਈ ਸਾਈਨ-ਇਨ ਵਿਕਲਪਾਂ ਨੂੰ ਅਣਲਾਕ ਕਰਨਾ ਹੈ?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਲਈ ਕੋਈ ਰੱਖਿਅਤ ਕੀਤੀ ਪਾਸਕੀ ਚੁਣੋ"</string> diff --git a/packages/CredentialManager/res/values-pl/strings.xml b/packages/CredentialManager/res/values-pl/strings.xml index 4a4a9fa58088..5fa26b49a9e6 100644 --- a/packages/CredentialManager/res/values-pl/strings.xml +++ b/packages/CredentialManager/res/values-pl/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"W czasie przechodzenia na technologie niewymagające haseł możliwość stosowania haseł – niezależnie od kluczy dostępu – wciąż będzie dostępna."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Wybierz, gdzie zapisywać <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Wybierz menedżera haseł, aby zapisywać informacje i logować się szybciej"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Utworzyć klucz dostępu do logowania w aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Zapisać hasło do logowania w aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Zapisać dane używane do logowania w aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"klucz"</string> <string name="password" msgid="6738570945182936667">"hasło"</string> <string name="passkeys" msgid="5733880786866559847">"klucze dostępu"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Zamknij"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Użyć zapisanego klucza dla aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Użyć zapisanego hasła do aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Używaj metody odblokowywania ekranu, aby logować się do aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g> za pomocą nazwy użytkownika <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Użyć tych danych logowania do aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Odblokować opcje logowania do aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Wybierz zapisany klucz dostępu do aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-pt-rBR/strings.xml b/packages/CredentialManager/res/values-pt-rBR/strings.xml index f2e84c112722..994bc553102d 100644 --- a/packages/CredentialManager/res/values-pt-rBR/strings.xml +++ b/packages/CredentialManager/res/values-pt-rBR/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Estamos avançando em direção a um futuro sem senhas, mas elas ainda vão estar disponíveis junto às chaves de acesso."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Escolha onde salvar suas <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecione um gerenciador de senhas para salvar suas informações e fazer login mais rapidamente na próxima vez"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Criar chave de acesso para fazer login no app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Salvar senha para fazer login no app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Salvar informações de login do app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"chave de acesso"</string> <string name="password" msgid="6738570945182936667">"senha"</string> <string name="passkeys" msgid="5733880786866559847">"chaves de acesso"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Dispensar"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Usar sua chave de acesso salva para o app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Usar a senha salva para o app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Use o bloqueio de tela para fazer login no app <xliff:g id="APP_NAME">%1$s</xliff:g> com a conta <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Usar seu login para o app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Desbloquear opções de login para o app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Escolha uma chave de acesso salva para o app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-pt-rPT/strings.xml b/packages/CredentialManager/res/values-pt-rPT/strings.xml index f95927ba930d..26c6491ad591 100644 --- a/packages/CredentialManager/res/values-pt-rPT/strings.xml +++ b/packages/CredentialManager/res/values-pt-rPT/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"À medida que avançamos para um futuro sem palavras-passe, as palavras-passe continuam disponíveis juntamente com as chaves de acesso."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Escolha onde guardar as suas <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecione um gestor de palavras-passe para guardar as suas informações e iniciar sessão mais rapidamente da próxima vez"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Criar a chave de acesso para iniciar sessão na app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Guardar a palavra-passe para iniciar sessão na app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Guardar as informações de início de sessão da app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"chave de acesso"</string> <string name="password" msgid="6738570945182936667">"palavra-passe"</string> <string name="passkeys" msgid="5733880786866559847">"chaves de acesso"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Ignorar"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Usar a sua chave de acesso guardada na app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Usar a sua palavra-passe guardada para a app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Use o seu bloqueio de ecrã para iniciar sessão na app <xliff:g id="APP_NAME">%1$s</xliff:g> com <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Usar o seu início de sessão para a app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Desbloquear as opções de início de sessão para a app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Escolha uma chave de acesso guardada para a app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-pt/strings.xml b/packages/CredentialManager/res/values-pt/strings.xml index f2e84c112722..994bc553102d 100644 --- a/packages/CredentialManager/res/values-pt/strings.xml +++ b/packages/CredentialManager/res/values-pt/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Estamos avançando em direção a um futuro sem senhas, mas elas ainda vão estar disponíveis junto às chaves de acesso."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Escolha onde salvar suas <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selecione um gerenciador de senhas para salvar suas informações e fazer login mais rapidamente na próxima vez"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Criar chave de acesso para fazer login no app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Salvar senha para fazer login no app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Salvar informações de login do app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"chave de acesso"</string> <string name="password" msgid="6738570945182936667">"senha"</string> <string name="passkeys" msgid="5733880786866559847">"chaves de acesso"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Dispensar"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Usar sua chave de acesso salva para o app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Usar a senha salva para o app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Use o bloqueio de tela para fazer login no app <xliff:g id="APP_NAME">%1$s</xliff:g> com a conta <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Usar seu login para o app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Desbloquear opções de login para o app <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Escolha uma chave de acesso salva para o app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-ro/strings.xml b/packages/CredentialManager/res/values-ro/strings.xml index c77c3b2c4c84..342b6ab77e8b 100644 --- a/packages/CredentialManager/res/values-ro/strings.xml +++ b/packages/CredentialManager/res/values-ro/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Ne îndreptăm spre un viitor fără parole, însă acestea sunt încă disponibile, alături de cheile de acces."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Alege unde dorești să salvezi <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Selectează un manager de parole pentru a salva informațiile și a te conecta mai rapid data viitoare"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Creezi o cheie de acces pentru a te conecta la <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Salvezi parola pentru a te conecta la <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Salvezi informațiile de conectare pentru <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"cheia de acces"</string> <string name="password" msgid="6738570945182936667">"parolă"</string> <string name="passkeys" msgid="5733880786866559847">"cheile de acces"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Închide"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Folosești cheia de acces salvată pentru <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Folosești parola salvată pentru <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Folosește blocarea ecranului ca să te conectezi la <xliff:g id="APP_NAME">%1$s</xliff:g> cu <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Folosești datele de conectare pentru <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Deblochezi opțiunile de conectare pentru <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Alege o cheie de acces salvată pentru <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-ru/strings.xml b/packages/CredentialManager/res/values-ru/strings.xml index 001587df0078..e4726957d650 100644 --- a/packages/CredentialManager/res/values-ru/strings.xml +++ b/packages/CredentialManager/res/values-ru/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Хотя движение к будущему без паролей уже началось, их по-прежнему можно будет использовать наряду с ключами доступа."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Укажите, куда нужно сохранить <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Выберите менеджер паролей, чтобы сохранять учетные данные и быстро выполнять вход."</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Создать ключ доступа для входа в приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Сохранить пароль для входа в приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Сохранить данные для входа в приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> <string name="passkey" msgid="632353688396759522">"ключ доступа"</string> <string name="password" msgid="6738570945182936667">"пароль"</string> <string name="passkeys" msgid="5733880786866559847">"ключи доступа"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Закрыть"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Использовать сохраненный ключ доступа для приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Использовать сохраненный пароль для приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Используйте способ разблокировки экрана для входа в приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" (<xliff:g id="USERNAME">%2$s</xliff:g>)."</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Войти в приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" с этими данными?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Разблокировать варианты входа для приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Выберите сохраненный ключ доступа для приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> diff --git a/packages/CredentialManager/res/values-si/strings.xml b/packages/CredentialManager/res/values-si/strings.xml index 612083f30f36..ce0b9cd048eb 100644 --- a/packages/CredentialManager/res/values-si/strings.xml +++ b/packages/CredentialManager/res/values-si/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"අපි මුරපද රහිත අනාගතයක් කරා ගමන් කරන විට, මුරයතුරු සමග මුරපද තවමත් පවතී."</string> <string name="choose_provider_title" msgid="8870795677024868108">"ඔබේ <xliff:g id="CREATETYPES">%1$s</xliff:g> සුරැකිය යුතු ස්ථානය තෝරා ගන්න"</string> <string name="choose_provider_body" msgid="4967074531845147434">"ඔබේ තතු සුරැකීමට සහ මීළඟ වතාවේ වේගයෙන් පුරනය වීමට මුරපද කළමනාකරුවෙකු තෝරන්න"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> වෙත පුරනය වීමට මුරයතුරක් තනන්න ද?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> වෙත පුරනය වීමට මුරපදය සුරකින්න ද?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> සඳහා පුරනය වීමේ තතු සුරකින්න ද?"</string> <string name="passkey" msgid="632353688396759522">"මුරයතුර"</string> <string name="password" msgid="6738570945182936667">"මුරපදය"</string> <string name="passkeys" msgid="5733880786866559847">"මුරයතුරු"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"අස් කරන්න"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> සඳහා ඔබේ සුරැකි මුරයතුර භාවිතා කරන්න ද?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> සඳහා ඔබේ සුරැකි මුරපදය භාවිත කරන්න ද?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="USERNAME">%2$s</xliff:g> සමඟින් <xliff:g id="APP_NAME">%1$s</xliff:g> වෙත පුරනය වීමට ඔබේ තිර අගුල භාවිත කරන්න"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> සඳහා ඔබේ පුරනය වීම භාවිතා කරන්න ද?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> සඳහා පුරන විකල්ප අගුලු හරින්න ද?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> සඳහා සුරකින ලද මුරයතුරක් තෝරන්න"</string> diff --git a/packages/CredentialManager/res/values-sk/strings.xml b/packages/CredentialManager/res/values-sk/strings.xml index 67d91c81f060..62a2e690edae 100644 --- a/packages/CredentialManager/res/values-sk/strings.xml +++ b/packages/CredentialManager/res/values-sk/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Blížime sa k budúcnosti bez hesiel, ale heslá budú popri prístupových kľúčoch stále k dispozícii."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Vyberte, kam sa majú ukladať <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Vyberte správcu hesiel, do ktorého sa budú ukladať vaše údaje, aby ste sa nabudúce mohli rýchlejšie prihlásiť"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Chcete vytvoriť prístupový kľúč na prihlasovanie do aplikácie <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Chcete uložiť heslo na prihlasovanie do aplikácie <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Chcete uložiť prihlasovacie údaje pre aplikáciu <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"prístupový kľúč"</string> <string name="password" msgid="6738570945182936667">"heslo"</string> <string name="passkeys" msgid="5733880786866559847">"prístupové kľúče"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Zavrieť"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Chcete pre aplikáciu <xliff:g id="APP_NAME">%1$s</xliff:g> použiť uložený prístupový kľúč?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Chcete použiť uložené heslo aplikácie <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Pomocou zámky obrazovky sa prihláste do aplikácie <xliff:g id="APP_NAME">%1$s</xliff:g> používateľským menom <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Chcete použiť svoje prihlásenie pre aplikáciu <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Chcete odomknúť možnosti prihlásenia pre aplikáciu <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Vyberte uložený prístupový kľúč pre aplikáciu <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-sl/strings.xml b/packages/CredentialManager/res/values-sl/strings.xml index 2c237edd3e9c..d2aaf685032a 100644 --- a/packages/CredentialManager/res/values-sl/strings.xml +++ b/packages/CredentialManager/res/values-sl/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Na poti v prihodnost brez gesel bodo poleg ključev za dostop še vedno v uporabi tudi gesla."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Izbira mesta za shranjevanje <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Izberite upravitelja gesel za shranjevanje podatkov za prijavo, da se boste naslednjič lahko hitreje prijavili."</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Želite ustvariti ključ za dostop za prijavo v aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Želite shraniti geslo za prijavo v aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Želite shraniti podatke za prijavo za aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"ključ za dostop"</string> <string name="password" msgid="6738570945182936667">"geslo"</string> <string name="passkeys" msgid="5733880786866559847">"ključi za dostop"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Opusti"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Želite uporabiti shranjeni ključ za dostop do aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Ali želite uporabiti shranjeno geslo za aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Uporabite zaklepanje zaslona za prijavo v aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g> z uporabniškim imenom <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Želite uporabiti svojo prijavo za aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Želite odkleniti možnosti prijave za aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Izberite shranjeni ključ za dostop za aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-sr/strings.xml b/packages/CredentialManager/res/values-sr/strings.xml index 8cd04633ce2b..e68a20cc4f3b 100644 --- a/packages/CredentialManager/res/values-sr/strings.xml +++ b/packages/CredentialManager/res/values-sr/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Како се крећемо ка будућности без лозинки, лозинке ће и даље бити доступне уз приступне кодове."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Одаберите где ћете сачувати: <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Изаберите менаџера лозинки да бисте сачували податке и брже се пријавили следећи пут"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Желите да направите приступни кључ да бисте се пријавили у <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Желите да сачувате лозинку да бисте се пријавили у <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Желите да сачувате податке за пријављивање за: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"приступни кôд"</string> <string name="password" msgid="6738570945182936667">"лозинка"</string> <string name="passkeys" msgid="5733880786866559847">"приступни кодови"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Одбаци"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Желите да користите сачувани приступни кôд за: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Желите да користите сачувану лозинку за: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Користите откључавање екрана да бисте се пријавили у <xliff:g id="APP_NAME">%1$s</xliff:g> као <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Желите ли да користите своје податке за пријављивање за апликацију <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Желите да откључате опције пријављивања за: <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Изаберите сачуван приступни кључ за: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-sv/strings.xml b/packages/CredentialManager/res/values-sv/strings.xml index bb6ae3f4b479..e18fea1049ea 100644 --- a/packages/CredentialManager/res/values-sv/strings.xml +++ b/packages/CredentialManager/res/values-sv/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Medan vi beger oss mot en lösenordslös framtid kommer lösenord fortfarande att vara tillgängliga utöver nycklar."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Välj var du vill spara <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Välj en lösenordshanterare för att spara dina uppgifter och logga in snabbare nästa gång"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Vill du skapa en nyckel för att logga in i <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Vill du spara lösenordet för att logga in i <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Vill du spara inloggningsuppgifterna för <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"nyckel"</string> <string name="password" msgid="6738570945182936667">"lösenord"</string> <string name="passkeys" msgid="5733880786866559847">"nycklar"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Stäng"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Vill du använda din sparade nyckel för <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Vill du använda det sparade lösenordet för <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Använd skärmlåset för att logga in i <xliff:g id="APP_NAME">%1$s</xliff:g> med <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Vill du använda din inloggning för <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Vill du låsa upp inloggningsalternativ för <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Välj en sparad nyckel för <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-sw/strings.xml b/packages/CredentialManager/res/values-sw/strings.xml index 1a7a75ea4ca8..65672d5696ef 100644 --- a/packages/CredentialManager/res/values-sw/strings.xml +++ b/packages/CredentialManager/res/values-sw/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Tunavyoelekea katika enzi isiyo ya manenosiri, manenosiri yataendelea kupatikana pamoja na funguo za siri."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Chagua ambako unahifadhi <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Chagua kidhibiti cha manenosiri ili uhifadhi taarifa zako na uingie kwenye akaunti kwa urahisi wakati mwingine"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Ungependa kubuni ufunguo wa siri wa kuingia katika akaunti ya <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Ungependa kuhifadhi nenosiri la kuingia katika akaunti ya <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Ungependa kuhifadhi maelezo ya kuingia katika akaunti ya <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"ufunguo wa siri"</string> <string name="password" msgid="6738570945182936667">"nenosiri"</string> <string name="passkeys" msgid="5733880786866559847">"funguo za siri"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Ondoa"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Ungependa kutumia ufunguo wa siri uliohifadhiwa wa <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Je, ungependa kutumia nenosiri lako lililohifadhiwa kuingia katika <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Tumia mbinu yako ya kufunga skrini kuingia katika akaunti ya <xliff:g id="APP_NAME">%1$s</xliff:g> ukitumia <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Ungependa kutumia kitambulisho chako cha kuingia katika akaunti ya <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Je, ungependa kuona chaguo za kuingia katika <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Chagua ufunguo wa siri uliohifadhiwa ambao ungependa kutumia kuingia katika <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-te/strings.xml b/packages/CredentialManager/res/values-te/strings.xml index f2493c00b73d..742a42279169 100644 --- a/packages/CredentialManager/res/values-te/strings.xml +++ b/packages/CredentialManager/res/values-te/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"మనం భవిష్యత్తులో పాస్వర్డ్ రహిత టెక్నాలజీని ఉపయోగించినా, పాస్కీలతో పాటు పాస్వర్డ్లు కూడా అందుబాటులో ఉంటాయి."</string> <string name="choose_provider_title" msgid="8870795677024868108">"మీ <xliff:g id="CREATETYPES">%1$s</xliff:g> ఎక్కడ సేవ్ చేయాలో ఎంచుకోండి"</string> <string name="choose_provider_body" msgid="4967074531845147434">"తర్వాతిసారి మరింత వేగంగా సైన్ ఇన్ చేసేందుకు వీలుగా మీ సమాచారాన్ని సేవ్ చేయడం కోసం ఒక పాస్వర్డ్ మేనేజర్ను ఎంచుకోండి"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g>కు సైన్ ఇన్ చేయడానికి పాస్-కీని క్రియేట్ చేయాలా?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g>కు సైన్ ఇన్ చేయడానికి పాస్వర్డ్ను సేవ్ చేయాలా?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> కోసం సైన్ ఇన్ సమాచారాన్ని సేవ్ చేయాలా?"</string> <string name="passkey" msgid="632353688396759522">"పాస్-కీ"</string> <string name="password" msgid="6738570945182936667">"పాస్వర్డ్"</string> <string name="passkeys" msgid="5733880786866559847">"పాస్-కీలు"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"విస్మరించండి"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> కోసం మీ సేవ్ చేసిన పాస్-కీని ఉపయోగించాలా?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> కోసం మీ సేవ్ చేసిన పాస్వర్డ్ను ఉపయోగించాలా?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"మీ స్క్రీన్ లాక్ను ఉపయోగించి <xliff:g id="USERNAME">%2$s</xliff:g>తో <xliff:g id="APP_NAME">%1$s</xliff:g>కు సైన్ ఇన్ చేయండి"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> కోసం మీ సైన్ ఇన్ వివరాలను ఉపయోగించాలా?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> కోసం సైన్ ఇన్ ఆప్షన్లను అన్లాక్ చేయాలా?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> కోసం సేవ్ చేసిన పాస్-కీని ఎంచుకోండి"</string> diff --git a/packages/CredentialManager/res/values-th/strings.xml b/packages/CredentialManager/res/values-th/strings.xml index 1e0808888636..3f9de268ecf4 100644 --- a/packages/CredentialManager/res/values-th/strings.xml +++ b/packages/CredentialManager/res/values-th/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"ในขณะที่เราก้าวไปสู่อนาคตที่ไม่ต้องใช้รหัสผ่านนั้น รหัสผ่านจะยังคงใช้ได้อยู่ควบคู่ไปกับการเปลี่ยนไปใช้พาสคีย์"</string> <string name="choose_provider_title" msgid="8870795677024868108">"เลือกว่าต้องการบันทึก<xliff:g id="CREATETYPES">%1$s</xliff:g>ไว้ที่ใด"</string> <string name="choose_provider_body" msgid="4967074531845147434">"เลือกเครื่องมือจัดการรหัสผ่านเพื่อบันทึกข้อมูลและลงชื่อเข้าใช้เร็วขึ้นในครั้งถัดไป"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"สร้างพาสคีย์เพื่อลงชื่อเข้าใช้ <xliff:g id="APP_NAME">%1$s</xliff:g> ไหม"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"บันทึกรหัสผ่านเพื่อลงชื่อเข้าใช้ <xliff:g id="APP_NAME">%1$s</xliff:g> ไหม"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"บันทึกข้อมูลการลงชื่อเข้าใช้สำหรับ <xliff:g id="APP_NAME">%1$s</xliff:g> ไหม"</string> <string name="passkey" msgid="632353688396759522">"พาสคีย์"</string> <string name="password" msgid="6738570945182936667">"รหัสผ่าน"</string> <string name="passkeys" msgid="5733880786866559847">"พาสคีย์"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"ปิด"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"ใช้พาสคีย์ที่บันทึกไว้สำหรับ <xliff:g id="APP_NAME">%1$s</xliff:g> ใช่ไหม"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"ใช้รหัสผ่านที่บันทึกไว้สำหรับ <xliff:g id="APP_NAME">%1$s</xliff:g> ใช่ไหม"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"ใช้การล็อกหน้าจอเพื่อลงชื่อเข้าใช้ <xliff:g id="APP_NAME">%1$s</xliff:g> ด้วย <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"ใช้การลงชื่อเข้าใช้สำหรับ <xliff:g id="APP_NAME">%1$s</xliff:g> ใช่ไหม"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"ปลดล็อกตัวเลือกการลงชื่อเข้าใช้สำหรับ <xliff:g id="APP_NAME">%1$s</xliff:g> ใช่ไหม"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"เลือกพาสคีย์ที่บันทึกไว้สำหรับ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-tl/strings.xml b/packages/CredentialManager/res/values-tl/strings.xml index a3bdc8ff1ede..659c1ec031b0 100644 --- a/packages/CredentialManager/res/values-tl/strings.xml +++ b/packages/CredentialManager/res/values-tl/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Habang lumalayo tayo sa mga password, magiging available pa rin ang mga password kasama ng mga passkey."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Piliin kung saan mo ise-save ang iyong <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Pumili ng password manager para ma-save ang iyong impormasyon at makapag-sign in nang mas mabilis sa susunod na pagkakataon"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Gumawa ng passkey para mag-sign in sa <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"I-save ang password para mag-sign in sa <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"I-save ang impormasyon sa pag-sign in para sa <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"passkey"</string> <string name="password" msgid="6738570945182936667">"password"</string> <string name="passkeys" msgid="5733880786866559847">"mga passkey"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"I-dismiss"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Gamitin ang iyong naka-save na passkey para sa <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Gamitin ang iyong naka-save na password para sa <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Gamitin ang iyong lock ng screen para mag-sign in sa <xliff:g id="APP_NAME">%1$s</xliff:g> gamit ang <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Gamitin ang iyong sign-in para sa <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"I-unlock ang mga opsyon sa pag-sign in para sa <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Pumili ng naka-save na passkey para sa <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-tr/strings.xml b/packages/CredentialManager/res/values-tr/strings.xml index 9a05d2aa1ddc..5139a6789f7a 100644 --- a/packages/CredentialManager/res/values-tr/strings.xml +++ b/packages/CredentialManager/res/values-tr/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Şifresiz bir geleceğe doğru ilerlerken şifreler, geçiş anahtarlarıyla birlikte kullanılmaya devam edecektir."</string> <string name="choose_provider_title" msgid="8870795677024868108">"<xliff:g id="CREATETYPES">%1$s</xliff:g> kaydedileceği yeri seçin"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Bilgilerinizi kaydedip bir dahaki sefere daha hızlı oturum açmak için bir şifre yöneticisi seçin"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> uygulamasında oturum açmak için geçiş anahtarı oluşturulsun mu?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> uygulamasında oturum açmak için şifre kaydedilsin mi?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> için oturum açma bilgileri kaydedilsin mi?"</string> <string name="passkey" msgid="632353688396759522">"Geçiş anahtarı"</string> <string name="password" msgid="6738570945182936667">"Şifre"</string> <string name="passkeys" msgid="5733880786866559847">"Geçiş anahtarlarınızın"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Kapat"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> için kayıtlı geçiş anahtarınız kullanılsın mı?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> için kayıtlı şifreniz kullanılsın mı?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="APP_NAME">%1$s</xliff:g> uygulamasında <xliff:g id="USERNAME">%2$s</xliff:g> hesabıyla oturum açmak için ekran kilidinizi kullanın"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> için oturum açma bilgileriniz kullanılsın mı?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> için oturum açma seçeneklerine izin verilsin mi?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> için kayıtlı bir geçiş anahtarı kullanın"</string> diff --git a/packages/CredentialManager/res/values-ur/strings.xml b/packages/CredentialManager/res/values-ur/strings.xml index b4e19bf23f0e..9fad27318f80 100644 --- a/packages/CredentialManager/res/values-ur/strings.xml +++ b/packages/CredentialManager/res/values-ur/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"چونکہ ہم بغیر پاس ورڈ والے مستقبل کی طرف جا رہے ہیں اس کے باوجود پاس ورڈز پاس کیز کے ساتھ ہی دستیاب ہوں گے۔"</string> <string name="choose_provider_title" msgid="8870795677024868108">"منتخب کریں کہ آپ کی <xliff:g id="CREATETYPES">%1$s</xliff:g> کو کہاں محفوظ کرنا ہے"</string> <string name="choose_provider_body" msgid="4967074531845147434">"اپنی معلومات کو محفوظ کرنے اور اگلی بار تیزی سے سائن ان کرنے کے لیے پاس ورڈ مینیجر منتخب کریں"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> میں سائن ان کرنے کیلئے پاس کی تخلیق کریں؟"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> میں سائن ان کرنے کیلئے پاس ورڈ محفوظ کریں؟"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے لیے سائن ان کی معلومات محفوظ کریں؟"</string> <string name="passkey" msgid="632353688396759522">"پاس کی"</string> <string name="password" msgid="6738570945182936667">"پاس ورڈ"</string> <string name="passkeys" msgid="5733880786866559847">"پاس کیز"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"برخاست کریں"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے لیے اپنی محفوظ کردہ پاس کی استعمال کریں؟"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے لیے آپ کا محفوظ کردہ پاس ورڈ استعمال کریں؟"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="USERNAME">%2$s</xliff:g> کے ساتھ <xliff:g id="APP_NAME">%1$s</xliff:g> میں سائن ان کرنے کے لیے اپنا اسکرین لاک استعمال کریں"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے لیے آپ کی سائن ان تفصیلات استعمال کریں؟"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے لیے سائن ان کے اختیارات کو غیر مقفل کریں؟"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے لیے ایک محفوظ کردہ پاس کی منتخب کریں"</string> diff --git a/packages/CredentialManager/res/values-uz/strings.xml b/packages/CredentialManager/res/values-uz/strings.xml index 0811e1452cbf..a3d20250a249 100644 --- a/packages/CredentialManager/res/values-uz/strings.xml +++ b/packages/CredentialManager/res/values-uz/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Parolsiz kelajak sari harakatlanar ekanmiz, parollar kalitlar bilan birga ishlatilishda davom etadi."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Bu <xliff:g id="CREATETYPES">%1$s</xliff:g> qayerga saqlanishini tanlang"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Maʼlumotlaringizni saqlash va keyingi safar tez kirish uchun parollar menejerini tanlang"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasiga kirish uchun kirish kaliti yaratilsinmi?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasiga kirish uchun parol saqlansinmi?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"<xliff:g id="APP_NAME">%1$s</xliff:g> uchun kirish maʼlumoti saqlansinmi?"</string> <string name="passkey" msgid="632353688396759522">"kalit"</string> <string name="password" msgid="6738570945182936667">"parol"</string> <string name="passkeys" msgid="5733880786866559847">"kalitlar"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Yopish"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"<xliff:g id="APP_NAME">%1$s</xliff:g> uchun saqlangan kalit ishlatilsinmi?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"<xliff:g id="APP_NAME">%1$s</xliff:g> uchun saqlangan parol ishlatilsinmi?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasiga <xliff:g id="USERNAME">%2$s</xliff:g> bilan kirish uchun ekran qulfini ishlating"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasiga bu maʼlumotlar bilan kirilsinmi?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"<xliff:g id="APP_NAME">%1$s</xliff:g> uchun kirish usullari ochilsinmi?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"<xliff:g id="APP_NAME">%1$s</xliff:g> uchun saqlangan kalitni tanlang"</string> diff --git a/packages/CredentialManager/res/values-vi/strings.xml b/packages/CredentialManager/res/values-vi/strings.xml index 2550c0651b34..da04efd82896 100644 --- a/packages/CredentialManager/res/values-vi/strings.xml +++ b/packages/CredentialManager/res/values-vi/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Trong quá trình chúng tôi hướng đến tương lai không dùng mật khẩu, bạn vẫn sẽ dùng được mật khẩu cùng với khoá truy cập."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Chọn vị trí lưu <xliff:g id="CREATETYPES">%1$s</xliff:g> của bạn"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Hãy chọn một trình quản lý mật khẩu để lưu thông tin của bạn và đăng nhập nhanh hơn vào lần tới"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Tạo khoá truy cập để đăng nhập vào <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Lưu mật khẩu để đăng nhập vào <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Lưu thông tin đăng nhập cho <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"khoá đăng nhập"</string> <string name="password" msgid="6738570945182936667">"mật khẩu"</string> <string name="passkeys" msgid="5733880786866559847">"khoá truy cập"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Đóng"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Dùng khoá đăng nhập bạn đã lưu cho <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Sử dụng mật khẩu bạn đã lưu cho <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Dùng phương thức khoá màn hình để đăng nhập vào <xliff:g id="APP_NAME">%1$s</xliff:g> bằng <xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Dùng thông tin đăng nhập của bạn cho <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Mở khoá các tuỳ chọn đăng nhập cho <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Chọn khoá truy cập đã lưu cho <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/CredentialManager/res/values-zh-rCN/strings.xml b/packages/CredentialManager/res/values-zh-rCN/strings.xml index 5cbdf904c22a..968e978801d4 100644 --- a/packages/CredentialManager/res/values-zh-rCN/strings.xml +++ b/packages/CredentialManager/res/values-zh-rCN/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"在我们向无密码未来迈进的过程中，密码仍会与通行密钥并行使用。"</string> <string name="choose_provider_title" msgid="8870795677024868108">"选择保存<xliff:g id="CREATETYPES">%1$s</xliff:g>的位置"</string> <string name="choose_provider_body" msgid="4967074531845147434">"请选择一款密码管理工具来保存您的信息，以便下次更快地登录"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"要创建通行密钥以便登录“<xliff:g id="APP_NAME">%1$s</xliff:g>”吗？"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"要保存密码以便登录“<xliff:g id="APP_NAME">%1$s</xliff:g>”吗？"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"要保存“<xliff:g id="APP_NAME">%1$s</xliff:g>”的登录信息吗？"</string> <string name="passkey" msgid="632353688396759522">"通行密钥"</string> <string name="password" msgid="6738570945182936667">"密码"</string> <string name="passkeys" msgid="5733880786866559847">"通行密钥"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"忽略"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"要使用您为“<xliff:g id="APP_NAME">%1$s</xliff:g>”保存的通行密钥吗？"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"要使用已保存的密码登录“<xliff:g id="APP_NAME">%1$s</xliff:g>”吗？"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"使用您的屏锁以 <xliff:g id="USERNAME">%2$s</xliff:g> 的身份登录“<xliff:g id="APP_NAME">%1$s</xliff:g>”"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"是否使用您的<xliff:g id="APP_NAME">%1$s</xliff:g>登录凭据继续？"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"要解锁“<xliff:g id="APP_NAME">%1$s</xliff:g>”的登录选项吗？"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"选择一个已保存的通行密钥来登录“<xliff:g id="APP_NAME">%1$s</xliff:g>”"</string> diff --git a/packages/CredentialManager/res/values-zh-rHK/strings.xml b/packages/CredentialManager/res/values-zh-rHK/strings.xml index 1a8eea7ffcae..03ae2e8fd1f7 100644 --- a/packages/CredentialManager/res/values-zh-rHK/strings.xml +++ b/packages/CredentialManager/res/values-zh-rHK/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"我們將會改用無密碼技術，而密碼仍可與密鑰並行使用。"</string> <string name="choose_provider_title" msgid="8870795677024868108">"選擇儲存<xliff:g id="CREATETYPES">%1$s</xliff:g>的位置"</string> <string name="choose_provider_body" msgid="4967074531845147434">"選取密碼管理工具即可儲存自己的資料，縮短下次登入的時間"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"要建立用於登入「<xliff:g id="APP_NAME">%1$s</xliff:g>」的密碼金鑰嗎？"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"要儲存用於登入「<xliff:g id="APP_NAME">%1$s</xliff:g>」的密碼嗎？"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"要儲存「<xliff:g id="APP_NAME">%1$s</xliff:g>」的登入資訊嗎？"</string> <string name="passkey" msgid="632353688396759522">"密鑰"</string> <string name="password" msgid="6738570945182936667">"密碼"</string> <string name="passkeys" msgid="5733880786866559847">"密鑰"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"關閉"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"要使用已儲存的「<xliff:g id="APP_NAME">%1$s</xliff:g>」密鑰嗎？"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"要使用已儲存的「<xliff:g id="APP_NAME">%1$s</xliff:g>」密碼嗎？"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"用 <xliff:g id="USERNAME">%2$s</xliff:g> 登入「<xliff:g id="APP_NAME">%1$s</xliff:g>」時使用螢幕鎖定功能進行驗證"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"要以此登入方式使用「<xliff:g id="APP_NAME">%1$s</xliff:g>」嗎？"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"要解鎖「<xliff:g id="APP_NAME">%1$s</xliff:g>」的登入選項嗎？"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"選擇已儲存的「<xliff:g id="APP_NAME">%1$s</xliff:g>」密鑰"</string> diff --git a/packages/CredentialManager/res/values-zh-rTW/strings.xml b/packages/CredentialManager/res/values-zh-rTW/strings.xml index a1f353ffe65e..029908872a71 100644 --- a/packages/CredentialManager/res/values-zh-rTW/strings.xml +++ b/packages/CredentialManager/res/values-zh-rTW/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"我們日後將改採無密碼技術，密碼仍可與密碼金鑰並行使用。"</string> <string name="choose_provider_title" msgid="8870795677024868108">"選擇要將<xliff:g id="CREATETYPES">%1$s</xliff:g>存在哪裡"</string> <string name="choose_provider_body" msgid="4967074531845147434">"選取密碼管理工具並儲存資訊，下次就能更快登入"</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"要建立用於登入「<xliff:g id="APP_NAME">%1$s</xliff:g>」的密碼金鑰嗎？"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"要儲存用於登入「<xliff:g id="APP_NAME">%1$s</xliff:g>」的密碼嗎？"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"要儲存「<xliff:g id="APP_NAME">%1$s</xliff:g>」的登入資訊嗎？"</string> <string name="passkey" msgid="632353688396759522">"密碼金鑰"</string> <string name="password" msgid="6738570945182936667">"密碼"</string> <string name="passkeys" msgid="5733880786866559847">"密碼金鑰"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"關閉"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"要使用已儲存的「<xliff:g id="APP_NAME">%1$s</xliff:g>」密碼金鑰嗎？"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"要使用已儲存的「<xliff:g id="APP_NAME">%1$s</xliff:g>」密碼嗎？"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"用 <xliff:g id="USERNAME">%2$s</xliff:g> 登入「<xliff:g id="APP_NAME">%1$s</xliff:g>」時使用螢幕鎖定功能進行驗證"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"要使用你的憑證登入「<xliff:g id="APP_NAME">%1$s</xliff:g>」嗎？"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"要解鎖「<xliff:g id="APP_NAME">%1$s</xliff:g>」的登入選項嗎？"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"選擇已儲存的「<xliff:g id="APP_NAME">%1$s</xliff:g>」密碼金鑰"</string> diff --git a/packages/CredentialManager/res/values-zu/strings.xml b/packages/CredentialManager/res/values-zu/strings.xml index 68b98a7022f6..4f888f42b686 100644 --- a/packages/CredentialManager/res/values-zu/strings.xml +++ b/packages/CredentialManager/res/values-zu/strings.xml @@ -39,12 +39,9 @@ <string name="seamless_transition_detail" msgid="4475509237171739843">"Njengoba sibhekela kwikusasa elingenaphasiwedi, amagama ayimfihlo asazotholakala eceleni kokhiye bokudlula."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Khetha lapho ongagcina khona i-<xliff:g id="CREATETYPES">%1$s</xliff:g> yakho"</string> <string name="choose_provider_body" msgid="4967074531845147434">"Khetha isiphathi sephasiwedi ukuze ulondoloze ulwazi lwakho futhi ungene ngemvume ngokushesha ngesikhathi esizayo."</string> - <!-- no translation found for choose_create_option_passkey_title (8762295821604276511) --> - <skip /> - <!-- no translation found for choose_create_option_password_title (4481366993598649224) --> - <skip /> - <!-- no translation found for choose_create_option_sign_in_title (7092914088455358079) --> - <skip /> + <string name="choose_create_option_passkey_title" msgid="8762295821604276511">"Sungula ukhiye wokudlula ukuze ungene ngemvume ku-<xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_password_title" msgid="4481366993598649224">"Londoloza iphasiwedi ukuze ungene ngemvume ku-<xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="choose_create_option_sign_in_title" msgid="7092914088455358079">"Londoloza ulwazi lokungena lwe-<xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="passkey" msgid="632353688396759522">"ukhiye wokudlula"</string> <string name="password" msgid="6738570945182936667">"iphasiwedi"</string> <string name="passkeys" msgid="5733880786866559847">"okhiye bokudlula"</string> @@ -73,8 +70,7 @@ <string name="accessibility_snackbar_dismiss" msgid="3456598374801836120">"Chitha"</string> <string name="get_dialog_title_use_passkey_for" msgid="6236608872708021767">"Sebenzisa ukhiye wakho wokungena olondoloziwe <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_use_password_for" msgid="625828023234318484">"Sebenzisa iphasiwedi yakho elondoloziwe ye-<xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> - <!-- no translation found for get_dialog_title_single_tap_for (2057945648748859483) --> - <skip /> + <string name="get_dialog_title_single_tap_for" msgid="2057945648748859483">"Sebenzisa ukukhiya kwakho kwesikrini ukuze ungene ngemvume ku-<xliff:g id="APP_NAME">%1$s</xliff:g> ngo-<xliff:g id="USERNAME">%2$s</xliff:g>"</string> <string name="get_dialog_title_use_sign_in_for" msgid="790049858275131785">"Sebenzisa ukungena kwakho ngemvume ku-<xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_unlock_options_for" msgid="7605568190597632433">"Vula ukungena ngemvume okukhethwa kukho kwe-<xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="get_dialog_title_choose_passkey_for" msgid="9175997688078538490">"Khetha ukhiye wokudlula olondoloziwe we-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string> diff --git a/packages/PackageInstaller/res/values-nl/strings.xml b/packages/PackageInstaller/res/values-nl/strings.xml index eaae47d00fa3..149783d9f5f8 100644 --- a/packages/PackageInstaller/res/values-nl/strings.xml +++ b/packages/PackageInstaller/res/values-nl/strings.xml @@ -83,8 +83,8 @@ <string name="uninstall_failed" msgid="1847750968168364332">"Verwijdering mislukt."</string> <string name="uninstall_failed_app" msgid="5506028705017601412">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> kan niet worden verwijderd."</string> <string name="uninstalling_cloned_app" msgid="1826380164974984870">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>-kloon verwijderen…"</string> - <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"Kan actieve apparaatbeheer-app niet verwijderen"</string> - <string name="uninstall_failed_device_policy_manager_of_user" msgid="4813104025494168064">"Kan actieve apparaatbeheer-app niet verwijderen voor <xliff:g id="USERNAME">%1$s</xliff:g>"</string> + <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"Kan actieve app voor apparaatbeheer niet verwijderen"</string> + <string name="uninstall_failed_device_policy_manager_of_user" msgid="4813104025494168064">"Kan actieve app voor apparaatbeheer niet verwijderen voor <xliff:g id="USERNAME">%1$s</xliff:g>"</string> <string name="uninstall_all_blocked_profile_owner" msgid="2009393666026751501">"Deze app is vereist voor sommige gebruikers of profielen en is verwijderd voor andere"</string> <string name="uninstall_blocked_profile_owner" msgid="6373897407002404848">"Deze app is vereist voor je profiel en kan niet worden verwijderd."</string> <string name="uninstall_blocked_device_owner" msgid="6724602931761073901">"Deze app is vereist door je apparaatbeheerder en kan niet worden verwijderd."</string> diff --git a/packages/PrintSpooler/res/values-te/strings.xml b/packages/PrintSpooler/res/values-te/strings.xml index ed0b6d411876..18fdc739539a 100644 --- a/packages/PrintSpooler/res/values-te/strings.xml +++ b/packages/PrintSpooler/res/values-te/strings.xml @@ -31,7 +31,7 @@ <string name="template_all_pages" msgid="3322235982020148762">"మొత్తం <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string> <string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> పరిధి"</string> <string name="pages_range_example" msgid="8558694453556945172">"ఉదా. 1—5,8,11—13"</string> - <string name="print_preview" msgid="8010217796057763343">"ముద్రణ ప్రివ్యూ"</string> + <string name="print_preview" msgid="8010217796057763343">"ప్రింట్ ప్రివ్యూ"</string> <string name="install_for_print_preview" msgid="6366303997385509332">"ప్రివ్యూ చేయడానికి PDF వ్యూయర్ను ఇన్స్టాల్ చేయండి"</string> <string name="printing_app_crashed" msgid="854477616686566398">"ముద్రణ యాప్ క్రాష్ అయ్యింది"</string> <string name="generating_print_job" msgid="3119608742651698916">"ముద్రణ జాబ్ను ఉత్పన్నం చేస్తోంది"</string> diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp index bd56aae1cb17..66fad3689eac 100644 --- a/packages/SettingsLib/Android.bp +++ b/packages/SettingsLib/Android.bp @@ -11,6 +11,7 @@ android_library { name: "SettingsLib", defaults: [ "SettingsLintDefaults", + "SettingsLibAvatarPickerDefaults", ], static_libs: [ @@ -109,3 +110,32 @@ java_aconfig_library { name: "settingslib_flags_lib", aconfig_declarations: "settingslib_flags", } + +soong_config_module_type { + name: "avatar_picker_java_defaults", + module_type: "java_defaults", + config_namespace: "SettingsLib", + bool_variables: [ + "legacy_avatar_picker_app_enabled", + ], + properties: [ + "static_libs", + "manifest", + ], +} + +soong_config_bool_variable { + name: "legacy_avatar_picker_app_enabled", +} + +avatar_picker_java_defaults { + name: "SettingsLibAvatarPickerDefaults", + soong_config_variables: { + // If flag is enabled, add the library + legacy_avatar_picker_app_enabled: { + static_libs: [ + "SettingsLibAvatarPicker", + ], + }, + }, +} diff --git a/packages/SettingsLib/AndroidManifest.xml b/packages/SettingsLib/AndroidManifest.xml index 322d6cfc2da7..412ff29aec32 100644 --- a/packages/SettingsLib/AndroidManifest.xml +++ b/packages/SettingsLib/AndroidManifest.xml @@ -21,9 +21,6 @@ <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" /> <application> - <activity - android:name="com.android.settingslib.users.AvatarPickerActivity" - android:theme="@style/SudThemeGlifV2.DayNight"/> </application> </manifest> diff --git a/packages/SettingsLib/AvatarPicker/Android.bp b/packages/SettingsLib/AvatarPicker/Android.bp new file mode 100644 index 000000000000..1d42cd4a0436 --- /dev/null +++ b/packages/SettingsLib/AvatarPicker/Android.bp @@ -0,0 +1,31 @@ +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_library { + name: "SettingsLibAvatarPicker", + manifest: "AndroidManifest.xml", + use_resource_processor: true, + platform_apis: true, + + defaults: [ + "SettingsLintDefaults", + ], + + static_libs: [ + "SettingsLibSettingsTheme", + "setupdesign", + "guava", + ], + + resource_dirs: ["res"], + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], +} diff --git a/packages/SettingsLib/AvatarPicker/AndroidManifest.xml b/packages/SettingsLib/AvatarPicker/AndroidManifest.xml new file mode 100644 index 000000000000..73dd35b0a310 --- /dev/null +++ b/packages/SettingsLib/AvatarPicker/AndroidManifest.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.settingslib.avatarpicker"> + + <uses-sdk android:minSdkVersion="23" /> + <application> + <activity + android:name=".AvatarPickerActivity" + android:theme="@style/SudThemeGlifV2.DayNight" + android:exported="true"> + <intent-filter> + <action android:name="com.android.avatarpicker.FULL_SCREEN_ACTIVITY" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + </application> +</manifest> diff --git a/packages/SettingsLib/AvatarPicker/res/drawable/avatar_choose_photo_circled.xml b/packages/SettingsLib/AvatarPicker/res/drawable/avatar_choose_photo_circled.xml new file mode 100644 index 000000000000..27bb87fc9687 --- /dev/null +++ b/packages/SettingsLib/AvatarPicker/res/drawable/avatar_choose_photo_circled.xml @@ -0,0 +1,30 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <shape android:shape="oval"> + <stroke + android:width="2dp" + android:color="?android:attr/colorPrimary" /> + </shape> + </item> + <item + android:bottom="@dimen/avatar_picker_icon_inset" + android:drawable="@drawable/ic_avatar_choose_photo" + android:left="@dimen/avatar_picker_icon_inset" + android:right="@dimen/avatar_picker_icon_inset" + android:top="@dimen/avatar_picker_icon_inset" /> +</layer-list> diff --git a/packages/SettingsLib/res/drawable/avatar_selector.xml b/packages/SettingsLib/AvatarPicker/res/drawable/avatar_selector.xml index ccde59763a4a..1fb521a80cd3 100644 --- a/packages/SettingsLib/res/drawable/avatar_selector.xml +++ b/packages/SettingsLib/AvatarPicker/res/drawable/avatar_selector.xml @@ -1,6 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2022 The Android Open Source Project +<?xml version="1.0" encoding="utf-8"?><!-- + Copyright (C) 2024 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,9 +16,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_selected="true"> <shape android:shape="oval"> - <stroke - android:color="?android:attr/colorPrimary" - android:width="@dimen/avatar_picker_padding"/> + <stroke android:width="@dimen/avatar_picker_padding" android:color="?android:attr/colorPrimary" /> </shape> </item> </selector>
\ No newline at end of file diff --git a/packages/SettingsLib/AvatarPicker/res/drawable/avatar_take_photo_circled.xml b/packages/SettingsLib/AvatarPicker/res/drawable/avatar_take_photo_circled.xml new file mode 100644 index 000000000000..d678e9b9aeb0 --- /dev/null +++ b/packages/SettingsLib/AvatarPicker/res/drawable/avatar_take_photo_circled.xml @@ -0,0 +1,30 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <shape android:shape="oval"> + <stroke + android:width="2dp" + android:color="?android:attr/colorPrimary" /> + </shape> + </item> + <item + android:bottom="@dimen/avatar_picker_icon_inset" + android:drawable="@drawable/ic_avatar_take_photo" + android:left="@dimen/avatar_picker_icon_inset" + android:right="@dimen/avatar_picker_icon_inset" + android:top="@dimen/avatar_picker_icon_inset" /> +</layer-list> diff --git a/packages/SettingsLib/AvatarPicker/res/drawable/ic_account_circle.xml b/packages/SettingsLib/AvatarPicker/res/drawable/ic_account_circle.xml new file mode 100644 index 000000000000..6421f9117029 --- /dev/null +++ b/packages/SettingsLib/AvatarPicker/res/drawable/ic_account_circle.xml @@ -0,0 +1,24 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportHeight="24" + android:viewportWidth="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M5.85,17.1Q7.125,16.125 8.7,15.562Q10.275,15 12,15Q13.725,15 15.3,15.562Q16.875,16.125 18.15,17.1Q19.025,16.075 19.513,14.775Q20,13.475 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,13.475 4.488,14.775Q4.975,16.075 5.85,17.1ZM12,13Q10.525,13 9.512,11.988Q8.5,10.975 8.5,9.5Q8.5,8.025 9.512,7.012Q10.525,6 12,6Q13.475,6 14.488,7.012Q15.5,8.025 15.5,9.5Q15.5,10.975 14.488,11.988Q13.475,13 12,13ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,20Q13.325,20 14.5,19.613Q15.675,19.225 16.65,18.5Q15.675,17.775 14.5,17.387Q13.325,17 12,17Q10.675,17 9.5,17.387Q8.325,17.775 7.35,18.5Q8.325,19.225 9.5,19.613Q10.675,20 12,20ZM12,11Q12.65,11 13.075,10.575Q13.5,10.15 13.5,9.5Q13.5,8.85 13.075,8.425Q12.65,8 12,8Q11.35,8 10.925,8.425Q10.5,8.85 10.5,9.5Q10.5,10.15 10.925,10.575Q11.35,11 12,11ZM12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5ZM12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Z" /> +</vector> diff --git a/packages/SettingsLib/AvatarPicker/res/drawable/ic_account_circle_filled.xml b/packages/SettingsLib/AvatarPicker/res/drawable/ic_account_circle_filled.xml new file mode 100644 index 000000000000..645fdf7a8861 --- /dev/null +++ b/packages/SettingsLib/AvatarPicker/res/drawable/ic_account_circle_filled.xml @@ -0,0 +1,27 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportHeight="24" + android:viewportWidth="24"> + <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,2zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33A7.95,7.95 0,0 1,4 12c0,-4.41 3.59,-8 8,-8s8,3.59 8,8c0,1.82 -0.62,3.49 -1.64,4.83z" /> + <path + android:fillColor="@android:color/white" + android:pathData="M12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13s3.5,-1.56 3.5,-3.5S13.94,6 12,6z" /> +</vector> diff --git a/packages/SettingsLib/AvatarPicker/res/drawable/ic_account_circle_outline.xml b/packages/SettingsLib/AvatarPicker/res/drawable/ic_account_circle_outline.xml new file mode 100644 index 000000000000..a5c103874538 --- /dev/null +++ b/packages/SettingsLib/AvatarPicker/res/drawable/ic_account_circle_outline.xml @@ -0,0 +1,25 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportHeight="24" + android:viewportWidth="24"> + <path + android:fillColor="?android:attr/colorPrimary" + android:pathData="M5.85,17.1q1.275,-0.975 2.85,-1.538Q10.275,15 12,15q1.725,0 3.3,0.563 1.575,0.562 2.85,1.537 0.875,-1.025 1.363,-2.325Q20,13.475 20,12q0,-3.325 -2.337,-5.662Q15.325,4 12,4T6.338,6.338Q4,8.675 4,12q0,1.475 0.487,2.775 0.488,1.3 1.363,2.325zM12,13q-1.475,0 -2.488,-1.012Q8.5,10.975 8.5,9.5t1.012,-2.487Q10.525,6 12,6t2.488,1.013Q15.5,8.024 15.5,9.5t-1.012,2.488Q13.475,13 12,13zM12,22q-2.075,0 -3.9,-0.788 -1.825,-0.787 -3.175,-2.137 -1.35,-1.35 -2.137,-3.175Q2,14.075 2,12t0.788,-3.9q0.787,-1.825 2.137,-3.175 1.35,-1.35 3.175,-2.137Q9.925,2 12,2t3.9,0.788q1.825,0.787 3.175,2.137 1.35,1.35 2.137,3.175Q22,9.925 22,12t-0.788,3.9q-0.787,1.825 -2.137,3.175 -1.35,1.35 -3.175,2.137Q14.075,22 12,22zM12,20q1.325,0 2.5,-0.387 1.175,-0.388 2.15,-1.113 -0.975,-0.725 -2.15,-1.113Q13.325,17 12,17t-2.5,0.387q-1.175,0.388 -2.15,1.113 0.975,0.725 2.15,1.113Q10.675,20 12,20zM12,11q0.65,0 1.075,-0.425 0.425,-0.425 0.425,-1.075 0,-0.65 -0.425,-1.075Q12.65,8 12,8q-0.65,0 -1.075,0.425Q10.5,8.85 10.5,9.5q0,0.65 0.425,1.075Q11.35,11 12,11zM12,9.5zM12,18.5z" /> +</vector> + diff --git a/packages/SettingsLib/res/layout/avatar_item.xml b/packages/SettingsLib/AvatarPicker/res/layout/avatar_item.xml index c52f6648cb7e..cc4e8a78357a 100644 --- a/packages/SettingsLib/res/layout/avatar_item.xml +++ b/packages/SettingsLib/AvatarPicker/res/layout/avatar_item.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2022 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,9 +15,9 @@ --> <ImageView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/avatar_image" - android:layout_height="@dimen/avatar_size_in_picker" android:layout_width="@dimen/avatar_size_in_picker" - android:layout_margin="@dimen/avatar_picker_margin" + android:layout_height="@dimen/avatar_size_in_picker" android:layout_gravity="center" - android:padding="@dimen/avatar_picker_padding" - android:background="@drawable/avatar_selector"/> + android:layout_margin="@dimen/avatar_picker_margin" + android:background="@drawable/avatar_selector" + android:padding="@dimen/avatar_picker_padding" /> diff --git a/packages/SettingsLib/res/layout/avatar_picker.xml b/packages/SettingsLib/AvatarPicker/res/layout/avatar_picker.xml index 2d40bd0de7ea..e9d375e3313c 100644 --- a/packages/SettingsLib/res/layout/avatar_picker.xml +++ b/packages/SettingsLib/AvatarPicker/res/layout/avatar_picker.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2022 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,25 +13,25 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.google.android.setupdesign.GlifLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.setupdesign.GlifLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/glif_layout" - android:layout_height="match_parent" android:layout_width="match_parent" + android:layout_height="match_parent" android:icon="@drawable/ic_account_circle_outline" - app:sucUsePartnerResource="true" - app:sucHeaderText="@string/avatar_picker_title"> + app:sucHeaderText="@string/avatar_picker_title" + app:sucUsePartnerResource="true"> <LinearLayout - android:layout_height="match_parent" + style="@style/SudContentFrame" android:layout_width="match_parent" - android:gravity="center_horizontal" - style="@style/SudContentFrame"> + android:layout_height="match_parent" + android:gravity="center_horizontal"> + <androidx.recyclerview.widget.RecyclerView android:id="@+id/avatar_grid" android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" /> </LinearLayout> </com.google.android.setupdesign.GlifLayout>
\ No newline at end of file diff --git a/packages/SettingsLib/AvatarPicker/res/values/arrays.xml b/packages/SettingsLib/AvatarPicker/res/values/arrays.xml new file mode 100644 index 000000000000..042bc4144c9f --- /dev/null +++ b/packages/SettingsLib/AvatarPicker/res/values/arrays.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Copyright 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- Images offered as options in the avatar picker. If populated, the avatar_image_descriptions + array must also be populated with a content description for each image. --> + <array name="avatar_images" /> + + <!-- Content descriptions for each of the images in the avatar_images array. When overlaid + these values should be translated, but this empty array must not be translated or it may + replace the real descriptions with an empty array. --> + <string-array name="avatar_image_descriptions" translatable="false" /> +</resources>
\ No newline at end of file diff --git a/packages/SettingsLib/AvatarPicker/res/values/dimens.xml b/packages/SettingsLib/AvatarPicker/res/values/dimens.xml new file mode 100644 index 000000000000..df54dc2cd195 --- /dev/null +++ b/packages/SettingsLib/AvatarPicker/res/values/dimens.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT 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> + <dimen name="avatar_size_in_picker">96dp</dimen> + <dimen name="avatar_picker_padding">6dp</dimen> + <dimen name="avatar_picker_margin">2dp</dimen> + <dimen name="avatar_picker_icon_inset">25dp</dimen> + <integer name="avatar_picker_columns">3</integer> +</resources>
\ No newline at end of file diff --git a/packages/SettingsLib/AvatarPicker/res/values/strings.xml b/packages/SettingsLib/AvatarPicker/res/values/strings.xml new file mode 100644 index 000000000000..1ead1289b696 --- /dev/null +++ b/packages/SettingsLib/AvatarPicker/res/values/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License + --> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- An option in a photo selection dialog to choose a pre-existing image [CHAR LIMIT=50] --> + <string name="user_image_choose_photo">Choose an image</string> + + <!-- An option in a photo selection dialog to take a new photo [CHAR LIMIT=50] --> + <string name="user_image_take_photo">Take a photo</string> + + <!-- Title for a screen allowing the user to choose a profile picture. [CHAR LIMIT=NONE] --> + <string name="avatar_picker_title">Choose a profile picture</string> + + <!-- Content description for a default user icon. [CHAR LIMIT=NONE] --> + <string name="default_user_icon_description">Default user icon</string> + + <!-- Button label for generic Done action, to be pressed when an action has been completed [CHAR LIMIT=20] --> + <string name="done">Done</string> +</resources>
\ No newline at end of file diff --git a/packages/SettingsLib/src/com/android/settingslib/users/AvatarPhotoController.java b/packages/SettingsLib/AvatarPicker/src/AvatarPhotoController.java index f165c9f7cf03..c20392a300e7 100644 --- a/packages/SettingsLib/src/com/android/settingslib/users/AvatarPhotoController.java +++ b/packages/SettingsLib/AvatarPicker/src/AvatarPhotoController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settingslib.users; +package com.android.settingslib.avatarpicker; import android.app.Activity; import android.content.ClipData; @@ -39,8 +39,6 @@ import android.util.Log; import androidx.annotation.Nullable; import androidx.core.content.FileProvider; -import com.android.settingslib.utils.ThreadUtils; - import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -170,8 +168,9 @@ class AvatarPhotoController { private void copyAndCropPhoto(final Uri pictureUri, boolean delayBeforeCrop) { ListenableFuture<Uri> future = ThreadUtils.getBackgroundExecutor().submit(() -> { final ContentResolver cr = mContextInjector.getContentResolver(); - try (InputStream in = cr.openInputStream(pictureUri); - OutputStream out = cr.openOutputStream(mPreCropPictureUri)) { + try { + InputStream in = cr.openInputStream(pictureUri); + OutputStream out = cr.openOutputStream(mPreCropPictureUri); Streams.copy(in, out); return mPreCropPictureUri; } catch (IOException e) { diff --git a/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java b/packages/SettingsLib/AvatarPicker/src/AvatarPickerActivity.java index 61c8ee786dbe..de101b1fb2e8 100644 --- a/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java +++ b/packages/SettingsLib/AvatarPicker/src/AvatarPickerActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settingslib.users; +package com.android.settingslib.avatarpicker; import android.app.Activity; import android.content.ContentResolver; @@ -38,7 +38,6 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.android.internal.util.UserIcons; -import com.android.settingslib.R; import com.google.android.setupcompat.template.FooterBarMixin; import com.google.android.setupcompat.template.FooterButton; diff --git a/packages/SettingsLib/src/com/android/settingslib/users/PhotoCapabilityUtils.java b/packages/SettingsLib/AvatarPicker/src/PhotoCapabilityUtils.java index b8615a7e5aa9..43cb0f5d10bf 100644 --- a/packages/SettingsLib/src/com/android/settingslib/users/PhotoCapabilityUtils.java +++ b/packages/SettingsLib/AvatarPicker/src/PhotoCapabilityUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settingslib.users; +package com.android.settingslib.avatarpicker; import android.app.KeyguardManager; import android.content.Context; diff --git a/packages/SettingsLib/AvatarPicker/src/ThreadUtils.java b/packages/SettingsLib/AvatarPicker/src/ThreadUtils.java new file mode 100644 index 000000000000..dc19e666b8e3 --- /dev/null +++ b/packages/SettingsLib/AvatarPicker/src/ThreadUtils.java @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settingslib.avatarpicker; + +import android.os.Handler; +import android.os.Looper; + +import androidx.annotation.NonNull; + +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; + +import java.util.concurrent.Callable; +import java.util.concurrent.Executors; + +// copied from SettinsLib/utils +public class ThreadUtils { + + private static volatile Thread sMainThread; + private static volatile Handler sMainThreadHandler; + private static volatile ListeningExecutorService sListeningService; + + /** + * Returns true if the current thread is the UI thread. + */ + public static boolean isMainThread() { + if (sMainThread == null) { + sMainThread = Looper.getMainLooper().getThread(); + } + return Thread.currentThread() == sMainThread; + } + + /** + * Returns a shared UI thread handler. + */ + @NonNull + public static Handler getUiThreadHandler() { + if (sMainThreadHandler == null) { + sMainThreadHandler = new Handler(Looper.getMainLooper()); + } + + return sMainThreadHandler; + } + + /** + * Checks that the current thread is the UI thread. Otherwise throws an exception. + */ + public static void ensureMainThread() { + if (!isMainThread()) { + throw new RuntimeException("Must be called on the UI thread"); + } + } + + /** + * Posts runnable in background using shared background thread pool. + * + * @return A future of the task that can be monitored for updates or cancelled. + */ + @SuppressWarnings("rawtypes") + @NonNull + public static ListenableFuture postOnBackgroundThread(@NonNull Runnable runnable) { + return getBackgroundExecutor().submit(runnable); + } + + /** + * Posts callable in background using shared background thread pool. + * + * @return A future of the task that can be monitored for updates or cancelled. + */ + @NonNull + public static <T> ListenableFuture<T> postOnBackgroundThread(@NonNull Callable<T> callable) { + return getBackgroundExecutor().submit(callable); + } + + /** + * Posts the runnable on the main thread. + * + * @deprecated moving work to the main thread should be done via the main executor provided to + * {@link com.google.common.util.concurrent.FutureCallback} via + * {@link android.content.Context#getMainExecutor()} or by calling an SDK method such as + * {@link android.app.Activity#runOnUiThread(Runnable)} or + * {@link android.content.Context#getMainThreadHandler()} where appropriate. + */ + @Deprecated + public static void postOnMainThread(@NonNull Runnable runnable) { + getUiThreadHandler().post(runnable); + } + + /** + * Provides a shared {@link ListeningExecutorService} created using a fixed thread pool executor + */ + @NonNull + public static synchronized ListeningExecutorService getBackgroundExecutor() { + if (sListeningService == null) { + sListeningService = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool( + Runtime.getRuntime().availableProcessors())); + } + return sListeningService; + } +} diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsColors.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsColors.kt index d72ec264cf74..69aba71413f9 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsColors.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsColors.kt @@ -33,10 +33,6 @@ data class SettingsColorScheme( val secondaryText: Color = Color.Unspecified, val primaryContainer: Color = Color.Unspecified, val onPrimaryContainer: Color = Color.Unspecified, - val spinnerHeaderContainer: Color = Color.Unspecified, - val onSpinnerHeaderContainer: Color = Color.Unspecified, - val spinnerItemContainer: Color = Color.Unspecified, - val onSpinnerItemContainer: Color = Color.Unspecified, ) internal val LocalColorScheme = staticCompositionLocalOf { SettingsColorScheme() } @@ -76,10 +72,6 @@ internal fun dynamicLightColorScheme(context: Context): SettingsColorScheme { secondaryText = tonalPalette.neutralVariant30, primaryContainer = tonalPalette.primary90, onPrimaryContainer = tonalPalette.neutral10, - spinnerHeaderContainer = tonalPalette.primary90, - onSpinnerHeaderContainer = tonalPalette.neutral10, - spinnerItemContainer = tonalPalette.secondary90, - onSpinnerItemContainer = tonalPalette.neutralVariant30, ) } @@ -103,10 +95,6 @@ internal fun dynamicDarkColorScheme(context: Context): SettingsColorScheme { secondaryText = tonalPalette.neutralVariant80, primaryContainer = tonalPalette.secondary90, onPrimaryContainer = tonalPalette.neutral10, - spinnerHeaderContainer = tonalPalette.primary90, - onSpinnerHeaderContainer = tonalPalette.neutral10, - spinnerItemContainer = tonalPalette.secondary90, - onSpinnerItemContainer = tonalPalette.neutralVariant30, ) } @@ -121,10 +109,6 @@ internal fun darkColorScheme(): SettingsColorScheme { secondaryText = tonalPalette.neutralVariant80, primaryContainer = tonalPalette.secondary90, onPrimaryContainer = tonalPalette.neutral10, - spinnerHeaderContainer = tonalPalette.primary90, - onSpinnerHeaderContainer = tonalPalette.neutral10, - spinnerItemContainer = tonalPalette.secondary90, - onSpinnerItemContainer = tonalPalette.neutralVariant30, ) } @@ -139,9 +123,5 @@ internal fun lightColorScheme(): SettingsColorScheme { secondaryText = tonalPalette.neutralVariant30, primaryContainer = tonalPalette.primary90, onPrimaryContainer = tonalPalette.neutral10, - spinnerHeaderContainer = tonalPalette.primary90, - onSpinnerHeaderContainer = tonalPalette.neutral10, - spinnerItemContainer = tonalPalette.secondary90, - onSpinnerItemContainer = tonalPalette.neutralVariant30, ) } diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Spinner.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Spinner.kt index 514ad66919ee..c48a1479555f 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Spinner.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Spinner.kt @@ -33,6 +33,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue @@ -74,8 +75,8 @@ fun Spinner(options: List<SpinnerOption>, selectedId: Int?, setId: (id: Int) -> modifier = Modifier.semantics { role = Role.DropdownList }, onClick = { expanded = true }, colors = ButtonDefaults.buttonColors( - containerColor = SettingsTheme.colorScheme.spinnerHeaderContainer, - contentColor = SettingsTheme.colorScheme.onSpinnerHeaderContainer, + containerColor = MaterialTheme.colorScheme.primaryContainer, + contentColor = MaterialTheme.colorScheme.onPrimaryContainer, ), contentPadding = contentPadding, ) { @@ -85,7 +86,7 @@ fun Spinner(options: List<SpinnerOption>, selectedId: Int?, setId: (id: Int) -> DropdownMenu( expanded = expanded, onDismissRequest = { expanded = false }, - modifier = Modifier.background(SettingsTheme.colorScheme.spinnerItemContainer), + modifier = Modifier.background(MaterialTheme.colorScheme.secondaryContainer), ) { for (option in options) { DropdownMenuItem( @@ -93,7 +94,7 @@ fun Spinner(options: List<SpinnerOption>, selectedId: Int?, setId: (id: Int) -> SpinnerText( option = option, modifier = Modifier.padding(end = 24.dp), - color = SettingsTheme.colorScheme.onSpinnerItemContainer, + color = MaterialTheme.colorScheme.onSecondaryContainer, ) }, onClick = { @@ -138,7 +139,7 @@ private fun SpinnerText( @Composable private fun SpinnerPreview() { SettingsTheme { - var selectedId by rememberSaveable { mutableStateOf(1) } + var selectedId by rememberSaveable { mutableIntStateOf(1) } Spinner( options = (1..3).map { SpinnerOption(id = it, text = "Option $it") }, selectedId = selectedId, diff --git a/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/framework/theme/SettingsColorsTest.kt b/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/framework/theme/SettingsColorsTest.kt index 5ea92abefbef..625663dc9f9a 100644 --- a/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/framework/theme/SettingsColorsTest.kt +++ b/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/framework/theme/SettingsColorsTest.kt @@ -37,15 +37,11 @@ class SettingsColorsTest { assertThat(ls.categoryTitle).isNotEqualTo(ls.background) assertThat(ls.secondaryText).isNotEqualTo(ls.background) assertThat(ls.primaryContainer).isNotEqualTo(ls.onPrimaryContainer) - assertThat(ls.spinnerHeaderContainer).isNotEqualTo(ls.onSpinnerHeaderContainer) - assertThat(ls.spinnerItemContainer).isNotEqualTo(ls.onSpinnerItemContainer) val ds = dynamicDarkColorScheme(context) assertThat(ds.categoryTitle).isNotEqualTo(ds.background) assertThat(ds.secondaryText).isNotEqualTo(ds.background) assertThat(ds.primaryContainer).isNotEqualTo(ds.onPrimaryContainer) - assertThat(ds.spinnerHeaderContainer).isNotEqualTo(ds.onSpinnerHeaderContainer) - assertThat(ds.spinnerItemContainer).isNotEqualTo(ds.onSpinnerItemContainer) } @Test @@ -58,10 +54,6 @@ class SettingsColorsTest { assertThat(ls.secondaryText).isEqualTo(Color(red = 73, green = 69, blue = 79)) assertThat(ls.primaryContainer).isEqualTo(Color(red = 234, green = 221, blue = 255)) assertThat(ls.onPrimaryContainer).isEqualTo(Color(red = 28, green = 27, blue = 31)) - assertThat(ls.spinnerHeaderContainer).isEqualTo(Color(red = 234, green = 221, blue = 255)) - assertThat(ls.onSpinnerHeaderContainer).isEqualTo(Color(red = 28, green = 27, blue = 31)) - assertThat(ls.spinnerItemContainer).isEqualTo(Color(red = 232, green = 222, blue = 248)) - assertThat(ls.onSpinnerItemContainer).isEqualTo(Color(red = 73, green = 69, blue = 79)) val ds = darkColorScheme() assertThat(ds.background).isEqualTo(Color(red = 28, green = 27, blue = 31)) @@ -71,9 +63,5 @@ class SettingsColorsTest { assertThat(ds.secondaryText).isEqualTo(Color(red = 202, green = 196, blue = 208)) assertThat(ds.primaryContainer).isEqualTo(Color(red = 232, green = 222, blue = 248)) assertThat(ds.onPrimaryContainer).isEqualTo(Color(red = 28, green = 27, blue = 31)) - assertThat(ds.spinnerHeaderContainer).isEqualTo(Color(red = 234, green = 221, blue = 255)) - assertThat(ds.onSpinnerHeaderContainer).isEqualTo(Color(red = 28, green = 27, blue = 31)) - assertThat(ds.spinnerItemContainer).isEqualTo(Color(red = 232, green = 222, blue = 248)) - assertThat(ds.onSpinnerItemContainer).isEqualTo(Color(red = 73, green = 69, blue = 79)) } } diff --git a/packages/SettingsLib/res/drawable/avatar_choose_photo_circled.xml b/packages/SettingsLib/res/drawable/avatar_choose_photo_circled.xml deleted file mode 100644 index 97aec740ea43..000000000000 --- a/packages/SettingsLib/res/drawable/avatar_choose_photo_circled.xml +++ /dev/null @@ -1,30 +0,0 @@ -<!-- - ~ Copyright (C) 2022 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item> - <shape android:shape="oval"> - <stroke - android:width="2dp" - android:color="?android:attr/colorPrimary"/> - </shape> - </item> - <item - android:left="@dimen/avatar_picker_icon_inset" - android:right="@dimen/avatar_picker_icon_inset" - android:top="@dimen/avatar_picker_icon_inset" - android:bottom="@dimen/avatar_picker_icon_inset" - android:drawable="@drawable/ic_avatar_choose_photo"/> -</layer-list> diff --git a/packages/SettingsLib/res/drawable/avatar_take_photo_circled.xml b/packages/SettingsLib/res/drawable/avatar_take_photo_circled.xml deleted file mode 100644 index 7033aaeec911..000000000000 --- a/packages/SettingsLib/res/drawable/avatar_take_photo_circled.xml +++ /dev/null @@ -1,30 +0,0 @@ -<!-- - ~ Copyright (C) 2022 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item> - <shape android:shape="oval"> - <stroke - android:width="2dp" - android:color="?android:attr/colorPrimary"/> - </shape> - </item> - <item - android:left="@dimen/avatar_picker_icon_inset" - android:right="@dimen/avatar_picker_icon_inset" - android:top="@dimen/avatar_picker_icon_inset" - android:bottom="@dimen/avatar_picker_icon_inset" - android:drawable="@drawable/ic_avatar_take_photo"/> -</layer-list> diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml index 1b29e8367a78..5a4d3ce5661b 100644 --- a/packages/SettingsLib/res/values/arrays.xml +++ b/packages/SettingsLib/res/values/arrays.xml @@ -639,15 +639,6 @@ <item>disabled</item> </array> - <!-- Images offered as options in the avatar picker. If populated, the avatar_image_descriptions - array must also be populated with a content description for each image. --> - <array name="avatar_images"/> - - <!-- Content descriptions for each of the images in the avatar_images array. When overlaid - these values should be translated, but this empty array must not be translated or it may - replace the real descriptions with an empty array. --> - <string-array name="avatar_image_descriptions" translatable="false"/> - <!-- NOTE: if you change this, you must also add the corresponding scale key and lookup table to frameworks/base/core/java/android/content/res/FontScaleConverterFactory.java --> <string-array name="entryvalues_font_size" translatable="false"> diff --git a/packages/SettingsLib/res/values/dimens.xml b/packages/SettingsLib/res/values/dimens.xml index 07854bd3e5d8..2bd4d023cd72 100644 --- a/packages/SettingsLib/res/values/dimens.xml +++ b/packages/SettingsLib/res/values/dimens.xml @@ -84,13 +84,6 @@ <dimen name="add_a_photo_icon_size_in_user_info_dialog">32dp</dimen> <dimen name="user_name_height_in_user_info_dialog">48sp</dimen> - <integer name="avatar_picker_columns">3</integer> - <dimen name="avatar_size_in_picker">96dp</dimen> - <dimen name="avatar_picker_padding">6dp</dimen> - <dimen name="avatar_picker_margin">2dp</dimen> - - <dimen name="avatar_picker_icon_inset">25dp</dimen> - <!-- Minimum increment between density scales. --> <fraction name="display_density_min_scale_interval">9%</fraction> <!-- Maximum density scale. The actual scale used depends on the device. --> diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 69e4bd7afdd2..7e6b004be9b8 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -222,6 +222,30 @@ <!-- Connected device settings. Message when the left-side and right-side hearing aids device are active. [CHAR LIMIT=NONE] --> <string name="bluetooth_hearing_aid_left_and_right_active">Active, left and right</string> + <!-- Connected devices settings. Message when Bluetooth is connected and active for media only, showing remote device status and battery level. [CHAR LIMIT=NONE] --> + <string name="bluetooth_active_media_only_battery_level">Active (media only), <xliff:g id="battery_level_as_percentage">%1$s</xliff:g> battery</string> + <!-- Connected devices settings. Message when Bluetooth is connected and active for media only, showing remote device status and battery level for untethered headset. [CHAR LIMIT=NONE] --> + <string name="bluetooth_active_media_only_battery_level_untethered">Active (media only), L: <xliff:g id="battery_level_as_percentage" example="25%">%1$s</xliff:g> battery, R: <xliff:g id="battery_level_as_percentage" example="25%">%2$s</xliff:g> battery</string> + <!-- Connected devices settings. Message when Bluetooth is connected but not in use, showing remote device battery level, supports audio sharing. [CHAR LIMIT=NONE] --> + <string name="bluetooth_battery_level_lea_support">Connected (supports audio sharing), <xliff:g id="battery_level_as_percentage">%1$s</xliff:g> battery</string> + <!-- Connected devices settings. Message when Bluetooth is connected but not in use, showing remote device battery level for untethered headset, supports audio sharing. [CHAR LIMIT=NONE] --> + <string name="bluetooth_battery_level_untethered_lea_support">Connected (supports audio sharing), L: <xliff:g id="battery_level_as_percentage" example="25%">%1$s</xliff:g> battery, R: <xliff:g id="battery_level_as_percentage" example="25%">%2$s</xliff:g> battery</string> + <!-- Connected devices settings. Message when Bluetooth is connected but not in use, showing remote device battery level for the left part of the untethered headset, supports audio sharing. [CHAR LIMIT=NONE] --> + <string name="bluetooth_battery_level_untethered_left_lea_support">Connected (supports audio sharing), left <xliff:g id="battery_level_as_percentage" example="25%">%1$s</xliff:g></string> + <!-- Connected devices settings. Message when Bluetooth is connected but not in use, showing remote device battery level for the right part of the untethered headset, supports audio sharing. [CHAR LIMIT=NONE] --> + <string name="bluetooth_battery_level_untethered_right_lea_support">Connected (supports audio sharing), right <xliff:g id="battery_level_as_percentage" example="25%">%1$s</xliff:g></string> + <!-- Connected devices settings. Message when Bluetooth is connected and active for media only but no battery information, showing remote device status. [CHAR LIMIT=NONE] --> + <string name="bluetooth_active_media_only_no_battery_level">Active (media only)</string> + <!-- Connected devices settings. Message shown when bluetooth device is disconnected but is a known, previously connected device, supports audio sharing [CHAR LIMIT=NONE] --> + <string name="bluetooth_saved_device_lea_support">Supports audio sharing</string> + + <!-- Connected device settings. Message when the left-side hearing aid device is active for media only. [CHAR LIMIT=NONE] --> + <string name="bluetooth_hearing_aid_media_only_left_active">Active (media only), left only</string> + <!-- Connected device settings. Message when the right-side hearing aid device is active for media only. [CHAR LIMIT=NONE] --> + <string name="bluetooth_hearing_aid_media_only_right_active">Active (media only), right only</string> + <!-- Connected device settings. Message when the left-side and right-side hearing aids device are active for media only. [CHAR LIMIT=NONE] --> + <string name="bluetooth_hearing_aid_media_only_left_and_right_active">Active (media only), left and right</string> + <!-- Bluetooth settings. The user-visible string that is used whenever referring to the A2DP profile. --> <string name="bluetooth_profile_a2dp">Media audio</string> <!-- Bluetooth settings. The user-visible string that is used whenever referring to the headset or handsfree profile. --> @@ -1540,10 +1564,6 @@ <string name="guest_notification_non_ephemeral_non_first_login">Reset to delete session activity now, or you can save or delete activity on exit</string> - <!-- An option in a photo selection dialog to take a new photo [CHAR LIMIT=50] --> - <string name="user_image_take_photo">Take a photo</string> - <!-- An option in a photo selection dialog to choose a pre-existing image [CHAR LIMIT=50] --> - <string name="user_image_choose_photo">Choose an image</string> <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] --> <string name="user_image_photo_selector">Select photo</string> @@ -1661,12 +1681,6 @@ <string name="accessibility_no_calling">No calling.</string> - <!-- Title for a screen allowing the user to choose a profile picture. [CHAR LIMIT=NONE] --> - <string name="avatar_picker_title">Choose a profile picture</string> - - <!-- Content description for a default user icon. [CHAR LIMIT=NONE] --> - <string name="default_user_icon_description">Default user icon</string> - <!-- Title for the 'physical keyboard' settings screen. [CHAR LIMIT=35] --> <string name="physical_keyboard_title">Physical keyboard</string> <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] --> diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java index 20f1b175e1de..1597a4b4e138 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java @@ -28,6 +28,7 @@ import android.app.AppGlobals; import android.app.AppOpsManager; import android.app.admin.DevicePolicyManager; import android.app.ecm.EnhancedConfirmationManager; +import android.app.admin.PackagePolicy; import android.app.role.RoleManager; import android.content.ComponentName; import android.content.Context; @@ -57,6 +58,7 @@ import androidx.annotation.VisibleForTesting; import com.android.internal.widget.LockPatternUtils; +import java.util.HashSet; import java.util.List; /** @@ -828,6 +830,29 @@ public class RestrictedLockUtilsInternal extends RestrictedLockUtils { } /** + * Check if there are restrictions on an application from being a Credential Manager provider. + * + * @return EnforcedAdmin Object containing the enforced admin component and admin user details, + * or {@code null} if the setting is not managed. + */ + public static @Nullable EnforcedAdmin checkIfApplicationCanBeCredentialManagerProvider( + @NonNull Context context, @NonNull String packageName) { + final DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class); + final PackagePolicy pp = dpm.getCredentialManagerPolicy(); + + if (pp == null || pp.isPackageAllowed(packageName, new HashSet<>())) { + return null; + } + + EnforcedAdmin admin = RestrictedLockUtilsInternal.getDeviceOwner(context); + if (admin != null) { + return admin; + } + int profileId = getManagedProfileId(context, UserHandle.USER_SYSTEM); + return RestrictedLockUtils.getProfileOrDeviceOwner(context, UserHandle.of(profileId)); + } + + /** * Static {@link LockPatternUtils} and {@link DevicePolicyManager} wrapper for testing purposes. * {@link LockPatternUtils} is an internal API not supported by robolectric. * {@link DevicePolicyManager} has a {@code getProfileParent} not yet suppored by robolectric. diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedSelectorWithWidgetPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedSelectorWithWidgetPreference.java new file mode 100644 index 000000000000..c52c7ea7328b --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedSelectorWithWidgetPreference.java @@ -0,0 +1,168 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settingslib; + +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + +import android.content.Context; +import android.os.UserHandle; +import android.util.AttributeSet; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceViewHolder; + +import com.android.settingslib.widget.SelectorWithWidgetPreference; + +/** + * Selector with widget preference that can be disabled by a device admin using a user restriction. + */ +public class RestrictedSelectorWithWidgetPreference extends SelectorWithWidgetPreference { + private RestrictedPreferenceHelper mHelper; + + /** + * Perform inflation from XML and apply a class-specific base style. + * + * @param context The {@link Context} this is associated with, through which it can access the + * current theme, resources, {@link SharedPreferences}, etc. + * @param attrs The attributes of the XML tag that is inflating the preference + * @param defStyle An attribute in the current theme that contains a reference to a style + * resource that supplies default values for the view. Can be 0 to not look for defaults. + */ + public RestrictedSelectorWithWidgetPreference( + @NonNull Context context, @NonNull AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + mHelper = new RestrictedPreferenceHelper(context, /* preference= */ this, attrs); + } + + /** + * Perform inflation from XML and apply a class-specific base style. + * + * @param context The {@link Context} this is associated with, through which it can access the + * current theme, resources, {@link SharedPreferences}, etc. + * @param attrs The attributes of the XML tag that is inflating the preference + */ + public RestrictedSelectorWithWidgetPreference( + @NonNull Context context, @NonNull AttributeSet attrs) { + super(context, attrs); + mHelper = new RestrictedPreferenceHelper(context, /* preference= */ this, attrs); + } + + /** + * Constructor to create a preference, which will display with a checkbox style. + * + * @param context The {@link Context} this is associated with. + * @param isCheckbox Whether this preference should display as a checkbox. + */ + public RestrictedSelectorWithWidgetPreference(@NonNull Context context, boolean isCheckbox) { + super(context, null); + mHelper = + new RestrictedPreferenceHelper(context, /* preference= */ this, /* attrs= */ null); + } + + /** + * Constructor to create a preference. + * + * @param context The Context this is associated with. + */ + public RestrictedSelectorWithWidgetPreference(@NonNull Context context) { + this(context, null); + mHelper = + new RestrictedPreferenceHelper(context, /* preference= */ this, /* attrs= */ null); + } + + @Override + public void onBindViewHolder(@NonNull PreferenceViewHolder holder) { + super.onBindViewHolder(holder); + mHelper.onBindViewHolder(holder); + } + + @Override + public void performClick() { + if (!mHelper.performClick()) { + super.performClick(); + } + } + + @Override + protected void onAttachedToHierarchy(@NonNull PreferenceManager preferenceManager) { + mHelper.onAttachedToHierarchy(); + super.onAttachedToHierarchy(preferenceManager); + } + + /** + * Set the user restriction and disable this preference. + * + * @param userRestriction constant from {@link android.os.UserManager} + */ + public void checkRestrictionAndSetDisabled(@NonNull String userRestriction) { + mHelper.checkRestrictionAndSetDisabled(userRestriction, UserHandle.myUserId()); + } + + /** + * Set the user restriction and disable this preference for the given user. + * + * @param userRestriction constant from {@link android.os.UserManager} + * @param userId user to check the restriction for. + */ + public void checkRestrictionAndSetDisabled(@NonNull String userRestriction, int userId) { + mHelper.checkRestrictionAndSetDisabled(userRestriction, userId); + } + + /** + * Checks if the given setting is subject to Enhanced Confirmation Mode restrictions for this + * package. Marks the preference as disabled if so. + * + * @param settingIdentifier The key identifying the setting + * @param packageName the package to check the settingIdentifier for + */ + public void checkEcmRestrictionAndSetDisabled( + @NonNull String settingIdentifier, @NonNull String packageName) { + mHelper.checkEcmRestrictionAndSetDisabled(settingIdentifier, packageName); + } + + @Override + public void setEnabled(boolean enabled) { + if (enabled && isDisabledByAdmin()) { + mHelper.setDisabledByAdmin(/* admin= */ null); + return; + } + super.setEnabled(enabled); + } + + /** + * Check whether this preference is disabled by admin. + * + * @return true if this preference is disabled by admin. + */ + public boolean isDisabledByAdmin() { + return mHelper.isDisabledByAdmin(); + } + + /** + * Disable preference based on the enforce admin. + * + * @param admin details of the admin who enforced the restriction. If it is {@code null}, then + * this preference will be enabled. Otherwise, it will be disabled. + */ + public void setDisabledByAdmin(@Nullable EnforcedAdmin admin) { + if (mHelper.setDisabledByAdmin(admin)) { + notifyChanged(); + } + } +} diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java index 09b1eafe4d78..57fcc7462a65 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java @@ -542,6 +542,25 @@ public class BluetoothUtils { } /** + * Checks if the Bluetooth device is an available hearing device, which means: + * 1) currently connected + * 2) is Hearing Aid + * 3) connected profile match hearing aid related profiles (e.g. ASHA, HAP) + * + * @param cachedDevice the CachedBluetoothDevice + * @return if the device is Available hearing device + */ + @WorkerThread + public static boolean isAvailableHearingDevice(CachedBluetoothDevice cachedDevice) { + if (isDeviceConnected(cachedDevice) && cachedDevice.isConnectedHearingAidDevice()) { + Log.d(TAG, "isFilterMatched() device : " + + cachedDevice.getName() + ", the profile is connected."); + return true; + } + return false; + } + + /** * Check if the Bluetooth device is a ConnectedBluetoothDevice, which means: * 1) currently connected * 2) is not Hearing Aid or LE Audio diff --git a/packages/SettingsLib/src/com/android/settingslib/users/EditUserPhotoController.java b/packages/SettingsLib/src/com/android/settingslib/users/EditUserPhotoController.java index b2de5a948836..cdc3f123eff7 100644 --- a/packages/SettingsLib/src/com/android/settingslib/users/EditUserPhotoController.java +++ b/packages/SettingsLib/src/com/android/settingslib/users/EditUserPhotoController.java @@ -62,6 +62,9 @@ public class EditUserPhotoController { private static final String AVATAR_PICKER_ACTION = "com.android.avatarpicker" + ".FULL_SCREEN_ACTIVITY"; + private static final String EXTRA_FILE_AUTHORITY = "file_authority"; + private static final String EXTRA_DEFAULT_ICON_TINT_COLOR = "default_icon_tint_color"; + static final String EXTRA_IS_USER_NEW = "is_user_new"; private final Activity mActivity; @@ -73,10 +76,12 @@ public class EditUserPhotoController { private Bitmap mNewUserPhotoBitmap; private Drawable mNewUserPhotoDrawable; private String mCachedDrawablePath; + public EditUserPhotoController(Activity activity, ActivityStarter activityStarter, ImageView view, Bitmap savedBitmap, Drawable savedDrawable, String fileAuthority) { this(activity, activityStarter, view, savedBitmap, savedDrawable, fileAuthority, true); } + public EditUserPhotoController(Activity activity, ActivityStarter activityStarter, ImageView view, Bitmap savedBitmap, Drawable savedDrawable, String fileAuthority, boolean isUserNew) { @@ -104,9 +109,9 @@ public class EditUserPhotoController { } if (requestCode == REQUEST_CODE_PICK_AVATAR) { - if (data.hasExtra(AvatarPickerActivity.EXTRA_DEFAULT_ICON_TINT_COLOR)) { + if (data.hasExtra(EXTRA_DEFAULT_ICON_TINT_COLOR)) { int tintColor = - data.getIntExtra(AvatarPickerActivity.EXTRA_DEFAULT_ICON_TINT_COLOR, -1); + data.getIntExtra(EXTRA_DEFAULT_ICON_TINT_COLOR, -1); onDefaultIconSelected(tintColor); return true; } @@ -123,15 +128,16 @@ public class EditUserPhotoController { } private void showAvatarPicker(boolean isUserNew) { - Intent intent; + Intent intent = new Intent(AVATAR_PICKER_ACTION); + intent.addCategory(Intent.CATEGORY_DEFAULT); if (Flags.avatarSync()) { - intent = new Intent(AVATAR_PICKER_ACTION); - intent.addCategory(Intent.CATEGORY_DEFAULT); intent.putExtra(EXTRA_IS_USER_NEW, isUserNew); } else { - intent = new Intent(mImageView.getContext(), AvatarPickerActivity.class); + // SettingsLib is used by multiple apps therefore we need to know out of all apps + // using settingsLib which one is the one we return value to. + intent.setPackage(mImageView.getContext().getApplicationContext().getPackageName()); } - intent.putExtra(AvatarPickerActivity.EXTRA_FILE_AUTHORITY, mFileAuthority); + intent.putExtra(EXTRA_FILE_AUTHORITY, mFileAuthority); mActivityStarter.startActivityForResult(intent, REQUEST_CODE_PICK_AVATAR); } @@ -183,7 +189,8 @@ public class EditUserPhotoController { } @Override - public void onFailure(Throwable t) {} + public void onFailure(Throwable t) { + } }, mImageView.getContext().getMainExecutor()); } diff --git a/packages/SettingsLib/tests/integ/Android.bp b/packages/SettingsLib/tests/integ/Android.bp index f303ab5fc54b..33d23a3ea16a 100644 --- a/packages/SettingsLib/tests/integ/Android.bp +++ b/packages/SettingsLib/tests/integ/Android.bp @@ -57,6 +57,7 @@ android_test { "mockito-target-extended-minus-junit4", "platform-test-annotations", "truth", + "SettingsLibAvatarPicker", "SettingsLibDeviceStateRotationLock", "SettingsLibSettingsSpinner", "SettingsLibUsageProgressBarPreference", diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AvatarPhotoControllerTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AvatarPhotoControllerTest.java index d988111c29d5..995314e44767 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AvatarPhotoControllerTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AvatarPhotoControllerTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.settingslib.users; +package com.android.settingslib.avatarpicker; -import static com.android.settingslib.users.AvatarPhotoController.REQUEST_CODE_CHOOSE_PHOTO; -import static com.android.settingslib.users.AvatarPhotoController.REQUEST_CODE_CROP_PHOTO; -import static com.android.settingslib.users.AvatarPhotoController.REQUEST_CODE_TAKE_PHOTO; +import static com.android.settingslib.avatarpicker.AvatarPhotoController.REQUEST_CODE_CHOOSE_PHOTO; +import static com.android.settingslib.avatarpicker.AvatarPhotoController.REQUEST_CODE_CROP_PHOTO; +import static com.android.settingslib.avatarpicker.AvatarPhotoController.REQUEST_CODE_TAKE_PHOTO; import static com.google.common.truth.Truth.assertThat; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothUtilsTest.java index 475a6d65a845..1246fd85ee16 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothUtilsTest.java @@ -430,4 +430,14 @@ public class BluetoothUtilsTest { assertThat(BluetoothUtils.isExclusivelyManagedBluetoothDevice(mContext, mBluetoothDevice)).isEqualTo(true); } + + @Test + public void isAvailableHearingDevice_isConnectedHearingAid_returnTure() { + when(mCachedBluetoothDevice.isConnectedHearingAidDevice()).thenReturn(true); + when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice); + when(mBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED); + when(mBluetoothDevice.isConnected()).thenReturn(true); + + assertThat(BluetoothUtils.isAvailableHearingDevice(mCachedBluetoothDevice)).isEqualTo(true); + } } diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index e346e72516cf..bbc9fe47a18b 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -1059,6 +1059,13 @@ </intent-filter> </receiver> + <receiver android:name=".accessibility.hearingaid.HearingDevicesDialogReceiver" + android:exported="false"> + <intent-filter android:priority="1"> + <action android:name="com.android.systemui.action.LAUNCH_HEARING_DEVICES_DIALOG" /> + </intent-filter> + </receiver> + <activity android:name=".logcat.LogAccessDialogActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar" android:excludeFromRecents="true" diff --git a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/AccessibilityMenuService.java b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/AccessibilityMenuService.java index 4dd029c038bb..f5baae2fa4ab 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/AccessibilityMenuService.java +++ b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/AccessibilityMenuService.java @@ -375,6 +375,10 @@ public class AccessibilityMenuService extends AccessibilityService unregisterReceiver(mToggleMenuReceiver); mPrefs.unregisterOnSharedPreferenceChangeListener(mSharedPreferenceChangeListener); sInitialized = false; + if (mA11yMenuLayout != null) { + mA11yMenuLayout.clearLayout(); + mA11yMenuLayout = null; + } return super.onUnbind(intent); } diff --git a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java index edd6a48607cc..1be04f854c9a 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java +++ b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java @@ -151,6 +151,14 @@ public class A11yMenuOverlayLayout { return mLayout; } + public void clearLayout() { + if (mLayout != null) { + mWindowManager.removeView(mLayout); + mLayout.setOnTouchListener(null); + mLayout = null; + } + } + /** Updates view layout with new layout parameters only. */ public void updateViewLayout() { if (mLayout == null || mLayoutParameter == null) { diff --git a/packages/SystemUI/aconfig/Android.bp b/packages/SystemUI/aconfig/Android.bp index 76cb6bd91714..15c2c17fd7f0 100644 --- a/packages/SystemUI/aconfig/Android.bp +++ b/packages/SystemUI/aconfig/Android.bp @@ -25,6 +25,8 @@ package { "//visibility:override", "//frameworks/base/packages/SystemUI:__subpackages__", "//frameworks/libs/systemui/tracinglib:__subpackages__", + "//frameworks/base/services/accessibility:__subpackages__", + "//frameworks/base/services/tests:__subpackages__", "//platform_testing:__subpackages__", "//vendor:__subpackages__", "//cts:__subpackages__", diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index c845ab3a7fb1..af89f63cb4e3 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -692,6 +692,16 @@ flag { } flag { + name: "screenshare_notification_hiding_bug_fix" + namespace: "systemui" + description: "Various bug fixes for notification redaction while screensharing" + bug: "312784809" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "qs_ui_refactor" namespace: "systemui" description: "Enables the new QS UI pipeline that follows recommended architecture and uses" diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt index 9ba5e3b846ed..cda43476610e 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt @@ -74,7 +74,7 @@ import com.android.systemui.notifications.ui.composable.Notifications.Transition import com.android.systemui.res.R import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.shade.ui.composable.ShadeHeader -import com.android.systemui.statusbar.notification.stack.shared.model.StackRounding +import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrimRounding import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel import kotlin.math.roundToInt @@ -157,9 +157,9 @@ fun SceneScope.NotificationScrollingStack( .toPx() } + navBarHeight - val contentHeight = viewModel.intrinsicContentHeight.collectAsState() + val stackHeight = viewModel.stackHeight.collectAsState() - val stackRounding = viewModel.stackRounding.collectAsState(StackRounding()) + val scrimRounding = viewModel.shadeScrimRounding.collectAsState(ShadeScrimRounding()) // the offset for the notifications scrim. Its upper bound is 0, and its lower bound is // calculated in minScrimOffset. The scrim is the same height as the screen minus the @@ -186,8 +186,8 @@ fun SceneScope.NotificationScrollingStack( // if contentHeight drops below minimum visible scrim height while scrim is // expanded, reset scrim offset. - LaunchedEffect(contentHeight, scrimOffset) { - snapshotFlow { contentHeight.value < minVisibleScrimHeight() && scrimOffset.value < 0f } + LaunchedEffect(stackHeight, scrimOffset) { + snapshotFlow { stackHeight.value < minVisibleScrimHeight() && scrimOffset.value < 0f } .collect { shouldCollapse -> if (shouldCollapse) scrimOffset.value = 0f } } @@ -232,7 +232,7 @@ fun SceneScope.NotificationScrollingStack( { expansionFraction }, layoutState.isTransitioningBetween(Scenes.Gone, Scenes.Shade) ) - .let { stackRounding.value.toRoundedCornerShape(it) } + .let { scrimRounding.value.toRoundedCornerShape(it) } clip = true } ) { @@ -274,14 +274,14 @@ fun SceneScope.NotificationScrollingStack( onScrimOffsetChanged = { scrimOffset.value = it }, minScrimOffset = minScrimOffset, maxScrimOffset = 0f, - contentHeight = { contentHeight.value }, + contentHeight = { stackHeight.value }, minVisibleScrimHeight = minVisibleScrimHeight, ) } ) .verticalScroll(scrollState) .fillMaxWidth() - .height { (contentHeight.value + navBarHeight).roundToInt() }, + .height { (stackHeight.value + navBarHeight).roundToInt() }, ) } } @@ -396,7 +396,7 @@ private fun Modifier.debugBackground( this } -fun StackRounding.toRoundedCornerShape(radius: Dp): RoundedCornerShape { +fun ShadeScrimRounding.toRoundedCornerShape(radius: Dp): RoundedCornerShape { val topRadius = if (roundTop) radius else 0.dp val bottomRadius = if (roundBottom) radius else 0.dp return RoundedCornerShape( diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt index e086cda2f793..003c572a3100 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt @@ -190,12 +190,20 @@ class AnimatableClockView @JvmOverloads constructor( refreshFormat() } + override fun setTextSize(type: Int, size: Float) { + super.setTextSize(type, size) + if (type == TypedValue.COMPLEX_UNIT_PX) { + lastUnconstrainedTextSize = size + } + } + @SuppressLint("DrawAllocation") override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { logger.d("onMeasure") if (migratedClocks && !isSingleLineInternal && MeasureSpec.getMode(heightMeasureSpec) == EXACTLY) { - setTextSize(TypedValue.COMPLEX_UNIT_PX, + // Call straight into TextView.setTextSize to avoid setting lastUnconstrainedTextSize + super.setTextSize(TypedValue.COMPLEX_UNIT_PX, min(lastUnconstrainedTextSize, MeasureSpec.getSize(heightMeasureSpec) / 2F)) } super.onMeasure(widthMeasureSpec, heightMeasureSpec) diff --git a/packages/SystemUI/docs/scene.md b/packages/SystemUI/docs/scene.md index 105e4385bb25..f331c9bf41e9 100644 --- a/packages/SystemUI/docs/scene.md +++ b/packages/SystemUI/docs/scene.md @@ -65,25 +65,23 @@ framework, please make sure `SceneContainerFlag.isEnabled` in the [`SceneContainerFlags.kt`](https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt) file evalutes to `true`. -1. Set **`SCENE_CONTAINER_ENABLED`** to `true` in the - [`Flags.kt`](https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/packages/SystemUI/src/com/android/systemui/flags/Flags.kt) - file -2. Set the **`migrate_keyguard_status_bar_view`** classic flag to `true` by +1. Set the **`migrate_keyguard_status_bar_view`** classic flag to `true` by running: `console $ adb shell statusbar cmd migrate_keyguard_status_bar_view true` -3. Set a collection of **aconfig flags** to `true` by running the following +2. Set a collection of **aconfig flags** to `true` by running the following commands: ```console $ adb shell device_config put systemui com.android.systemui.scene_container true + $ adb shell device_config put systemui com.android.systemui.compose_lockscreen true $ adb shell device_config put systemui com.android.systemui.keyguard_bottom_area_refactor true - $ adb shell device_config put systemui com.android.systemui.keyguard_shade_migration_nssl true $ adb shell device_config put systemui com.android.systemui.media_in_scene_container true + $ adb shell device_config put systemui com.android.systemui.migrate_clocks_to_blueprint true ``` -4. **Restart** System UI by issuing the following command: +3. **Restart** System UI by issuing the following command: ```console $ adb shell am crash com.android.systemui ``` -5. **Verify** that the scene framework was turned on. There are two ways to do +4. **Verify** that the scene framework was turned on. There are two ways to do this: *(a)* look for the sash/ribbon UI at the bottom-right corner of the display: diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerBaseTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerBaseTest.java index 324534fb766c..7986051de3e0 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerBaseTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerBaseTest.java @@ -105,7 +105,7 @@ public class UdfpsKeyguardViewLegacyControllerBaseTest extends SysuiTestCase { when(mKeyguardViewMediator.isAnimatingScreenOff()).thenReturn(false); when(mView.getUnpausedAlpha()).thenReturn(255); when(mShadeExpansionStateManager.addExpansionListener(any())).thenReturn( - new ShadeExpansionChangeEvent(0, false, false, 0)); + new ShadeExpansionChangeEvent(0, false, false)); mController = createUdfpsKeyguardViewController(); } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java index 5827671e22b8..6a86801cba90 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java @@ -376,7 +376,7 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { // Ensure correct expansion passed in. ShadeExpansionChangeEvent event = new ShadeExpansionChangeEvent( - expansion, /* expanded= */ false, /* tracking= */ true, dragDownAmount); + expansion, /* expanded= */ false, /* tracking= */ true); verify(mScrimController).expand(event); } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/scrim/BouncerlessScrimControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/scrim/BouncerlessScrimControllerTest.java index 97052a84a60f..7cdd4781631f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/scrim/BouncerlessScrimControllerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/scrim/BouncerlessScrimControllerTest.java @@ -59,7 +59,7 @@ public class BouncerlessScrimControllerTest extends SysuiTestCase { final BouncerlessScrimController scrimController = new BouncerlessScrimController(mExecutor, mPowerManager); scrimController.addCallback(mCallback); - scrimController.expand(new ShadeExpansionChangeEvent(.5f, true, false, 0.0f)); + scrimController.expand(new ShadeExpansionChangeEvent(.5f, true, false)); mExecutor.runAllReady(); verify(mPowerManager).wakeUp(anyLong(), eq(PowerManager.WAKE_REASON_GESTURE), any()); verify(mCallback).onWakeup(); @@ -71,7 +71,7 @@ public class BouncerlessScrimControllerTest extends SysuiTestCase { new BouncerlessScrimController(mExecutor, mPowerManager); scrimController.addCallback(mCallback); final ShadeExpansionChangeEvent expansionEvent = - new ShadeExpansionChangeEvent(0.5f, false, false, 0.0f); + new ShadeExpansionChangeEvent(0.5f, false, false); scrimController.expand(expansionEvent); mExecutor.runAllReady(); verify(mCallback).onExpansion(eq(expansionEvent)); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractorImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractorImplTest.kt index 16b68ccf097b..ad40f8eab4f6 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractorImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractorImplTest.kt @@ -52,6 +52,7 @@ class PanelExpansionInteractorImplTest : SysuiTestCase() { private val deviceEntryRepository = kosmos.fakeDeviceEntryRepository private val deviceUnlockedInteractor = kosmos.deviceUnlockedInteractor private val sceneInteractor = kosmos.sceneInteractor + private val shadeAnimationInteractor = kosmos.shadeAnimationInteractor private val transitionState = MutableStateFlow<ObservableTransitionState>( ObservableTransitionState.Idle(Scenes.Lockscreen) @@ -112,6 +113,40 @@ class PanelExpansionInteractorImplTest : SysuiTestCase() { changeScene(Scenes.Communal) { assertThat(panelExpansion).isEqualTo(1f) } assertThat(panelExpansion).isEqualTo(1f) } + + @Test + @EnableSceneContainer + fun shouldHideStatusBarIconsWhenExpanded_goneScene() = + testScope.runTest { + underTest = kosmos.panelExpansionInteractorImpl + shadeAnimationInteractor.setIsLaunchingActivity(false) + changeScene(Scenes.Gone) + + assertThat(underTest.shouldHideStatusBarIconsWhenExpanded()).isFalse() + } + + @Test + @EnableSceneContainer + fun shouldHideStatusBarIconsWhenExpanded_lockscreenScene() = + testScope.runTest { + underTest = kosmos.panelExpansionInteractorImpl + shadeAnimationInteractor.setIsLaunchingActivity(false) + changeScene(Scenes.Lockscreen) + + assertThat(underTest.shouldHideStatusBarIconsWhenExpanded()).isTrue() + } + + @Test + @EnableSceneContainer + fun shouldHideStatusBarIconsWhenExpanded_activityLaunch() = + testScope.runTest { + underTest = kosmos.panelExpansionInteractorImpl + changeScene(Scenes.Gone) + shadeAnimationInteractor.setIsLaunchingActivity(true) + + assertThat(underTest.shouldHideStatusBarIconsWhenExpanded()).isFalse() + } + private fun TestScope.setUnlocked(isUnlocked: Boolean) { val isDeviceUnlocked by collectLastValue(deviceUnlockedInteractor.isDeviceUnlocked) deviceEntryRepository.setUnlocked(isUnlocked) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/startable/ShadeStartableTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/startable/ShadeStartableTest.kt index 31dacdd61151..52caa787bb2f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/startable/ShadeStartableTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/startable/ShadeStartableTest.kt @@ -18,15 +18,32 @@ package com.android.systemui.shade.domain.startable import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest +import com.android.compose.animation.scene.ObservableTransitionState +import com.android.compose.animation.scene.SceneKey import com.android.systemui.SysuiTestCase import com.android.systemui.common.ui.data.repository.fakeConfigurationRepository import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepository +import com.android.systemui.deviceentry.domain.interactor.deviceUnlockedInteractor +import com.android.systemui.flags.EnableSceneContainer import com.android.systemui.kosmos.testScope import com.android.systemui.res.R +import com.android.systemui.scene.domain.interactor.sceneInteractor +import com.android.systemui.scene.shared.model.Scenes +import com.android.systemui.scene.shared.model.fakeSceneDataSource +import com.android.systemui.shade.ShadeExpansionChangeEvent +import com.android.systemui.shade.ShadeExpansionListener import com.android.systemui.shade.domain.interactor.shadeInteractor import com.android.systemui.shade.shared.model.ShadeMode import com.android.systemui.testKosmos +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Test import org.junit.runner.RunWith @@ -34,11 +51,15 @@ import org.junit.runner.RunWith @SmallTest @RunWith(AndroidJUnit4::class) class ShadeStartableTest : SysuiTestCase() { - private val kosmos = testKosmos() private val testScope = kosmos.testScope private val shadeInteractor = kosmos.shadeInteractor + private val sceneInteractor = kosmos.sceneInteractor + private val shadeExpansionStateManager = kosmos.shadeExpansionStateManager + private val deviceEntryRepository = kosmos.fakeDeviceEntryRepository + private val deviceUnlockedInteractor = kosmos.deviceUnlockedInteractor private val fakeConfigurationRepository = kosmos.fakeConfigurationRepository + private val fakeSceneDataSource = kosmos.fakeSceneDataSource private val underTest = kosmos.shadeStartable @@ -59,4 +80,89 @@ class ShadeStartableTest : SysuiTestCase() { fakeConfigurationRepository.onAnyConfigurationChange() assertThat(shadeMode).isEqualTo(ShadeMode.Single) } + + @Test + @EnableSceneContainer + fun hydrateShadeExpansionStateManager() = + testScope.runTest { + val expansionListener = mock<ShadeExpansionListener>() + var latestChangeEvent: ShadeExpansionChangeEvent? = null + whenever(expansionListener.onPanelExpansionChanged(any())).thenAnswer { + latestChangeEvent = it.arguments[0] as ShadeExpansionChangeEvent + Unit + } + shadeExpansionStateManager.addExpansionListener(expansionListener) + + underTest.start() + + setUnlocked(true) + val transitionState = + MutableStateFlow<ObservableTransitionState>( + ObservableTransitionState.Idle(Scenes.Gone) + ) + sceneInteractor.setTransitionState(transitionState) + + changeScene(Scenes.Gone, transitionState) + val currentScene by collectLastValue(sceneInteractor.currentScene) + assertThat(currentScene).isEqualTo(Scenes.Gone) + + assertThat(latestChangeEvent) + .isEqualTo( + ShadeExpansionChangeEvent( + fraction = 0f, + expanded = false, + tracking = false, + ) + ) + + changeScene(Scenes.Shade, transitionState) { progress -> + assertThat(latestChangeEvent?.fraction).isEqualTo(progress) + } + } + + private fun TestScope.setUnlocked(isUnlocked: Boolean) { + val isDeviceUnlocked by collectLastValue(deviceUnlockedInteractor.isDeviceUnlocked) + deviceEntryRepository.setUnlocked(isUnlocked) + runCurrent() + + assertThat(isDeviceUnlocked).isEqualTo(isUnlocked) + } + + private fun TestScope.changeScene( + toScene: SceneKey, + transitionState: MutableStateFlow<ObservableTransitionState>, + assertDuringProgress: ((progress: Float) -> Unit) = {}, + ) { + val currentScene by collectLastValue(sceneInteractor.currentScene) + val progressFlow = MutableStateFlow(0f) + transitionState.value = + ObservableTransitionState.Transition( + fromScene = checkNotNull(currentScene), + toScene = toScene, + progress = progressFlow, + isInitiatedByUserInput = true, + isUserInputOngoing = flowOf(true), + ) + runCurrent() + assertDuringProgress(progressFlow.value) + + progressFlow.value = 0.2f + runCurrent() + assertDuringProgress(progressFlow.value) + + progressFlow.value = 0.6f + runCurrent() + assertDuringProgress(progressFlow.value) + + progressFlow.value = 1f + runCurrent() + assertDuringProgress(progressFlow.value) + + transitionState.value = ObservableTransitionState.Idle(toScene) + fakeSceneDataSource.changeScene(toScene) + runCurrent() + assertDuringProgress(progressFlow.value) + + assertThat(currentScene).isEqualTo(toScene) + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt index 94539a39869e..53522e276112 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt @@ -30,7 +30,7 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.scene.shared.model.fakeSceneDataSource -import com.android.systemui.statusbar.notification.stack.shared.model.StackBounds +import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrimBounds import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationStackAppearanceViewModel import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationsPlaceholderViewModel import com.android.systemui.testKosmos @@ -64,7 +64,7 @@ class NotificationStackAppearanceIntegrationTest : SysuiTestCase() { @Test fun updateBounds() = testScope.runTest { - val clipping by collectLastValue(appearanceViewModel.stackClipping) + val clipping by collectLastValue(appearanceViewModel.shadeScrimClipping) val top = 200f val left = 0f @@ -77,7 +77,7 @@ class NotificationStackAppearanceIntegrationTest : SysuiTestCase() { bottom = bottom ) assertThat(clipping?.bounds) - .isEqualTo(StackBounds(left = left, top = top, right = right, bottom = bottom)) + .isEqualTo(ShadeScrimBounds(left = left, top = top, right = right, bottom = bottom)) } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorTest.kt index e3fa89c5760d..dc928c49fbd3 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorTest.kt @@ -23,8 +23,8 @@ import com.android.systemui.coroutines.collectLastValue import com.android.systemui.kosmos.testScope import com.android.systemui.shade.data.repository.shadeRepository import com.android.systemui.shade.shared.model.ShadeMode -import com.android.systemui.statusbar.notification.stack.shared.model.StackBounds -import com.android.systemui.statusbar.notification.stack.shared.model.StackRounding +import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrimBounds +import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrimRounding import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.test.runTest @@ -42,42 +42,44 @@ class NotificationStackAppearanceInteractorTest : SysuiTestCase() { @Test fun stackBounds() = testScope.runTest { - val stackBounds by collectLastValue(underTest.stackBounds) + val stackBounds by collectLastValue(underTest.shadeScrimBounds) val bounds1 = - StackBounds( + ShadeScrimBounds( top = 100f, bottom = 200f, ) - underTest.setStackBounds(bounds1) + underTest.setShadeScrimBounds(bounds1) assertThat(stackBounds).isEqualTo(bounds1) val bounds2 = - StackBounds( + ShadeScrimBounds( top = 200f, bottom = 300f, ) - underTest.setStackBounds(bounds2) + underTest.setShadeScrimBounds(bounds2) assertThat(stackBounds).isEqualTo(bounds2) } @Test fun stackRounding() = testScope.runTest { - val stackRounding by collectLastValue(underTest.stackRounding) + val stackRounding by collectLastValue(underTest.shadeScrimRounding) kosmos.shadeRepository.setShadeMode(ShadeMode.Single) - assertThat(stackRounding).isEqualTo(StackRounding(roundTop = true, roundBottom = false)) + assertThat(stackRounding) + .isEqualTo(ShadeScrimRounding(roundTop = true, roundBottom = false)) kosmos.shadeRepository.setShadeMode(ShadeMode.Split) - assertThat(stackRounding).isEqualTo(StackRounding(roundTop = true, roundBottom = true)) + assertThat(stackRounding) + .isEqualTo(ShadeScrimRounding(roundTop = true, roundBottom = true)) } @Test(expected = IllegalStateException::class) fun setStackBounds_withImproperBounds_throwsException() = testScope.runTest { - underTest.setStackBounds( - StackBounds( + underTest.setShadeScrimBounds( + ShadeScrimBounds( top = 100f, bottom = 99f, ) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModelTest.kt index 9e5f7c9ba648..d4a704919a49 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModelTest.kt @@ -26,7 +26,7 @@ import com.android.systemui.coroutines.collectLastValue import com.android.systemui.keyguard.domain.interactor.keyguardInteractor import com.android.systemui.kosmos.testScope import com.android.systemui.statusbar.notification.stack.domain.interactor.notificationStackAppearanceInteractor -import com.android.systemui.statusbar.notification.stack.shared.model.StackBounds +import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrimBounds import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.test.runTest @@ -47,16 +47,16 @@ class NotificationsPlaceholderViewModelTest : SysuiTestCase() { val containerBounds by collectLastValue(kosmos.keyguardInteractor.notificationContainerBounds) val stackBounds by - collectLastValue(kosmos.notificationStackAppearanceInteractor.stackBounds) + collectLastValue(kosmos.notificationStackAppearanceInteractor.shadeScrimBounds) assertThat(containerBounds) .isEqualTo(NotificationContainerBounds(top = 5f, bottom = 5f)) assertThat(stackBounds) - .isEqualTo(StackBounds(left = 5f, top = 5f, right = 5f, bottom = 5f)) + .isEqualTo(ShadeScrimBounds(left = 5f, top = 5f, right = 5f, bottom = 5f)) } @Test fun onContentTopChanged_setsContentTop() { underTest.onContentTopChanged(padding = 5f) - assertThat(kosmos.notificationStackAppearanceInteractor.contentTop.value).isEqualTo(5f) + assertThat(kosmos.notificationStackAppearanceInteractor.stackTop.value).isEqualTo(5f) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java index 781a9a85edb3..7e5205b56d57 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java @@ -36,7 +36,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.keyguard.LockIconViewController; import com.android.systemui.SysuiTestCase; import com.android.systemui.assist.AssistManager; import com.android.systemui.biometrics.AuthController; @@ -93,7 +92,6 @@ public class DozeServiceHostTest extends SysuiTestCase { @Mock private NotificationShadeWindowViewController mNotificationShadeWindowViewController; @Mock private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; @Mock private ShadeLockscreenInteractor mShadeLockscreenInteractor; - @Mock private LockIconViewController mLockIconViewController; @Mock private View mAmbientIndicationContainer; @Mock private BiometricUnlockController mBiometricUnlockController; @Mock private AuthController mAuthController; diff --git a/packages/SystemUI/res/layout/hearing_devices_tile_dialog.xml b/packages/SystemUI/res/layout/hearing_devices_tile_dialog.xml new file mode 100644 index 000000000000..a5cdaeb2f925 --- /dev/null +++ b/packages/SystemUI/res/layout/hearing_devices_tile_dialog.xml @@ -0,0 +1,56 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<androidx.constraintlayout.widget.ConstraintLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/root" + style="@style/Widget.SliceView.Panel" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/device_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@id/pair_new_device_button" /> + + <Button + android:id="@+id/pair_new_device_button" + style="@style/BluetoothTileDialog.Device" + android:paddingEnd="0dp" + android:paddingStart="20dp" + android:background="@drawable/bluetooth_tile_dialog_bg_off" + android:layout_width="0dp" + android:layout_height="64dp" + android:contentDescription="@string/accessibility_hearing_device_pair_new_device" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/device_list" + android:drawableStart="@drawable/ic_add" + android:drawablePadding="20dp" + android:drawableTint="?android:attr/textColorPrimary" + android:text="@string/quick_settings_pair_hearing_devices" + android:textSize="14sp" + android:textAppearance="@style/TextAppearance.Dialog.Title" + android:textDirection="locale" + android:textAlignment="viewStart" + android:maxLines="1" + android:ellipsize="end" /> + +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index b1b47484ef0e..9702e8b0f254 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Die neem van skermskote word deur jou IT-admin geblokkeer"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Wysig"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Wysig skermkiekie"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Deel"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Deel skermskoot"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Vang meer vas"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Maak skermkiekie toe"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skandeer tans gesig"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Stuur"</string> <string name="cancel" msgid="1089011503403416730">"Kanselleer"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Applogo"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Bevestig"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Probeer weer"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Tik om stawing te kanselleer"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Gesig is herken. Druk die ontsluitikoon om voort te gaan."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Gestaaf"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Kanselleer stawing"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Meer opsies"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Gebruik PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Gebruik patroon"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Gebruik wagwoord"</string> @@ -281,7 +282,7 @@ <string name="quick_settings_bluetooth_secondary_label_input" msgid="3887552721233148132">"Invoer"</string> <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="5553051568867097111">"Gehoortoestelle"</string> <string name="quick_settings_bluetooth_secondary_label_transient" msgid="3882884317600669650">"Skakel tans aan …"</string> - <string name="quick_settings_rotation_unlocked_label" msgid="2359922767950346112">"Outo-draai"</string> + <string name="quick_settings_rotation_unlocked_label" msgid="2359922767950346112">"Outodraai"</string> <string name="accessibility_quick_settings_rotation" msgid="4800050198392260738">"Outodraai skerm"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Ligging"</string> <string name="quick_settings_screensaver_label" msgid="1495003469366524120">"Sluimerskerm"</string> @@ -362,11 +363,13 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standaard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Medium"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Hoog"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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_dialog_content" msgid="1624701280680913717">"Dit deblokkeer toegang vir alle apps 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 apps 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="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"Mikrofoon is geblokkeer"</string> <string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"Kamera is geblokkeer"</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Verwyder"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Voeg legstuk by"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Klaar"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Laat enige legstuk op die sluitskerm toe?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Maak instellings oop"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Hervat werkapps?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Hierdie toestel word deur jou ouer bestuur. Jou ouer kan inligting sien en bestuur soos die programme wat jy gebruik, jou ligging en jou skermtyd."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Ontsluit gehou deur TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Toestel is gesluit; te veel stawingpogings"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Toestel is gesluit\nKon nie staaf nie"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Klankinstellings"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Gee outomaties mediaopskrifte"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Gaan by verdeelde skerm in met huidige app aan die regterkant"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Gaan by verdeelde skerm in met huidige app aan die linkerkant"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Skakel oor van verdeelde skerm na volskerm"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Skakel oor na app regs of onder terwyl jy verdeelde skerm gebruik"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Skakel oor na app links of bo terwyl jy verdeelde skerm gebruik"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Tydens verdeelde skerm: verplaas ’n app van een skerm na ’n ander"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Invoer"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Skakel oor na volgende taal"</string> @@ -895,12 +898,12 @@ <string name="instant_apps_title" msgid="8942706782103036910">"<xliff:g id="APP">%1$s</xliff:g> loop tans"</string> <string name="instant_apps_message" msgid="6112428971833011754">"Program is oopgemaak sonder dat dit geïnstalleer is."</string> <string name="instant_apps_message_with_help" msgid="1816952263531203932">"Program is oopgemaak sonder dat dit geïnstalleer is. Tik om meer te wete te kom."</string> - <string name="app_info" msgid="5153758994129963243">"Programinligting"</string> + <string name="app_info" msgid="5153758994129963243">"Appinligting"</string> <string name="go_to_web" msgid="636673528981366511">"Gaan na blaaier"</string> <string name="mobile_data" msgid="4564407557775397216">"Mobiele data"</string> <string name="mobile_data_text_format" msgid="6806501540022589786">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string> <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> - <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi is af"</string> + <string name="wifi_is_off" msgid="5389597396308001471">"Wi-fi is af"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth is af"</string> <string name="dnd_is_off" msgid="3185706903793094463">"Moenie Steur Nie is af"</string> <string name="dnd_is_on" msgid="7009368176361546279">"Moenie Steur Nie is aan"</string> @@ -1076,7 +1079,7 @@ <string name="controls_error_removed" msgid="6675638069846014366">"Nie gekry nie"</string> <string name="controls_error_removed_title" msgid="1207794911208047818">"Kontrole is nie beskikbaar nie"</string> <string name="controls_error_removed_message" msgid="2885911717034750542">"Kon nie by <xliff:g id="DEVICE">%1$s</xliff:g> ingaan nie. Gaan die <xliff:g id="APPLICATION">%2$s</xliff:g>-program na om seker te maak dat die kontrole steeds beskikbaar is en dat die programinstellings nie verander het nie."</string> - <string name="controls_open_app" msgid="483650971094300141">"Maak program oop"</string> + <string name="controls_open_app" msgid="483650971094300141">"Maak app oop"</string> <string name="controls_error_generic" msgid="352500456918362905">"Kan nie status laai nie"</string> <string name="controls_error_failed" msgid="960228639198558525">"Fout, probeer weer"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Voeg kontroles by"</string> @@ -1240,7 +1243,7 @@ <string name="home_quick_affordance_unavailable_configure_the_app" msgid="604424593994493281">"• Minstens een toestel of toestelpaneel is beskikbaar"</string> <string name="notes_app_quick_affordance_unavailable_explanation" msgid="4796955161600178530">"Kies ’n versteknotasapp om die notaneemkortpad te gebruik"</string> <string name="keyguard_affordance_enablement_dialog_notes_app_action" msgid="6821710209675089470">"Kies app"</string> - <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Raak en hou kortpad"</string> + <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Raak-en-hou-kortpad"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Kanselleer"</string> <string name="rear_display_bottom_sheet_confirm" msgid="1507591562761552899">"Wissel skerms nou"</string> <string name="rear_display_folded_bottom_sheet_title" msgid="3930008746560711990">"Ontvou foon"</string> diff --git a/packages/SystemUI/res/values-af/tiles_states_strings.xml b/packages/SystemUI/res/values-af/tiles_states_strings.xml index 14275745c838..8f0532e00064 100644 --- a/packages/SystemUI/res/values-af/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-af/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Af"</item> <item msgid="5137565285664080143">"Aan"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 8daa20eca3e3..2f7cc5f68d6c 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"ቅጽበታዊ ገፅ እይታዎችን ማንሳት በእርስዎ አይቲ አስተዳዳሪ ታግዷል"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"አርትዕ ያድርጉ"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"ቅጽበታዊ ገፅ ዕይታን አርትዕ ያድርጉ"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"አጋራ"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"ቅጽበታዊ ገፅ እይታን ያጋሩ"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"ተጨማሪ ይቅረጹ"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ቅጽበታዊ ገፅ ዕይታን አሰናብት"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"የቅኝት ፊት"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ላክ"</string> <string name="cancel" msgid="1089011503403416730">"ይቅር"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"የመተግበሪያ ዓርማ"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"አረጋግጥ"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"እንደገና ይሞክሩ"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"ማረጋገጥን ለመሰረዝ መታ ያድርጉ"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"መልክ ተለይቶ ታውቋል። ለመቀጠል የመክፈቻ አዶውን ይጫኑ።"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"የተረጋገጠ"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"ማረጋገጥን ሰርዝ"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"ተጨማሪ አማራጮች"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ፒን ይጠቀሙ"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ሥርዓተ ጥለትን ተጠቀም"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"የይለፍ ቃልን ተጠቀም"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"መደበኛ"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"መካከለኛ"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"ከፍተኛ"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"አስወግድ"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"ምግብር አክል"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"ተከናውኗል"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"በማያ ገጽ ቁልፍ ላይ ማንኛውንም ምግብር ይፈቀድ?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"ቅንብሮችን ክፈት"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"የሥራ መተግበሪያዎች ከቆሙበት ይቀጥሉ?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ይህ መሣሪያ በእርስዎ ወላጅ የሚተዳደር ነው። ወላጅዎ የሚጠቀሙባቸውን መተግበሪያዎች፣ አካባቢዎን እና የማያ ገፅ ጊዜዎን የመሳሰሉ መረጃዎችን ማየት እና ማስተዳደር ይችላል።"</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"በ TrustAgent እንደተከፈተ ቀርቷል"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"መሣሪያው ተቆልፏል፣ ከልክ በላይ ብዙ የማረጋገጫ ሙከራዎች"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"መሣሪያው ተቆልፏል\nማረጋገጥ አልተሳካም"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>። <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"የድምፅ ቅንብሮች"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"ራስሰር የሥዕል መግለጫ ጽሑፍን ሚዲያ"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"ለአርኤችኤስ በአሁኑ መተግበሪያ ወደ የተከፈለ ማያ ገጽ ግባ"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"ለኤልኤችኤስ በአሁኑ መተግበሪያ ወደ የተከፈለ ማያ ገጽ ይግቡ"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"ከየተከፈለ ማያ ገጽ ወደ ሙሉ ገጽ ዕይታ ቀይር"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"የተከፈለ ማያ ገጽን ሲጠቀሙ በቀኝ ወይም ከታች ወዳለ መተግበሪያ ይቀይሩ"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"የተከፈለ ማያ ገጽን ሲጠቀሙ በቀኝ ወይም ከላይ ወዳለ መተግበሪያ ይቀይሩ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"በተከፈለ ማያ ገጽ ወቅት፡- መተግበሪያን ከአንዱ ወደ ሌላው ተካ"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ግቤት"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"ወደ ቀጣዩ ቋንቋ ቀይር"</string> diff --git a/packages/SystemUI/res/values-am/tiles_states_strings.xml b/packages/SystemUI/res/values-am/tiles_states_strings.xml index ab0b68b3e4e5..bb0ca36f501c 100644 --- a/packages/SystemUI/res/values-am/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-am/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"ጠፍቷል"</item> <item msgid="5137565285664080143">"በርቷል"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 8cfbf6a0fbbe..4fef3a9053d0 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"حَظَر مشرف تكنولوجيا المعلومات عملية أخذ لقطات للشاشة."</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"تعديل"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"تعديل لقطة الشاشة"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"مشاركة"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"مشاركة لقطة الشاشة"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"التقاط المزيد من المحتوى"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"إغلاق لقطة الشاشة"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"مسح الوجه"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"إرسال"</string> <string name="cancel" msgid="1089011503403416730">"إلغاء"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"شعار التطبيق"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"تأكيد"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"إعادة المحاولة"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"انقر لإلغاء المصادقة."</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"تم التعرّف على الوجه. للمتابعة، اضغط على رمز فتح القفل."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"مصادقة"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"إلغاء المصادقة"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"مزيد من الخيارات"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"استخدام رقم تعريف شخصي"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"استخدام نقش"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"استخدام كلمة المرور"</string> @@ -264,7 +265,7 @@ <string name="quick_settings_dnd_label" msgid="7728690179108024338">"عدم الإزعاج"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"بلوتوث"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"لا يتوفر أي أجهزة مقترنة"</string> - <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"انقر لربط جهاز أو إلغاء ربطه."</string> + <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"انقر لربط جهاز أو إلغاء ربطه"</string> <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"إقران جهاز جديد"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"عرض الكل"</string> <string name="turn_on_bluetooth" msgid="5681370462180289071">"استخدام البلوتوث"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"عادي"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"متوسط"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"مرتفع"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"إزالة"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"إضافة تطبيق مصغّر"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"تم"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"هل تريد السماح بعرض أي تطبيق مصغّر على شاشة القفل؟"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"فتح الإعدادات"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"أتريد إعادة تفعيل تطبيقات العمل؟"</string> @@ -451,7 +458,7 @@ <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"البدء من جديد"</string> <string name="guest_wipe_session_dontwipe" msgid="3211052048269304205">"نعم، متابعة"</string> <string name="guest_notification_app_name" msgid="2110425506754205509">"وضع الضيف"</string> - <string name="guest_notification_session_active" msgid="5567273684713471450">"أنت تستخدِم وضع الضيف."</string> + <string name="guest_notification_session_active" msgid="5567273684713471450">"أنت تستخدِم وضع الضيف"</string> <string name="user_add_user_message_guest_remove" msgid="5589286604543355007">\n\n"ستؤدي إضافة مُستخدِم جديد إلى الخروج من وضع الضيف وحذف كل التطبيقات والبيانات من جلسة الضيف الحالية."</string> <string name="user_limit_reached_title" msgid="2429229448830346057">"تم الوصول إلى أقصى عدد للمستخدمين"</string> <string name="user_limit_reached_message" msgid="1070703858915935796">"{count,plural, =1{يمكن إنشاء مستخدم واحد فقط.}zero{يمكنك إضافة ما يصل إلى # مستخدم}two{يمكنك إضافة ما يصل إلى مستخدمَين}few{يمكنك إضافة ما يصل إلى # مستخدمِين}many{يمكنك إضافة ما يصل إلى # مستخدمًا}other{يمكنك إضافة ما يصل إلى # مستخدم}}"</string> @@ -494,7 +501,7 @@ <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> + <string name="empty_shade_text" msgid="8935967157319717412">"ما مِن إشعارات"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"ما مِن إشعارات جديدة"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"افتَح قفل الشاشة لعرض الإشعارات الأقدم."</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"يتولّى أحد الوالدين إدارة هذا الجهاز."</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"يتولّى أحد الوالدين إدارة هذا الجهاز. يمكن للوالدين عرض وإدارة معلوماتك، مثلاً التطبيقات التي تستخدمها وموقعك الجغرافي ووقت النظر إلى الشاشة."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"شبكة افتراضية خاصة"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"فتح القفل باستمرار بواسطة TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"تم قفل الجهاز بسبب إجراء العديد من محاولات المصادقة"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"تم قفل الجهاز\nتعذّرت المصادقة"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"إعدادات الصوت"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"شرح تلقائي للوسائط"</string> @@ -623,7 +628,7 @@ <string name="wallet_title" msgid="5369767670735827105">"محفظة"</string> <string name="wallet_empty_state_label" msgid="7776761245237530394">"يمكنك إعداد طريقة دفع لإجراء عمليات شراء بسرعة وأمان أكبر باستخدام هاتفك."</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"عرض الكل"</string> - <string name="wallet_secondary_label_no_card" msgid="8488069304491125713">"انقر لفتح قفل الجهاز."</string> + <string name="wallet_secondary_label_no_card" msgid="8488069304491125713">"انقر لفتح قفل الجهاز"</string> <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"جارٍ تحديث تطبيق المحفظة"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"فتح القفل للاستخدام"</string> <string name="wallet_error_generic" msgid="257704570182963611">"حدثت مشكلة أثناء الحصول على البطاقات، يُرجى إعادة المحاولة لاحقًا."</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"تفعيل وضع \"تقسيم الشاشة\" مع عرض التطبيق الحالي على يسار الشاشة"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"تفعيل وضع \"تقسيم الشاشة\" مع عرض التطبيق الحالي على يمين الشاشة"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"التبديل من وضع \"تقسيم الشاشة\" إلى وضع \"ملء الشاشة\""</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"التبديل إلى التطبيق على اليسار أو الأسفل أثناء استخدام \"تقسيم الشاشة\""</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"التبديل إلى التطبيق على اليمين أو الأعلى أثناء استخدام \"تقسيم الشاشة\""</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"استبدال تطبيق بآخر في وضع \"تقسيم الشاشة\""</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"إدخال"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"التبديل إلى اللغة التالية"</string> @@ -1153,7 +1156,7 @@ <string name="person_available" msgid="2318599327472755472">"متاح"</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> + <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"لم يتم ضبط منبّه"</string> <string name="accessibility_bouncer" msgid="5896923685673320070">"إدخال الرمز لفتح القفل"</string> <string name="accessibility_fingerprint_label" msgid="5255731221854153660">"مستشعر بصمات الإصبع"</string> <string name="accessibility_authenticate_hint" msgid="798914151813205721">"المصادقة"</string> diff --git a/packages/SystemUI/res/values-ar/tiles_states_strings.xml b/packages/SystemUI/res/values-ar/tiles_states_strings.xml index 364737db4d1c..307a26e8e611 100644 --- a/packages/SystemUI/res/values-ar/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-ar/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"الخيار غير مفعَّل"</item> <item msgid="5137565285664080143">"الخيار مفعَّل"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index b621ce887a47..81b3004684d8 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"স্ক্ৰীনশ্বট লোৱাটো আপোনাৰ আইটি প্ৰশাসকে অৱৰোধ কৰিছে"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"সম্পাদনা কৰক"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"স্ক্ৰীনশ্বট সম্পাদনা কৰক"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"শ্বেয়াৰ কৰক"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"স্ক্ৰীনশ্বট শ্বেয়াৰ কৰক"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"অধিক কেপচাৰ কৰক"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"স্ক্ৰীনশ্বট অগ্ৰাহ্য কৰক"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"চেহেৰা স্কেন কৰি থকা হৈছে"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"পঠিয়াওক"</string> <string name="cancel" msgid="1089011503403416730">"বাতিল কৰক"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"এপৰ ল’গ’"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"নিশ্চিত কৰক"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"আকৌ চেষ্টা কৰক"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"বিশ্বাসযোগ্যতা প্ৰমাণীকৰণ বাতিল কৰিবলৈ টিপক"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"মুখাৱয়ব চিনাক্ত কৰা হৈছে। অব্যাহত ৰাখিবলৈ আনলক কৰক চিহ্নটোত টিপক।"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"বিশ্বাসযোগ্যতা প্ৰমাণীকৰণ কৰা হ’ল"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"বিশ্বাসযোগ্যতা প্ৰমাণীকৰণ বাতিল কৰক"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"অধিক বিকল্প"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"পিন ব্যৱহাৰ কৰক"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"আৰ্হি ব্যৱহাৰ কৰক"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"পাছৱৰ্ড ব্যৱহাৰ কৰক"</string> @@ -264,7 +265,7 @@ <string name="quick_settings_dnd_label" msgid="7728690179108024338">"অসুবিধা নিদিব"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ব্লুটুথ"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"কোনো যোৰা লগোৱা ডিভাইচ উপলব্ধ নহয়।"</string> - <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"এটা ডিভাইচৰ সংযোগ কৰিবলৈ অথবা ডিভাইচটোৰ সৈতে সংযোগ বিচ্ছিন্ন কৰিবলৈ টিপক"</string> + <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"ডিভাইচ সংযোগ কৰিবলৈ অথবা সংযোগ বিচ্ছিন্ন কৰিবলৈ টিপক"</string> <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"নতুন ডিভাইচ পেয়াৰ কৰক"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"আটাইবোৰ চাওক"</string> <string name="turn_on_bluetooth" msgid="5681370462180289071">"ব্লুটুথ ব্যৱহাৰ কৰক"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"মানক"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"মধ্যমীয়া"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"উচ্চ"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"আঁতৰাওক"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"ৱিজেট যোগ দিয়ক"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"কৰা হ’ল"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"লক স্ক্ৰীনত যিকোনো ৱিজেটৰ অনুমতি দিবনে?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"ছেটিং খোলক"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"কাম সম্পৰ্কীয় এপ্ আনপজ কৰিবনে?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"এই ডিভাইচটো আপোনাৰ অভিভাৱকে পৰিচালনা কৰে। আপোনাৰ অভিভাৱকে আপুনি ব্যৱহাৰ কৰা এপ্, আপোনাৰ অৱস্থান আৰু আপুনি ডিভাইচত অতিবাহিত কৰা সময়ৰ দৰে তথ্য চাব আৰু পৰিচালনা কৰিব পাৰে।"</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"ভিপিএন"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgentএ আনলক কৰি ৰাখিছে"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"ডিভাইচ লক কৰা হৈছে, বিশ্বাসযোগ্যতা প্ৰমাণীকৰণৰ অতি বেছিসংখ্যক প্ৰয়াস"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"ডিভাইচ লক কৰা হৈছে\nবিশ্বাসযোগ্যতা প্ৰমাণীকৰণ কৰিব পৰা নগ’ল"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"ধ্বনিৰ ছেটিং"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"স্বয়ংক্ৰিয় কেপশ্বন মিডিয়া"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"বৰ্তমানৰ এপৰ জৰিয়তে বিভাজিত স্ক্ৰীনৰ সোঁফালৰ স্ক্ৰীনখনত সোমাওক"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"বৰ্তমানৰ এপৰ জৰিয়তে বিভাজিত স্ক্ৰীনৰ বাওঁফালৰ স্ক্ৰীনখনত সোমাওক"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"বিভাজিত স্ক্ৰীনৰ পৰা পূৰ্ণ স্ক্ৰীনলৈ সলনি কৰক"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"বিভাজিত স্ক্ৰীন ব্যৱহাৰ কৰাৰ সময়ত সোঁফালে অথবা তলত থকা এপলৈ সলনি কৰক"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"বিভাজিত স্ক্ৰীন ব্যৱহাৰ কৰাৰ সময়ত বাওঁফালে অথবা ওপৰত থকা এপলৈ সলনি কৰক"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"বিভাজিত স্ক্ৰীনৰ ব্যৱহাৰ কৰাৰ সময়ত: কোনো এপ্ এখন স্ক্ৰীনৰ পৰা আনখনলৈ নিয়ক"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ইনপুট"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"পৰৱৰ্তী ভাষাটোলৈ সলনি কৰক"</string> diff --git a/packages/SystemUI/res/values-as/tiles_states_strings.xml b/packages/SystemUI/res/values-as/tiles_states_strings.xml index 767b34d3712b..7c62af06e857 100644 --- a/packages/SystemUI/res/values-as/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-as/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"অফ আছে"</item> <item msgid="5137565285664080143">"অন আছে"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index 0fbab2020370..7b09be54acb5 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Skrinşot çəkilməsi İT admininiz tərəfindən bloklanıb"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Redaktə edin"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Skrinşota düzəliş edin"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Paylaşın"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Skrinşotu paylaşın"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Genişləndirin"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ekran şəklini ötürün"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Üzün skan edilməsi"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Göndərin"</string> <string name="cancel" msgid="1089011503403416730">"Ləğv edin"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Tətbiq loqosu"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Təsdiq"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Yenidən cəhd edin"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Doğrulanmanı ləğv etmək üçün toxunun"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Üz tanınıb. \"Kiliddən çıxar\" ikonasına basıb davam edin."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Doğrulandı"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"İdentifikasiyanı ləğv edin"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Digər seçimlər"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN istifadə edin"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Model istifadə edin"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Parol istifadə edin"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standart"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Orta"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Yüksək"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Silin"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Vidcet əlavə edin"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Hazırdır"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Kilid ekranında istənilən vidcetə icazə verilsin?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Ayarları açın"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"İş tətbiqi üzrə pauza bitsin?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Bu cihaz valideyniniz tərəfindən idarə olunur. Valideyniniz işlətdiyiniz tətbiqlər, məkanınız və ekran vaxtınız kimi bilgiləri görə və idarə edə bilər."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN (Virtual Şəxsi Şəbəkələr)"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent ilə açıq saxlayın"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Cihaz kilidlənib, həddindən çox identifikasiya cəhdi"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Cihaz kilidləndi\nDoğrulama uğursuz oldu"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Səs ayarları"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Avtomatik başlıq mediası"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Cari tətbiq sağda olmaqla bölünmüş ekrana daxil olun"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Cari tətbiq solda olmaqla bölünmüş ekrana daxil olun"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Bölünmüş ekrandan tam ekrana keçin"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Bölünmüş ekran istifadə edərkən sağda və ya aşağıda tətbiqə keçin"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Bölünmüş ekran istifadə edərkən solda və ya yuxarıda tətbiqə keçin"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Bölünmüş ekran rejimində: tətbiqi birindən digərinə dəyişin"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Daxiletmə"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Növbəti dilə keçin"</string> diff --git a/packages/SystemUI/res/values-az/tiles_states_strings.xml b/packages/SystemUI/res/values-az/tiles_states_strings.xml index 3457a717c69b..f39036946434 100644 --- a/packages/SystemUI/res/values-az/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-az/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Deaktiv"</item> <item msgid="5137565285664080143">"Aktiv"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index 18d010c5861e..07bb005510c5 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"IT administrator blokira pravljenje snimaka ekrana"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Izmeni"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Izmenite snimak ekrana"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Delite"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Delite snimak ekrana"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Snimite još"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Odbacite snimak ekrana"</string> @@ -106,8 +105,8 @@ <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> <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"Želite da započnete snimanje?"</string> - <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Android ima pristup kompletnom sadržaju koji je vidljiv na ekranu ili se pušta na uređaju dok snimate. Zato budite pažljivi sa lozinkama, informacijama o plaćanju, porukama, slikama i audio i videima."</string> - <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Kada snimate aplikaciju, Android ima pristup kompletnom sadržaju koji je vidljiv ili se pušta u toj aplikaciji. Zato budite pažljivi sa lozinkama, informacijama o plaćanju, porukama, slikama i audio i videima."</string> + <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Android ima pristup kompletnom sadržaju koji je vidljiv na ekranu ili se pušta na uređaju dok snimate. Zato pazite na lozinke, informacije o plaćanju, poruke, slike, i audio i video sadržaj."</string> + <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Kada snimate aplikaciju, Android ima pristup kompletnom sadržaju koji je vidljiv ili se pušta u toj aplikaciji. Zato pazite na lozinke, informacije o plaćanju, poruke, slike, i audio i video sadržaj."</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Započni snimanje"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Snimaj zvuk"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Zvuk uređaja"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skeniranje lica"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Pošalji"</string> <string name="cancel" msgid="1089011503403416730">"Otkaži"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logotip aplikacije"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potvrdi"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Probaj ponovo"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Dodirnite da biste otkazali potvrdu identiteta"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Lice prepoznato. Pritisnite ikonu otključavanja za nastavak."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Identitet je potvrđen"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Otkažite potvrdu identiteta"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Još opcija"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Koristite PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Koristite šablon"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Koristite lozinku"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standardno"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Srednje"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Visoko"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Ukloni"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Dodaj vidžet"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Gotovo"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Želite da dozvolite sve vidžete na zaključanom ekranu?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Otvori podešavanja"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Uključiti poslovne aplikacije?"</string> @@ -466,17 +473,17 @@ <string name="screen_share_permission_dialog_option_single_app" msgid="4350961814397220929">"Jedna aplikacija"</string> <string name="screen_share_permission_app_selector_title" msgid="1404878013670347899">"Delite ili snimite aplikaciju"</string> <string name="media_projection_entry_app_permission_dialog_title" msgid="9155535851866407199">"Želite da počnete snimanje ili prebacivanje pomoću aplikacije <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>?"</string> - <string name="media_projection_entry_app_permission_dialog_warning_entire_screen" msgid="8736391633234144237">"Kada delite, snimate ili prebacujete, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ima pristup kompletnom sadržaju koji je vidljiv na ekranu ili se pušta na uređaju. Zato budite pažljivi sa lozinkama, informacijama o plaćanju, porukama, slikama i audio i videima."</string> - <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Kada delite, snimate ili prebacujete aplikaciju, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ima pristup kompletnom sadržaju koji je vidljiv ili se pušta u toj aplikaciji. Zato budite pažljivi sa lozinkama, informacijama o plaćanju, porukama, slikama i audio i videima."</string> + <string name="media_projection_entry_app_permission_dialog_warning_entire_screen" msgid="8736391633234144237">"Kada delite, snimate ili prebacujete, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ima pristup kompletnom sadržaju koji je vidljiv na ekranu ili se pušta na uređaju. Zato pazite na lozinke, informacije o plaćanju, poruke, slike, i audio i video sadržaj."</string> + <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Kada delite, snimate ili prebacujete aplikaciju, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ima pristup kompletnom sadržaju koji je vidljiv ili se pušta u toj aplikaciji. Zato pazite na lozinke, informacije o plaćanju, poruke, slike, i audio i video sadržaj."</string> <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"Pokreni"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> je onemogućila ovu opciju"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Želite da započnete prebacivanje?"</string> - <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Kada prebacujete, Android ima pristup kompletnom sadržaju koji je vidljiv na ekranu ili se pušta na uređaju. Zato budite pažljivi sa lozinkama, informacijama o plaćanju, porukama, slikama i audio i videima."</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Kada prebacujete aplikaciju, Android ima pristup kompletnom sadržaju koji je vidljiv ili se pušta u toj aplikaciji. Zato budite pažljivi sa lozinkama, informacijama o plaćanju, porukama, slikama i audio i videima."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Kada prebacujete, Android ima pristup kompletnom sadržaju koji je vidljiv na ekranu ili se pušta na uređaju. Zato pazite na lozinke, informacije o plaćanju, poruke, slike, i audio i video sadržaj."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Kada prebacujete aplikaciju, Android ima pristup kompletnom sadržaju koji je vidljiv ili se pušta u toj aplikaciji. Zato pazite na lozinke, informacije o plaćanju, poruke, slike, i audio i video sadržaj."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Započni prebacivanje"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Želite da počnete da delite?"</string> - <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Kada delite, snimate ili prebacujete, Android ima pristup kompletnom sadržaju koji je vidljiv na ekranu ili se pušta na uređaju. Zato budite pažljivi sa lozinkama, informacijama o plaćanju, porukama, slikama i audio i videima."</string> - <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Kada delite, snimate ili prebacujete aplikaciju, Android ima pristup kompletnom sadržaju koji je vidljiv ili se pušta u toj aplikaciji. Zato budite pažljivi sa lozinkama, informacijama o plaćanju, porukama, slikama i audio i videima."</string> + <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Kada delite, snimate ili prebacujete, Android ima pristup kompletnom sadržaju koji je vidljiv na ekranu ili se pušta na uređaju. Zato pazite na lozinke, informacije o plaćanju, poruke, slike, i audio i video sadržaj."</string> + <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Kada delite, snimate ili prebacujete aplikaciju, Android ima pristup kompletnom sadržaju koji je vidljiv ili se pušta u toj aplikaciji. Zato pazite na lozinke, informacije o plaćanju, poruke, slike, i audio i video sadržaj."</string> <string name="media_projection_entry_generic_permission_dialog_continue" msgid="8640381403048097116">"Pokreni"</string> <string name="media_projection_task_switcher_text" msgid="590885489897412359">"Deljenje se zaustavlja kada menjate aplikacije"</string> <string name="media_projection_task_switcher_action_switch" msgid="8682258717291921123">"Deli ovu aplikaciju"</string> @@ -593,7 +600,7 @@ <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. Dodirnite da biste isključili zvuk. Zvuk usluga pristupačnosti će možda biti isključen."</string> <string name="volume_stream_content_description_vibrate_a11y" msgid="2742330052979397471">"%1$s. Dodirnite da biste podesili na vibraciju."</string> <string name="volume_stream_content_description_mute_a11y" msgid="5743548478357238156">"%1$s. Dodirnite da biste isključili zvuk."</string> - <string name="volume_panel_noise_control_title" msgid="7413949943872304474">"Kontrola šuma"</string> + <string name="volume_panel_noise_control_title" msgid="7413949943872304474">"Kontrola buke"</string> <string name="volume_panel_spatial_audio_title" msgid="3367048857932040660">"Prostorni zvuk"</string> <string name="volume_panel_spatial_audio_off" msgid="4177490084606772989">"Isključeno"</string> <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fiksno"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Pokreni podeljeni ekran za aktuelnu aplikaciju na desnoj strani"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Pokreni podeljeni ekran za aktuelnu aplikaciju na levoj strani"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Pređi sa podeljenog ekrana na ceo ekran"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Pređite u aplikaciju zdesna ili ispod dok koristite podeljeni ekran"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Pređite u aplikaciju sleva ili iznad dok koristite podeljeni ekran"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"U režimu podeljenog ekrana: zamena jedne aplikacije drugom"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Unos"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Pređi na sledeći jezik"</string> @@ -1152,7 +1157,7 @@ <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">"Nije podešen"</string> - <string name="accessibility_bouncer" msgid="5896923685673320070">"unesite zaključavanje ekrana"</string> + <string name="accessibility_bouncer" msgid="5896923685673320070">"unesite otključavanje ekrana"</string> <string name="accessibility_fingerprint_label" msgid="5255731221854153660">"Senzor za otisak prsta"</string> <string name="accessibility_authenticate_hint" msgid="798914151813205721">"potvrdite identitet"</string> <string name="accessibility_enter_hint" msgid="2617864063504824834">"unesite uređaj"</string> @@ -1174,7 +1179,7 @@ <string name="wifi_empty_list_wifi_on" msgid="3864376632067585377">"Traže se mreže…"</string> <string name="wifi_failed_connect_message" msgid="4161863112079000071">"Povezivanje sa mrežom nije uspelo"</string> <string name="wifi_wont_autoconnect_for_now" msgid="5782282612749867762">"WiFi trenutno ne može da se automatski poveže"</string> - <string name="see_all_networks" msgid="3773666844913168122">"Pogledajte sve"</string> + <string name="see_all_networks" msgid="3773666844913168122">"Prikaži sve"</string> <string name="to_switch_networks_disconnect_ethernet" msgid="6698111101156951955">"Da biste promenili mrežu, prekinite eternet vezu"</string> <string name="wifi_scan_notify_message" msgid="3753839537448621794">"Radi boljeg doživljaja uređaja, aplikacije i usluge i dalje mogu da traže WiFi mreže u bilo kom trenutku, čak i kada je WiFi isključen. To možete da promenite u podešavanjima WiFi skeniranja. "<annotation id="link">"Promenite"</annotation></string> <string name="turn_off_airplane_mode" msgid="8425587763226548579">"Isključi režim rada u avionu"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/tiles_states_strings.xml b/packages/SystemUI/res/values-b+sr+Latn/tiles_states_strings.xml index 75fb3259ba34..e09cab50e9bb 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Isključeno"</item> <item msgid="5137565285664080143">"Uključeno"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 217a6fe84417..6c4e88dc96fd 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Стварэнне здымкаў экрана заблакіравана IT-адміністратарам"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Змяніць"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Змяніць здымак экрана"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Абагуліць"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Абагуліць здымак экрана"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Захапіць больш"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Адхіліць здымак экрана"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Сканіраванне твару"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Адправіць"</string> <string name="cancel" msgid="1089011503403416730">"Скасаваць"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Лагатып праграмы"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Пацвердзіць"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Паўтарыць спробу"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Націсніце, каб скасаваць аўтэнтыфікацыю"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Твар распазнаны. Для працягу націсніце значок разблакіроўкі."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Распазнана"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Скасаваць аўтэнтыфікацыю"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Іншыя варыянты"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Увесці PIN-код"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Выкарыстаць узор разблакіроўкі"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Выкарыстаць пароль"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Стандартная"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Сярэдняя"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Высокая"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Выдаліць"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Дадаць віджэт"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Гатова"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Дазволіць размяшчаць на экране блакіроўкі любыя віджэты?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Адкрыць налады"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Уключыць працоўныя праграмы?"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Перайсці ў рэжым падзеленага экрана з бягучай праграмай справа"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Перайсці ў рэжым падзеленага экрана з бягучай праграмай злева"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Пераключыцца з рэжыму падзеленага экрана на поўнаэкранны рэжым"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Пераключыцца на праграму справа або ўнізе на падзеленым экране"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Пераключыцца на праграму злева або ўверсе на падзеленым экране"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"У рэжыме падзеленага экрана замяніць адну праграму на іншую"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Увод"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Пераключыцца на наступную мову"</string> diff --git a/packages/SystemUI/res/values-be/tiles_states_strings.xml b/packages/SystemUI/res/values-be/tiles_states_strings.xml index 74fc7c63cc38..32619ef03053 100644 --- a/packages/SystemUI/res/values-be/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-be/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Выключана"</item> <item msgid="5137565285664080143">"Уключана"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 62c95b2a6299..01eed3dff4d8 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Правенето на екранни снимки е блокирано от системния ви администратор"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Редактиране"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Редактиране на екранната снимка"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Споделяне"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Споделяне на екранната снимка"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Заснемане на още"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Отхвърляне на екранната снимка"</string> @@ -110,10 +109,10 @@ <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Докато записвате дадено приложение, Android има достъп до всичко, което се показва или възпроизвежда в него. Затова бъдете внимателни с неща като пароли, подробности за начини на плащане, съобщения, снимки, аудио и видео."</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Стартиране на записването"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Записване на звук"</string> - <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Аудио от устройството"</string> + <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Звук от устройството"</string> <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"Звук от устройството ви, като например музика, обаждания и мелодии"</string> <string name="screenrecord_mic_label" msgid="2111264835791332350">"Микрофон"</string> - <string name="screenrecord_device_audio_and_mic_label" msgid="1831323771978646841">"Аудио от устройството и микрофона"</string> + <string name="screenrecord_device_audio_and_mic_label" msgid="1831323771978646841">"Звук от устройството и микрофона"</string> <string name="screenrecord_continue" msgid="4055347133700593164">"Стартиране"</string> <string name="screenrecord_ongoing_screen_only" msgid="4459670242451527727">"Екранът се записва"</string> <string name="screenrecord_ongoing_screen_and_audio" msgid="5351133763125180920">"Екранът и аудиото се записват"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Извършва се сканиране на лице"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Изпращане"</string> <string name="cancel" msgid="1089011503403416730">"Отказ"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Лого на приложението"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Потвърждаване"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Нов опит"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Докоснете, за да анулирате удостоверяването"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Лицето бе разпознато. Продължете чрез иконата за отключване."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Удостоверено"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Анулиране на удостоверяването"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Още опции"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Използване на ПИН"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Използване на фигура"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Използване на парола"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Стандартен"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Среден"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Висок"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Премахване"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Добавяне на приспособление"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Готово"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Да се разреши ли което и да е приспособление на заключения екран?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Отваряне на настройките"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Отмяна на паузата за служ. прил.?"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Преминаване към разделен екран с текущото приложение отдясно"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Преминаване към разделен екран с текущото приложение отляво"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Превключване от разделен към цял екран"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Превключване към приложението вдясно/отдолу в режима на разделен екран"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Превключване към приложението вляво/отгоре в режима на разделен екран"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"При разделен екран: замяна на дадено приложение с друго"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Въвеждане"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Превключване към следващия език"</string> diff --git a/packages/SystemUI/res/values-bg/tiles_states_strings.xml b/packages/SystemUI/res/values-bg/tiles_states_strings.xml index ddd0c3fa49dd..381b0f0b2abb 100644 --- a/packages/SystemUI/res/values-bg/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-bg/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Изключено"</item> <item msgid="5137565285664080143">"Включено"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index abfbfcc96616..5b71e634b632 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"আপনার আইটি অ্যাডমিন স্ক্রিনশট নেওয়ার সুবিধা ব্লক করেছেন"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"এডিট করুন"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"স্ক্রিনশট এডিট করুন"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"শেয়ার করুন"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"স্ক্রিনশট শেয়ার করুন"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"আরও বেশি ক্যাপচার করুন"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"স্ক্রিনশট বাতিল করুন"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"ফেস স্ক্যান করা হচ্ছে"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"পাঠান"</string> <string name="cancel" msgid="1089011503403416730">"বাতিল করুন"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"অ্যাপের লোগো"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"কনফার্ম করুন"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"আবার চেষ্টা করুন"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"যাচাইকরণ বাতিল করতে ট্যাপ করুন"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"ফেস শনাক্ত করা হয়েছে। চালিয়ে যেতে আনলক আইকন প্রেস করুন।"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"প্রমাণীকৃত"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"যাচাইকরণ বাতিল করুন"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"আরও বিকল্প"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"পিন ব্যবহার করুন"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"প্যাটার্ন ব্যবহার করুন"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"পাসওয়ার্ড ব্যবহার করুন"</string> @@ -362,11 +363,13 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"স্ট্যান্ডার্ড"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"মিডিয়াম"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"হাই"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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_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="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"মাইক্রোফোন ব্লক করা আছে"</string> <string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"ক্যামেরা ব্লক করা আছে"</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"সরান"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"উইজেট যোগ করুন"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"হয়ে গেছে"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"লক স্ক্রিনে যেকোনও উইজেটকে অনুমতি দেবেন?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"সেটিংস খুলুন"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"অফিসের অ্যাপ আনপজ করতে চান?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"আপনার অভিভাবক এই ডিভাইস ম্যানেজ করেন। আপনার অভিভাবক আপনার ব্যবহার করা অ্যাপ, লোকেশন ও স্ক্রিন টাইমের মতো তথ্যগুলি দেখতে এবং ম্যানেজ করতে পারেন।"</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent দিয়ে আনলক করে রাখা হয়েছে"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"ডিভাইস লক করা আছে, যাচাইকরণের জন্য অনেক বেশিবার চেষ্টা করা হয়েছে"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"ডিভাইস লক করা আছে\nযাচাইকরণ করা যায়নি"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"সাউন্ড সেটিংস"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"অটোমেটিক মিডিয়া ক্যাপশন দেখুন"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"ডানদিকে থাকা বর্তমান অ্যাপ ব্যবহার করে \'স্প্লিট স্ক্রিন\' যোগ করুন"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"বাঁদিকে থাকা বর্তমান অ্যাপ ব্যবহার করে \'স্প্লিট স্ক্রিন\' যোগ করুন"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"\'স্প্লিট স্ক্রিন\' থেকে ফুল স্ক্রিনে পাল্টান"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"স্প্লিট স্ক্রিন ব্যবহার করার সময় ডানদিকের বা নিচের অ্যাপে পাল্টে নিন"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"স্প্লিট স্ক্রিন ব্যবহার করার সময় বাঁদিকের বা উপরের অ্যাপে পাল্টে নিন"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"\'স্প্লিট স্ক্রিন\' থাকাকালীন: একটি অ্যাপ থেকে অন্যটিতে পাল্টান"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ইনপুট"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"পরবর্তী ভাষায় পাল্টান"</string> diff --git a/packages/SystemUI/res/values-bn/tiles_states_strings.xml b/packages/SystemUI/res/values-bn/tiles_states_strings.xml index ad3256068f5f..2eebd97088ab 100644 --- a/packages/SystemUI/res/values-bn/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-bn/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"বন্ধ আছে"</item> <item msgid="5137565285664080143">"চালু আছে"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 75a2f94c9b27..f62657907eca 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Snimanje ekrana je blokirao IT administrator"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Uredite"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Uredite snimak ekrana"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Dijeli"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Dijeljenje snimka ekrana"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Snimi više"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Odbacite snimak ekrana"</string> @@ -109,9 +108,9 @@ <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Dok snimate, Android ima pristup svemu što je vidljivo na ekranu ili što se reproducira na uređaju. Stoga budite oprezni s informacijama kao što su lozinke, podaci o plaćanju, poruke, fotografije, zvukovi i videozapisi."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Dok snimate aplikaciju, Android ima pristup svemu što se prikazuje ili reproducira u toj aplikaciji. Stoga budite oprezni s informacijama kao što su lozinke, podaci o plaćanju, poruke, fotografije, zvukovi i videozapisi."</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Pokreni snimanje"</string> - <string name="screenrecord_audio_label" msgid="6183558856175159629">"Snimi zvučni zapis"</string> + <string name="screenrecord_audio_label" msgid="6183558856175159629">"Snimanje zvuka"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Zvuk na uređaju"</string> - <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"Zvuk s vašeg uređaja, naprimjer muzika, pozivi i melodije zvona"</string> + <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"Zvuk s vašeg uređaja, npr. muzika, pozivi i melodije zvona"</string> <string name="screenrecord_mic_label" msgid="2111264835791332350">"Mikrofon"</string> <string name="screenrecord_device_audio_and_mic_label" msgid="1831323771978646841">"Zvuk na uređaju i mikrofon"</string> <string name="screenrecord_continue" msgid="4055347133700593164">"Pokreni"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skeniranje lica"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Pošalji"</string> <string name="cancel" msgid="1089011503403416730">"Otkaži"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logotip aplikacije"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potvrdite"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Pokušaj ponovo"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Dodirnite da otkažete autentifikaciju"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Lice prepoznato. Pritisnite ikonu za otklj. da nastavite."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentificirano"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Otkažite autentifikaciju"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Više opcija"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Koristi PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Koristi uzorak"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Koristi lozinku"</string> @@ -264,7 +265,7 @@ <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Ne ometaj"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Nema dostupnih uparenih uređaja"</string> - <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Dodirnite da povežete uređaj ili prekinete njegovu povezanost"</string> + <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Dodirnite da povežete ili prekinete povezanost uređaja"</string> <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Upari novi uređaj"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"Prikaži sve"</string> <string name="turn_on_bluetooth" msgid="5681370462180289071">"Koristi Bluetooth"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standardno"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Srednje"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Visoko"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Uklanjanje"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Dodajte vidžet"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Gotovo"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Dozvoliti bilo koji vidžet na zaključanom ekranu?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Otvori postavke"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Pokrenuti poslovne aplikacije?"</string> @@ -540,7 +547,7 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Ovim uređajem upravlja tvoj roditelj. Roditelj može vidjeti i upravljati informacijama kao što su aplikacije koje koristiš, lokacija i vrijeme korištenja uređaja."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Pouzdani agent sprečava zaključavanje"</string> - <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Uređaj je bio zaključan zbog previše pokušaja autentifikacije"</string> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Uređaj je zaključan zbog previše pokušaja autentifikacije"</string> <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Uređaj je zaključan\nAutentifikacija nije uspjela"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Postavke zvuka"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Otvaranje podijeljenog ekrana s trenutnom aplikacijom na desnoj strani"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Otvaranje podijeljenog ekrana s trenutnom aplikacijom na lijevoj strani"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Prebacivanje s podijeljenog ekrana na prikaz preko cijelog ekrana"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Pređite u aplikaciju desno ili ispod dok koristite podijeljeni ekran"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Pređite u aplikaciju lijevo ili iznad dok koristite podijeljeni ekran"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Za vrijeme podijeljenog ekrana: zamjena jedne aplikacije drugom"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Unos"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Prebacivanje na sljedeći jezik"</string> diff --git a/packages/SystemUI/res/values-bs/tiles_states_strings.xml b/packages/SystemUI/res/values-bs/tiles_states_strings.xml index 75fb3259ba34..e09cab50e9bb 100644 --- a/packages/SystemUI/res/values-bs/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-bs/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Isključeno"</item> <item msgid="5137565285664080143">"Uključeno"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index d31fb06c7fa6..e4a790654a48 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"El teu administrador de TI ha bloquejat les captures de pantalla"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Edita"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Edita la captura de pantalla"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Comparteix"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Comparteix la captura de pantalla"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Captura més"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ignora la captura de pantalla"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"S\'està escanejant la cara"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Envia"</string> <string name="cancel" msgid="1089011503403416730">"Cancel·la"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logotip de l\'aplicació"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirma"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Torna-ho a provar"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Toca per cancel·lar l\'autenticació"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"S\'ha reconegut la cara. Prem la icona per continuar."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticat"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Cancel·la l\'autenticació"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Més opcions"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Utilitza el PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Utilitza el patró"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Utilitza la contrasenya"</string> @@ -362,12 +363,14 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Estàndard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Mitjà"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Alt"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Si ho fas, tots els serveis i les aplicacions que tenen permís podran utilitzar el micròfon."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Si ho fas, tots els serveis i les aplicacions que tenen permís podran utilitzar la càmera."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Si ho fas, tots els serveis i les aplicacions que tenen permís podran utilitzar la càmera o el micròfon."</string> <string name="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"El micròfon està bloquejat"</string> <string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"La càmera està bloquejada"</string> <string name="sensor_privacy_start_use_mic_camera_blocked_dialog_title" msgid="195236134743281973">"El micròfon i la càmera estan bloquejats"</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Suprimeix"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Afegeix un widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Fet"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Vols permetre qualsevol widget a la pantalla de bloqueig?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Obre la configuració"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Reactivar les apps de treball?"</string> @@ -467,7 +474,7 @@ <string name="screen_share_permission_app_selector_title" msgid="1404878013670347899">"Comparteix o grava una aplicació"</string> <string name="media_projection_entry_app_permission_dialog_title" msgid="9155535851866407199">"Vols començar a gravar o emetre contingut amb <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>?"</string> <string name="media_projection_entry_app_permission_dialog_warning_entire_screen" msgid="8736391633234144237">"Quan comparteixes, graves o emets contingut, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> té accés a qualsevol cosa que es vegi a la pantalla o que es reprodueixi al dispositiu. Per aquest motiu, ves amb compte amb les contrasenyes, les dades de pagament, els missatges, les fotos i l\'àudio i el vídeo."</string> - <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Quan comparteixes, graves o emets contingut, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> té accés a qualsevol cosa que es vegi a la pantalla o que es reprodueixi a l\'aplicació. Per aquest motiu, ves amb compte amb les contrasenyes, les dades de pagament, els missatges, les fotos i l\'àudio i el vídeo."</string> + <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Quan comparteixes, graves o emets una aplicació, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> té accés a qualsevol cosa que es mostri o que es reprodueixi en aquella aplicació. Per aquest motiu, ves amb compte amb les contrasenyes, les dades de pagament, els missatges, les fotos i l\'àudio i el vídeo."</string> <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"Inicia"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> ha desactivat aquesta opció"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Vols iniciar una emissió?"</string> @@ -476,7 +483,7 @@ <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Inicia una emissió"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Vols començar a compartir?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Quan comparteixes, graves o emets contingut, Android té accés a qualsevol cosa que es vegi a la pantalla o que es reprodueixi al dispositiu. Per aquest motiu, ves amb compte amb les contrasenyes, les dades de pagament, els missatges, les fotos i l\'àudio i el vídeo."</string> - <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Quan comparteixes, graves o emets contingut, Android té accés a qualsevol cosa que es vegi a la pantalla o que es reprodueixi a l\'aplicació. Per aquest motiu, ves amb compte amb les contrasenyes, les dades de pagament, els missatges, les fotos i l\'àudio i el vídeo."</string> + <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Quan comparteixes, graves o emets una aplicació, Android té accés a qualsevol cosa que es mostri o que es reprodueixi en aquella aplicació. Per aquest motiu, ves amb compte amb les contrasenyes, les dades de pagament, els missatges, les fotos i l\'àudio i el vídeo."</string> <string name="media_projection_entry_generic_permission_dialog_continue" msgid="8640381403048097116">"Inicia"</string> <string name="media_projection_task_switcher_text" msgid="590885489897412359">"La compartició es posa en pausa quan canvies d\'aplicació"</string> <string name="media_projection_task_switcher_action_switch" msgid="8682258717291921123">"Comparteix aquesta aplicació"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"El teu pare o mare gestionen aquest dispositiu, i poden veure i gestionar informació com ara les aplicacions que utilitzes, la teva ubicació i el teu temps de connexió."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Desbloquejat per TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"El dispositiu s\'ha bloquejat; massa intents d\'autenticació"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"El dispositiu s\'ha bloquejat\nHa fallat l\'autenticació"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Configuració del so"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Subtitula el contingut multimèdia automàticament"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Entra al mode de pantalla dividida amb l\'aplicació actual a la dreta"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Entra al mode de pantalla dividida amb l\'aplicació actual a l\'esquerra"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Canvia de pantalla dividida a pantalla completa"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Canvia a l\'aplicació de la dreta o de sota amb la pantalla dividida"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Canvia a l\'aplicació de l\'esquerra o de dalt amb la pantalla dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Durant el mode de pantalla dividida: substitueix una app per una altra"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Entrada"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Canvia a l\'idioma següent"</string> diff --git a/packages/SystemUI/res/values-ca/tiles_states_strings.xml b/packages/SystemUI/res/values-ca/tiles_states_strings.xml index c926e9ec4691..6a36b6f5b9d8 100644 --- a/packages/SystemUI/res/values-ca/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-ca/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Desactivat"</item> <item msgid="5137565285664080143">"Activat"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 995d9940cd3d..58cbbca4b42f 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Pořizování snímků obrazovky je blokováno administrátorem IT"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Upravit"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Upravit snímek obrazovky"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Sdílet"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Sdílet snímek obrazovky"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Zvětšit záběr snímku"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Zavřít snímek obrazovky"</string> @@ -107,7 +106,7 @@ <string name="screenrecord_channel_description" msgid="4147077128486138351">"Trvalé oznámení o relaci nahrávání"</string> <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"Začít nahrávat?"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Během nahrávání má Android přístup k veškerému obsahu, který je viditelný na obrazovce nebo se přehrává v zařízení. Buďte proto opatrní s věcmi, jako jsou hesla, platební údaje, zprávy, fotografie, zvuk a video."</string> - <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Během nahrávání aplikace má Android přístup k veškerému obsahu, který je v dané aplikaci zobrazen nebo přehráván. Buďte proto opatrní s věcmi, jako jsou hesla, platební údaje, zprávy, fotografie, zvuk a video."</string> + <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Během nahrávání aplikace má Android přístup k veškerému obsahu, který je v dané aplikaci zobrazen nebo přehráván. Buďte proto opatrní s informacemi, jako jsou hesla, platební údaje, zprávy, fotky, zvukové záznamy nebo videa."</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Začít nahrávat"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Nahrávat zvuk"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Zvuk zařízení"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skenování obličeje"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Odeslat"</string> <string name="cancel" msgid="1089011503403416730">"Zrušit"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logo aplikace"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potvrdit"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Zkusit znovu"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Klepnutím zrušíte ověření"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Obličej rozpoznán. Klepněte na ikonu odemknutí."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Ověřeno"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Zrušit ověření"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Další možnosti"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Použít kód PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Použít gesto"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Použít heslo"</string> @@ -264,7 +265,7 @@ <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Nerušit"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Nejsou dostupná žádná spárovaná zařízení"</string> - <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Klepnutím připojíte nebo odpojíte zařízení"</string> + <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Klepnutím zařízení připojíte nebo odpojíte"</string> <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Spárovat nové zařízení"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"Zobrazit vše"</string> <string name="turn_on_bluetooth" msgid="5681370462180289071">"Použít Bluetooth"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standardní"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Střední"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Vysoká"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Odstranit"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Přidat widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Hotovo"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Povolit jakýkoli widget na obrazovce uzamčení?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Otevřít nastavení"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Zrušit pozastavení pracovních aplikací?"</string> @@ -472,11 +479,11 @@ <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> tuto možnost zakázala"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Začít odesílat?"</string> <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Během odesílání má Android přístup ke všemu, co je viditelné na obrazovce nebo se přehrává v zařízení. Buďte proto opatrní s věcmi, jako jsou hesla, platební údaje, zprávy, fotografie, zvuk a video."</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Během odesílání aplikace má Android přístup k veškerému obsahu, který je v dané aplikaci zobrazen nebo přehráván. Buďte proto opatrní s věcmi, jako jsou hesla, platební údaje, zprávy, fotografie, zvuk a video."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Během odesílání aplikace má Android přístup k veškerému obsahu, který je v dané aplikaci zobrazen nebo přehráván. Buďte proto opatrní s informacemi, jako jsou hesla, platební údaje, zprávy, fotky, zvukové záznamy a videa."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Začít odesílat"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Začít sdílet?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Během sdílení, nahrávání nebo odesílání má Android přístup k veškerému obsahu, který je viditelný na obrazovce nebo se přehrává v zařízení. Buďte proto opatrní s věcmi, jako jsou hesla, platební údaje, zprávy, fotografie, zvuk a video."</string> - <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Během sdílení, nahrávání nebo odesílání aplikace má Android přístup k veškerému obsahu, který je v dané aplikaci zobrazen nebo přehráván. Buďte proto opatrní s věcmi, jako jsou hesla, platební údaje, zprávy, fotografie, zvuk a video."</string> + <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Během sdílení, nahrávání nebo odesílání aplikace má Android přístup k veškerému obsahu, který je v dané aplikaci zobrazen nebo přehráván. Buďte proto opatrní s informacemi, jako jsou hesla, platební údaje, zprávy, fotky, zvukové záznamy a videa."</string> <string name="media_projection_entry_generic_permission_dialog_continue" msgid="8640381403048097116">"Začít"</string> <string name="media_projection_task_switcher_text" msgid="590885489897412359">"Když přepnete aplikace, sdílení se pozastaví"</string> <string name="media_projection_task_switcher_action_switch" msgid="8682258717291921123">"Sdílet aplikaci"</string> @@ -610,7 +617,7 @@ <string name="volume_panel_hint_mute" msgid="6962563028495243738">"ztlumíte %s"</string> <string name="volume_panel_hint_unmute" msgid="7489063242934477382">"zapnete zvuk %s"</string> <string name="media_output_label_title" msgid="872824698593182505">"Přehrávání <xliff:g id="LABEL">%s</xliff:g> na"</string> - <string name="media_output_title_without_playing" msgid="3825663683169305013">"Zvuk se přehraje na"</string> + <string name="media_output_title_without_playing" msgid="3825663683169305013">"Zvuk se přehraje přes"</string> <string name="system_ui_tuner" msgid="1471348823289954729">"Nástroj na ladění uživatelského rozhraní systému"</string> <string name="status_bar" msgid="4357390266055077437">"Stavový řádek"</string> <string name="demo_mode" msgid="263484519766901593">"Ukázkový režim uživatelského rozhraní systému"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Přepnout na rozdělenou obrazovku s aktuálními aplikacemi napravo"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Přepnout na rozdělenou obrazovku s aktuálními aplikacemi nalevo"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Přepnout z rozdělené obrazovky na celou obrazovku"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Přechod na aplikaci vpravo nebo dole v režimu rozdělené obrazovky"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Přechod na aplikaci vlevo nebo nahoře v režimu rozdělené obrazovky"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"V režimu rozdělené obrazovky: nahradit jednu aplikaci druhou"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Vstup"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Přepnout na další jazyk"</string> @@ -1164,7 +1169,7 @@ <string name="mobile_data_connection_active" msgid="944490013299018227">"Připojeno"</string> <string name="mobile_data_temp_connection_active" msgid="4590222725908806824">"Dočasně připojeno"</string> <string name="mobile_data_poor_connection" msgid="819617772268371434">"Nekvalitní připojení"</string> - <string name="mobile_data_off_summary" msgid="3663995422004150567">"Mobilní data se nebudou připojovat automaticky"</string> + <string name="mobile_data_off_summary" msgid="3663995422004150567">"Bez automatického připojení přes mobilní data"</string> <string name="mobile_data_no_connection" msgid="1713872434869947377">"Žádné připojení"</string> <string name="non_carrier_network_unavailable" msgid="770049357024492372">"Žádné další sítě nejsou k dispozici"</string> <string name="all_network_unavailable" msgid="4112774339909373349">"Nejsou k dispozici žádné sítě"</string> diff --git a/packages/SystemUI/res/values-cs/tiles_states_strings.xml b/packages/SystemUI/res/values-cs/tiles_states_strings.xml index 534556910c01..02a0f5f792b0 100644 --- a/packages/SystemUI/res/values-cs/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-cs/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Vypnuto"</item> <item msgid="5137565285664080143">"Zapnuto"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 32f8336fe51a..c0202bb1db5a 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Din it-administrator har blokeret screenshot-funktionen"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Rediger"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Rediger screenshot"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Del"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Del screenshottet"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Medtag mere"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Luk screenshot"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanner ansigt"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> <string name="cancel" msgid="1089011503403416730">"Annuller"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Applogo"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Bekræft"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Prøv igen"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Tryk for at annullere godkendelsen"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Ansigt genkendt. Tryk på oplåsningsikonet for at fortsætte."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Godkendt"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Annuller godkendelsen"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Flere valgmuligheder"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Brug pinkode"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Brug mønster"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Brug adgangskode"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Middel"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Høj"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vil du fjerne blokeringen af enhedens mikrofon?"</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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Fjern"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Tilføj widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Udfør"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Vil du tillade alle widgets på låseskærmen?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Åbn Indstillinger"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Vil du genoptage arbejdsapps?"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Start opdelt skærm med aktuel app til højre"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Start opdelt skærm med aktuel app til venstre"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Skift fra opdelt skærm til fuld skærm"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Skift til en app til højre eller nedenfor, når du bruger opdelt skærm"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Skift til en app til venstre eller ovenfor, når du bruger opdelt skærm"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ved opdelt skærm: Udskift én app med en anden"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Skift til næste sprog"</string> diff --git a/packages/SystemUI/res/values-da/tiles_states_strings.xml b/packages/SystemUI/res/values-da/tiles_states_strings.xml index 5a5314933aa2..598fcfe40dc8 100644 --- a/packages/SystemUI/res/values-da/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-da/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Fra"</item> <item msgid="5137565285664080143">"Til"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 6768608c8bbe..b8758d7efe91 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Dein IT-Administrator hat das Erstellen von Screenshots blockiert"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Bearbeiten"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Screenshot bearbeiten"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Teilen"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Screenshot teilen"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Mehr aufnehmen"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Screenshot schließen"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Gesicht wird gescannt"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Senden"</string> <string name="cancel" msgid="1089011503403416730">"Abbrechen"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"App-Logo"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Bestätigen"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Noch einmal versuchen"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Zum Abbrechen der Authentifizierung tippen"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Gesicht erkannt. Tippe zum Fortfahren auf das Symbol „Entsperren“."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authentifiziert"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Authentifizierung abbrechen"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Weitere Optionen"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN verwenden"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Muster verwenden"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Passwort verwenden"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Mittel"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Hoch"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Blockierung des Gerätemikrofons aufheben?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Blockierung der Gerätekamera aufheben?"</string> <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Blockierung von Gerätekamera und Gerätemikrofon aufheben?"</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Entfernen"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Widget hinzufügen"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Fertig"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Beliebige Widgets auf Sperrbildschirm zulassen?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Einstellungen öffnen"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Geschäftliche Apps nicht mehr pausieren?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Dieses Gerät wird von deinen Eltern verwaltet. Sie können unter anderem Informationen über deine genutzten Apps, deinen Standort und deine Bildschirmzeit einsehen und verwalten."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Durch TrustAgent entsperrt"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Das Gerät wurde aufgrund zu vieler Authentifizierungsversuche gesperrt"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Gerät gesperrt\nAuthentifizierung fehlgeschlagen"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Toneinstellungen"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Medien autom. untertiteln"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Splitscreen aktivieren, aktuelle App rechts"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Splitscreen aktivieren, aktuelle App links"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Vom Splitscreen zum Vollbild wechseln"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Im Splitscreen-Modus rechts oder unten zu einer App wechseln"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Im Splitscreen-Modus links oder oben zu einer App wechseln"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Im Splitscreen: eine App durch eine andere ersetzen"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Eingabe"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Zur nächsten Sprache wechseln"</string> diff --git a/packages/SystemUI/res/values-de/tiles_states_strings.xml b/packages/SystemUI/res/values-de/tiles_states_strings.xml index e5f86557e171..4b4eed53d1f4 100644 --- a/packages/SystemUI/res/values-de/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-de/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Aus"</item> <item msgid="5137565285664080143">"An"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index c7d4825ecceb..222eb2934481 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Η λήψη στιγμιότυπων οθόνης έχει αποκλειστεί από τον διαχειριστή IT."</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Επεξεργασία"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Επεξεργασία στιγμιότυπου οθόνης"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Κοινή χρήση"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Κοινοποίηση στιγμιότυπου οθόνης"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Περισσότερα"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Παράβλεψη στιγμιότυπου οθόνης"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Σάρωση προσώπου"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Αποστολή"</string> <string name="cancel" msgid="1089011503403416730">"Ακύρωση"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Λογότυπο εφαρμογής"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Επιβεβαίωση"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Δοκιμάστε ξανά"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Πατήστε για ακύρωση του ελέγχου ταυτότητας"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Το πρόσωπο αναγνωρ. Πατήστε το εικον. ξεκλειδ. για συνέχεια."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Ολοκληρώθηκε ο έλεγχος ταυτότητας"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Ακύρωση ελέγχου ταυτότητας"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Περισσότερες επιλογές"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Χρήση PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Χρήση μοτίβου"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Χρήση κωδικού πρόσβασης"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Τυπική"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Μέτρια"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Υψηλή"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Κατάργηση"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Προσθήκη γραφικού στοιχείου"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Τέλος"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Να επιτρέπονται όλα τα γραφικά στοιχεία στην οθόνη κλειδώματος;"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Άνοιγμα ρυθμίσεων"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Αναίρ. παύσης εφαρμ. εργασιών;"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Ενεργοποίηση διαχωρισμού οθόνης με την τρέχουσα εφαρμογή στα δεξιά"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Ενεργοποίηση διαχωρισμού οθόνης με την τρέχουσα εφαρμογή στα αριστερά"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Εναλλαγή από διαχωρισμό οθόνης σε πλήρη οθόνη"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Εναλλαγή στην εφαρμογή δεξιά ή κάτω κατά τη χρήση διαχωρισμού οθόνης"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Εναλλαγή σε εφαρμογή αριστερά ή επάνω κατά τη χρήση διαχωρισμού οθόνης"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Κατά τον διαχωρισμό οθόνης: αντικατάσταση μιας εφαρμογής με άλλη"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Είσοδος"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Εναλλαγή στην επόμενη γλώσσα"</string> @@ -1176,7 +1181,7 @@ <string name="wifi_wont_autoconnect_for_now" msgid="5782282612749867762">"Δεν θα γίνεται προς το παρόν αυτόματη σύνδεση Wi-Fi."</string> <string name="see_all_networks" msgid="3773666844913168122">"Εμφάνιση όλων"</string> <string name="to_switch_networks_disconnect_ethernet" msgid="6698111101156951955">"Για εναλλαγή δικτύων, αποσυνδέστε το ethernet"</string> - <string name="wifi_scan_notify_message" msgid="3753839537448621794">"Για βελτίωση της εμπειρίας στη συσκευή, οι εφαρμογές και οι υπηρεσίες μπορούν ακόμα να εκτελούν σάρωση για δίκτυα Wi‑Fi ανά πάσα στιγμή, ακόμα και όταν το Wi‑Fi είναι απενεργοποιημένο. Μπορείτε να αλλάξετε αυτήν τη ρύθμιση στις ρυθμίσεις της Σάρωσης Wi‑Fi. "<annotation id="link">"Αλλαγή"</annotation></string> + <string name="wifi_scan_notify_message" msgid="3753839537448621794">"Για βελτίωση της εμπειρίας στη συσκευή, οι εφαρμογές και οι υπηρεσίες μπορούν ακόμα να εκτελούν σάρωση για δίκτυα Wi‑Fi ανά πάσα στιγμή, ακόμα και όταν το Wi‑Fi είναι απενεργοποιημένο. Μπορείτε να αλλάξετε αυτή τη ρύθμιση στις ρυθμίσεις της Σάρωσης Wi‑Fi. "<annotation id="link">"Αλλαγή"</annotation></string> <string name="turn_off_airplane_mode" msgid="8425587763226548579">"Απενεργοποίηση λειτουργίας πτήσης"</string> <string name="qs_tile_request_dialog_text" msgid="3501359944139877694">"Η εφαρμογή <xliff:g id="APPNAME">%1$s</xliff:g> θέλει να προσθέσει το παρακάτω πλακίδιο στις Γρήγορες ρυθμίσεις"</string> <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Προσθήκη πλακιδίου"</string> diff --git a/packages/SystemUI/res/values-el/tiles_states_strings.xml b/packages/SystemUI/res/values-el/tiles_states_strings.xml index a697711c120c..e4c6854a2f30 100644 --- a/packages/SystemUI/res/values-el/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-el/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Ανενεργό"</item> <item msgid="5137565285664080143">"Ενεργό"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index ed9e8168a522..2355e8a91140 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Taking screenshots is blocked by your IT admin"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Edit"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Edit screenshot"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Share"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Share screenshot"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capture more"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Dismiss screenshot"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanning face"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> <string name="cancel" msgid="1089011503403416730">"Cancel"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"App logo"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirm"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Try again"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Tap to cancel authentication"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Face recognised. Press the unlock icon to continue."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authenticated"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Cancel authentication"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"More options"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Use PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Use pattern"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Use password"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Medium"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"High"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,8 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Remove"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Add widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Done"</string> + <string name="label_for_button_in_empty_state_cta" msgid="7314975555382055823">"Add widgets"</string> + <string name="title_for_empty_state_cta" msgid="6161654421223450530">"Get quick access to your favourite app widgets without unlocking your tablet."</string> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Allow any widget on the lock screen?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Open settings"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Unpause work apps?"</string> @@ -472,7 +477,7 @@ <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> has disabled this option"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Start casting?"</string> <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"When you’re casting, Android has access to anything visible on your screen or played on your device. So be careful with things like passwords, payment details, messages, photos, audio and video."</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"When you’re casting an app, Android has access to anything shown or played on that app. So be careful with things like passwords, payment details, messages, photos, audio and video."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"When you’re casting an app, Android has access to anything shown or played on that app. Be careful with things like passwords, payment details, messages, photos, audio and video."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Start casting"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Start sharing?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"When you’re sharing, recording or casting, Android has access to anything visible on your screen or played on your device. So be careful with things like passwords, payment details, messages, photos, audio and video."</string> @@ -763,10 +768,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Enter split screen with current app to RHS"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Enter split screen with current app to LHS"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Switch from split screen to full screen"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Switch to the app on the right or below while using split screen"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Switch to the app on the left or above while using split screen"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"During split screen: Replace an app from one to another"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Switch to next language"</string> diff --git a/packages/SystemUI/res/values-en-rAU/tiles_states_strings.xml b/packages/SystemUI/res/values-en-rAU/tiles_states_strings.xml index d97c4c914f26..304abe108492 100644 --- a/packages/SystemUI/res/values-en-rAU/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-en-rAU/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Off"</item> <item msgid="5137565285664080143">"On"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index 99b3e31ecc7f..2c39531bfbaa 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -151,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanning face"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> <string name="cancel" msgid="1089011503403416730">"Cancel"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"App logo"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirm"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Try again"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Tap to cancel authentication"</string> @@ -165,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Face recognized. Press the unlock icon to continue."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authenticated"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Cancel Authentication"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"More Options"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Use PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Use pattern"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Use password"</string> @@ -361,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Medium"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"High"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -438,6 +442,8 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Remove"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Add widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Done"</string> + <string name="label_for_button_in_empty_state_cta" msgid="7314975555382055823">"Add widgets"</string> + <string name="title_for_empty_state_cta" msgid="6161654421223450530">"Get quick access to your favorite app widgets without unlocking your tablet."</string> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Allow any widget on lock screen?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Open settings"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Unpause work apps?"</string> diff --git a/packages/SystemUI/res/values-en-rCA/tiles_states_strings.xml b/packages/SystemUI/res/values-en-rCA/tiles_states_strings.xml index d97c4c914f26..304abe108492 100644 --- a/packages/SystemUI/res/values-en-rCA/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-en-rCA/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Off"</item> <item msgid="5137565285664080143">"On"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index ed9e8168a522..2355e8a91140 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Taking screenshots is blocked by your IT admin"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Edit"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Edit screenshot"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Share"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Share screenshot"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capture more"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Dismiss screenshot"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanning face"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> <string name="cancel" msgid="1089011503403416730">"Cancel"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"App logo"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirm"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Try again"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Tap to cancel authentication"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Face recognised. Press the unlock icon to continue."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authenticated"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Cancel authentication"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"More options"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Use PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Use pattern"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Use password"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Medium"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"High"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,8 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Remove"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Add widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Done"</string> + <string name="label_for_button_in_empty_state_cta" msgid="7314975555382055823">"Add widgets"</string> + <string name="title_for_empty_state_cta" msgid="6161654421223450530">"Get quick access to your favourite app widgets without unlocking your tablet."</string> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Allow any widget on the lock screen?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Open settings"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Unpause work apps?"</string> @@ -472,7 +477,7 @@ <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> has disabled this option"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Start casting?"</string> <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"When you’re casting, Android has access to anything visible on your screen or played on your device. So be careful with things like passwords, payment details, messages, photos, audio and video."</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"When you’re casting an app, Android has access to anything shown or played on that app. So be careful with things like passwords, payment details, messages, photos, audio and video."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"When you’re casting an app, Android has access to anything shown or played on that app. Be careful with things like passwords, payment details, messages, photos, audio and video."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Start casting"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Start sharing?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"When you’re sharing, recording or casting, Android has access to anything visible on your screen or played on your device. So be careful with things like passwords, payment details, messages, photos, audio and video."</string> @@ -763,10 +768,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Enter split screen with current app to RHS"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Enter split screen with current app to LHS"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Switch from split screen to full screen"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Switch to the app on the right or below while using split screen"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Switch to the app on the left or above while using split screen"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"During split screen: Replace an app from one to another"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Switch to next language"</string> diff --git a/packages/SystemUI/res/values-en-rGB/tiles_states_strings.xml b/packages/SystemUI/res/values-en-rGB/tiles_states_strings.xml index d97c4c914f26..304abe108492 100644 --- a/packages/SystemUI/res/values-en-rGB/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-en-rGB/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Off"</item> <item msgid="5137565285664080143">"On"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index ed9e8168a522..2355e8a91140 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Taking screenshots is blocked by your IT admin"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Edit"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Edit screenshot"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Share"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Share screenshot"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capture more"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Dismiss screenshot"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanning face"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> <string name="cancel" msgid="1089011503403416730">"Cancel"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"App logo"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirm"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Try again"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Tap to cancel authentication"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Face recognised. Press the unlock icon to continue."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authenticated"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Cancel authentication"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"More options"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Use PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Use pattern"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Use password"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Medium"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"High"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,8 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Remove"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Add widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Done"</string> + <string name="label_for_button_in_empty_state_cta" msgid="7314975555382055823">"Add widgets"</string> + <string name="title_for_empty_state_cta" msgid="6161654421223450530">"Get quick access to your favourite app widgets without unlocking your tablet."</string> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Allow any widget on the lock screen?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Open settings"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Unpause work apps?"</string> @@ -472,7 +477,7 @@ <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> has disabled this option"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Start casting?"</string> <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"When you’re casting, Android has access to anything visible on your screen or played on your device. So be careful with things like passwords, payment details, messages, photos, audio and video."</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"When you’re casting an app, Android has access to anything shown or played on that app. So be careful with things like passwords, payment details, messages, photos, audio and video."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"When you’re casting an app, Android has access to anything shown or played on that app. Be careful with things like passwords, payment details, messages, photos, audio and video."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Start casting"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Start sharing?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"When you’re sharing, recording or casting, Android has access to anything visible on your screen or played on your device. So be careful with things like passwords, payment details, messages, photos, audio and video."</string> @@ -763,10 +768,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Enter split screen with current app to RHS"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Enter split screen with current app to LHS"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Switch from split screen to full screen"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Switch to the app on the right or below while using split screen"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Switch to the app on the left or above while using split screen"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"During split screen: Replace an app from one to another"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Switch to next language"</string> diff --git a/packages/SystemUI/res/values-en-rIN/tiles_states_strings.xml b/packages/SystemUI/res/values-en-rIN/tiles_states_strings.xml index d97c4c914f26..304abe108492 100644 --- a/packages/SystemUI/res/values-en-rIN/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-en-rIN/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Off"</item> <item msgid="5137565285664080143">"On"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index fc7f605c6d94..26548528e070 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -151,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanning face"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> <string name="cancel" msgid="1089011503403416730">"Cancel"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"App logo"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirm"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Try again"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Tap to cancel authentication"</string> @@ -165,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Face recognized. Press the unlock icon to continue."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authenticated"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Cancel Authentication"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"More Options"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Use PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Use pattern"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Use password"</string> @@ -361,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Medium"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"High"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -438,6 +442,8 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Remove"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Add widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Done"</string> + <string name="label_for_button_in_empty_state_cta" msgid="7314975555382055823">"Add widgets"</string> + <string name="title_for_empty_state_cta" msgid="6161654421223450530">"Get quick access to your favorite app widgets without unlocking your tablet."</string> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Allow any widget on lock screen?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Open settings"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Unpause work apps?"</string> diff --git a/packages/SystemUI/res/values-en-rXC/tiles_states_strings.xml b/packages/SystemUI/res/values-en-rXC/tiles_states_strings.xml index 2facf58f0f59..fbd6d1160717 100644 --- a/packages/SystemUI/res/values-en-rXC/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-en-rXC/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Off"</item> <item msgid="5137565285664080143">"On"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 129987e8ceea..709238353e2e 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Tu administrador de TI bloquea las capturas de pantalla"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Editar"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Editar captura de pantalla"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Compartir"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Compartir captura"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturar más"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Descartar captura de pantalla"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Escaneando rostro"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Enviar"</string> <string name="cancel" msgid="1089011503403416730">"Cancelar"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logotipo de la app"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmar"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Volver a intentarlo"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Presiona para cancelar la autenticación"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Rostro reconocido. Presiona el desbloqueo para continuar."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticado"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Cancelar autenticación"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Más opciones"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Usar PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Usar patrón"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Usar contraseña"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Estándar"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Medio"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Alto"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,8 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Quitar"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Agregar widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Listo"</string> + <string name="label_for_button_in_empty_state_cta" msgid="7314975555382055823">"Agregar widgets"</string> + <string name="title_for_empty_state_cta" msgid="6161654421223450530">"Accede rápidamente a los widgets de tus apps favoritas sin desbloquear la tablet."</string> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"¿Quieres permitir cualquier widget en la pantalla de bloqueo?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Abrir configuración"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"¿Reanudar apps de trabajo?"</string> @@ -450,7 +455,7 @@ <string name="guest_wipe_session_message" msgid="3393823610257065457">"¿Quieres retomar la sesión?"</string> <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"Volver a empezar"</string> <string name="guest_wipe_session_dontwipe" msgid="3211052048269304205">"Sí, continuar"</string> - <string name="guest_notification_app_name" msgid="2110425506754205509">"Modo de Invitado"</string> + <string name="guest_notification_app_name" msgid="2110425506754205509">"Modo de invitado"</string> <string name="guest_notification_session_active" msgid="5567273684713471450">"Estás en el modo de invitado"</string> <string name="user_add_user_message_guest_remove" msgid="5589286604543355007">\n\n"Si agregas un usuario nuevo, se desactivará el modo de invitado y se borrarán todas las apps y los datos de la sesión de invitado actual."</string> <string name="user_limit_reached_title" msgid="2429229448830346057">"Alcanzaste el límite de usuarios"</string> @@ -470,10 +475,10 @@ <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Cuando compartas, grabes o transmitas una app, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> podrá acceder a todo el contenido que se muestre o que reproduzcas en ella. Por lo tanto, debes tener cuidado con contraseñas, detalles de pagos, mensajes, fotos, audios y videos."</string> <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"Iniciar"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> inhabilitó esta opción"</string> - <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"¿Quieres comenzar a transmitir contenido?"</string> + <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"¿Empezar a transmitir contenido?"</string> <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Cuando transmitas contenido, Android podrá acceder a todo lo que sea visible en la pantalla o que reproduzcas en el dispositivo. Por lo tanto, debes tener cuidado con contraseñas, detalles de pagos, mensajes, fotos, audios y videos."</string> <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Cuando transmitas una app, Android podrá acceder a todo el contenido que se muestre o que reproduzcas en ella. Por lo tanto, debes tener cuidado con contraseñas, detalles de pagos, mensajes, fotos, audios y videos."</string> - <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Comenzar a transmitir contenido"</string> + <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Empezar"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"¿Quieres empezar a compartir?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Cuando compartas, grabes o transmitas contenido, Android podrá acceder a todo lo que sea visible en la pantalla o que reproduzcas en el dispositivo. Por lo tanto, debes tener cuidado con contraseñas, detalles de pagos, mensajes, fotos, audios y videos."</string> <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Cuando compartas, grabes o transmitas una app, Android podrá acceder a todo el contenido que se muestre o que reproduzcas en ella. Por lo tanto, debes tener cuidado con contraseñas, detalles de pagos, mensajes, fotos, audios y videos."</string> @@ -621,7 +626,7 @@ <string name="wallet_title" msgid="5369767670735827105">"Billetera"</string> <string name="wallet_empty_state_label" msgid="7776761245237530394">"Prepárate para realizar compras rápidas y seguras con tu teléfono"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Mostrar todo"</string> - <string name="wallet_secondary_label_no_card" msgid="8488069304491125713">"Presiona para abrir"</string> + <string name="wallet_secondary_label_no_card" msgid="8488069304491125713">"Toca para abrir"</string> <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Actualizando"</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> @@ -763,10 +768,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Activar pantalla dividida con la app actual en el lado derecho (RHS)"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Activar pantalla dividida con la app actual en el lado izquierdo (LHS)"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Cambiar de pantalla dividida a pantalla completa"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Ubica la app a la derecha o abajo cuando usas la pantalla dividida"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Ubica la app a la izquierda o arriba cuando usas la pantalla dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Durante pantalla dividida: Reemplaza una app con otra"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Entrada"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Cambiar al próximo idioma"</string> @@ -1164,7 +1167,7 @@ <string name="mobile_data_connection_active" msgid="944490013299018227">"Conexión establecida"</string> <string name="mobile_data_temp_connection_active" msgid="4590222725908806824">"Conectado temporalmente"</string> <string name="mobile_data_poor_connection" msgid="819617772268371434">"Conexión deficiente"</string> - <string name="mobile_data_off_summary" msgid="3663995422004150567">"No se conectarán automáticamente los datos móviles"</string> + <string name="mobile_data_off_summary" msgid="3663995422004150567">"Los datos móviles no se conectarán automáticamente"</string> <string name="mobile_data_no_connection" msgid="1713872434869947377">"Sin conexión"</string> <string name="non_carrier_network_unavailable" msgid="770049357024492372">"No hay otras redes disponibles"</string> <string name="all_network_unavailable" msgid="4112774339909373349">"No hay redes disponibles"</string> diff --git a/packages/SystemUI/res/values-es-rUS/tiles_states_strings.xml b/packages/SystemUI/res/values-es-rUS/tiles_states_strings.xml index 6446bdff9ffc..71efef961b89 100644 --- a/packages/SystemUI/res/values-es-rUS/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-es-rUS/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Desactivado"</item> <item msgid="5137565285664080143">"Activado"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index c01a44f27449..bccf20bd349c 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Tu administrador de TI ha bloqueado las capturas de pantalla"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Editar"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Editar captura de pantalla"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Compartir"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Compartir captura de pantalla"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturar más"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Cerrar captura de pantalla"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Escaneando cara"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Enviar"</string> <string name="cancel" msgid="1089011503403416730">"Cancelar"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logotipo de la aplicación"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmar"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Reintentar"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Toca para cancelar la autenticación"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Cara reconocida. Pulsa el icono de desbloquear para continuar."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Se ha autenticado"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Cancelar autenticación"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Más opciones"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Usar PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Usar patrón"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Usar contraseña"</string> @@ -265,7 +266,7 @@ <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"No hay dispositivos vinculados disponibles"</string> <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Toca para conectar o desconectar un dispositivo"</string> - <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Emparejar un nuevo dispositivo"</string> + <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Emparejar nuevo dispositivo"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"Ver todos"</string> <string name="turn_on_bluetooth" msgid="5681370462180289071">"Usar Bluetooth"</string> <string name="quick_settings_bluetooth_device_connected" msgid="7884777006729260996">"Conectado"</string> @@ -286,7 +287,7 @@ <string name="quick_settings_location_label" msgid="2621868789013389163">"Ubicación"</string> <string name="quick_settings_screensaver_label" msgid="1495003469366524120">"Salvapantallas"</string> <string name="quick_settings_camera_label" msgid="5612076679385269339">"Acceso a cámara"</string> - <string name="quick_settings_mic_label" msgid="8392773746295266375">"Acceso al micro"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Acceso a micro"</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> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Estándar"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Medio"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Alto"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Quitar"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Añadir widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Hecho"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"¿Permitir cualquier widget en la pantalla de bloqueo?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Abrir ajustes"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"¿Reactivar apps de trabajo?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Tu padre o madre gestionan este dispositivo y pueden ver y controlar cierta información, como las aplicaciones que utilizas, tu ubicación y tu tiempo de pantalla."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Desbloqueado por TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Dispositivo bloqueado; demasiados intentos de autenticación"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Dispositivo bloqueado\nError de autenticación"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Ajustes de sonido"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Subtitular automáticamente"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Iniciar pantalla dividida con esta aplicación en el lado derecho"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Iniciar pantalla dividida con esta aplicación en el lado izquierdo"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Cambiar de pantalla dividida a pantalla completa"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Cambiar a la app de la derecha o de abajo en pantalla dividida"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Cambiar a la app de la izquierda o de arriba en pantalla dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Con pantalla dividida: reemplazar una aplicación por otra"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Entrada"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Cambiar a siguiente idioma"</string> diff --git a/packages/SystemUI/res/values-es/tiles_states_strings.xml b/packages/SystemUI/res/values-es/tiles_states_strings.xml index 4cc0c6749a01..bd90056382e6 100644 --- a/packages/SystemUI/res/values-es/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-es/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Desactivado"</item> <item msgid="5137565285664080143">"Activado"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index ff07693fc948..b25fa06fb0b8 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -151,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Näo skannimine"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Saada"</string> <string name="cancel" msgid="1089011503403416730">"Tühista"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Rakenduse logo"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Kinnita"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Proovi uuesti"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Puudutage autentimise tühistamiseks"</string> @@ -165,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Nägu tuvastati. Jätkamiseks vajutage avamise ikooni."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenditud"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Tühista autentimine"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Rohkem valikuid"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Kasuta PIN-koodi"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Kasuta mustrit"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Kasuta parooli"</string> @@ -361,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Tavaline"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Keskmine"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Kõrge"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -438,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Eemalda"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Lisa vidin"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Valmis"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Kas lubada lukustuskuval kõik vidinad?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Ava seaded"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Kas lõpetada töörakenduste peatamine?"</string> @@ -539,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Seda seadet haldab sinu vanem. Sinu vanem näeb ja saab hallata teavet, näiteks kasutatavaid rakendusi, sinu asukohta ja ekraaniaega."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Avatuna hoiab TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Seade lukustati, liiga palju autentimiskatseid"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Seade on lukustatud\nAutentimine ebaõnnestus"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Heliseaded"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Automaatsed subtiitrid"</string> @@ -611,7 +617,7 @@ <string name="volume_panel_hint_mute" msgid="6962563028495243738">"vaigistab %s"</string> <string name="volume_panel_hint_unmute" msgid="7489063242934477382">"tühistab %s vaigistuse"</string> <string name="media_output_label_title" msgid="872824698593182505">"Esitamine jätkub seadmes <xliff:g id="LABEL">%s</xliff:g>"</string> - <string name="media_output_title_without_playing" msgid="3825663683169305013">"Heli esitamine jätkub"</string> + <string name="media_output_title_without_playing" msgid="3825663683169305013">"Heli esitatakse seadmes"</string> <string name="system_ui_tuner" msgid="1471348823289954729">"Süsteemi kasutajaliidese tuuner"</string> <string name="status_bar" msgid="4357390266055077437">"Olekuriba"</string> <string name="demo_mode" msgid="263484519766901593">"Süsteemi kasutajaliidese demorežiim"</string> @@ -1176,7 +1182,7 @@ <string name="see_all_networks" msgid="3773666844913168122">"Kuva kõik"</string> <string name="to_switch_networks_disconnect_ethernet" msgid="6698111101156951955">"Võrkude vahetamiseks katkestage Etherneti-ühendus"</string> <string name="wifi_scan_notify_message" msgid="3753839537448621794">"Seadme kasutuskogemuse parandamiseks võivad rakendused ja teenused siiski alati otsida WiFi-võrke isegi siis, kui WiFi on väljas. Seda saab muuta WiFi-skannimise seadetes. "<annotation id="link">"Muuda"</annotation></string> - <string name="turn_off_airplane_mode" msgid="8425587763226548579">"Lennureżiimi väljalülitamine"</string> + <string name="turn_off_airplane_mode" msgid="8425587763226548579">"Lülita lennukireżiim välja"</string> <string name="qs_tile_request_dialog_text" msgid="3501359944139877694">"<xliff:g id="APPNAME">%1$s</xliff:g> soovib kiirseadetesse lisada järgmise paani"</string> <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Lisa paan"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Ära lisa paani"</string> @@ -1237,7 +1243,7 @@ <string name="home_quick_affordance_unavailable_configure_the_app" msgid="604424593994493281">"• Vähemalt üks seade või seadmepaneel on saadaval"</string> <string name="notes_app_quick_affordance_unavailable_explanation" msgid="4796955161600178530">"Valige märkmete tegemise vaikerakendus, et kasutada märkmete tegemise otseteed"</string> <string name="keyguard_affordance_enablement_dialog_notes_app_action" msgid="6821710209675089470">"Valige rakendus"</string> - <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Pikalt puudutamise otsetee"</string> + <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Puudutage otseteed pikalt"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Tühista"</string> <string name="rear_display_bottom_sheet_confirm" msgid="1507591562761552899">"Vaheta ekraane kohe"</string> <string name="rear_display_folded_bottom_sheet_title" msgid="3930008746560711990">"Telefoni lahtivoltimine"</string> diff --git a/packages/SystemUI/res/values-et/tiles_states_strings.xml b/packages/SystemUI/res/values-et/tiles_states_strings.xml index f16d55247099..55bff30d3071 100644 --- a/packages/SystemUI/res/values-et/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-et/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Väljas"</item> <item msgid="5137565285664080143">"Sees"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index caed3b5aa98e..87c68ff400dc 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"IKT saileko administratzaileak blokeatu egin dizu pantaila-argazkiak ateratzeko aukera"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Editatu"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Editatu pantaila-argazkia"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Partekatu"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Partekatu pantaila-argazkia"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Kapturatu eduki gehiago"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Baztertu pantaila-argazkia"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Aurpegia eskaneatzen"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Bidali"</string> <string name="cancel" msgid="1089011503403416730">"Utzi"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Aplikazioaren logotipoa"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Berretsi"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Saiatu berriro"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Sakatu hau autentifikazioa bertan behera uzteko"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Ezagutu da aurpegia. Aurrera egiteko, sakatu desblokeatzeko ikonoa."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentifikatuta"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Utzi bertan behera autentifikazioa"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Aukera gehiago"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Erabili PINa"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Erabili eredua"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Erabili pasahitza"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Arrunta"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Tartekoa"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Altua"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Kendu"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Gehitu widget bat"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Eginda"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Pantaila blokeatuan edozein widget erakusteko baimena eman nahi duzu?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Ireki ezarpenak"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Laneko aplikazioak berraktibatu?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Zure gurasoak kudeatzen du gailua. Zure gurasoak gailuko informazioa ikusi eta kudea dezake; besteak beste, zer aplikazio erabiltzen dituzun, zure kokapena zein den eta pantaila aurrean zenbat eta noiz egoten zaren."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPNa"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent bidez desblokeatuta"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Blokeatu egin da gailua. Autentifikatze-saiakera gehiegi egin dira."</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Gailua blokeatuta dago\nEzin izan da autentifikatu"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Soinuaren ezarpenak"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Ezarri azpitituluak automatikoki"</string> @@ -595,7 +600,7 @@ <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. Sakatu audioa desaktibatzeko. Baliteke erabilerraztasun-eginbideen audioa desaktibatzea."</string> <string name="volume_stream_content_description_vibrate_a11y" msgid="2742330052979397471">"%1$s. Sakatu hau dardara ezartzeko."</string> <string name="volume_stream_content_description_mute_a11y" msgid="5743548478357238156">"%1$s. Sakatu hau audioa desaktibatzeko."</string> - <string name="volume_panel_noise_control_title" msgid="7413949943872304474">"Zarata-murrizketa"</string> + <string name="volume_panel_noise_control_title" msgid="7413949943872304474">"Zarata-kontrola"</string> <string name="volume_panel_spatial_audio_title" msgid="3367048857932040660">"Audio espaziala"</string> <string name="volume_panel_spatial_audio_off" msgid="4177490084606772989">"Desaktibatuta"</string> <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Finkoa"</string> @@ -612,7 +617,7 @@ <string name="volume_panel_hint_mute" msgid="6962563028495243738">"desaktibatu honen audioa: %s"</string> <string name="volume_panel_hint_unmute" msgid="7489063242934477382">"aktibatu honen audioa: %s"</string> <string name="media_output_label_title" msgid="872824698593182505">"<xliff:g id="LABEL">%s</xliff:g> hemen erreproduzitzen:"</string> - <string name="media_output_title_without_playing" msgid="3825663683169305013">"Audioa erreproduzitzen jarraituko du"</string> + <string name="media_output_title_without_playing" msgid="3825663683169305013">"Audioak abian jarraituko du hemen:"</string> <string name="system_ui_tuner" msgid="1471348823289954729">"Sistemaren erabiltzaile-interfazearen konfiguratzailea"</string> <string name="status_bar" msgid="4357390266055077437">"Egoera-barra"</string> <string name="demo_mode" msgid="263484519766901593">"Sistemaren erabiltzaile-interfazearen demo modua"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Sartu pantaila zatituaren eskuineko aldean oraingo aplikazioarekin"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Sartu pantaila zatituaren ezkerreko aldean oraingo aplikazioarekin"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Aldatu pantaila zatitutik pantaila osora"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Aldatu eskuineko edo beheko aplikaziora pantaila zatitua erabiltzean"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Aldatu ezkerreko edo goiko aplikaziora pantaila zatitua erabiltzean"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Pantaila zatituan zaudela, ordeztu aplikazio bat beste batekin"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Sarrera"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Aldatu hurrengo hizkuntzara"</string> @@ -1153,7 +1156,7 @@ <string name="person_available" msgid="2318599327472755472">"Konektatuta"</string> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Arazo bat izan 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> + <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Alarmarik ez"</string> <string name="accessibility_bouncer" msgid="5896923685673320070">"erabili pantailaren blokeoa"</string> <string name="accessibility_fingerprint_label" msgid="5255731221854153660">"Hatz-marken sentsorea"</string> <string name="accessibility_authenticate_hint" msgid="798914151813205721">"autentifikatu"</string> @@ -1166,7 +1169,7 @@ <string name="mobile_data_connection_active" msgid="944490013299018227">"Konektatuta"</string> <string name="mobile_data_temp_connection_active" msgid="4590222725908806824">"Aldi baterako konektatuta"</string> <string name="mobile_data_poor_connection" msgid="819617772268371434">"Konexio ahula"</string> - <string name="mobile_data_off_summary" msgid="3663995422004150567">"Ez da automatikoki aktibatuko datu-konexioa"</string> + <string name="mobile_data_off_summary" msgid="3663995422004150567">"Datu-konexioa ez da automatikoki aktibatuko"</string> <string name="mobile_data_no_connection" msgid="1713872434869947377">"Konexiorik gabe"</string> <string name="non_carrier_network_unavailable" msgid="770049357024492372">"Ez dago beste sare erabilgarririk"</string> <string name="all_network_unavailable" msgid="4112774339909373349">"Ez dago sare erabilgarririk"</string> diff --git a/packages/SystemUI/res/values-eu/tiles_states_strings.xml b/packages/SystemUI/res/values-eu/tiles_states_strings.xml index 0f6570c39750..7f38d4486600 100644 --- a/packages/SystemUI/res/values-eu/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-eu/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Desaktibatuta"</item> <item msgid="5137565285664080143">"Aktibatuta"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 03566d69a01b..cc979794bc35 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"سرپرست فناوری اطلاعات گرفتن نماگرفت را مسدود کرده است"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"ویرایش"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"ویرایش نماگرفت"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"همرسانی"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"همرسانی نماگرفت"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"ضبط محتوای بیشتر"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"رد کردن نماگرفت"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"درحال اسکن کردن چهره"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ارسال"</string> <string name="cancel" msgid="1089011503403416730">"لغو"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"نشانواره برنامه"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"تأیید"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"امتحان مجدد"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"برای لغو راستیآزمایی ضربه بزنید"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"چهره شناسایی شد. برای ادامه، نماد قفلگشایی را فشار دهید."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"راستیآزماییشده"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"لغو اصالتسنجی"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"گزینههای بیشتر"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"استفاده از پین"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"استفاده از الگو"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"استفاده از گذرواژه"</string> @@ -274,7 +275,7 @@ <string name="accessibility_quick_settings_bluetooth_device_tap_to_activate" msgid="3724301751036877403">"فعال کردن"</string> <string name="turn_on_bluetooth_auto_tomorrow" msgid="414836329962473906">"فردا دوباره بهطور خودکار روشن شود"</string> <string name="turn_on_bluetooth_auto_info_disabled" msgid="8267380591344023327">"ویژگیهایی مثل «همرسانی سریع»، «پیدا کردن دستگاهم»، و مکان دستگاه از بلوتوث استفاده میکنند"</string> - <string name="turn_on_bluetooth_auto_info_enabled" msgid="4802071533678400330">"بلوتوث فردا ۵ ق.ظ. روشن خواهد شد"</string> + <string name="turn_on_bluetooth_auto_info_enabled" msgid="4802071533678400330">"بلوتوث فردا ۵ ق.ظ روشن خواهد شد"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"شارژ باتری <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> <string name="quick_settings_bluetooth_secondary_label_audio" msgid="780333390310051161">"صوت"</string> <string name="quick_settings_bluetooth_secondary_label_headset" msgid="2332093067553000852">"هدست"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"استاندارد"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"متوسط"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"بالا"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"برداشتن"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"افزودن ابزارک"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"تمام"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"هر نوع ابزارکی در صفحه قفل مجاز شود؟"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"باز کردن تنظیمات"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"مکث برنامههای کاری لغو شود؟"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"این دستگاه را ولیتان مدیریت میکند. ولیتان میتواند اطلاعاتی مثل برنامههایی که استفاده میکنید، مکانتان، و مدت تماشای صفحهتان را ببیند و مدیریت کند."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"با TrustAgent قفل را باز نگهدارید"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"دستگاه قفل شد، تعداد تلاشها برای اصالتسنجی بسیار زیاد بود"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"دستگاه قفل شد\nاصالتسنجی ناموفق بود"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"تنظیمات صدا"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"رسانه زیرنویس خودکار"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"وارد شدن به صفحهٔ دونیمه با برنامه فعلی در سمت راست"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"وارد شدن به صفحهٔ دونیمه با برنامه فعلی در سمت چپ"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"جابهجایی از صفحهٔ دونیمه به تمام صفحه"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"رفتن به برنامه سمت راست یا پایین درحین استفاده از صفحهٔ دونیمه"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"رفتن به برنامه سمت چپ یا بالا درحین استفاده از صفحهٔ دونیمه"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"درحین صفحهٔ دونیمه: برنامهای را با دیگری جابهجا میکند"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ورودی"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"رفتن به زبان بعدی"</string> diff --git a/packages/SystemUI/res/values-fa/tiles_states_strings.xml b/packages/SystemUI/res/values-fa/tiles_states_strings.xml index 6d6954eec79b..9a6b1af3ad6b 100644 --- a/packages/SystemUI/res/values-fa/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-fa/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"خاموش"</item> <item msgid="5137565285664080143">"روشن"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index ee3631557ef5..33d0776c7418 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"IT-järjestelmänvalvoja on estänyt kuvakaappauksien ottamisen."</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Muuta"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Muokkaa kuvakaappausta"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Jaa"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Jaa kuvakaappaus"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Kuvaa enemmän"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Hylkää kuvakaappaus"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Kasvojen skannaus"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Lähetä"</string> <string name="cancel" msgid="1089011503403416730">"Peru"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Sovelluksen logo"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Vahvista"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Yritä uudelleen"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Peru todennus napauttamalla"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Kasvot tunnistettu. Jatka lukituksen avauskuvakkeella."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Todennettu"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Peruuta todennus"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Lisää vaihtoehtoja"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Käytä PIN-koodia"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Käytä kuviota"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Käytä salasanaa"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Tavallinen"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Keskitaso"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Suuri"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Poista"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Lisää widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Valmis"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Sallitaanko kaikki widgetit lukitusnäytöllä?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Avaa asetukset"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Laita työsovellukset päälle?"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Siirry jaettuun näyttöön (sovellus oikeanpuoleiseen näyttöön)"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Siirry jaettuun näyttöön (sovellus vasemmanpuoleiseen näyttöön)"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Vaihda jaetusta näytöstä koko näyttöön"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Vaihda sovellukseen oikealla tai alapuolella jaetun näytön avulla"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Vaihda sovellukseen vasemmalla tai yläpuolella jaetun näytön avulla"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Jaetun näytön aikana: korvaa sovellus toisella"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Syöttötapa"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Vaihda seuraavaan kieleen"</string> diff --git a/packages/SystemUI/res/values-fi/tiles_states_strings.xml b/packages/SystemUI/res/values-fi/tiles_states_strings.xml index 545abc9c5681..f1e3e614cb70 100644 --- a/packages/SystemUI/res/values-fi/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-fi/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Pois päältä"</item> <item msgid="5137565285664080143">"Päällä"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 5c534cb15002..be65bf5b1f85 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"La prise de captures d\'écran est bloquée par votre administrateur informatique"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Modifier"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Modifier la capture d\'écran"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Partager"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Partagez la capture d\'écran"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturer plus"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Fermer la capture d\'écran"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Numérisation du visage"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Envoyer"</string> <string name="cancel" msgid="1089011503403416730">"Annuler"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logo de l\'application"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmer"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Réessayer"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Touchez ici pour annuler l\'authentification"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Visage reconnu. Appuyez sur Déverrouiller pour continuer."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authentifié"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Annuler l\'authentification"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Plus d\'options"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Utiliser un NIP"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Utiliser un schéma"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Utiliser un mot de passe"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Moyen"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Élevé"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Retirer"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Ajouter un widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Terminé"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Autoriser n\'importe quel widget sur l\'écran de verrouillage?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Ouvrir les paramètres"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Réactiver les applis pros?"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Passer à l\'écran divisé avec l\'application actuelle à droite"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Passer à l\'écran divisé avec l\'application actuelle à gauche"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Passer de l\'écran divisé au plein écran"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Passer à l\'application à droite ou en dessous avec l\'Écran divisé"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Passer à l\'application à gauche ou au-dessus avec l\'Écran divisé"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"En mode d\'écran divisé : remplacer une application par une autre"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Entrée"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Passer à la langue suivante"</string> diff --git a/packages/SystemUI/res/values-fr-rCA/tiles_states_strings.xml b/packages/SystemUI/res/values-fr-rCA/tiles_states_strings.xml index d89484dc8c4a..dfea45ac8d84 100644 --- a/packages/SystemUI/res/values-fr-rCA/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Désactivée"</item> <item msgid="5137565285664080143">"Activée"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 35c8e7ec3ef0..983a41cd67bb 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"La capture d\'écran est bloquée par votre administrateur informatique"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Modifier"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Modifier la capture d\'écran"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Partager"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Partager la capture d\'écran"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturer plus"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Fermer la capture d\'écran"</string> @@ -111,7 +110,7 @@ <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Lancer l\'enregistrement"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Enregistrer l\'audio"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Audio de l\'appareil"</string> - <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"Son provenant de l\'appareil (musique, appels et sonneries, etc.)"</string> + <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"Son provenant de l\'appareil (musique, appels, sonneries, etc.)"</string> <string name="screenrecord_mic_label" msgid="2111264835791332350">"Micro"</string> <string name="screenrecord_device_audio_and_mic_label" msgid="1831323771978646841">"Audio de l\'appareil et micro"</string> <string name="screenrecord_continue" msgid="4055347133700593164">"Commencer"</string> @@ -146,12 +145,13 @@ <string name="accessibility_phone_button" msgid="4256353121703100427">"Téléphoner"</string> <string name="accessibility_voice_assist_button" msgid="6497706615649754510">"Assistance vocale"</string> <string name="accessibility_wallet_button" msgid="1458258783460555507">"Wallet"</string> - <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"Lecteur de code QR"</string> + <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"Lecteur code QR"</string> <string name="accessibility_unlock_button" msgid="3613812140816244310">"Déverrouillé"</string> <string name="accessibility_lock_icon" msgid="661492842417875775">"Appareil verrouillé"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Analyse du visage en cours"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Envoyer"</string> <string name="cancel" msgid="1089011503403416730">"Annuler"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logo de l\'appli"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmer"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Réessayer"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Appuyer pour annuler l\'authentification"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Visage reconnu. Appuyez sur l\'icône de déverrouillage pour continuer."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authentifié"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Annuler l\'authentification"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Plus d\'options"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Utiliser un code PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Utiliser un schéma"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Utiliser un mot de passe"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Moyen"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Élevé"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Débloquer le micro de l\'appareil ?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Débloquer la caméra de l\'appareil ?"</string> <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Débloquer l\'appareil photo et le micro de l\'appareil ?"</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Supprimer"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Ajouter un widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"OK"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Autoriser n\'importe quel widget sur l\'écran de verrouillage ?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Ouvrir les paramètres"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Réactiver les applis pro ?"</string> @@ -463,7 +470,7 @@ <string name="media_projection_sys_service_dialog_title" msgid="3751133258891897878">"Commencer à enregistrer ou à caster ?"</string> <string name="media_projection_sys_service_dialog_warning" msgid="2443872865267330320">"Le service qui fournit cette fonction aura accès à toutes les infos visibles sur votre écran ou lues depuis votre appareil pendant un enregistrement ou une diffusion de contenu. Il peut s\'agir de mots de passe, détails de mode de paiement, photos, messages ou encore contenus audio lus."</string> <string name="screen_share_permission_dialog_option_entire_screen" msgid="3131200488455089620">"Tout l\'écran"</string> - <string name="screen_share_permission_dialog_option_single_app" msgid="4350961814397220929">"Une seule appli"</string> + <string name="screen_share_permission_dialog_option_single_app" msgid="4350961814397220929">"Uniquement l\'appli"</string> <string name="screen_share_permission_app_selector_title" msgid="1404878013670347899">"Partager ou enregistrer une appli"</string> <string name="media_projection_entry_app_permission_dialog_title" msgid="9155535851866407199">"Commencer à enregistrer ou à caster avec <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ?"</string> <string name="media_projection_entry_app_permission_dialog_warning_entire_screen" msgid="8736391633234144237">"Lorsque vous partagez, enregistrez ou castez, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> a accès à tout ce qui est visible sur votre écran ou lu sur votre appareil. Faites donc attention aux éléments tels que les mots de passe, détails de mode de paiement, messages, photos et contenus audio et vidéo."</string> @@ -610,7 +617,7 @@ <string name="volume_panel_hint_mute" msgid="6962563028495243738">"couper le son de %s"</string> <string name="volume_panel_hint_unmute" msgid="7489063242934477382">"réactiver le son de %s"</string> <string name="media_output_label_title" msgid="872824698593182505">"Diffusion de <xliff:g id="LABEL">%s</xliff:g> sur"</string> - <string name="media_output_title_without_playing" msgid="3825663683169305013">"L\'audio se mettra en marche"</string> + <string name="media_output_title_without_playing" msgid="3825663683169305013">"Lecture audio sur"</string> <string name="system_ui_tuner" msgid="1471348823289954729">"System UI Tuner"</string> <string name="status_bar" msgid="4357390266055077437">"Barre d\'état"</string> <string name="demo_mode" msgid="263484519766901593">"Mode démo de l\'UI du système"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Passer en écran partagé avec l\'appli actuelle affichée à droite"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Passer en écran partagé avec l\'appli actuelle affichée à gauche"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Passer de l\'écran partagé au plein écran"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Passez à l\'appli à droite ou en dessous avec l\'écran partagé"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Passez à l\'appli à gauche ou au-dessus avec l\'écran partagé"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"En mode écran partagé : Remplacer une appli par une autre"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Saisie"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Passer à la langue suivante"</string> diff --git a/packages/SystemUI/res/values-fr/tiles_states_strings.xml b/packages/SystemUI/res/values-fr/tiles_states_strings.xml index a560ff0a2f26..34ccb7517615 100644 --- a/packages/SystemUI/res/values-fr/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-fr/tiles_states_strings.xml @@ -58,7 +58,7 @@ </string-array> <string-array name="tile_states_flashlight"> <item msgid="3465257127433353857">"Indisponible"</item> - <item msgid="5044688398303285224">"Désactivé"</item> + <item msgid="5044688398303285224">"Désactivée"</item> <item msgid="8527389108867454098">"Activée"</item> </string-array> <string-array name="tile_states_rotation"> @@ -79,7 +79,7 @@ <string-array name="tile_states_location"> <item msgid="3316542218706374405">"Indisponible"</item> <item msgid="4813655083852587017">"Désactivé"</item> - <item msgid="6744077414775180687">"Activé"</item> + <item msgid="6744077414775180687">"Activée"</item> </string-array> <string-array name="tile_states_hotspot"> <item msgid="3145597331197351214">"Indisponible"</item> @@ -113,7 +113,7 @@ </string-array> <string-array name="tile_states_cast"> <item msgid="6032026038702435350">"Indisponible"</item> - <item msgid="1488620600954313499">"Désactivé"</item> + <item msgid="1488620600954313499">"Désactivée"</item> <item msgid="588467578853244035">"Activé"</item> </string-array> <string-array name="tile_states_night"> @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Désactivé"</item> <item msgid="5137565285664080143">"Activé"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index c0694e6bf494..d853b128eefd 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -151,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Analizando cara"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Enviar"</string> <string name="cancel" msgid="1089011503403416730">"Cancelar"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logotipo da aplicación"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmar"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Tentar de novo"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Toca para cancelar a autenticación"</string> @@ -165,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Recoñeceuse a cara. Preme a icona de desbloquear."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticado"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Cancelar a autenticación"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Máis opcións"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Usar PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Usar padrón"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Usar contrasinal"</string> @@ -361,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Nivel estándar"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Nivel medio"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Nivel alto"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -438,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Quitar"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Engadir widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Feito"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Queres permitir calquera widget na pantalla de bloqueo?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Abrir configuración"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Reactivar apps do traballo?"</string> diff --git a/packages/SystemUI/res/values-gl/tiles_states_strings.xml b/packages/SystemUI/res/values-gl/tiles_states_strings.xml index 1cde1ab0cbb7..de8ee63907aa 100644 --- a/packages/SystemUI/res/values-gl/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-gl/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Desactivado"</item> <item msgid="5137565285664080143">"Activado"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 9913d04a073d..7ef77fda1cee 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"તમારા IT ઍડમિન દ્વારા સ્ક્રીનશૉટ લેવાની સુવિધા બ્લૉક કરવામાં આવી છે"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"ફેરફાર કરો"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"સ્ક્રીનશૉટમાં ફેરફાર કરો"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"શેર કરો"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"સ્ક્રીનશૉટ શેર કરો"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"વધુ કૅપ્ચર કરો"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"સ્ક્રીનશૉટ છોડી દો"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"ચહેરો સ્કૅન કરવો"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"મોકલો"</string> <string name="cancel" msgid="1089011503403416730">"રદ કરો"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"ઍપનો લોગો"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"કન્ફર્મ કરો"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ફરી પ્રયાસ કરો"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"પ્રમાણીકરણ રદ કરવા માટે ટૅપ કરો"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"ચહેરો ઓળખ્યો. આગળ વધવા \'અનલૉક કરો\' આઇકન દબાવો."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"પ્રમાણિત"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"પ્રમાણીકરણ રદ કરો"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"વધુ વિકલ્પો"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"પિનનો ઉપયોગ કરો"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"પૅટર્નનો ઉપયોગ કરો"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"પાસવર્ડનો ઉપયોગ કરો"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"સ્ટૅન્ડર્ડ"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"મધ્યમ"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"વધુ"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"કાઢી નાખો"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"વિજેટ ઉમેરો"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"થઈ ગયું"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"લૉક સ્ક્રીન પર કોઈપણ વિજેટને મંજૂરી આપીએ?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"સેટિંગ ખોલો"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"ઑફિસની થોભાવેલી ઍપ ચાલુ કરીએ?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"આ ડિવાઇસ તમારા માતાપિતા દ્વારા મેનેજ કરવામાં આવે છે. તમે જેનો ઉપયોગ કરો છો તે ઍપ, તમારું સ્થાન અને તમારા સ્ક્રીન સમય જેવી માહિતીને તમારા માતાપિતા જોઈ અને મેનેજ કરી શકે છે."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent દ્વારા અનલૉક રાખેલું"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"પ્રમાણીકરણના ઘણા પ્રયાસો કરવામાં આવ્યા, તેથી ડિવાઇસ લૉક કરવામાં આવ્યું"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"ડિવાઇસ લૉક કર્યું\nપ્રમાણીકરણ નિષ્ફળ થયું છે"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"સાઉન્ડ સેટિંગ"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"મીડિયામાં કૅપ્શન ઑટોમૅટિક રીતે ઉમેરો"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"જમણી બાજુ પર હાલની ઍપ સાથે વિભાજિત સ્ક્રીનમાં દાખલ થાઓ"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"ડાબી બાજુ પર હાલની ઍપ સાથે વિભાજિત સ્ક્રીનમાં દાખલ થાઓ"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"વિભાજિત સ્ક્રીનથી પૂર્ણ સ્ક્રીન પર સ્વિચ કરો"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"વિભાજિત સ્ક્રીનનો ઉપયોગ કરતી વખતે જમણી બાજુ કે નીચેની ઍપ પર સ્વિચ કરો"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"વિભાજિત સ્ક્રીનનો ઉપયોગ કરતી વખતે ડાબી બાજુની કે ઉપરની ઍપ પર સ્વિચ કરો"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"વિભાજિત સ્ક્રીન દરમિયાન: એક ઍપને બીજી ઍપમાં બદલો"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ઇનપુટ"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"આગલી ભાષા પર સ્વિચ કરો"</string> diff --git a/packages/SystemUI/res/values-gu/tiles_states_strings.xml b/packages/SystemUI/res/values-gu/tiles_states_strings.xml index 65b6133c547c..c6a86e550f7a 100644 --- a/packages/SystemUI/res/values-gu/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-gu/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"બંધ"</item> <item msgid="5137565285664080143">"ચાલુ"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 03018c08bb4a..6a7328b2f041 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"आईटी एडमिन ने स्क्रीनशॉट लेने पर रोक लगाई है"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"बदलाव करें"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"स्क्रीनशॉट में बदलाव करें"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"शेयर करें"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"स्क्रीनशॉट शेयर करें"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"ज़्यादा कॉन्टेंट कैप्चर करें"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"स्क्रीनशॉट को खारिज करें"</string> @@ -105,7 +104,7 @@ <string name="screenrecord_title" msgid="4257171601439507792">"स्क्रीन रिकॉर्डर"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"स्क्रीन रिकॉर्डिंग को प्रोसेस किया जा रहा है"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"स्क्रीन रिकॉर्ड सेशन के लिए जारी सूचना"</string> - <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"क्या स्क्रीन रिकॉर्ड करनी है?"</string> + <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"क्या रिकॉर्डिंग शुरू करनी है?"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"रिकॉर्ड करते समय, Android के पास स्क्रीन पर दिख रहे कॉन्टेंट या डिवाइस पर चल रहे हर मीडिया का ऐक्सेस होता है. इसलिए, पासवर्ड, पेमेंट के तरीके की जानकारी, मैसेज, फ़ोटो, और डिवाइस पर चल रहे ऑडियो और वीडियो को लेकर सावधानी बरतें."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"किसी ऐप्लिकेशन को रिकॉर्ड करते समय, Android के पास उस ऐप्लिकेशन पर दिख रहे कॉन्टेंट या उस पर चल रहे हर मीडिया का ऐक्सेस होता है. इसलिए, पासवर्ड, पेमेंट के तरीके की जानकारी, मैसेज, फ़ोटो, और डिवाइस पर चल रहे ऑडियो और वीडियो को लेकर सावधानी बरतें."</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"रिकॉर्ड करें"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"डिवाइस अनलॉक करने के लिए चेहरा स्कैन किया जाता है"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"भेजें"</string> <string name="cancel" msgid="1089011503403416730">"रद्द करें"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"ऐप्लिकेशन का लोगो"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"पुष्टि करें"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"फिर से कोशिश करें"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"पुष्टि की प्रक्रिया रद्द करने के लिए टैप करें"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"चेहरे की पहचान हो गई. जारी रखने के लिए अनलॉक आइकॉन को टैप करें."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"पुष्टि हो गई"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"पुष्टि करने की प्रोसेस को रद्द करें"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"ज़्यादा विकल्प"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"पिन इस्तेमाल करें"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"पैटर्न इस्तेमाल करें"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"पासवर्ड इस्तेमाल करें"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"स्टैंडर्ड"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"सामान्य"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"ज़्यादा"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"हटाएं"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"विजेट जोड़ें"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"हो गया"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"लॉक स्क्रीन पर किसी भी विजेट को अनुमति देनी है?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"सेटिंग खोलें"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"वर्क ऐप्लिकेशन चालू करने हैं?"</string> @@ -464,15 +471,15 @@ <string name="media_projection_sys_service_dialog_warning" msgid="2443872865267330320">"रिकॉर्ड या कास्ट करते समय, इस सुविधा को उपलब्ध कराने वाली सेवा के पास आपकी स्क्रीन पर दिख रही जानकारी या डिवाइस पर चल रहे हर मीडिया का ऐक्सेस होता है. जैसे, पासवर्ड, पेमेंट के तरीके की जानकारी, फ़ोटो, मैसेज, और डिवाइस पर चल रहा ऑडियो."</string> <string name="screen_share_permission_dialog_option_entire_screen" msgid="3131200488455089620">"पूरी स्क्रीन"</string> <string name="screen_share_permission_dialog_option_single_app" msgid="4350961814397220929">"सिर्फ़ एक ऐप्लिकेशन"</string> - <string name="screen_share_permission_app_selector_title" msgid="1404878013670347899">"रिकॉर्ड या शेयर करने के लिए ऐप्लिकेशन चुनें"</string> + <string name="screen_share_permission_app_selector_title" msgid="1404878013670347899">"ऐप्लिकेशन शेयर करें या उसकी रिकॉर्डिंग करें"</string> <string name="media_projection_entry_app_permission_dialog_title" msgid="9155535851866407199">"क्या <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> का इस्तेमाल करके रिकॉर्ड या कास्ट करना है?"</string> <string name="media_projection_entry_app_permission_dialog_warning_entire_screen" msgid="8736391633234144237">"शेयर, रिकॉर्ड या कास्ट करते समय, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> के पास स्क्रीन पर दिख रहे कॉन्टेंट या डिवाइस पर चल रहे हर मीडिया का ऐक्सेस होता है. इसलिए, पासवर्ड, पेमेंट के तरीके की जानकारी, मैसेज, फ़ोटो, और डिवाइस पर चल रहे ऑडियो और वीडियो को लेकर सावधानी बरतें."</string> <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"किसी ऐप्लिकेशन को शेयर, रिकॉर्ड या कास्ट करते समय, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> के पास उस ऐप्लिकेशन पर दिख रहे कॉन्टेंट या उस पर चल रहे हर मीडिया का ऐक्सेस होता है. इसलिए, पासवर्ड, पेमेंट के तरीके की जानकारी, मैसेज, फ़ोटो, और डिवाइस पर चल रहे ऑडियो और वीडियो को लेकर सावधानी बरतें."</string> <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"शुरू करें"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> ने इस विकल्प को बंद कर दिया है"</string> - <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"क्या मीडिया कास्ट करना है?"</string> + <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"क्या कास्टिंग शुरू करनी है?"</string> <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"कास्ट करते समय, Android के पास स्क्रीन पर दिख रहे कॉन्टेंट या डिवाइस पर चल रहे हर मीडिया का ऐक्सेस होता है. इसलिए, पासवर्ड, पेमेंट के तरीके की जानकारी, मैसेज, फ़ोटो, और डिवाइस पर चल रहे ऑडियो और वीडियो को लेकर सावधानी बरतें."</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"किसी ऐप्लिकेशन को कास्ट करते समय, Android के पास उस ऐप्लिकेशन पर दिख रहे कॉन्टेंट या उस पर चल रहे हर मीडिया का ऐक्सेस होता है. इसलिए, पासवर्ड, पेमेंट के तरीके की जानकारी, मैसेज, फ़ोटो, और डिवाइस पर चल रहे ऑडियो और वीडियो को लेकर सावधानी बरतें."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"जब किसी ऐप्लिकेशन को कास्ट किया जाता है, तब उस पर दिख रहे कॉन्टेंट या चल रहे हर मीडिया का ऐक्सेस Android के पास होता है. इसलिए, पासवर्ड, पेमेंट के तरीके की जानकारी, मैसेज, फ़ोटो, और डिवाइस पर चल रहे ऑडियो और वीडियो को लेकर आपको सावधानी बरतनी चाहिए."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"कास्ट करें"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"क्या मीडिया शेयर करना है?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"शेयर, रिकॉर्ड या कास्ट करते समय, Android के पास स्क्रीन पर दिख रहे कॉन्टेंट या डिवाइस पर चल रहे हर मीडिया का ऐक्सेस होता है. इसलिए, पासवर्ड, पेमेंट के तरीके की जानकारी, मैसेज, फ़ोटो, और डिवाइस पर चल रहे ऑडियो और वीडियो को लेकर सावधानी बरतें."</string> @@ -610,7 +617,7 @@ <string name="volume_panel_hint_mute" msgid="6962563028495243738">"%s को म्यूट करें"</string> <string name="volume_panel_hint_unmute" msgid="7489063242934477382">"%s को अनम्यूट करें"</string> <string name="media_output_label_title" msgid="872824698593182505">"<xliff:g id="LABEL">%s</xliff:g> को चलाया जा रहा है"</string> - <string name="media_output_title_without_playing" msgid="3825663683169305013">"ऑडियो इसमें चलेगा"</string> + <string name="media_output_title_without_playing" msgid="3825663683169305013">"ऑडियो इस पर चलेगा"</string> <string name="system_ui_tuner" msgid="1471348823289954729">"सिस्टम यूज़र इंटरफ़ेस (यूआई) ट्यूनर"</string> <string name="status_bar" msgid="4357390266055077437">"स्टेटस बार"</string> <string name="demo_mode" msgid="263484519766901593">"सिस्टम यूज़र इंटरफ़ेस (यूआई) डेमो मोड"</string> @@ -621,7 +628,7 @@ <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> <string name="wallet_empty_state_label" msgid="7776761245237530394">"फ़ोन के ज़रिए तेज़ी से और सुरक्षित तरीके से खरीदारी करने के लिए सेट अप करें"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"सभी दिखाएं"</string> - <string name="wallet_secondary_label_no_card" msgid="8488069304491125713">"अनलॉक करने के लिए टैप करें"</string> + <string name="wallet_secondary_label_no_card" msgid="8488069304491125713">"खोलने के लिए टैप करें"</string> <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"अपडेट हो रहा है"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"इस्तेमाल करने के लिए, डिवाइस अनलॉक करें"</string> <string name="wallet_error_generic" msgid="257704570182963611">"आपके कार्ड की जानकारी पाने में कोई समस्या हुई है. कृपया बाद में कोशिश करें"</string> @@ -629,7 +636,7 @@ <string name="qr_code_scanner_title" msgid="1938155688725760702">"क्यूआर कोड स्कैनर"</string> <string name="qr_code_scanner_updating_secondary_label" msgid="8344598017007876352">"अपडेट हो रहा है"</string> <string name="status_bar_work" msgid="5238641949837091056">"वर्क प्रोफ़ाइल"</string> - <string name="status_bar_airplane" msgid="4848702508684541009">"हवाई जहाज़ मोड"</string> + <string name="status_bar_airplane" msgid="4848702508684541009">"फ़्लाइट मोड"</string> <string name="zen_alarm_warning" msgid="7844303238486849503">"आपको <xliff:g id="WHEN">%1$s</xliff:g> पर अपना अगला अलार्म नहीं सुनाई देगा"</string> <string name="alarm_template" msgid="2234991538018805736">"<xliff:g id="WHEN">%1$s</xliff:g> बजे"</string> <string name="alarm_template_far" msgid="3561752195856839456">"<xliff:g id="WHEN">%1$s</xliff:g> पर"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"स्प्लिट स्क्रीन का इस्तेमाल करके, मौजूदा ऐप्लिकेशन को दाईं ओर ले जाएं"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"स्प्लिट स्क्रीन का इस्तेमाल करके, मौजूदा ऐप्लिकेशन को बाईं ओर ले जाएं"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"स्प्लिट स्क्रीन से फ़ुल स्क्रीन मोड पर स्विच करने के लिए"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"स्प्लिट स्क्रीन इस्तेमाल करते समय दाईं ओर या नीचे के ऐप पर स्विच करें"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"स्प्लिट स्क्रीन इस्तेमाल करते समय बाईं ओर या ऊपर के ऐप पर स्विच करें"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"स्प्लिट स्क्रीन के दौरान: एक ऐप्लिकेशन को दूसरे ऐप्लिकेशन से बदलें"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"इनपुट"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"अगली भाषा पर स्विच करने के लिए"</string> @@ -1177,7 +1182,7 @@ <string name="see_all_networks" msgid="3773666844913168122">"सभी देखें"</string> <string name="to_switch_networks_disconnect_ethernet" msgid="6698111101156951955">"नेटवर्क बदलने के लिए, पहले ईथरनेट को डिसकनेक्ट करें"</string> <string name="wifi_scan_notify_message" msgid="3753839537448621794">"डिवाइस इस्तेमाल करने के अनुभव काे बेहतर बनाने के लिए, ऐप्लिकेशन और सेवाओं की मदद से, किसी भी समय वाई-फ़ाई नेटवर्क स्कैन किए जा सकते हैं. ऐसा वाई-फ़ाई बंद होने पर भी किया जा सकता है. वाई-फ़ाई स्कैनिंग की सेटिंग में जाकर, इसे बदला जा सकता है. "<annotation id="link">"बदलें"</annotation></string> - <string name="turn_off_airplane_mode" msgid="8425587763226548579">"हवाई जहाज़ मोड बंद करें"</string> + <string name="turn_off_airplane_mode" msgid="8425587763226548579">"फ़्लाइट मोड बंद करें"</string> <string name="qs_tile_request_dialog_text" msgid="3501359944139877694">"<xliff:g id="APPNAME">%1$s</xliff:g> इस टाइल को \'फटाफट सेटिंग\' में जोड़ने के लिए अनुमति चाहता है"</string> <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"टाइल जोड़ें"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"टाइल न जोड़ें"</string> diff --git a/packages/SystemUI/res/values-hi/tiles_states_strings.xml b/packages/SystemUI/res/values-hi/tiles_states_strings.xml index b49d3b94167d..0cb06c001671 100644 --- a/packages/SystemUI/res/values-hi/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-hi/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"बंद है"</item> <item msgid="5137565285664080143">"चालू है"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index dde688c856f2..fb9d53a17acd 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Izradu snimki zaslona blokirao je IT administrator"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Uredi"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Uređivanje snimke zaslona"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Podijelite"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Podijeli snimku zaslona"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Snimi više"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Odbacivanje snimke zaslona"</string> @@ -106,8 +105,8 @@ <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> <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"Želite li pokrenuti snimanje?"</string> - <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Dok snimate, Android ima pristup svemu što je vidljivo na vašem zaslonu ili se reproducira na vašem uređaju. Stoga pazite na stvari kao što su zaporke, podaci o plaćanju, poruke, fotografije te audio i videozapisi."</string> - <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Dok snimate aplikaciju, Android ima pristup svemu što se prikazuje ili reproducira u toj aplikaciji. Stoga pazite na stvari kao što su zaporke, podaci o plaćanju, poruke, fotografije te audio i videozapisi."</string> + <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Dok snimate, Android ima pristup svemu što je vidljivo na zaslonu ili se reproducira na uređaju. Stoga pazite na zaporke, podatke o plaćanju, poruke, fotografije te audio i videozapise."</string> + <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Dok snimate aplikaciju, Android ima pristup svemu što se prikazuje ili reproducira u toj aplikaciji. Stoga pazite na zaporke, podatke o plaćanju, poruke, fotografije te audio i videozapise."</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Pokreni snimanje"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Snimanje zvuka"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Zvuk na uređaju"</string> @@ -142,7 +141,7 @@ <string name="accessibility_accessibility_button" msgid="4089042473497107709">"Pristupačnost"</string> <string name="accessibility_rotate_button" msgid="1238584767612362586">"Zakretanje zaslona"</string> <string name="accessibility_recent" msgid="901641734769533575">"Pregled"</string> - <string name="accessibility_camera_button" msgid="2938898391716647247">"Fotoaparat"</string> + <string name="accessibility_camera_button" msgid="2938898391716647247">"Kamera"</string> <string name="accessibility_phone_button" msgid="4256353121703100427">"Telefon"</string> <string name="accessibility_voice_assist_button" msgid="6497706615649754510">"Glasovna pomoć"</string> <string name="accessibility_wallet_button" msgid="1458258783460555507">"Wallet"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skeniranje lica"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Pošalji"</string> <string name="cancel" msgid="1089011503403416730">"Odustani"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logotip aplikacije"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potvrdi"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Pokušaj ponovo"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Dodirnite da biste otkazali autentifikaciju"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Lice je prepoznato. Pritisnite ikonu otključavanja da biste nastavili."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentifikacija izvršena"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Otkaži autentifikaciju"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Više opcija"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Koristite PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Koristite uzorak"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Koristite zaporku"</string> @@ -264,10 +265,10 @@ <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Ne uznemiravaj"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Upareni uređaji nisu dostupni"</string> - <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Dodirnite da biste povezali uređaj ili prekinuli vezu uređaja"</string> - <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Upari novi uređaj"</string> + <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Dodirnite da biste povezali uređaj ili prekinuli vezu s njim"</string> + <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Uparite novi uređaj"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"Pogledajte sve"</string> - <string name="turn_on_bluetooth" msgid="5681370462180289071">"Uključi"</string> + <string name="turn_on_bluetooth" msgid="5681370462180289071">"Koristi Bluetooth"</string> <string name="quick_settings_bluetooth_device_connected" msgid="7884777006729260996">"Povezano"</string> <string name="quick_settings_bluetooth_device_saved" msgid="7549938728928069477">"Spremljeno"</string> <string name="accessibility_quick_settings_bluetooth_device_tap_to_disconnect" msgid="415980329093277342">"prekini vezu"</string> @@ -285,7 +286,7 @@ <string name="accessibility_quick_settings_rotation" msgid="4800050198392260738">"Automatsko zakretanje zaslona"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Lokacija"</string> <string name="quick_settings_screensaver_label" msgid="1495003469366524120">"Čuvar zaslona"</string> - <string name="quick_settings_camera_label" msgid="5612076679385269339">"Pristup fotoaparatu"</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> @@ -293,7 +294,7 @@ <string name="quick_settings_user_title" msgid="8673045967216204537">"Korisnik"</string> <string name="quick_settings_wifi_label" msgid="2879507532983487244">"Wi-Fi"</string> <string name="quick_settings_internet_label" msgid="6603068555872455463">"Internet"</string> - <string name="quick_settings_networks_available" msgid="1875138606855420438">"Mreže su dostupne"</string> + <string name="quick_settings_networks_available" msgid="1875138606855420438">"Dostupne su mreže"</string> <string name="quick_settings_networks_unavailable" msgid="1167847013337940082">"Mreže nisu dostupne"</string> <string name="quick_settings_wifi_detail_empty_text" msgid="483130889414601732">"Nije dostupna nijedna Wi-Fi mreža"</string> <string name="quick_settings_wifi_secondary_label_transient" msgid="7501659015509357887">"Uključivanje…"</string> @@ -347,7 +348,7 @@ <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="qs_record_issue_label" msgid="8166290137285529059">"Zabilježi poteškoću"</string> - <string name="qs_record_issue_start" msgid="2979831312582567056">"Početak"</string> + <string name="qs_record_issue_start" msgid="2979831312582567056">"Pokreni"</string> <string name="qs_record_issue_stop" msgid="3531747965741982657">"Zaustavi"</string> <string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Na koji dio doživljaja na uređaju to utjecalo?"</string> <string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Odaberite vrstu problema"</string> @@ -362,12 +363,14 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standardni"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Srednji"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Visoki"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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_camera_dialog_title" msgid="8807639852654305227">"Želite li deblokirati kameru uređaja?"</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Želite li deblokirati kameru 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="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Time se deblokira pristup za sve aplikacije i usluge kojima je dopuštena upotreba vaše kamere."</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še kamere ili mikrofona."</string> <string name="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"Mikrofon je blokiran"</string> <string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"Kamera je blokirana"</string> <string name="sensor_privacy_start_use_mic_camera_blocked_dialog_title" msgid="195236134743281973">"Mikrofon i kamera su blokirani"</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Ukloni"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Dodaj widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Gotovo"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Želite li dopustiti bilo koji widget na zaključanom zaslonu?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Otvori postavke"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Pokrenuti poslovne aplikacije?"</string> @@ -466,17 +473,17 @@ <string name="screen_share_permission_dialog_option_single_app" msgid="4350961814397220929">"Jedna aplikacija"</string> <string name="screen_share_permission_app_selector_title" msgid="1404878013670347899">"Dijeljenje ili snimanje aplikacije"</string> <string name="media_projection_entry_app_permission_dialog_title" msgid="9155535851866407199">"Želite li započeti snimanje ili emitiranje pomoću aplikacije <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>?"</string> - <string name="media_projection_entry_app_permission_dialog_warning_entire_screen" msgid="8736391633234144237">"Kad dijelite, snimate ili emitirate, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ima pristup svemu što je vidljivo na vašem zaslonu ili se reproducira na vašem uređaju. Stoga pazite na stvari kao što su zaporke, podaci o plaćanju, poruke, fotografije te audio i videozapisi."</string> - <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Kad dijelite, snimate ili emitirate aplikaciju, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ima pristup svemu što se prikazuje ili reproducira u toj aplikaciji. Stoga pazite na stvari kao što su zaporke, podaci o plaćanju, poruke, fotografije te audio i videozapisi."</string> + <string name="media_projection_entry_app_permission_dialog_warning_entire_screen" msgid="8736391633234144237">"Kad dijelite, snimate ili emitirate, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ima pristup svemu što je vidljivo na zaslonu ili se reproducira na uređaju. Stoga pazite na zaporke, podatke o plaćanju, poruke, fotografije te audio i videozapise."</string> + <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Kad dijelite, snimate ili emitirate aplikaciju, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ima pristup svemu što se prikazuje ili reproducira u toj aplikaciji. Stoga pazite na zaporke, podatke o plaćanju, poruke, fotografije te audio i videozapise."</string> <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"Pokreni"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> onemogućila je ovu opciju"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Želite li pokrenuti emitiranje?"</string> - <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Kad emitirate, Android ima pristup svemu što je vidljivo na vašem zaslonu ili se reproducira na vašem uređaju. Stoga pazite na stvari kao što su zaporke, podaci o plaćanju, poruke, fotografije te audio i videozapisi."</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Kad emitirate aplikaciju, Android ima pristup svemu što se prikazuje ili reproducira u toj aplikaciji. Stoga pazite na stvari kao što su zaporke, podaci o plaćanju, poruke, fotografije te audio i videozapisi."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Kad emitirate, Android ima pristup svemu što je vidljivo na zaslonu ili se reproducira na uređaju. Stoga pazite na zaporke, podatke o plaćanju, poruke, fotografije te audio i videozapise."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Kad emitirate aplikaciju, Android ima pristup svemu što se prikazuje ili reproducira u toj aplikaciji. Stoga pazite na zaporke, podatke o plaćanju, poruke, fotografije te audio i videozapise."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Pokreni emitiranje"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Želite li pokrenuti dijeljenje?"</string> - <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Kad dijelite, snimate ili emitirate, Android ima pristup svemu što je vidljivo na vašem zaslonu ili se reproducira na vašem uređaju. Stoga pazite na stvari kao što su zaporke, podaci o plaćanju, poruke, fotografije te audio i videozapisi."</string> - <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Kad dijelite, snimate ili emitirate aplikaciju, Android ima pristup svemu što se prikazuje ili reproducira u toj aplikaciji. Stoga pazite na stvari kao što su zaporke, podaci o plaćanju, poruke, fotografije te audio i videozapisi."</string> + <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Kad dijelite, snimate ili emitirate, Android ima pristup svemu što je vidljivo na zaslonu ili se reproducira na uređaju. Stoga pazite na zaporke, podatke o plaćanju, poruke, fotografije te audio i videozapise."</string> + <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Kad dijelite, snimate ili emitirate aplikaciju, Android ima pristup svemu što se prikazuje ili reproducira u toj aplikaciji. Stoga pazite na zaporke, podatke o plaćanju, poruke, fotografije te audio i videozapise."</string> <string name="media_projection_entry_generic_permission_dialog_continue" msgid="8640381403048097116">"Pokreni"</string> <string name="media_projection_task_switcher_text" msgid="590885489897412359">"Dijeljenje pauza tijekom prebacivanja aplikacija"</string> <string name="media_projection_task_switcher_action_switch" msgid="8682258717291921123">"Umjesto toga podijelite ovu aplikaciju"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Otvori podijeljeni zaslon s trenutačnom aplikacijom s desne strane"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Otvori podijeljeni zaslon s trenutačnom aplikacijom s lijeve strane"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Prijeđi s podijeljenog zaslona na cijeli zaslon"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Prijeđite na aplikaciju zdesna ili ispod uz podijeljeni zaslon"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Prijeđite na aplikaciju slijeva ili iznad uz podijeljeni zaslon"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Tijekom podijeljenog zaslona: zamijeni aplikaciju drugom"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Unos"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Prijeđi na sljedeći jezik"</string> @@ -935,7 +940,7 @@ <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(putem apl. <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> - <string name="privacy_type_camera" msgid="7974051382167078332">"fotoaparat"</string> + <string name="privacy_type_camera" msgid="7974051382167078332">"kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"lokaciju"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> <string name="privacy_type_media_projection" msgid="8136723828804251547">"snimanje zaslona"</string> @@ -1238,7 +1243,7 @@ <string name="home_quick_affordance_unavailable_configure_the_app" msgid="604424593994493281">"• Dostupan je najmanje jedan uređaj ili ploča uređaja"</string> <string name="notes_app_quick_affordance_unavailable_explanation" msgid="4796955161600178530">"Odaberite zadanu aplikaciju za bilješke da biste koristili prečac za pisanje bilježaka"</string> <string name="keyguard_affordance_enablement_dialog_notes_app_action" msgid="6821710209675089470">"Odaberite aplikaciju"</string> - <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Prečac za dodirnuti i zadržati"</string> + <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Dodirnite i zadržite prečac"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Odustani"</string> <string name="rear_display_bottom_sheet_confirm" msgid="1507591562761552899">"Promijenite zaslon odmah"</string> <string name="rear_display_folded_bottom_sheet_title" msgid="3930008746560711990">"Otklopite telefon"</string> @@ -1259,7 +1264,7 @@ <string name="call_from_work_profile_action" msgid="2937701298133010724">"Prijeđite na poslovni profil"</string> <string name="install_dialer_on_work_profile_action" msgid="2014659711597862506">"Instaliraj poslovnu aplikaciju telefona"</string> <string name="call_from_work_profile_close" msgid="5830072964434474143">"Odustani"</string> - <string name="lock_screen_settings" msgid="6152703934761402399">"Prilagodi zaključavanje zaslona"</string> + <string name="lock_screen_settings" msgid="6152703934761402399">"Prilagodite zaključavanje zaslona"</string> <string name="keyguard_unlock_to_customize_ls" msgid="2068542308086253819">"Otključajte da biste prilagodili zaključani zaslon"</string> <string name="wifi_unavailable_dream_overlay_content_description" msgid="2024166212194640100">"Wi-Fi nije dostupan"</string> <string name="camera_blocked_dream_overlay_content_description" msgid="4074759493559418130">"Kamera je blokirana"</string> diff --git a/packages/SystemUI/res/values-hr/tiles_states_strings.xml b/packages/SystemUI/res/values-hr/tiles_states_strings.xml index 75fb3259ba34..e09cab50e9bb 100644 --- a/packages/SystemUI/res/values-hr/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-hr/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Isključeno"</item> <item msgid="5137565285664080143">"Uključeno"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 8b320953d674..224ed28f82c4 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"A képernyőkép készítésének lehetőségét a rendszergazda letiltotta"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Szerkesztés"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Képernyőkép szerkesztése"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Megosztás"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Képernyőkép megosztása"</string> <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> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Arc keresése"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Küldés"</string> <string name="cancel" msgid="1089011503403416730">"Mégse"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Alkalmazás emblémája"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Megerősítés"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Újrapróbálkozás"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Koppintson a hitelesítés visszavonásához"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Arc felismerve. A folytatáshoz koppintson a Feloldásra."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Hitelesítve"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Hitelesítés megszakítása"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"További lehetőségek"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN-kód használata"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Minta használata"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Jelszó használata"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Normál"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Közepes"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Nagy"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Feloldja az eszköz mikrofonjának letiltását?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Feloldja az eszköz kamerájának letiltását?"</string> <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Feloldja az eszköz kamerájának és mikrofonjának letiltását?"</string> @@ -439,6 +442,8 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Eltávolítás"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Modul hozzáadása"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Kész"</string> + <string name="label_for_button_in_empty_state_cta" msgid="7314975555382055823">"Modulok hozzáadása"</string> + <string name="title_for_empty_state_cta" msgid="6161654421223450530">"Táblagépe feloldása nélkül, gyorsan hozzáférhet kedvenc alkalmazásmoduljaihoz."</string> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Minden modult engedélyez a lezárási képernyőn?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Beállítások megnyitása"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Feloldja a munkahelyi appokat?"</string> @@ -540,10 +545,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Az eszközt a szülőd felügyeli. A szülőd megtekintheti és kezelheti például a használt alkalmazásokra, a tartózkodási helyre és a képernyőidőre vonatkozó adatokat."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Feloldva tartva TrustAgent által"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Az eszköz túl sok hitelesítési kísérlet miatt zárolva lett."</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Eszköz zárolva\nSikertelen hitelesítés"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Hangbeállítások"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Automatikus feliratozás"</string> @@ -765,10 +768,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Osztott képernyő aktiválása; az aktuális alkalmazás kerüljön jobbra"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Osztott képernyő aktiválása; az aktuális alkalmazás kerüljön balra"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Váltás osztott képernyőről teljes képernyőre"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Váltás a jobb oldalt, illetve lent lévő appra osztott képernyő esetén"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Váltás a bal oldalt, illetve fent lévő appra osztott képernyő esetén"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Osztott képernyőn: az egyik alkalmazás lecserélése egy másikra"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Bevitel"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Váltás a következő nyelvre"</string> diff --git a/packages/SystemUI/res/values-hu/tiles_states_strings.xml b/packages/SystemUI/res/values-hu/tiles_states_strings.xml index 3ca391499727..8f75dc6ebe5c 100644 --- a/packages/SystemUI/res/values-hu/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-hu/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Ki"</item> <item msgid="5137565285664080143">"Be"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 815168612e44..5750db13bcab 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Ձեր ՏՏ ադմինիստրատորն արգելափակել է սքրինշոթներ անելու հնարավորությունը"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Փոփոխել"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Փոփոխել սքրինշոթը"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Կիսվել"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Ուղարկել սքրինշոթ"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Մեծացնել սքրինշոթի տարածքը"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Փակել սքրինշոթը"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Դեմքի սկանավորում"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Ուղարկել"</string> <string name="cancel" msgid="1089011503403416730">"Չեղարկել"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Հավելվածի լոգո"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Հաստատել"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Նորից փորձել"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Հպեք՝ նույնականացումը չեղարկելու համար"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Դեմքը ճանաչվեց։ Սեղմեք ապակողպման պատկերակը։"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Նույնականացված է"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Չեղարկել իսկորոշումը"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Լրացուցիչ ընտրանքներ"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Օգտագործել PIN կոդ"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Օգտագործել նախշ"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Օգտագործել գաղտնաբառ"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Սովորական"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Միջին"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Բարձր"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Հեռացնել"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Ավելացնել վիջեթ"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Պատրաստ է"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Թույլատրե՞լ վիջեթների ցուցադրումը կողպէկրանին"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Բացել կարգավորումները"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Վերսկսե՞լ աշխ. հավելվածները"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Միացնել էկրանի տրոհումը՝ ընթացիկ հավելվածն աջ կողմում"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Միացնել էկրանի տրոհումը՝ ընթացիկ հավելվածը ձախ կողմում"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Տրոհված էկրանից անցնել լիաէկրան ռեժիմ"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Անցեք աջ կողմի կամ ներքևի հավելվածին տրոհված էկրանի միջոցով"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Անցեք աջ կողմի կամ վերևի հավելվածին տրոհված էկրանի միջոցով"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Տրոհված էկրանի ռեժիմում մեկ հավելվածը փոխարինել մյուսով"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Ներածում"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Անցնել հաջորդ լեզվին"</string> diff --git a/packages/SystemUI/res/values-hy/tiles_states_strings.xml b/packages/SystemUI/res/values-hy/tiles_states_strings.xml index 89a94e80b622..118915d03612 100644 --- a/packages/SystemUI/res/values-hy/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-hy/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Անջատված է"</item> <item msgid="5137565285664080143">"Միացված է"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 565eaff8ab5b..1f6e5b035253 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Mengambil screenshot diblokir oleh admin IT Anda"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Edit"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Mengedit screenshot"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Bagikan"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Bagikan screenshot"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Ambil screenshot lagi"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Menutup screenshot"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Memindai wajah"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Kirim"</string> <string name="cancel" msgid="1089011503403416730">"Batal"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logo aplikasi"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Konfirmasi"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Coba lagi"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Ketuk untuk membatalkan autentikasi"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Wajah dikenali. Tekan ikon buka kunci untuk melanjutkan."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Diautentikasi"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Batalkan Autentikasi"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Opsi Lainnya"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Gunakan PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Gunakan pola"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Gunakan sandi"</string> @@ -264,7 +265,7 @@ <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Jangan Ganggu"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Perangkat yang disandingkan tak tersedia"</string> - <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Ketuk untuk menghubungkan atau memutuskan koneksi perangkat"</string> + <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Ketuk untuk memulai atau menghentikan koneksi perangkat"</string> <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Sambungkan perangkat baru"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"Lihat semua"</string> <string name="turn_on_bluetooth" msgid="5681370462180289071">"Gunakan Bluetooth"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standar"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Sedang"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Tinggi"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Berhenti memblokir mikrofon perangkat?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Berhenti memblokir kamera perangkat?"</string> <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Berhenti memblokir kamera dan mikrofon perangkat?"</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Hapus"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Tambahkan widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Selesai"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Izinkan widget di layar kunci?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Buka setelan"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Batalkan jeda aplikasi kerja?"</string> @@ -470,10 +477,10 @@ <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Jika Anda membagikan, merekam, atau mentransmisikan suatu aplikasi, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> akan memiliki akses ke semua hal yang ditampilkan atau yang diputar di aplikasi tersebut. Jadi, berhati-hatilah saat memasukkan sandi, detail pembayaran, pesan, foto, audio dan video."</string> <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"Mulai"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> telah menonaktifkan opsi ini"</string> - <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Mulai mentransmisikan?"</string> - <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Jika mentransmisikan, Android akan memiliki akses ke semua hal yang ditampilkan di layar atau yang diputar di perangkat Anda. Jadi, berhati-hatilah saat memasukkan sandi, detail pembayaran, pesan, foto, audio, dan video."</string> + <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Mulai transmisi?"</string> + <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Jika Anda melakukan transmisi, Android akan memiliki akses ke semua hal yang ditampilkan di layar atau yang diputar di perangkat Anda. Jadi, berhati-hatilah saat memasukkan sandi, detail pembayaran, pesan, foto, audio, dan video."</string> <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Jika Anda mentransmisikan aplikasi, Android akan memiliki akses ke semua hal yang ditampilkan atau yang diputar di aplikasi tersebut. Jadi, berhati-hatilah saat memasukkan sandi, detail pembayaran, pesan, foto, audio, dan video."</string> - <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Mulai mentransmisikan"</string> + <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Mulai transmisi"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Mulai berbagi?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Jika Anda membagikan, merekam, atau mentransmisikan, Android akan memiliki akses ke semua hal yang ditampilkan di layar atau yang diputar di perangkat Anda. Jadi, berhati-hatilah saat memasukkan sandi, detail pembayaran, pesan, foto, audio, dan video."</string> <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Jika Anda membagikan, merekam, atau mentransmisikan suatu aplikasi, Android akan memiliki akses ke semua hal yang ditampilkan atau yang diputar di aplikasi tersebut. Jadi, berhati-hatilah saat memasukkan sandi, detail pembayaran, pesan, foto, audio, dan video."</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Perangkat ini dikelola oleh orang tuamu. Orang tuamu bisa melihat dan mengelola berbagai informasi, seperti aplikasi yang kamu gunakan, lokasimu, dan lama pemakaian perangkat."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Tetap terbuka kuncinya oleh TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Perangkat dikunci, terlalu banyak upaya autentikasi"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Perangkat dikunci\nAutentikasi gagal"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Setelan suara"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Otomatis beri teks di media"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Masuk ke layar terpisah dengan aplikasi saat ini ke RHS"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Masuk ke layar terpisah dengan aplikasi saat ini ke LHS"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Beralih dari layar terpisah ke layar penuh"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Beralih ke aplikasi di bagian kanan atau bawah saat menggunakan layar terpisah"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Beralih ke aplikasi di bagian kiri atau atas saat menggunakan layar terpisah"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Dalam layar terpisah: ganti salah satu aplikasi dengan yang lain"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Beralih ke bahasa berikutnya"</string> diff --git a/packages/SystemUI/res/values-in/tiles_states_strings.xml b/packages/SystemUI/res/values-in/tiles_states_strings.xml index e1d533876be2..bd429c147784 100644 --- a/packages/SystemUI/res/values-in/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-in/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Nonaktif"</item> <item msgid="5137565285664080143">"Aktif"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index 149ba55ee63f..aafd70c44fb8 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Kerfisstjórinn lokaði á skjámyndatöku"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Breyta"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Breyta skjámynd"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Deila"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Deila skjámynd"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Mynda meira"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Loka skjámynd"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Andlit skannað"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Senda"</string> <string name="cancel" msgid="1089011503403416730">"Hætta við"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Lógó forrits"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Staðfesta"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Reyna aftur"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Ýttu til að hætta við auðkenningu"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Andlitið var greint. Ýttu á opnunartáknið til að halda áfr."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Auðkennt"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Hætta við auðkenningu"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Fleiri valkostir"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Nota PIN-númer"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Nota mynstur"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Nota aðgangsorð"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Staðlað"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Miðlungs"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Mikið"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Fjarlægja"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Bæta græju við"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Lokið"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Leyfa allar græjur á lásskjá?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Opna stillingar"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Ljúka hléi vinnuforrita?"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Opna skjáskiptingu hægra megin með núverandi forriti"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Opna skjáskiptingu vinstra megin með núverandi forriti"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Skipta úr skjáskiptingu yfir á allan skjáinn"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Skiptu í forrit til hægri eða fyrir neðan þegar skjáskipting er notuð"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Skiptu í forrit til vinstri eða fyrir ofan þegar skjáskipting er notuð"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Í skjáskiptingu: Skipta forriti út fyrir annað forrit"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Innsláttur"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Skipta yfir í næsta tungumál"</string> diff --git a/packages/SystemUI/res/values-is/tiles_states_strings.xml b/packages/SystemUI/res/values-is/tiles_states_strings.xml index 1bd38ba77cfb..abdc3e7610b1 100644 --- a/packages/SystemUI/res/values-is/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-is/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Slökkt"</item> <item msgid="5137565285664080143">"Kveikt"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index f701787ea994..52346411c46e 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"L\'acquisizione di screenshot è stata bloccata dall\'amministratore IT"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Modifica"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Modifica screenshot"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Condividi"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Condividi screenshot"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Acquisisci di più"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ignora screenshot"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scansione del viso"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Invia"</string> <string name="cancel" msgid="1089011503403416730">"Annulla"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logo dell\'app"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Conferma"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Riprova"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Tocca per annullare l\'autenticazione"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Volto riconosciuto. Premi l\'icona Sblocca e continua."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticazione eseguita"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Annulla autenticazione"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Altre opzioni"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Utilizza PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Usa sequenza"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Utilizza password"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Medio"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Alto"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Rimuovi"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Aggiungi widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Fine"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Consentire tutti i widget nella schermata di blocco?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Apri impostazioni"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Riattivare le app di lavoro?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Questo dispositivo è gestito da uno dei tuoi genitori, il quale può visualizzare e gestire informazioni come le app che usi, la tua posizione e il tuo tempo di utilizzo."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Sbloccato da TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Dispositivo bloccato, troppi tentativi di autenticazione"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Dispositivo bloccato\nAutenticazione non riuscita"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Impostazioni audio"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Sottotitoli automatici"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Attiva lo schermo diviso con l\'app corrente a destra"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Attiva lo schermo diviso con l\'app corrente a sinistra"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Passa da schermo diviso a schermo intero"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Passa all\'app a destra o sotto mentre usi lo schermo diviso"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Passa all\'app a sinistra o sopra mentre usi lo schermo diviso"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Con lo schermo diviso: sostituisci un\'app con un\'altra"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Inserimento"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Passa alla lingua successiva"</string> diff --git a/packages/SystemUI/res/values-it/tiles_states_strings.xml b/packages/SystemUI/res/values-it/tiles_states_strings.xml index f7abea571f1b..7ffd71c3ddf1 100644 --- a/packages/SystemUI/res/values-it/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-it/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Off"</item> <item msgid="5137565285664080143">"On"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 414f347084fc..619eaf361128 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"יצירת צילומי המסך נחסמה על ידי מנהל ה-IT"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"עריכה"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"עריכת צילום מסך"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"שיתוף"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"שיתוף של צילום מסך"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"צילום תוכן נוסף"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"סגירת צילום מסך"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"סורק פנים"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"שליחה"</string> <string name="cancel" msgid="1089011503403416730">"ביטול"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"לוגו של האפליקציה"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"אישור"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ניסיון נוסף"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"יש להקיש כדי לבטל את האימות"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"הפנים זוהו. להמשך יש ללחוץ על סמל ביטול הנעילה."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"מאומת"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"ביטול האימות"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"אפשרויות נוספות"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"שימוש בקוד אימות"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"שימוש בקו ביטול נעילה"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"שימוש בסיסמה"</string> @@ -328,7 +329,7 @@ <string name="quick_settings_work_mode_label" msgid="6440531507319809121">"אפליקציות לעבודה"</string> <string name="quick_settings_work_mode_paused_state" msgid="6681788236383735976">"בהשהיה"</string> <string name="quick_settings_night_display_label" msgid="8180030659141778180">"תאורת לילה"</string> - <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"התכונה מופעלת בשקיעה"</string> + <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"מופעלת בשקיעה"</string> <string name="quick_settings_night_secondary_label_until_sunrise" msgid="4063448287758262485">"עד הזריחה"</string> <string name="quick_settings_night_secondary_label_on_at" msgid="3584738542293528235">"תופעל בשעה <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_secondary_label_until" msgid="1883981263191927372">"עד <xliff:g id="TIME">%s</xliff:g>"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"רגילה"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"בינונית"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"גבוהה"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"הסרה"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"הוספת ווידג\'ט"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"סיום"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"לאפשר להציג כל ווידג\'ט במסך הנעילה?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"לפתיחת ההגדרות"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"להפעיל את האפליקציות לעבודה?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"מכשיר זה מנוהל על ידי ההורה שלך. להורה שלך יש אפשרות לצפות בפרטים כמו האפליקציות שבשימוש, המיקום וזמן המסך שלך, ולנהל אותם."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"הנעילה נמנעת על ידי סביבה מהימנה"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"המכשיר ננעל, יותר מדי ניסיונות אימות"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"המכשיר ננעל\nהאימות נכשל"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"הגדרות צליל"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"הוספת כתוביות באופן אוטומטי למדיה"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"כניסה למסך מפוצל עם האפליקציה הנוכחית ל-RHS"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"כניסה למסך מפוצל עם האפליקציה הנוכחית ל-LHS"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"החלפה ממסך מפוצל למסך מלא"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"מעבר לאפליקציה משמאל או למטה בזמן שימוש במסך מפוצל"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"מעבר לאפליקציה מימין או למעלה בזמן שימוש במסך מפוצל"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"כשהמסך מפוצל: החלפה בין אפליקציה אחת לאחרת"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"קלט"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"מעבר לשפה הבאה"</string> diff --git a/packages/SystemUI/res/values-iw/tiles_states_strings.xml b/packages/SystemUI/res/values-iw/tiles_states_strings.xml index 1948685a2c66..196a6c270593 100644 --- a/packages/SystemUI/res/values-iw/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-iw/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"מושבת"</item> <item msgid="5137565285664080143">"מופעל"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 78f1df29f415..438fce63a431 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"スクリーンショットの撮影は IT 管理者によってブロックされています。"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"編集"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"スクリーンショットを編集します"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"共有"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"スクリーンショットを共有"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"キャプチャ範囲を拡大"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"スクリーンショットを閉じます"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"顔のスキャン"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"送信"</string> <string name="cancel" msgid="1089011503403416730">"キャンセル"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"アプリのロゴ"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"確認"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"再試行"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"タップすると認証をキャンセルします"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"顔を認識しました。ロック解除アイコンを押して続行します。"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"認証済み"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"認証をキャンセルします"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"その他のオプション"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN を使用"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"パターンを使用"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"パスワードを使用"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"標準"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"中"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"高"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"削除"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"ウィジェットを追加"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"完了"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"ロック画面でのウィジェットを許可しますか？"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"設定を開く"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"仕事用アプリの停止解除"</string> @@ -470,7 +477,7 @@ <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"アプリの共有、録画、キャスト中は、そのアプリで表示または再生される内容に <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> がアクセスできるため、パスワード、お支払いの詳細、メッセージ、写真、音声、動画などの情報にご注意ください。"</string> <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"開始"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> がこのオプションを無効にしています"</string> - <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"キャスト開始しますか？"</string> + <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"キャストを開始しますか？"</string> <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"キャスト中は、画面に表示される内容やデバイスで再生される内容に Android がアクセスできるため、パスワード、お支払いの詳細、メッセージ、写真、音声、動画などの情報にご注意ください。"</string> <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"アプリのキャスト中は、そのアプリで表示または再生される内容に Android がアクセスできるため、パスワード、お支払いの詳細、メッセージ、写真、音声、動画などの情報にご注意ください。"</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"キャストを開始"</string> @@ -609,8 +616,8 @@ <string name="volume_panel_collapsed_sliders" msgid="1413383759434791450">"音量スライダーを閉じました"</string> <string name="volume_panel_hint_mute" msgid="6962563028495243738">"%s をミュート"</string> <string name="volume_panel_hint_unmute" msgid="7489063242934477382">"%s のミュートを解除"</string> - <string name="media_output_label_title" msgid="872824698593182505">"<xliff:g id="LABEL">%s</xliff:g> を再生:"</string> - <string name="media_output_title_without_playing" msgid="3825663683169305013">"音声の再生形式:"</string> + <string name="media_output_label_title" msgid="872824698593182505">"<xliff:g id="LABEL">%s</xliff:g> の再生先:"</string> + <string name="media_output_title_without_playing" msgid="3825663683169305013">"音声の再生先"</string> <string name="system_ui_tuner" msgid="1471348823289954729">"システムUI調整ツール"</string> <string name="status_bar" msgid="4357390266055077437">"ステータスバー"</string> <string name="demo_mode" msgid="263484519766901593">"システム UI デモモード"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"分割画面にして現在のアプリを右側に設定する"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"分割画面にして現在のアプリを左側に設定する"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"分割画面から全画面に切り替える"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"分割画面の使用時に右側または下部のアプリに切り替える"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"分割画面の使用時に左側または上部のアプリに切り替える"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"分割画面中: アプリを順に置換する"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"入力"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"次の言語に切り替える"</string> diff --git a/packages/SystemUI/res/values-ja/tiles_states_strings.xml b/packages/SystemUI/res/values-ja/tiles_states_strings.xml index dd78c5e4d786..52aef897f288 100644 --- a/packages/SystemUI/res/values-ja/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-ja/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"OFF"</item> <item msgid="5137565285664080143">"ON"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index 64478d7be747..799fb9c90aba 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"ეკრანის ანაბეჭდის გადაღება დაბლოკილია თქვენი IT ადმინისტრატორის მიერ"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"რედაქტირება"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"ეკრანის ანაბეჭდის რედაქტირება"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"გაზიარება"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"ეკრანის ანაბეჭდის გაზიარება"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"მეტის აღბეჭდვა"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ეკრანის ანაბეჭდის დახურვა"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"მიმდინარეობს სახის სკანირება"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"გაგზავნა"</string> <string name="cancel" msgid="1089011503403416730">"გაუქმება"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"აპის ლოგო"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"დადასტურება"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ხელახლა ცდა"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"შეეხეთ ავტორიზაციის გასაუქმებლად"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"ამოცნობილია სახით. გასაგრძელებლად დააჭირეთ განბლოკვის ხატულას."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ავტორიზებულია"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"ავტორიზაციის გაუქმება"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"სხვა ვარიანტები"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN-კოდის გამოყენება"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ნიმუშის გამოყენება"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"პაროლის გამოყენება"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"სტანდარტული"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"საშუალო"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"მაღალი"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,8 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"ამოშლა"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"ვიჯეტის დამატება"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"მზადაა"</string> + <string name="label_for_button_in_empty_state_cta" msgid="7314975555382055823">"ვიჯეტების დამატება"</string> + <string name="title_for_empty_state_cta" msgid="6161654421223450530">"მიიღეთ წვდომა თქვენი რჩეული აპების ვიჯეტებზე ტაბლეტის განბლოკვის გარეშე."</string> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"ნებისმიერი ვიჯეტის დაშვება ჩაკეტილ ეკრანზე"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"პარამეტრების გახსნა"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"კვლავ გააქტიურდეს სამსახურის აპები?"</string> @@ -763,10 +768,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"ეკრანის გაყოფის შეყვანა მიმდინარე აპით RHS-ში"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"ეკრანის გაყოფის შეყვანა მიმდინარე აპით LHS-ში"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"გადართვა ეკრანის გაყოფიდან სრულ ეკრანზე"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"ეკრანის გაყოფის გამოყენებისას აპზე მარჯვნივ ან ქვემოთ გადართვა"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ეკრანის გაყოფის გამოყენებისას აპზე მარცხნივ ან ზემოთ გადართვა"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ეკრანის გაყოფის დროს: ერთი აპის მეორით ჩანაცვლება"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"შეყვანა"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"შემდეგ ენაზე გადართვა"</string> diff --git a/packages/SystemUI/res/values-ka/tiles_states_strings.xml b/packages/SystemUI/res/values-ka/tiles_states_strings.xml index 2691b69154a9..aae98baa9c5d 100644 --- a/packages/SystemUI/res/values-ka/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-ka/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"გამორთული"</item> <item msgid="5137565285664080143">"ჩართული"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 8b8683249fd5..6d538bd4a0f6 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Әкімшіңіз скриншот жасауға тыйым салды."</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Өзгерту"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Скриншотты өзгерту"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Бөлісу"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Скриншотты бөлісу"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Тағы суретке түсіру"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Скриншотты жабу"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Бетті сканерлеу"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Жіберу"</string> <string name="cancel" msgid="1089011503403416730">"Бас тарту"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Қолданба логотипі"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Растау"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Қайта көру"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Аутентификациядан бас тарту үшін түртіңіз."</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Бет танылды. Жалғастыру үшін құлыпты ашу белгішесін басыңыз."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Аутентификацияланған"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Аутентификациядан бас тарту"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Қосымша опциялар"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN кодын пайдалану"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Өрнекті пайдалану"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Құпия сөзді пайдалану"</string> @@ -362,11 +363,13 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Стандартты режим"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Орташа"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Жоғары"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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_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="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"Микрофон блокталған"</string> <string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"Камера блокталған"</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Өшіру"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Виджет қосу"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Дайын"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Құлыптаулы экранда кез келген виджетке рұқсат беру керек пе?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Параметрлерді ашу"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Жұмыс қолданбаларын қайта қосасыз ба?"</string> @@ -472,7 +479,7 @@ <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасы осы опцияны өшірді."</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Трансляциялау басталсын ба?"</string> <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Трансляциялау кезінде Android жүйесі экраныңызда көрінетін не құрылғыңызда ойнатылатын барлық нәрсені пайдалана алады. Сондықтан құпия сөздерді, төлем туралы мәліметті, хабарларды немесе басқа құпия ақпаратты енгізген кезде сақ болыңыз."</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Қолданба экранын трансляциялау кезінде Android жүйесі қолданбада көрінетін не ойнатылатын барлық нәрсені пайдалана алады. Сондықтан құпия сөздерді, төлем туралы мәліметті, хабарларды немесе басқа құпия ақпаратты енгізген кезде сақ болыңыз."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Қолданба экранын трансляциялау кезінде Android қолданбада көрінетін не ойнатылатын барлық контентті пайдалана алады. Сондықтан құпия сөздер, төлем туралы мәлімет, хабарлар, фотосуреттер, дыбыстар мен бейнелер сияқты ақпаратқа сақ болыңыз."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Трансляциялауды бастау"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Бөлісу басталсын ба?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Бөлісу, жазу не трансляциялау кезінде Android жүйесі экраныңызда көрінетін не құрылғыңызда ойнатылатын барлық нәрсені пайдалана алады. Сондықтан құпия сөздерді, төлем туралы мәліметті, хабарларды немесе басқа құпия ақпаратты енгізген кезде сақ болыңыз."</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Бұл құрылғыны ата-анаңыз басқарады. Ата-анаңыз сіз пайдаланатын қолданбалар, геодерегіңіз және пайдалану уақытыңыз сияқты ақпаратты көре және басқара алады."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent арқылы құлпы ашылды."</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Құрылғы құлыпталды, тым көп аутентификациялау талпынысы жасалды."</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Құрылғы құлыпталды\nАутентификация орындалмады"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Дыбыс параметрлері"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Автоматты субтитр қосу"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Бөлінген экран режиміне кіру (ағымдағы қолданбаны оңға орналастыру)"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Бөлінген экран режиміне кіру (ағымдағы қолданбаны солға орналастыру)"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Бөлінген экран режимінен толық экран режиміне ауысу"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Экранды бөлуді қолданғанда, оң не жоғары жақтағы қолданбаға ауысыңыз"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Экранды бөлуді қолданғанда, сол не жоғары жақтағы қолданбаға ауысыңыз"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Экранды бөлу кезінде: бір қолданбаны басқасымен алмастыру"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Енгізу"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Келесі тілге ауысу"</string> @@ -1057,7 +1060,7 @@ <string name="controls_media_button_pause" msgid="8614887780950376258">"Кідірту"</string> <string name="controls_media_button_prev" msgid="8126822360056482970">"Алдыңғы трек"</string> <string name="controls_media_button_next" msgid="6662636627525947610">"Келесі трек"</string> - <string name="controls_media_button_connecting" msgid="3138354625847598095">"Жалғануда"</string> + <string name="controls_media_button_connecting" msgid="3138354625847598095">"Жалғанып жатыр"</string> <string name="controls_media_smartspace_rec_title" msgid="1699818353932537407">"Ойнату"</string> <string name="controls_media_smartspace_rec_description" msgid="4136242327044070732">"<xliff:g id="APP_LABEL">%1$s</xliff:g> қолданбасын ашу"</string> <string name="controls_media_smartspace_rec_item_description" msgid="2189271793070870883">"<xliff:g id="APP_LABEL">%3$s</xliff:g> қолданбасында <xliff:g id="ARTIST_NAME">%2$s</xliff:g> орындайтын \"<xliff:g id="SONG_NAME">%1$s</xliff:g>\" әнін ойнату"</string> diff --git a/packages/SystemUI/res/values-kk/tiles_states_strings.xml b/packages/SystemUI/res/values-kk/tiles_states_strings.xml index b37e98299b1f..98f6a3e4a941 100644 --- a/packages/SystemUI/res/values-kk/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-kk/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Өшірулі"</item> <item msgid="5137565285664080143">"Қосулы"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index 083586e16654..35c8bab19045 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"ការថតអេក្រង់ត្រូវបានទប់ស្កាត់ដោយអ្នកគ្រប់គ្រងផ្នែកព័ត៌មានវិទ្យារបស់អ្នក"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"កែ"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"កែរូបថតអេក្រង់"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"ចែករំលែក"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"ចែករំលែករូបថតអេក្រង់"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"ថតច្រើនទៀត"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ច្រានចោលរូបថតអេក្រង់"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"ការស្កេនមុខ"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ផ្ញើ"</string> <string name="cancel" msgid="1089011503403416730">"បោះបង់"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"និមិត្តសញ្ញាកម្មវិធី"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"បញ្ជាក់"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ព្យាយាមម្ដងទៀត"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"ចុចដើម្បីបោះបង់ការផ្ទៀងផ្ទាត់"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"បានស្គាល់មុខ។ សូមចុចរូបដោះសោ ដើម្បីបន្ត។"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"បានផ្ទៀងផ្ទាត់"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"បោះបង់ការផ្ទៀងផ្ទាត់"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"ជម្រើសច្រើនទៀត"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ប្រើកូដ PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ប្រើលំនាំ"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"ប្រើពាក្យសម្ងាត់"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"ស្តង់ដារ"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"មធ្យម"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"ខ្ពស់"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"ដកចេញ"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"បញ្ចូលធាតុក្រាហ្វិក"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"រួចរាល់"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"អនុញ្ញាតធាតុក្រាហ្វិកនៅលើអេក្រង់ចាក់សោឬ?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"បើកការកំណត់"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"ឈប់ផ្អាកកម្មវិធីការងារឬ?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ឧបករណ៍នេះស្ថិតក្រោមការគ្រប់គ្រងរបស់មាតាបិតាអ្នក។ មាតាបិតារបស់អ្នកអាចមើល និងគ្រប់គ្រងព័ត៌មានដូចជា កម្មវិធីដែលអ្នកប្រើ ទីតាំងរបស់អ្នក និងរយៈពេលប្រើប្រាស់ឧបករណ៍របស់អ្នកជាដើម។"</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"បានដោះសោដោយភ្នាក់ងារទុកចិត្ត"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"ឧបករណ៍ត្រូវបានចាក់សោ ដោយសារមានការព្យាយាមផ្ទៀងផ្ទាត់ច្រើនដងពេក"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"បានចាក់សោឧបករណ៍\nការផ្ទៀងផ្ទាត់មិនបានសម្រេច"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"ការកំណត់សំឡេង"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"ដាក់អក្សររត់លើមេឌៀដោយស្វ័យប្រវត្តិ"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"ចូលក្នុងមុខងារបំបែកអេក្រង់ដោយប្រើកម្មវិធីបច្ចុប្បន្ននៅខាងស្ដាំដៃ"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"ចូលក្នុងមុខងារបំបែកអេក្រង់ដោយប្រើកម្មវិធីបច្ចុប្បន្ននៅខាងឆ្វេងដៃ"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"ប្ដូរពីមុខងារបំបែកអេក្រង់ទៅជាអេក្រង់ពេញ"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"ប្ដូរទៅកម្មវិធីនៅខាងស្ដាំ ឬខាងក្រោម ពេលកំពុងប្រើមុខងារបំបែកអេក្រង់"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ប្ដូរទៅកម្មវិធីនៅខាងឆ្វេង ឬខាងលើ ពេលកំពុងប្រើមុខងារបំបែកអេក្រង់"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ក្នុងអំឡុងពេលប្រើមុខងារបំបែកអេក្រង់៖ ជំនួសកម្មវិធីពីមួយទៅមួយទៀត"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"បញ្ចូល"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"ប្ដូរទៅភាសាបន្ទាប់"</string> diff --git a/packages/SystemUI/res/values-km/tiles_states_strings.xml b/packages/SystemUI/res/values-km/tiles_states_strings.xml index 0b2d5b3816ee..7e17620844a5 100644 --- a/packages/SystemUI/res/values-km/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-km/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"បិទ"</item> <item msgid="5137565285664080143">"បើក"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index df50db6e2aa1..f0ad46355f21 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"ಸ್ಕ್ರೀನ್ಶಾಟ್ಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳುವುದನ್ನು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರು ನಿರ್ಬಂಧಿಸಿದ್ದಾರೆ"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"ಎಡಿಟ್ ಮಾಡಿ"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"ಸ್ಕ್ರೀನ್ಶಾಟ್ ಅನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"ಹಂಚಿಕೊಳ್ಳಿ"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"ಸ್ಕ್ರೀನ್ಶಾಟ್ ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"ಇನ್ನಷ್ಟು ಕ್ಯಾಪ್ಚರ್ ಮಾಡಿ"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ಸ್ಕ್ರೀನ್ಶಾಟ್ ಅನ್ನು ವಜಾಗೊಳಿಸಿ"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"ಮುಖವನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ಕಳುಹಿಸಿ"</string> <string name="cancel" msgid="1089011503403416730">"ರದ್ದುಮಾಡಿ"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"ಆ್ಯಪ್ ಲೋಗೋ"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"ದೃಢೀಕರಿಸಿ"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"ದೃಢೀಕರಣವನ್ನು ರದ್ದುಗೊಳಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"ಮುಖ ಗುರುತಿಸಲಾಗಿದೆ. ಮುಂದುವರಿಯಲು ಅನ್ಲಾಕ್ ಐಕಾನ್ ಅನ್ನು ಒತ್ತಿ."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ದೃಢೀಕರಿಸಲಾಗಿದೆ"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"ದೃಢೀಕರಣವನ್ನು ರದ್ದುಗೊಳಿಸಿ"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ಪಿನ್ ಬಳಸಿ"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ಪ್ಯಾಟರ್ನ್ ಬಳಸಿ"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"ಪಾಸ್ವರ್ಡ್ ಬಳಸಿ"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"ಪ್ರಮಾಣಿತ"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"ಮಧ್ಯಮ"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"ಹೆಚ್ಚು"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,13 +442,17 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"ತೆಗೆದುಹಾಕಿ"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"ವಿಜೆಟ್ ಅನ್ನು ಸೇರಿಸಿ"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"ಮುಗಿದಿದೆ"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"ಲಾಕ್ ಸ್ಕ್ರೀನ್ನಲ್ಲಿ ಯಾವುದೇ ವಿಜೆಟ್ ಅನ್ನು ಅನುಮತಿಸಬೇಕೇ?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ತೆರೆಯಿರಿ"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"ಕೆಲಸದ ಆ್ಯಪ್ ವಿರಾಮ ರದ್ದುಮಾಡಬೇಕೇ"</string> <string name="work_mode_turn_on" msgid="907813741770247267">"ವಿರಾಮವನ್ನು ರದ್ದುಗೊಳಿಸಿ"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"ಬಳಕೆದಾರರನ್ನು ಬದಲಿಸಿ"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"ಪುಲ್ಡೌನ್ ಮೆನು"</string> - <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"ಈ ಸೆಷನ್ನಲ್ಲಿನ ಎಲ್ಲ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string> + <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"ಈ ಸೆಶನ್ನಲ್ಲಿನ ಎಲ್ಲಾ ಆ್ಯಪ್ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string> <string name="guest_wipe_session_title" msgid="7147965814683990944">"ಮತ್ತೆ ಸುಸ್ವಾಗತ, ಅತಿಥಿ!"</string> <string name="guest_wipe_session_message" msgid="3393823610257065457">"ನಿಮ್ಮ ಸೆಷನ್ ಮುಂದುವರಿಸಲು ಇಚ್ಚಿಸುವಿರಾ?"</string> <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"ಪ್ರಾರಂಭಿಸಿ"</string> @@ -470,8 +477,8 @@ <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"ನೀವು ಆ್ಯಪ್ ಅನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತಿರುವಾಗ, ರೆಕಾರ್ಡಿಂಗ್ ಮಾಡುತ್ತಿರುವಾಗ ಅಥವಾ ಕ್ಯಾಸ್ಟ್ ಮಾಡುತ್ತಿರುವಾಗ, ಆ ಆ್ಯಪ್ನಲ್ಲಿ ತೋರಿಸುವ ಅಥವಾ ಪ್ಲೇ ಮಾಡುವ ಯಾವುದೇ ವಿಷಯಕ್ಕೆ <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ಹೊಂದಿರುತ್ತದೆ. ಆದ್ದರಿಂದ ಪಾಸ್ವರ್ಡ್ಗಳು, ಪಾವತಿ ವಿವರಗಳು, ಸಂದೇಶಗಳು, ಫೋಟೋಗಳು ಹಾಗೂ ಆಡಿಯೊ ಮತ್ತು ವೀಡಿಯೊದಂತಹ ವಿಷಯಗಳ ಕುರಿತು ಜಾಗರೂಕರಾಗಿರಿ."</string> <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"ಪ್ರಾರಂಭಿಸಿ"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಈ ಆಯ್ಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದೆ"</string> - <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"ಕ್ಯಾಸ್ಟ್ ಮಾಡಲು ಪ್ರಾರಂಭಿಸಬೇಕೇ?"</string> - <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"ನೀವು ಕ್ಯಾಸ್ಟ್ ಮಾಡುವಾಗ, ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಮೇಲೆ ಕಾಣಿಸುವ ಅಥವಾ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಪ್ಲೇ ಮಾಡುವ ಯಾವುದೇ ವಿಷಯಕ್ಕೆ Android ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ಹೊಂದಿರುತ್ತದೆ. ಆದ್ದರಿಂದ ಪಾಸ್ವರ್ಡ್ಗಳು, ಪಾವತಿ ವಿವರಗಳು, ಸಂದೇಶಗಳು, ಫೋಟೋಗಳು ಹಾಗೂ ಆಡಿಯೊ ಮತ್ತು ವೀಡಿಯೊದಂತಹ ವಿಷಯಗಳ ಕುರಿತು ಜಾಗರೂಕರಾಗಿರಿ."</string> + <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"ಕ್ಯಾಸ್ಟ್ ಮಾಡಲು ಪ್ರಾರಂಭಿಸಬೇಕೆ?"</string> + <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"ನೀವು ಕ್ಯಾಸ್ಟ್ ಮಾಡುತ್ತಿರುವಾಗ, ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಮೇಲೆ ಕಾಣಿಸುವ ಅಥವಾ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಪ್ಲೇ ಮಾಡುವ ಯಾವುದೇ ವಿಷಯಕ್ಕೆ Android ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ಹೊಂದಿರುತ್ತದೆ. ಆದ್ದರಿಂದ ಪಾಸ್ವರ್ಡ್ಗಳು, ಪಾವತಿ ವಿವರಗಳು, ಸಂದೇಶಗಳು, ಫೋಟೋಗಳು ಹಾಗೂ ಆಡಿಯೊ ಮತ್ತು ವೀಡಿಯೊದಂತಹ ವಿಷಯಗಳ ಕುರಿತು ಜಾಗರೂಕರಾಗಿರಿ."</string> <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"ನೀವು ಆ್ಯಪ್ ಅನ್ನು ಕ್ಯಾಸ್ಟ್ ಮಾಡುತ್ತಿರುವಾಗ, ಆ ಆ್ಯಪ್ನಲ್ಲಿ ತೋರಿಸುವ ಅಥವಾ ಪ್ಲೇ ಮಾಡುವ ಯಾವುದೇ ವಿಷಯಕ್ಕೆ Android ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ಹೊಂದಿರುತ್ತದೆ. ಆದ್ದರಿಂದ ಪಾಸ್ವರ್ಡ್ಗಳು, ಪಾವತಿ ವಿವರಗಳು, ಸಂದೇಶಗಳು, ಫೋಟೋಗಳು ಹಾಗೂ ಆಡಿಯೊ ಮತ್ತು ವೀಡಿಯೊದಂತಹ ವಿಷಯಗಳ ಕುರಿತು ಜಾಗರೂಕರಾಗಿರಿ."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"ಕ್ಯಾಸ್ಟ್ ಮಾಡಲು ಪ್ರಾರಂಭಿಸಿ"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"ಹಂಚಿಕೊಳ್ಳಲು ಪ್ರಾರಂಭಿಸಬೇಕೇ?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ಈ ಸಾಧನವನ್ನು ನಿಮ್ಮ ಪೋಷಕರು ನಿರ್ವಹಿಸುತ್ತಿದ್ದಾರೆ. ನೀವು ಬಳಸುವ ಆ್ಯಪ್ಗಳು, ನಿಮ್ಮ ಸ್ಥಳ ಮತ್ತು ನಿಮ್ಮ ವೀಕ್ಷಣಾ ಅವಧಿಯಂತಹ ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮ ಪೋಷಕರು ನೋಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent ನಿಂದ ಅನ್ಲಾಕ್ ಮಾಡಲಾಗಿದೆ"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"ಸಾಧನವನ್ನು ಲಾಕ್ ಮಾಡಲಾಗಿದೆ, ಹಲವಾರು ದೃಢೀಕರಣ ಪ್ರಯತ್ನಗಳು"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"ಸಾಧನವನ್ನು ಲಾಕ್ ಮಾಡಲಾಗಿದೆ\nದೃಢೀಕರಣ ವಿಫಲವಾಗಿದೆ"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"ಸೌಂಡ್ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"ಸ್ವಯಂಚಾಲಿತ ಶೀರ್ಷಿಕೆ ಮಾಧ್ಯಮ"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"RHS ಗೆ ಇರುವ ಪ್ರಸ್ತುತ ಆ್ಯಪ್ ಸಹಾಯದಿಂದ ಸ್ಕ್ರೀನ್ ಬೇರ್ಪಡಿಸಿ ಮೋಡ್ ನಮೂದಿಸಿ"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"LHS ಗೆ ಇರುವ ಪ್ರಸ್ತುತ ಆ್ಯಪ್ ಸಹಾಯದಿಂದ ಸ್ಕ್ರೀನ್ ಬೇರ್ಪಡಿಸಿ ಮೋಡ್ ನಮೂದಿಸಿ"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"ಸ್ಕ್ರೀನ್ ಬೇರ್ಪಡಿಸಿ ಮೋಡ್ನಿಂದ ಪೂರ್ಣ ಸ್ಕ್ರೀನ್ಗೆ ಬದಲಿಸಿ"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"ಪರದೆ ಬೇರ್ಪಡಿಸಿ ಮೋಡ್ ಬಳಸುವಾಗ ಬಲಭಾಗ ಅಥವಾ ಕೆಳಭಾಗದಲ್ಲಿರುವ ಆ್ಯಪ್ಗೆ ಬದಲಿಸಿ"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ಪರದೆ ಬೇರ್ಪಡಿಸಿ ಮೋಡ್ ಬಳಸುವಾಗ ಎಡಭಾಗ ಅಥವಾ ಮೇಲ್ಭಾಗದಲ್ಲಿರುವ ಆ್ಯಪ್ಗೆ ಬದಲಿಸಿ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ಸ್ಕ್ರೀನ್ ಬೇರ್ಪಡಿಸುವ ಸಮಯದಲ್ಲಿ: ಒಂದು ಆ್ಯಪ್ನಿಂದ ಮತ್ತೊಂದು ಆ್ಯಪ್ಗೆ ಬದಲಿಸಿ"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ಇನ್ಪುಟ್"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"ಮುಂದಿನ ಭಾಷೆಗೆ ಬದಲಿಸಿ"</string> diff --git a/packages/SystemUI/res/values-kn/tiles_states_strings.xml b/packages/SystemUI/res/values-kn/tiles_states_strings.xml index 3ae65785784f..9628323a595f 100644 --- a/packages/SystemUI/res/values-kn/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-kn/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"ಆಫ್ ಆಗಿದೆ"</item> <item msgid="5137565285664080143">"ಆನ್ ಆಗಿದೆ"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 4c442284c1e2..26cfb6a1073b 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"IT 관리자가 스크린샷 촬영을 허용하지 않습니다."</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"수정"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"스크린샷 수정"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"공유"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"스크린샷 공유"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"더 캡처하기"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"스크린샷 닫기"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"얼굴 스캔 중"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"보내기"</string> <string name="cancel" msgid="1089011503403416730">"취소"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"앱 로고"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"확인"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"다시 시도하세요."</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"탭하여 인증 취소"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"얼굴이 인식되었습니다. 계속하려면 아이콘을 누르세요."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"인증됨"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"인증 취소"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"옵션 더보기"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN 사용"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"패턴 사용"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"비밀번호 사용"</string> @@ -362,7 +363,9 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"표준"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"보통"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"높음"</string> - <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"기기 마이크를 &#173;차단 해제하시겠습니까?"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> + <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"삭제"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"위젯 추가"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"완료"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"잠금 화면에서 위젯 사용을 허용하시겠습니까?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"설정 열기"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"직장 앱 일시중지를 해제하시겠습니까?"</string> @@ -603,7 +610,7 @@ <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"음소거 해제"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"진동"</string> <string name="volume_dialog_title" msgid="6502703403483577940">"%s 볼륨 컨트롤"</string> - <string name="volume_dialog_ringer_guidance_ring" msgid="9143194270463146858">"전화 및 알림이 오면 벨소리가 울림(<xliff:g id="VOLUME_LEVEL">%1$s</xliff:g>)"</string> + <string name="volume_dialog_ringer_guidance_ring" msgid="9143194270463146858">"전화 및 알림이 오면 벨소리가 울립니다(<xliff:g id="VOLUME_LEVEL">%1$s</xliff:g>)"</string> <string name="volume_panel_enter_media_output_settings" msgid="8824244246272552669">"출력 설정 열기"</string> <string name="volume_panel_expanded_sliders" msgid="1885750987768506271">"볼륨 슬라이더 펼침"</string> <string name="volume_panel_collapsed_sliders" msgid="1413383759434791450">"볼륨 슬라이더 접힘"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"현재 앱을 오른쪽으로 보내는 화면 분할 입력"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"현재 앱을 왼쪽으로 보내는 화면 분할 입력"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"화면 분할에서 전체 화면으로 전환"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"화면 분할을 사용하는 중에 오른쪽 또는 아래쪽에 있는 앱으로 전환하기"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"화면 분할을 사용하는 중에 왼쪽 또는 위쪽에 있는 앱으로 전환하기"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"화면 분할 중: 다른 앱으로 바꾸기"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"입력"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"다음 언어로 전환"</string> diff --git a/packages/SystemUI/res/values-ko/tiles_states_strings.xml b/packages/SystemUI/res/values-ko/tiles_states_strings.xml index 002efb2b693b..d30aff2073f1 100644 --- a/packages/SystemUI/res/values-ko/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-ko/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"사용 안함"</item> <item msgid="5137565285664080143">"사용"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 2044f9256c43..079b1b8df267 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"IT администраторуңуз скриншот тартууга тыюу салган"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Түзөтүү"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Скриншотту түзөтүү"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Бөлүшүү"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Скриншотту бөлүшүү"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Көбүрөөк тартуу"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Скриншотту четке кагуу"</string> @@ -107,7 +106,7 @@ <string name="screenrecord_channel_description" msgid="4147077128486138351">"Экранды жаздыруу сеансы боюнча учурдагы билдирме"</string> <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"Жаздырып баштайсызбы?"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Жаздырып жатканыңызда Android экраныңызда көрүнүп жана түзмөктө ойнотулуп жаткан нерселерди көрө алат. Андыктан сырсөздөрдү, төлөмдүн чоо-жайын, билдирүүлөрдү, сүрөттөрдү, аудио жана видеону көрсөтүп албаңыз."</string> - <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Колдонмону жаздырып жатканда Android ал колдонмодо көрсөтүлүп жана ойнотулуп жаткан нерселерди көрө алат. Андыктан сырсөздөрдү, төлөмдүн чоо-жайын, билдирүүлөрдү, сүрөттөрдү, аудио жана видеону көрсөтүп албаңыз."</string> + <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Колдонмону жаздырып жатканда Android анда көрүнүп же ойноп жаткан нерселерди көрө алат. Андыктан сырсөздөрдү, төлөмдүн чоо-жайын, билдирүүлөрдү, сүрөттөрдү, аудио жана видеону көрсөтүп албаңыз."</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Жаздырып баштоо"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Аудио жаздыруу"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Түзмөктөгү аудиолор"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Жүз скандалууда"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Жөнөтүү"</string> <string name="cancel" msgid="1089011503403416730">"Баш тартуу"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Колдонмонун логотиби"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Ырастоо"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Кайталоо"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Аныктыгын текшерүүнү жокко чыгаруу үчүн таптаңыз"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Жүз таанылды. Улантуу үчүн кулпусун ачуу сүрөтчөсүн басыңыз."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Аныктыгы текшерилди"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Аныктыгын текшерүүнү жокко чыгаруу"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Дагы параметрлер"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN кодду колдонуу"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Графикалык ачкычты колдонуу"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Сырсөз колдонуу"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Кадимки"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Орточо"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Жогору"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,8 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Өчүрүү"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Виджет кошуу"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Бүттү"</string> + <string name="label_for_button_in_empty_state_cta" msgid="7314975555382055823">"Виджеттерди кошуу"</string> + <string name="title_for_empty_state_cta" msgid="6161654421223450530">"Тандалма колдонмолордун виджеттерин планшеттин кулпусун ачпастан эле, ыкчам колдонуңуз."</string> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Бардык виджеттер кулпуланган экранда көрсөтүлсүнбү?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Параметрлерди ачуу"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Жумуш колдонмолорун иштетесизби?"</string> @@ -467,16 +472,16 @@ <string name="screen_share_permission_app_selector_title" msgid="1404878013670347899">"Колдонмону бөлүшүү же жаздыруу"</string> <string name="media_projection_entry_app_permission_dialog_title" msgid="9155535851866407199">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> колдонмосу аркылуу жаздырып же тышкы экранга чыгарып баштайсызбы?"</string> <string name="media_projection_entry_app_permission_dialog_warning_entire_screen" msgid="8736391633234144237">"Бөлүшүп, жаздырып же тышкы экранга чыгарып жатканда <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> колдонмосу экраныңыздагы бардык маалыматты же түзмөктө ойнотулуп жаткан нерселерди көрө алат. Андыктан сырсөздөрдү, төлөмдүн чоо-жайын, билдирүүлөрдү, сүрөттөрдү, аудио жана видеону көрсөтүп албаңыз."</string> - <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Колдонмону бөлүшүп, жаздырып же тышкы экранга чыгарганда <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> колдонмосу ал колдонмодо көрсөтүлүп жана ойнотулуп жаткан нерселерди көрө алат. Андыктан сырсөздөрдү, төлөмдүн чоо-жайын, билдирүүлөрдү, сүрөттөрдү, аудио жана видеону көрсөтүп албаңыз."</string> + <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Колдонмону бөлүшүп, жаздырып же тышкы экранга чыгарганда <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> колдонмосу анда көрүнүп же ойноп жаткан нерселерди көрө алат. Андыктан сырсөздөрдү, төлөмдүн чоо-жайын, билдирүүлөрдү, сүрөттөрдү, аудио жана видеону көрсөтүп албаңыз."</string> <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"Баштоо"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> бул параметрди өчүрүп койду"</string> - <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Тышкы экранга чыгаруу башталсынбы?"</string> + <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Тышкы экранга чыгарып баштайсызбы?"</string> <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Тышкы экранга чыгарганда Android экраныңызда көрүнүп жана түзмөктө ойнотулуп жаткан нерселерди көрө алат. Андыктан сырсөздөрдү, төлөмдүн чоо-жайын, билдирүүлөрдү, сүрөттөрдү, аудио жана видеону көрсөтүп албаңыз."</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Колдонмону тышкы экранга чыгарганда Android ал колдонмодо көрсөтүлүп жана ойнотулуп жаткан нерселерди көрө алат. Андыктан сырсөздөрдү, төлөмдүн чоо-жайын, билдирүүлөрдү, сүрөттөрдү, аудио жана видеону көрсөтүп албаңыз."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Колдонмону тышкы экранга чыгарганда Android анда көрүнүп же ойноп жаткан нерселерди көрө алат. Андыктан сырсөздөрдү, төлөмдүн чоо-жайын, билдирүүлөрдү, сүрөттөрдү, аудио жана видеону көрсөтүп албаңыз."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Тышкы экранга чыгарып баштоо"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Бөлүшүү башталсынбы?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Бөлүшүп, жаздырып же тышкы экранга чыгарып жатканда Android экраныңыздагы бардык маалыматты же түзмөктө ойнотулуп жаткан нерселерди көрө алат. Андыктан сырсөздөрдү, төлөмдүн чоо-жайын, билдирүүлөрдү, сүрөттөрдү, аудио жана видеону көрсөтүп албаңыз."</string> - <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Колдонмону бөлүшүп, жаздырып же тышкы экранга чыгарганда Android ал колдонмодо көрсөтүлүп жана ойнотулуп жаткан нерселерди көрө алат. Андыктан сырсөздөрдү, төлөмдүн чоо-жайын, билдирүүлөрдү, сүрөттөрдү, аудио жана видеону көрсөтүп албаңыз."</string> + <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Колдонмону бөлүшүп, жаздырып же тышкы экранга чыгарганда Android анда көрүнүп же ойноп жаткан нерселерди көрө алат. Андыктан сырсөздөрдү, төлөмдүн чоо-жайын, билдирүүлөрдү, сүрөттөрдү, аудио жана видеону көрсөтүп албаңыз."</string> <string name="media_projection_entry_generic_permission_dialog_continue" msgid="8640381403048097116">"Баштоо"</string> <string name="media_projection_task_switcher_text" msgid="590885489897412359">"Колдонмо которулганда бөлүшүү тындырылат"</string> <string name="media_projection_task_switcher_action_switch" msgid="8682258717291921123">"Анын ордуна бул колдонмону бөлүшүү"</string> @@ -610,7 +615,7 @@ <string name="volume_panel_hint_mute" msgid="6962563028495243738">"%s үнүн басуу"</string> <string name="volume_panel_hint_unmute" msgid="7489063242934477382">"%s үнүн чыгаруу"</string> <string name="media_output_label_title" msgid="872824698593182505">"<xliff:g id="LABEL">%s</xliff:g> аркылуу ойнотулууда"</string> - <string name="media_output_title_without_playing" msgid="3825663683169305013">"Аудио төмөнкүдө ойнотулат:"</string> + <string name="media_output_title_without_playing" msgid="3825663683169305013">"Аудио кайсы жерде ойнотулат:"</string> <string name="system_ui_tuner" msgid="1471348823289954729">"System UI Tuner"</string> <string name="status_bar" msgid="4357390266055077437">"Абал тилкеси"</string> <string name="demo_mode" msgid="263484519766901593">"Системанын интерфейсинин демо режими"</string> @@ -763,10 +768,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Учурда оң жактагы колдонмо менен экранды бөлүүнү иштетүү"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Учурда сол жактагы колдонмо менен экранды бөлүүнү иштетүү"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Экранды бөлүү режиминен толук экранга которулуу"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Бөлүнгөн экранды колдонуп жатканда сол же төмөн жактагы колдонмого которулуңуз"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Бөлүнгөн экранды колдонуп жатканда сол же жогору жактагы колдонмого которулуңуз"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Экранды бөлүү режиминде бир колдонмону экинчисине алмаштыруу"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Киргизүү"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Кийинки тилге которулуу"</string> @@ -1164,7 +1167,7 @@ <string name="mobile_data_connection_active" msgid="944490013299018227">"Туташты"</string> <string name="mobile_data_temp_connection_active" msgid="4590222725908806824">"Убактылуу туташып турат"</string> <string name="mobile_data_poor_connection" msgid="819617772268371434">"Байланыш начар"</string> - <string name="mobile_data_off_summary" msgid="3663995422004150567">"Мобилдик трафик автоматтык түрдө туташтырылбайт"</string> + <string name="mobile_data_off_summary" msgid="3663995422004150567">"Мобилдик Интернетке автоматтык түрдө өтпөйт"</string> <string name="mobile_data_no_connection" msgid="1713872434869947377">"Байланыш жок"</string> <string name="non_carrier_network_unavailable" msgid="770049357024492372">"Башка тармактар жеткиликсиз"</string> <string name="all_network_unavailable" msgid="4112774339909373349">"Тармактар жеткиликтүү эмес"</string> diff --git a/packages/SystemUI/res/values-ky/tiles_states_strings.xml b/packages/SystemUI/res/values-ky/tiles_states_strings.xml index bb03d0acc04d..35795b77a32e 100644 --- a/packages/SystemUI/res/values-ky/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-ky/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Өчүк"</item> <item msgid="5137565285664080143">"Күйүк"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index f109041f5c75..7e8320296197 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"ຜູ້ເບິ່ງແຍງໄອທີຂອງທ່ານບລັອກການຖ່າຍຮູບໜ້າຈໍໄວ້."</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"ແກ້ໄຂ"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"ແກ້ໄຂຮູບໜ້າຈໍ"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"ແບ່ງປັນ"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"ແບ່ງປັນຮູບໜ້າຈໍ"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"ຖ່າຍຮູບເພີ່ມເຕີມ"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ປິດຮູບໜ້າຈໍ"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"ການສະແກນໜ້າ"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ສົ່ງ"</string> <string name="cancel" msgid="1089011503403416730">"ຍົກເລີກ"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"ໂລໂກ້ແອັບ"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"ຢືນຢັນ"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ລອງໃໝ່"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"ແຕະເພື່ອຍົກເລີກການກວດສອບຄວາມຖືກຕ້ອງ"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"ຈຳແນກໜ້າໄດ້ແລ້ວ. ກົດໄອຄອນປົດລັອກເພື່ອສືບຕໍ່."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ຮັບຮອງຄວາມຖືກຕ້ອງແລ້ວ"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"ຍົກເລີກການພິສູດຢືນຢັນ"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"ຕົວເລືອກເພີ່ມເຕີມ"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ໃຊ້ PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ໃຊ້ຮູບແບບ"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"ໃຊ້ລະຫັດຜ່ານ"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"ມາດຕະຖານ"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"ປານກາງ"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"ສູງ"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"ລຶບອອກ"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"ເພີ່ມວິດເຈັດ"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"ແລ້ວໆ"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"ອະນຸຍາດວິດເຈັດໃດກໍຕາມຢູ່ໜ້າຈໍລັອກບໍ?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"ເປີດການຕັ້ງຄ່າ"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"ຍົກເລີກການຢຸດຊົ່ວຄາວແອັບບ່ອນເຮັດວຽກບໍ?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ອຸປະກອນນີ້ແມ່ນຈັດການໂດຍພໍ່ແມ່ຂອງທ່ານ. ພໍ່ແມ່ຂອງທ່ານສາມາດເບິ່ງ ແລະ ຈັດການຂໍ້ມູນໄດ້ ເຊັ່ນ: ແອັບທີ່ທ່ານໃຊ້, ສະຖານທີ່ ແລະ ເວລາໜ້າຈໍຂອງທ່ານ."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"ປັອດລັອກປະໄວ້ໂດຍ TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"ອຸປະກອນຖືກລັອກແລ້ວ, ພະຍາຍາມເຮັດການພິສູດຢືນຢັນຫຼາຍເທື່ອເກີນໄປ"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"ລັອກອຸປະກອນແລ້ວ\nການພິສູດຢືນຢັນບໍ່ສຳເລັດ"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"ການຕັ້ງຄ່າສຽງ"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"ສ້າງຄຳບັນຍາຍມີເດຍໂດຍອັດຕະໂນມັດ"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"ເຂົ້າສູ່ແບ່ງໜ້າຈໍດ້ວຍແອັບປັດຈຸບັນໄປຫາ RHS"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"ເຂົ້າສູ່ແບ່ງໜ້າຈໍດ້ວຍແອັບປັດຈຸບັນໄປຫາ LHS"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"ສະຫຼັບຈາກແບ່ງໜ້າຈໍໄປເປັນເຕັມຈໍ"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"ສະຫຼັບໄປໃຊ້ແອັບຢູ່ຂວາ ຫຼື ທາງລຸ່ມໃນຂະນະທີ່ໃຊ້ແບ່ງໜ້າຈໍ"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ສະຫຼັບໄປໃຊ້ແອັບຢູ່ຊ້າຍ ຫຼື ທາງເທິງໃນຂະນະທີ່ໃຊ້ແບ່ງໜ້າຈໍ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ໃນລະຫວ່າງແບ່ງໜ້າຈໍ: ໃຫ້ປ່ຽນຈາກແອັບໜຶ່ງເປັນອີກແອັບໜຶ່ງ"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ການປ້ອນຂໍ້ມູນ"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"ສະຫຼັບເປັນພາສາຖັດໄປ"</string> diff --git a/packages/SystemUI/res/values-lo/tiles_states_strings.xml b/packages/SystemUI/res/values-lo/tiles_states_strings.xml index 3c288fce5d5a..290c01859877 100644 --- a/packages/SystemUI/res/values-lo/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-lo/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"ປິດ"</item> <item msgid="5137565285664080143">"ເປີດ"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 5f1c7bb1a26e..37d9592d5a18 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Jūsų IT administratorius užblokavo galimybę daryti ekrano kopijas."</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Redaguoti"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Redaguoti ekrano kopiją"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Bendrinti"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Bendrinti ekrano kopiją"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Fiksuoti daugiau"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Praleisti ekrano kopiją"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Nuskaitomas veidas"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Siųsti"</string> <string name="cancel" msgid="1089011503403416730">"Atšaukti"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Programos logotipas"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Patvirtinkite"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Bandyti dar kartą"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Palieskite, jei norite atšaukti autentifikavimą"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Veidas atpažintas. Tęskite paspaudę atrakinimo piktogramą."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentifikuota"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Atšaukti autentifikavimą"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Daugiau parinkčių"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Naudoti PIN kodą"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Naudoti atrakinimo piešinį"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Naudoti slaptažodį"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Įprastas"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Vidutinis"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Aukštas"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Pašalinti"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Pridėti valdiklį"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Atlikta"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Leisti visus valdiklius užrakinimo ekrane?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Atidaryti nustatymus"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Atš. darbo progr. pristabd.?"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Eiti į išskaidyto ekrano režimą su dabartine programa dešinėje"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Eiti į išskaidyto ekrano režimą su dabartine programa kairėje"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Perjungti iš išskaidyto ekrano režimo į viso ekrano režimą"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Perjunkite į programą dešinėje arba apačioje išskaidyto ekrano režimu"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Perjunkite į programą kairėje arba viršuje išskaidyto ekrano režimu"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Išskaidyto ekrano režimu: pakeisti iš vienos programos į kitą"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Įvestis"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Perjungti į kitą kalbą"</string> diff --git a/packages/SystemUI/res/values-lt/tiles_states_strings.xml b/packages/SystemUI/res/values-lt/tiles_states_strings.xml index 8c4515bf513c..cfa55522cbf3 100644 --- a/packages/SystemUI/res/values-lt/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-lt/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Išjungta"</item> <item msgid="5137565285664080143">"Įjungta"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 0be94f1f5961..ede8e7d27960 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Jūsu IT administrators ir bloķējis ekrānuzņēmumu izveidi"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Rediģēt"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Rediģēt ekrānuzņēmumu"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Kopīgot"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Kopīgot ekrānuzņēmumu"</string> <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> @@ -107,8 +106,8 @@ <string name="screenrecord_channel_description" msgid="4147077128486138351">"Aktīvs paziņojums par ekrāna ierakstīšanas sesiju"</string> <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"Vai sākt ierakstīšanu?"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Ierakstīšanas laikā Android var piekļūt visam, kas tiek rādīts jūsu ekrānā vai atskaņots jūsu ierīcē. Tāpēc piesardzīgi apejieties ar parolēm, maksājumu informāciju, ziņojumiem, fotoattēliem un audio un video saturu."</string> - <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Lietotnes ierakstīšanas laikā Android var piekļūt visam, kas tiek rādīts vai atskaņots attiecīgajā lietotnē. Tāpēc piesardzīgi apejieties ar parolēm, maksājumu informāciju, ziņojumiem, fotoattēliem un audio un video saturu."</string> - <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Sāk ierakstīšanu"</string> + <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Lietotnes ierakstīšanas laikā Android var piekļūt visam, kas tiek rādīts vai atskaņots attiecīgajā lietotnē. Tāpēc ar parolēm, maksājumu informāciju, ziņojumiem, fotoattēliem un audio un video saturu rīkojieties piesardzīgi."</string> + <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Sākt ierakstīšanu"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Ierakstīt audio"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Ierīces audio"</string> <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"Skaņa no jūsu ierīces, piemēram, mūzika, sarunas un zvana signāli"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Sejas skenēšana"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Sūtīt"</string> <string name="cancel" msgid="1089011503403416730">"Atcelt"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Lietotnes logotips"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Apstiprināt"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Mēģināt vēlreiz"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Pieskarieties, lai atceltu autentifikāciju."</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Seja atpazīta. Lai turpinātu, nospiediet atbloķēšanas ikonu."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentifikācija veikta"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Atcelt autentificēšanu"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Citas opcijas"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Izmantot PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Izmantot kombināciju"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Izmantot paroli"</string> @@ -265,7 +266,7 @@ <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Nav pieejama neviena pārī savienota ierīce."</string> <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Lai pievienotu vai atvienotu kādu ierīci, pieskarieties."</string> - <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Savienošana pārī ar jaunu ierīci"</string> + <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Savienot pārī ar jaunu ierīci"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"Skatīt visas"</string> <string name="turn_on_bluetooth" msgid="5681370462180289071">"Izmantot Bluetooth"</string> <string name="quick_settings_bluetooth_device_connected" msgid="7884777006729260996">"Savienojums izveidots"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standarta"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Vidējs"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Augsts"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vai 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 atbloķēt ierīces kameru un mikrofonu?"</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Noņemt"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Pievienot logrīku"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Gatavs"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Vai atļaut jebkāda veida logrīkus bloķēšanas ekrānā?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Atvērt iestatījumus"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Vai aktivizēt darba lietotnes?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Šo ierīci pārvalda viens no jūsu vecākiem. Vecāki var skatīt un pārvaldīt tādu informāciju kā jūsu izmantotās lietotnes, atrašanās vieta un izmantošanas ilgums."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Bloķēšanu liedzis TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Ierīce tika bloķēta; pārāk daudz autentifikācijas mēģinājumu."</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Ierīce bloķēta\nAutentifikācija neizdevās"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Skaņas iestatījumi"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Autom. paraksti multividei"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Pāriet ekrāna sadalīšanas režīmā ar pašreizējo lietotni pa labi"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Pāriet ekrāna sadalīšanas režīmā ar pašreizējo lietotni pa kreisi"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Pārslēgties no ekrāna sadalīšanas režīma uz pilnekrāna režīmu"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Pāriet uz lietotni pa labi/lejā, kamēr izmantojat sadalīto ekrānu."</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Pāriet uz lietotni pa kreisi/augšā, kamēr izmantojat sadalīto ekrānu."</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ekrāna sadalīšanas režīmā: pārvietot lietotni no viena ekrāna uz otru"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Ievade"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Pārslēgt uz nākamo valodu"</string> diff --git a/packages/SystemUI/res/values-lv/tiles_states_strings.xml b/packages/SystemUI/res/values-lv/tiles_states_strings.xml index a75e9d858afb..e6b4deab07ea 100644 --- a/packages/SystemUI/res/values-lv/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-lv/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Izslēgts"</item> <item msgid="5137565285664080143">"Ieslēgts"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 3a84c9c76126..e5f71d45a17c 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Зачувувањето слики од екранот е блокирано од IT-администраторот"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Измени"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Изменете ја сликата од екранот"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Сподели"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Споделете слика од екранот"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Сними повеќе"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Отфрлете ја сликата од екранот"</string> @@ -107,7 +106,7 @@ <string name="screenrecord_channel_description" msgid="4147077128486138351">"Тековно известување за сесија за снимање на екранот"</string> <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"Да се започне со снимање?"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Додека снимате, Android има пристап до сѐ што е видливо на вашиот екран или пуштено на вашиот уред. Затоа, бидете внимателни со работи како лозинки, детали за плаќање, пораки, фотографии и аудио и видео."</string> - <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Додека снимате апликација, Android има пристап до сѐ што се прикажува или пушта на таа апликација. Затоа, бидете внимателни со лозинки, детали за плаќање, пораки фотографии и аудио и видео."</string> + <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Додека снимате апликација, Android има пристап до сѐ што се прикажува или пушта на таа апликација. Затоа, бидете внимателни со лозинки, детали за плаќање, пораки, фотографии и аудио и видео."</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Започни со снимање"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Снимај аудио"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Аудио од уредот"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Скенирање лице"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Испрати"</string> <string name="cancel" msgid="1089011503403416730">"Откажи"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Лого на апликацијата"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Потврди"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Обиди се повторно"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Допрете за да ја откажете проверката"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Лицето е препознаено. Притиснете ја иконата за отклучување за да продолжите."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Проверена"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Откажување автентикација"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Повеќе опции"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Користи PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Користи шема"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Користи лозинка"</string> @@ -264,7 +265,7 @@ <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Не вознемирувај"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Нема достапни спарени уреди"</string> - <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Допрете за да поврзете уред или да ја прекинете врската со уред"</string> + <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Допрете за да воспоставите или да прекинете врска со уред"</string> <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Спарете нов уред"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"Прикажи ги сите"</string> <string name="turn_on_bluetooth" msgid="5681370462180289071">"Користи Bluetooth"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Стандарден"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Среден"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Висок"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,13 +442,17 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Отстранува"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Додајте виџет"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Готово"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Да се дозволи каков било виџет на заклучен екран?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Отвори ги поставките"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Да се актив. работните аплик.?"</string> <string name="work_mode_turn_on" msgid="907813741770247267">"Прекини ја паузата"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Промени го корисникот"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"паѓачко мени"</string> - <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Сите апликации и податоци во сесијата ќе се избришат."</string> + <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Сите апликации и податоци во сесијава ќе се избришат."</string> <string name="guest_wipe_session_title" msgid="7147965814683990944">"Добре дојде пак, гостине!"</string> <string name="guest_wipe_session_message" msgid="3393823610257065457">"Дали сакате да продолжите со сесијата?"</string> <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"Почни одново"</string> @@ -585,7 +592,7 @@ <string name="volume_ringer_status_vibrate" msgid="6970078708957857825">"Вибрации"</string> <string name="volume_ringer_status_silent" msgid="3691324657849880883">"Исклучи звук"</string> <string name="media_device_cast" msgid="4786241789687569892">"Емитување"</string> - <string name="stream_notification_unavailable" msgid="4313854556205836435">"Недостапно бидејќи ѕвонењето е исклучено"</string> + <string name="stream_notification_unavailable" msgid="4313854556205836435">"Недостапно бидејќи звукот е исклучен"</string> <string name="stream_alarm_unavailable" msgid="4059817189292197839">"Недостапно бидејќи е вклучено „Не вознемирувај“"</string> <string name="stream_media_unavailable" msgid="6823020894438959853">"Недостапно бидејќи е вклучено „Не вознемирувај“"</string> <string name="volume_stream_content_description_unmute" msgid="7729576371406792977">"%1$s. Допрете за да вклучите звук."</string> @@ -593,7 +600,7 @@ <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. Допрете за да исклучите звук. Можеби ќе се исклучи звукот на услугите за достапност."</string> <string name="volume_stream_content_description_vibrate_a11y" msgid="2742330052979397471">"%1$s. Допрете за да се постави на вибрации."</string> <string name="volume_stream_content_description_mute_a11y" msgid="5743548478357238156">"%1$s. Допрете за да се исклучи звукот."</string> - <string name="volume_panel_noise_control_title" msgid="7413949943872304474">"Контрола на бучавата"</string> + <string name="volume_panel_noise_control_title" msgid="7413949943872304474">"Контрола на шум"</string> <string name="volume_panel_spatial_audio_title" msgid="3367048857932040660">"Просторен звук"</string> <string name="volume_panel_spatial_audio_off" msgid="4177490084606772989">"Исклучено"</string> <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Фиксно"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Активирајте поделен екран со тековната апликација десно"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Активирајте поделен екран со тековната апликација лево"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Префрлете од поделен екран во цел екран"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Префрлете на апликацијата десно или долу при користењето поделен екран"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Префрлете на апликацијата лево или горе при користењето поделен екран"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"При поделен екран: префрлете ги аплик. од едната на другата страна"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Внесување"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Префрлете на следниот јазик"</string> diff --git a/packages/SystemUI/res/values-mk/tiles_states_strings.xml b/packages/SystemUI/res/values-mk/tiles_states_strings.xml index 4dd9e7328f88..0d811206a766 100644 --- a/packages/SystemUI/res/values-mk/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-mk/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Исклучено"</item> <item msgid="5137565285664080143">"Вклучено"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index e2ee3ec89903..b2ccee41d8d1 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"സ്ക്രീൻഷോട്ടുകൾ എടുക്കുന്നത് നിങ്ങളുടെ ഐടി അഡ്മിൻ ബ്ലോക്ക് ചെയ്തിരിക്കുന്നു"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"എഡിറ്റ് ചെയ്യുക"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"സ്ക്രീൻഷോട്ട് എഡിറ്റ് ചെയ്യുക"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"പങ്കിടുക"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"സ്ക്രീൻഷോട്ട് പങ്കിടുക"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"കൂടുതൽ ക്യാപ്ചർ ചെയ്യുക"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"സ്ക്രീൻഷോട്ട് ഡിസ്മിസ് ചെയ്യുക"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"മുഖം സ്കാൻ ചെയ്യുന്നു"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"അയയ്ക്കുക"</string> <string name="cancel" msgid="1089011503403416730">"റദ്ദാക്കുക"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"ആപ്പ് ലോഗോ"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"സ്ഥിരീകരിക്കുക"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"വീണ്ടും ശ്രമിക്കുക"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"പരിശോധിച്ചുറപ്പിക്കൽ റദ്ദാക്കാൻ ടാപ്പ് ചെയ്യുക"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"മുഖം തിരിച്ചറിഞ്ഞു. തുടരാൻ അൺലോക്ക് ഐക്കൺ അമർത്തുക."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"പരിശോധിച്ചുറപ്പിച്ചു"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"പരിശോധിച്ചുറപ്പിക്കൽ റദ്ദാക്കുക"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"കൂടുതൽ ഓപ്ഷനുകൾ"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"പിൻ ഉപയോഗിക്കുക"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"പാറ്റേൺ ഉപയോഗിക്കുക"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"പാസ്വേഡ് ഉപയോഗിക്കുക"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"സ്റ്റാൻഡേർഡ്"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"ഇടത്തരം"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"കൂടുതൽ"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"നീക്കം ചെയ്യുക"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"വിജറ്റ് ചേർക്കുക"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"പൂർത്തിയായി"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"ലോക്ക് സ്ക്രീനിൽ ഏതെങ്കിലും വിജറ്റ് അനുവദിക്കണോ?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"ക്രമീകരണം തുറക്കുക"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"വർക്ക് ആപ്പുകൾ പുനരാരംഭിക്കണോ?"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"നിലവിലെ ആപ്പ് വലതുവശത്ത് വരുന്ന രീതിയിൽ സ്ക്രീൻ വിഭജന മോഡിൽ കടക്കുക"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"നിലവിലെ ആപ്പ് ഇടതുവശത്ത് വരുന്ന രീതിയിൽ സ്ക്രീൻ വിഭജന മോഡിൽ കടക്കുക"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"സ്ക്രീൻ വിഭജന മോഡിൽ നിന്ന് പൂർണ്ണ സ്ക്രീനിലേക്ക് മാറുക"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"സ്ക്രീൻ വിഭജന മോഡ് ഉപയോഗിക്കുമ്പോൾ വലതുവശത്തെ/താഴത്തെ ആപ്പിലേക്ക് മാറൂ"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"സ്ക്രീൻ വിഭജന മോഡ് ഉപയോഗിക്കുമ്പോൾ ഇടതുവശത്തെ/മുകളിലെ ആപ്പിലേക്ക് മാറൂ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"സ്ക്രീൻ വിഭജന മോഡിൽ: ഒരു ആപ്പിൽ നിന്ന് മറ്റൊന്നിലേക്ക് മാറുക"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ഇൻപുട്ട്"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"അടുത്ത ഭാഷയിലേക്ക് മാറുക"</string> diff --git a/packages/SystemUI/res/values-ml/tiles_states_strings.xml b/packages/SystemUI/res/values-ml/tiles_states_strings.xml index 18e7b29b5d3d..a314f0e2cc8c 100644 --- a/packages/SystemUI/res/values-ml/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-ml/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"ഓഫാണ്"</item> <item msgid="5137565285664080143">"ഓണാണ്"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index 84ff51b7ad74..93bc6a69c15a 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Таны IT админ дэлгэцийн агшин авахыг блоклосон байна"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Засах"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Дэлгэцийн агшныг засах"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Хуваалцах"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Дэлгэцийн агшныг хуваалцах"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Ихийг багтаасан зураг авах"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Дэлгэцийн агшныг хаах"</string> @@ -117,7 +116,7 @@ <string name="screenrecord_continue" msgid="4055347133700593164">"Эхлүүлэх"</string> <string name="screenrecord_ongoing_screen_only" msgid="4459670242451527727">"Дэлгэцийг бичиж байна"</string> <string name="screenrecord_ongoing_screen_and_audio" msgid="5351133763125180920">"Дэлгэц болон аудиог бичиж байна"</string> - <string name="screenrecord_taps_label" msgid="1595690528298857649">"Дэлгэц дээр мэдрэгчийг харуулах"</string> + <string name="screenrecord_taps_label" msgid="1595690528298857649">"Дэлгэц дээр хүрэхийг харуулах"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Зогсоох"</string> <string name="screenrecord_share_label" msgid="5025590804030086930">"Хуваалцах"</string> <string name="screenrecord_save_title" msgid="1886652605520893850">"Дэлгэцийн бичлэгийг хадгалсан"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Скан хийх нүүр царай"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Илгээх"</string> <string name="cancel" msgid="1089011503403416730">"Цуцлах"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Аппын лого"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Баталгаажуулах"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Дахин оролдох"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Нотолгоог цуцлахын тулд товшино уу"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Царайг таньсан. Үргэлжлүүлэх бол түгжээг тайлах дүрсийг дар."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Баталгаажуулагдсан"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Баталгаажуулалтыг цуцлах"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Бусад сонголт"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ПИН ашиглах"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Хээ ашиглах"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Нууц үг ашиглах"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Стандарт"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Дунд зэрэг"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Өндөр"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Хасах"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Виджет нэмэх"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Болсон"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Түгжээтэй дэлгэц дээр дурын виджетийг зөвшөөрөх үү?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Тохиргоог нээх"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Ажлын аппыг үргэлжлүүлэх үү?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Энэ төхөөрөмжийг таны эцэг эх удирддаг. Таны эцэг эх таны хэрэглэдэг апп, байршил, дэлгэцийн цаг зэрэг мэдээллийг харж, удирдах боломжтой."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent-р түгжээгүй байлгасан"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Төхөөрөмжийг түгжсэн. Хэт олон удаа баталгаажуулах оролдлого хийсэн"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Төхөөрөмжийг түгжсэн\nБаталгаажуулж чадсангүй"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Дууны тохиргоо"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Медиад автоматаар тайлбар нэмэх"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Одоогийн аппаар баруун гар талд дэлгэц хуваахад орох"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Одоогийн аппаар зүүн гар талд дэлгэц хуваахад орох"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Дэлгэц хуваахаас бүтэн дэлгэц рүү сэлгэх"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Дэлгэц хуваахыг ашиглаж байхдаа баруун эсвэл доор байх апп руу сэлгэ"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Дэлгэц хуваахыг ашиглаж байхдаа зүүн эсвэл дээр байх апп руу сэлгэ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Дэлгэц хуваах үеэр: аппыг нэгээс нөгөөгөөр солих"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Оролт"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Дараагийн хэл рүү сэлгэх"</string> diff --git a/packages/SystemUI/res/values-mn/tiles_states_strings.xml b/packages/SystemUI/res/values-mn/tiles_states_strings.xml index 95f835ed0789..cfaf693ccd4c 100644 --- a/packages/SystemUI/res/values-mn/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-mn/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Унтраалттай"</item> <item msgid="5137565285664080143">"Асаалттай"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 7372368b5307..7cc7962bf71f 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"तुमच्या आयटी ॲडमिनने स्क्रीनशॉट घेणे ब्लॉक केले आहे"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"संपादित करा"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"स्क्रीनशॉट संपादित करा"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"शेअर करा"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"स्क्रीनशॉट शेअर करा"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"आणखी गोष्टी कॅप्चर करा"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"स्क्रीनशॉट डिसमिस करा"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"चेहरा स्कॅन करत आहे"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"पाठवा"</string> <string name="cancel" msgid="1089011503403416730">"रद्द करा"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"अॅप लोगो"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"कन्फर्म करा"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"पुन्हा प्रयत्न करा"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"ऑथेंटिकेशन रद्द करण्यासाठी टॅप करा"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"चेहरा ओळखला आहे. पुढे सुरू ठेवण्यासाठी अनलॉक करा आयकन प्रेस करा."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ऑथेंटिकेशन केलेले"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"ऑथेंटिकेशन रद्द करा"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"अधिक पर्याय"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"पिन वापरा"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"पॅटर्न वापरा"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"पासवर्ड वापरा"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"साधारण"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"मध्यम"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"उच्च"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"काढून टाका"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"विजेट जोडा"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"पूर्ण झाले"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"लॉक स्क्रीनवर कोणत्याही विजेटला अनुमती द्यायची आहे का?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"सेटिंग्ज उघडा"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"वर्क ॲप्स पुन्हा सुरू करायची?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"हे डिव्हाइस तुमच्या पालकाने व्यवस्थापित केले आहे. तुम्ही वापरत असलेली ॲप्स, तुमचे स्थान आणि तुमचा स्क्रीन वेळ यांसारखी माहिती तुमचे पालक पाहू आणि व्यवस्थापित करू शकतात."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent ने अनलॉक ठेवले"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"डिव्हाइस लॉक केले होते, ऑथेंटिकेशनचे खूप वेळा प्रयत्न केले गेले"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"डिव्हाइस लॉक केले आहे\nऑथेंटिकेशन यशस्वी झाले नाही"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"आवाज सेटिंग्ज"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"मीडियाला आपोआप सबटायटल द्या"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"उजव्या बाजूला सध्याचे अॅप असलेल्या स्प्लिट स्क्रीनवर जा"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"डाव्या बाजूला सध्याचे अॅप असलेल्या स्प्लिट स्क्रीनवर जा"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"स्प्लिट स्क्रीनवरून फुल स्क्रीनवर स्विच करा"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"स्प्लिट स्क्रीन वापरताना उजवीकडील किंवा खालील अॅपवर स्विच करा"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"स्प्लिट स्क्रीन वापरताना डावीकडील किंवा वरील अॅपवर स्विच करा"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"स्प्लिट स्क्रीनदरम्यान: एक अॅप दुसऱ्या अॅपने बदला"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"इनपुट"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"पुढील भाषेवर स्विच करा"</string> @@ -943,7 +946,7 @@ <string name="privacy_type_media_projection" msgid="8136723828804251547">"स्क्रीन रेकॉर्डिंग"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"शीर्षक नाही"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"स्टँडबाय"</string> - <string name="font_scaling_dialog_title" msgid="6273107303850248375">"फॉंट आकार"</string> + <string name="font_scaling_dialog_title" msgid="6273107303850248375">"फॉंटचा आकार"</string> <string name="font_scaling_smaller" msgid="1012032217622008232">"आणखी लहान करा"</string> <string name="font_scaling_larger" msgid="5476242157436806760">"आणखी मोठे करा"</string> <string name="magnification_window_title" msgid="4863914360847258333">"मॅग्निफिकेशन विंडो"</string> diff --git a/packages/SystemUI/res/values-mr/tiles_states_strings.xml b/packages/SystemUI/res/values-mr/tiles_states_strings.xml index 6902a2fda8e2..abb7aceec4e2 100644 --- a/packages/SystemUI/res/values-mr/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-mr/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"बंद आहे"</item> <item msgid="5137565285664080143">"सुरू आहे"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 3839df3c0b28..dd4ef7b2a6a0 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Pengambilan tangkapan skrin disekat oleh pentadbir IT anda"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Edit"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Edit tangkapan skrin"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Kongsi"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Kongsi tangkapan skrin"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Tangkap imej lagi"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ketepikan tangkapan skrin"</string> @@ -106,8 +105,8 @@ <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> <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"Mulakan Rakaman?"</string> - <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Apabila anda membuat rakaman, Android boleh mengakses apa-apa sahaja yang boleh dilihat pada skrin anda atau dimainkan pada peranti anda. Oleh hal yang demikian, berhati-hati dengan perkara seperti kata laluan, butiran pembayaran, mesej, foto dan audio serta video."</string> - <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Semasa anda merakam apl, Android boleh mengakses apa-apa sahaja yang ditunjukan atau dimainkan pada apl itu. Oleh hal yang demikian, berhati-hati dengan perkara seperti kata laluan, butiran pembayaran, mesej, foto dan audio serta video."</string> + <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Apabila anda merakam, Android boleh mengakses apa-apa sahaja yang kelihatan pada skrin anda atau dimainkan pada peranti anda. Oleh hal yang demikian, berhati-hati apabila memasukkan kata laluan, butiran pembayaran, mesej, foto, audio dan video."</string> + <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Semasa anda merakam apl, Android boleh mengakses apa-apa sahaja yang ditunjukkan atau dimainkan pada apl itu. Oleh hal yang demikian, berhati-hati ketika memasukkan kata laluan, butiran pembayaran, mesej, foto, audio dan video."</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Mulakan rakaman"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Rakam audio"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Audio peranti"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Mengimbas wajah"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Hantar"</string> <string name="cancel" msgid="1089011503403416730">"Batal"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logo apl"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Sahkan"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Cuba lagi"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Ketik untuk membatalkan pengesahan"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Wajah dicam. Tekan ikon buka kunci untuk meneruskan."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Disahkan"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Batalkan Pengesahan"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Lagi Pilihan"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Gunakan PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Gunakan corak"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Gunakan kata laluan"</string> @@ -328,7 +329,7 @@ <string name="quick_settings_work_mode_label" msgid="6440531507319809121">"Apl kerja"</string> <string name="quick_settings_work_mode_paused_state" msgid="6681788236383735976">"Dijeda"</string> <string name="quick_settings_night_display_label" msgid="8180030659141778180">"Cahaya Malam"</string> - <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"Dihidupkan pd senja"</string> + <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"Hidup waktu senja"</string> <string name="quick_settings_night_secondary_label_until_sunrise" msgid="4063448287758262485">"Hingga matahari terbit"</string> <string name="quick_settings_night_secondary_label_on_at" msgid="3584738542293528235">"Dihidupkan pada <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_secondary_label_until" msgid="1883981263191927372">"Hingga <xliff:g id="TIME">%s</xliff:g>"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Sederhana"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Tinggi"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Alih keluar"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Tambahkan widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Selesai"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Benarkan sebarang widget pada skrin kunci?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Buka tetapan"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Nyahjeda apl kerja?"</string> @@ -471,8 +478,8 @@ <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"Mula"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> telah melumpuhkan pilihan ini"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Mulakan penghantaran?"</string> - <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Apabila anda membuat penghantaran, Android boleh mengakses apa-apa sahaja yang boleh dilihat pada skrin anda atau dimainkan pada peranti anda. Oleh hal yang demikian, berhati-hati dengan perkara seperti kata laluan, butiran pembayaran, mesej, foto dan audio serta video."</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Apabila anda menghantar apl, Android boleh mengakses apa-apa sahaja yang ditunjukan atau dimainkan pada apl itu. Oleh hal yang demikian, berhati-hati dengan perkara seperti kata laluan, butiran pembayaran, mesej, foto dan audio serta video."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Apabila anda membuat penghantaran, Android boleh mengakses apa-apa sahaja yang kelihatan pada skrin atau dimainkan pada peranti anda. Oleh hal yang demikian, berhati-hati apabila memasukkan kata laluan, butiran pembayaran, mesej, foto, audio dan video."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Apabila anda menghantar apl, Android boleh mengakses apa-apa sahaja yang ditunjukkan atau dimainkan pada apl itu. Oleh hal yang demikian, berhati-hati apabila memasukkan kata laluan, butiran pembayaran, mesej, foto, audio dan video."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Mulakan penghantaran"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Mulakan perkongsian?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Apabila anda membuat perkongsian, rakaman atau penghantaran, Android boleh mengakses apa-apa sahaja yang boleh dilihat pada skrin anda atau dimainkan pada peranti anda. Oleh hal yang demikian, berhati-hati dengan perkara seperti kata laluan, butiran pembayaran, mesej, foto dan audio serta video."</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Peranti ini diurus oleh ibu bapa anda. Ibu bapa anda dapat melihat dan mengurus maklumat seperti apl yang anda gunakan, lokasi dan masa skrin anda."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Dibiarkan tidak berkunci oleh TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Peranti telah dikunci, terlalu banyak percubaan pengesahan"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Peranti dikunci\nPengesahan gagal"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Tetapan bunyi"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Sari kata media automatik"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Masuk skrin pisah dengan apl semasa pada sisi kanan"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Masuk skrin pisah dengan apl semasa pada sisi kiri"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Beralih daripada skrin pisah kepada skrin penuh"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Tukar kepada apl di sebelah kanan/bawah semasa menggunakan skrin pisah"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Tukar kepada apl di sebelah kiri/atas semasa menggunakan skrin pisah"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Semasa skrin pisah: gantikan apl daripada satu apl kepada apl lain"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Beralih kepada bahasa seterusnya"</string> @@ -1240,7 +1243,7 @@ <string name="home_quick_affordance_unavailable_configure_the_app" msgid="604424593994493281">"• Sekurang-kurangnya satu peranti atau panel peranti tersedia"</string> <string name="notes_app_quick_affordance_unavailable_explanation" msgid="4796955161600178530">"Pilih apl nota lalai untuk menggunakan pintasan pengambilan nota"</string> <string name="keyguard_affordance_enablement_dialog_notes_app_action" msgid="6821710209675089470">"Pilih apl"</string> - <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Pintasan sentuh & tahan"</string> + <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Sentuh & tahan pintasan"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Batal"</string> <string name="rear_display_bottom_sheet_confirm" msgid="1507591562761552899">"Tukar skrin sekarang"</string> <string name="rear_display_folded_bottom_sheet_title" msgid="3930008746560711990">"Buka telefon"</string> diff --git a/packages/SystemUI/res/values-ms/tiles_states_strings.xml b/packages/SystemUI/res/values-ms/tiles_states_strings.xml index a280916c7415..6d72f3c60b13 100644 --- a/packages/SystemUI/res/values-ms/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-ms/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Mati"</item> <item msgid="5137565285664080143">"Hidup"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index dd3e3a74c1b9..ba45f6d0c340 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"ဖန်သားပြင်ဓာတ်ပုံရိုက်ခြင်းကို သင့် IT စီမံခန့်ခွဲသူက ပိတ်ထားသည်"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"တည်းဖြတ်ရန်"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"ဖန်သားပြင်ဓာတ်ပုံကို တည်းဖြတ်သည်"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"မျှဝေရန်"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"ဖန်သားပြင်ဓာတ်ပုံကို မျှဝေနိုင်သည်"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"နောက်ထပ် ရိုက်ကူးရန်"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ဖန်သားပြင်ဓာတ်ပုံကို ပယ်သည်"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"မျက်နှာ စကင်ဖတ်နေသည်"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ပို့ရန်"</string> <string name="cancel" msgid="1089011503403416730">"မလုပ်တော့"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"အက်ပ်လိုဂို"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"အတည်ပြုရန်"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ထပ်စမ်းကြည့်ရန်"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"အထောက်အထားစိစစ်ခြင်းကို ပယ်ဖျက်ရန် တို့ပါ"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"မျက်နှာ မှတ်မိသည်။ ရှေ့ဆက်ရန် လော့ခ်ဖွင့်သင်္ကေတကို နှိပ်ပါ။"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"အထောက်အထားစိစစ်ပြီးပြီ"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"အထောက်အထားစိစစ်ခြင်းကို ပယ်ဖျက်ရန်"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"နောက်ထပ်ရွေးစရာများ"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ပင်နံပါတ်သုံးရန်"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ပုံစံကို သုံးရန်"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"စကားဝှက် သုံးရန်"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"ပုံမှန်"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"အသင့်အတင့်"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"များ"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"ဖယ်ရှားရန်"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"ဝိဂျက်ထည့်ရန်"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"ပြီးပြီ"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"လော့ခ်မျက်နှာပြင်ရှိ ဝိဂျက်အားလုံးကို ခွင့်ပြုမလား။"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"ဆက်တင်များ ဖွင့်ရန်"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"အလုပ်သုံးအက်ပ် ပြန်ဖွင့်မလား။"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ဤစက်ပစ္စည်းကို သင့်မိဘက စီမံခန့်ခွဲသည်။ သင့်မိဘက သင်သုံးသောအက်ပ်များ၊ သင်၏တည်နေရာနှင့် အသုံးပြုချိန် ကဲ့သို့သော အချက်အလက်များကို မြင်နိုင်ပြီး စီမံခန့်ခွဲနိုင်သည်။"</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent ဖြင့် ဆက်ဖွင့်ထားရန်"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"စက်လော့ခ်ကျနေသည်၊ အထောက်အထားစိစစ်ရန် ကြိုးပမ်းမှုအကြိမ်ရေ များလွန်းသည်"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"စက်လော့ခ်ကျနေသည်\nအထောက်အထားစိစစ်၍ မရပါ"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>။ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"အသံဆက်တင်များ"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"အလိုအလျောက် စာတန်းထိုးရန်"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"လက်ရှိအက်ပ်ကို မျက်နှာပြင် ခွဲ၍ပြသမှု၏ ညာဘက်တွင်ထည့်ရန်"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"လက်ရှိအက်ပ်ကို မျက်နှာပြင် ခွဲ၍ပြသမှု၏ ဘယ်ဘက်တွင်ထည့်ရန်"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"မျက်နှာပြင် ခွဲ၍ပြသမှုမှ မျက်နှာပြင်အပြည့်သို့ ပြောင်းရန်"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"မျက်နှာပြင်ခွဲ၍ပြသခြင်း သုံးစဉ် ညာ (သို့) အောက်ရှိအက်ပ်သို့ ပြောင်းရန်"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"မျက်နှာပြင် ခွဲ၍ပြသခြင်းသုံးစဉ် ဘယ် (သို့) အထက်ရှိအက်ပ်သို့ ပြောင်းရန်"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"မျက်နှာပြင် ခွဲ၍ပြသစဉ်- အက်ပ်တစ်ခုကို နောက်တစ်ခုနှင့် အစားထိုးရန်"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"စာရိုက်ခြင်း"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"နောက်ဘာသာစကားသို့ ပြောင်းရန်"</string> @@ -1113,7 +1116,7 @@ <string name="media_output_broadcast_last_update_error" msgid="5484328807296895491">"သိမ်း၍မရပါ။"</string> <string name="media_output_broadcast_code_hint_no_less_than_min" msgid="4663836092607696185">"အနည်းဆုံး အက္ခရာ ၄ လုံး သုံးရန်"</string> <string name="media_output_broadcast_edit_hint_no_more_than_max" msgid="3923625800037673922">"အက္ခရာ <xliff:g id="LENGTH">%1$d</xliff:g> လုံးအောက် သုံးရန်"</string> - <string name="build_number_clip_data_label" msgid="3623176728412560914">"တည်ဆောက်မှုနံပါတ်"</string> + <string name="build_number_clip_data_label" msgid="3623176728412560914">"တည်ဆောက်ပုံအမှတ်"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"တည်ဆောက်မှုနံပါတ်ကို ကလစ်ဘုတ်သို့ မိတ္တူကူးပြီးပါပြီ။"</string> <string name="basic_status" msgid="2315371112182658176">"စကားဝိုင်းကို ဖွင့်ရန်"</string> <string name="select_conversation_title" msgid="6716364118095089519">"စကားဝိုင်း ဝိဂျက်များ"</string> diff --git a/packages/SystemUI/res/values-my/tiles_states_strings.xml b/packages/SystemUI/res/values-my/tiles_states_strings.xml index ce10c422d6e1..6bfd65a2c04f 100644 --- a/packages/SystemUI/res/values-my/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-my/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"ပိတ်"</item> <item msgid="5137565285664080143">"ဖွင့်"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 23c3f454be81..24a940b61d22 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Funksjonen for å ta skjermdumper er blokkert av IT-administratoren din"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Rediger"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Rediger skjermdumpen"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Del"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Del skjermdumpen"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Utvidet skjermdump"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Avvis skjermdumpen"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skanning av ansikt"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> <string name="cancel" msgid="1089011503403416730">"Avbryt"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Applogo"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Bekreft"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Prøv på nytt"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Trykk for å avbryte autentiseringen"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Ansiktet er gjenkjent. Trykk på lås opp-ikon for å fortsette"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentisert"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Avbryt autentisering"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Flere alternativer"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Bruk PIN-kode"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Bruk mønster"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Bruk passord"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Middels"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Høy"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Fjern"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Legg til modul"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Ferdig"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Vil du tillate alle moduler på låseskjermen?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Åpne innstillingene"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Vil du slå på jobbapper igjen?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Denne enheten administreres av forelderen din. Forelderen din kan se og administrere informasjon, for eksempel appene du bruker, posisjonen din og skjermtiden din."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Holdes opplåst med TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Enheten var låst – for mange autentiseringsforsøk"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Enheten er låst\nKunne ikke autentisere"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Lydinnstillinger"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Automatisk medieteksting"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Åpne delt skjerm med den aktive appen til høyre"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Åpne delt skjerm med den aktive appen til venstre"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Bytt fra delt skjerm til fullskjerm"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Bytt til appen til høyre eller under mens du bruker delt skjerm"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Bytt til appen til venstre eller over mens du bruker delt skjerm"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"I delt skjerm: Bytt ut en app"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Skrivespråk"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Bytt til neste språk"</string> @@ -859,7 +862,7 @@ <string name="data_connection_no_internet" msgid="691058178914184544">"Ingen internettilkobling"</string> <string name="accessibility_quick_settings_open_settings" msgid="536838345505030893">"Åpne <xliff:g id="ID_1">%s</xliff:g>-innstillingene."</string> <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Endre rekkefølgen på innstillingene."</string> - <string name="accessibility_quick_settings_power_menu" msgid="6820426108301758412">"Av/på-meny"</string> + <string name="accessibility_quick_settings_power_menu" msgid="6820426108301758412">"På/av-meny"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Side <xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Låseskjerm"</string> <string name="finder_active" msgid="7907846989716941952">"Du kan finne denne telefonen med Finn enheten min, selv når den er slått av"</string> @@ -1240,7 +1243,7 @@ <string name="home_quick_affordance_unavailable_configure_the_app" msgid="604424593994493281">"• Minst én enhet eller ett enhetspanel er tilgjengelig"</string> <string name="notes_app_quick_affordance_unavailable_explanation" msgid="4796955161600178530">"Velg en standard notatapp du vil bruke med notatsnarveien"</string> <string name="keyguard_affordance_enablement_dialog_notes_app_action" msgid="6821710209675089470">"Velg app"</string> - <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Trykk på og hold inne snarveien"</string> + <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Trykk på snarveien og hold den inne"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Avbryt"</string> <string name="rear_display_bottom_sheet_confirm" msgid="1507591562761552899">"Bytt skjerm nå"</string> <string name="rear_display_folded_bottom_sheet_title" msgid="3930008746560711990">"Åpne telefonen"</string> diff --git a/packages/SystemUI/res/values-nb/tiles_states_strings.xml b/packages/SystemUI/res/values-nb/tiles_states_strings.xml index 71160d030629..af0042395127 100644 --- a/packages/SystemUI/res/values-nb/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-nb/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Av"</item> <item msgid="5137565285664080143">"På"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 23543c29e3d5..70cb0724d80d 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"तपाईंको IT एड्मिनले स्क्रिनसट लिने सुविधा ब्लक गर्नुभएको छ"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"सम्पादन गर्नुहोस्"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"स्क्रिनसट सम्पादन गर्नुहोस्"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"सेयर गर्नुहोस्"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"स्क्रिनसट सेयर गर्नुहोस्"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"अन्य कुराहरू खिच्नुहोस्"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"स्क्रिनसट हटाउनुहोस्"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"अनुहार स्क्यान गर्दै"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"पठाउनुहोस्"</string> <string name="cancel" msgid="1089011503403416730">"रद्द गर्नुहोस्"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"एपको लोगो"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"पुष्टि गर्नुहोस्"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"फेरि प्रयास गर्नुहोस्"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"प्रमाणीकरण रद्द गर्न ट्याप गर्नुहोस्"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"अनुहार पहिचान गरियो। जारी राख्न अनलक आइकनमा थिच्नुहोस्।"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"प्रमाणीकरण गरियो"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"प्रमाणीकरण रद्द गर्नुहोस्"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"थप विकल्पहरू"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN प्रयोग गर्नुहोस्"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ढाँचा प्रयोग गर्नुहोस्"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"पासवर्ड प्रयोग गर्नुहोस्"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"डिफल्ट"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"मध्यम"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"उच्च"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"हटाउनुहोस्"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"विजेट हाल्नुहोस्"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"पूरा भयो"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"लक स्क्रिनमा कुनै विजेट देखाउने हो?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"सेटिङ खोल्नुहोस्"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"कामसम्बन्धी एपहरू अनपज गर्ने हो?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"यो डिभाइस तपाईंका अभिभावक व्यवस्थापन गर्नुहुन्छ। तपाईंका अभिभावक तपाईंले प्रयोग गर्ने एप, तपाईंको स्थान र तपाईंले यन्त्र चलाएर बिताउने समय जस्ता जानकारी हेर्न तथा व्यवस्थापन गर्न सक्नुहुन्छ।"</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent ले खुला राखेको"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"डिभाइस लक गरिएको छ, प्रमाणीकरण गर्ने निकै धेरै प्रयास गरिएका छन्"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"डिभाइस लक गरिएको छ\nप्रमाणीकरण गर्न सकिएन"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"ध्वनिसम्बन्धी सेटिङहरू"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"मिडियाको स्वत: क्याप्सन बनाउनुहोस्"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"हालको एप दायाँतर्फ रहने गरी स्प्लिट स्क्रिन मोड सुरु गर्नुहोस्"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"हालको एप बायाँतर्फ रहने गरी स्प्लिट स्क्रिन मोड सुरु गर्नुहोस्"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"स्प्लिट स्क्रिनको साटो फुल स्क्रिन प्रयोग गर्नुहोस्"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"स्प्लिट स्क्रिन प्रयोग गर्दै गर्दा दायाँ वा तलको एप चलाउनुहोस्"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"स्प्लिट स्क्रिन प्रयोग गर्दै गर्दा बायाँ वा माथिको एप चलाउनुहोस्"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"स्प्लिट स्क्रिन प्रयोग गरिएका बेला: एउटा स्क्रिनमा भएको एप अर्कोमा लैजानुहोस्"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"इनपुट"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"अर्को भाषा प्रयोग गर्नुहोस्"</string> diff --git a/packages/SystemUI/res/values-ne/tiles_states_strings.xml b/packages/SystemUI/res/values-ne/tiles_states_strings.xml index 19777063a49a..005a473a79c1 100644 --- a/packages/SystemUI/res/values-ne/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-ne/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"अफ छ"</item> <item msgid="5137565285664080143">"अन छ"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 976d2abc4b53..6677f6719094 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Screenshots maken is geblokkeerd door je IT-beheerder"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Bewerken"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Screenshot bewerken"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Delen"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Screenshot delen"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Meer opnemen"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Screenshot sluiten"</string> @@ -106,8 +105,8 @@ <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> <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"Opname starten?"</string> - <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Als je opneemt, heeft Android toegang tot alles dat zichtbaar is op je scherm of wordt afgespeeld op je apparaat. Wees daarom voorzichtig met bijvoorbeeld wachtwoorden, betalingsgegevens, berichten, foto\'s, en audio en video."</string> - <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Als je een app opneemt, heeft Android toegang tot alles dat wordt getoond of afgespeeld in die app. Wees daarom voorzichtig met bijvoorbeeld wachtwoorden, betalingsgegevens, berichten, foto\'s, en audio en video."</string> + <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Terwijl je aan het opnemen bent, heeft Android toegang tot alles dat zichtbaar is op je scherm of wordt afgespeeld op je apparaat. Wees daarom voorzichtig met bijvoorbeeld wachtwoorden, betalingsgegevens, berichten, foto\'s, en audio en video."</string> + <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Terwijl je een app aan het opnemen bent, heeft Android toegang tot alles dat wordt getoond of afgespeeld in die app. Wees daarom voorzichtig met bijvoorbeeld wachtwoorden, betalingsgegevens, berichten, foto\'s, en audio en video."</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Opname starten"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Audio opnemen"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Audio van apparaat"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Gezicht scannen"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Verzenden"</string> <string name="cancel" msgid="1089011503403416730">"Annuleren"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"App-logo"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Bevestigen"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Opnieuw proberen"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Tik om de verificatie te annuleren"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Gezicht herkend. Druk op het ontgrendelicoon."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Geverifieerd"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Verificatie annuleren"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Meer opties"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Pincode gebruiken"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Patroon gebruiken"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Wachtwoord gebruiken"</string> @@ -362,11 +363,13 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standaard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Gemiddeld"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Hoog"</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> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> + <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Microfoon van apparaat niet meer blokkeren?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Apparaatcamera niet meer blokkeren?"</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_dialog_content" msgid="1624701280680913717">"Alle apps en services die je microfoon mogen gebruiken, krijgen dan toegang tot de microfoon."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Alle apps en services die je camera mogen gebruiken, krijgen dan toegang tot de camera."</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="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"Microfoon is geblokkeerd"</string> <string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"Camera is geblokkeerd"</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Verwijderen"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Widget toevoegen"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Klaar"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Elke widget toestaan op het vergrendelscherm?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Instellingen openen"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Werk-apps hervatten?"</string> @@ -472,7 +479,7 @@ <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"Voor <xliff:g id="APP_NAME">%1$s</xliff:g> staat deze optie uit"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Casten starten?"</string> <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Als je cast, heeft Android toegang tot alles dat zichtbaar is op je scherm of wordt afgespeeld op je apparaat. Wees daarom voorzichtig met bijvoorbeeld wachtwoorden, betalingsgegevens, berichten, foto\'s, en audio en video."</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Als je een app cast, heeft Android toegang tot alles dat zichtbaar is op je scherm of wordt afgespeeld op je apparaat. Wees daarom voorzichtig met bijvoorbeeld wachtwoorden, betalingsgegevens, berichten, foto\'s, en audio en video."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Als je een app cast, heeft Android toegang tot alles dat wordt getoond of afgespeeld in die app. Wees daarom voorzichtig met bijvoorbeeld wachtwoorden, betalingsgegevens, berichten, foto\'s, en audio en video."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Casten starten"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Delen starten?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Als je deelt, opneemt of cast, heeft Android toegang tot alles dat zichtbaar is op je scherm of wordt afgespeeld op je apparaat. Wees daarom voorzichtig met bijvoorbeeld wachtwoorden, betalingsgegevens, berichten, foto\'s, en audio en video."</string> @@ -626,7 +633,7 @@ <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Ontgrendelen om te gebruiken"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Er is een probleem opgetreden bij het ophalen van je kaarten. Probeer het later opnieuw."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Instellingen voor vergrendelscherm"</string> - <string name="qr_code_scanner_title" msgid="1938155688725760702">"QR-code-scanner"</string> + <string name="qr_code_scanner_title" msgid="1938155688725760702">"QR-codescanner"</string> <string name="qr_code_scanner_updating_secondary_label" msgid="8344598017007876352">"Updaten"</string> <string name="status_bar_work" msgid="5238641949837091056">"Werkprofiel"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Vliegtuigmodus"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Gesplitst scherm openen met huidige app rechts"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Gesplitst scherm openen met huidige app links"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Van gesplitst scherm naar volledig scherm schakelen"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Ga naar de app rechts of onderaan als je een gesplitst scherm gebruikt"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Ga naar de app links of bovenaan als je een gesplitst scherm gebruikt"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Tijdens gesplitst scherm: een app vervangen door een andere"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Invoer"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Overschakelen naar volgende taal"</string> @@ -1176,7 +1181,7 @@ <string name="wifi_wont_autoconnect_for_now" msgid="5782282612749867762">"Wifi maakt momenteel niet automatisch verbinding"</string> <string name="see_all_networks" msgid="3773666844913168122">"Alles tonen"</string> <string name="to_switch_networks_disconnect_ethernet" msgid="6698111101156951955">"Verbreek de ethernetverbinding om van netwerk te wisselen"</string> - <string name="wifi_scan_notify_message" msgid="3753839537448621794">"Apps en services kunnen nog steeds op elk moment scannen op wifi-netwerken, zelfs als wifi uitstaat, om de apparaatfunctionaliteit te verbeteren. Je kunt dit aanpassen in de instellingen voor wifi-scannen. "<annotation id="link">"Wijzigen"</annotation></string> + <string name="wifi_scan_notify_message" msgid="3753839537448621794">"Apps en services kunnen nog steeds op elk gewenst moment zoeken naar apparaten in de buurt om de apparaatfunctionaliteit te verbeteren, zelfs als bluetooth uitstaat. Je kunt dit aanpassen in de instellingen voor wifi-scannen. "<annotation id="link">"Wijzigen"</annotation></string> <string name="turn_off_airplane_mode" msgid="8425587763226548579">"Vliegtuigmodus uitzetten"</string> <string name="qs_tile_request_dialog_text" msgid="3501359944139877694">"<xliff:g id="APPNAME">%1$s</xliff:g> wil de volgende tegel toevoegen aan Snelle instellingen"</string> <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Tegel toevoegen"</string> diff --git a/packages/SystemUI/res/values-nl/tiles_states_strings.xml b/packages/SystemUI/res/values-nl/tiles_states_strings.xml index 7737794fbd9c..1b286f33d583 100644 --- a/packages/SystemUI/res/values-nl/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-nl/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Uit"</item> <item msgid="5137565285664080143">"Aan"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index ee8c094b3d10..66f8808bd641 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"ସ୍କ୍ରିନସଟଗୁଡ଼ିକ ନେବା ଆପଣଙ୍କ IT ଆଡମିନଙ୍କ ଦ୍ୱାରା ବ୍ଲକ କରାଯାଇଛି"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"ଏଡିଟ କରନ୍ତୁ"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"ସ୍କ୍ରିନସଟ୍ ଏଡିଟ କରନ୍ତୁ"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"ସେୟାର କରନ୍ତୁ"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"ସ୍କ୍ରିନସଟ ସେୟାର କରନ୍ତୁ"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"ଅଧିକ କେପଚର କରନ୍ତୁ"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ସ୍କ୍ରିନସଟ୍ ଖାରଜ କରନ୍ତୁ"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"ଫେସ୍ ସ୍କାନିଙ୍ଗ କରାଯାଉଛି"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ପଠାନ୍ତୁ"</string> <string name="cancel" msgid="1089011503403416730">"ବାତିଲ କରନ୍ତୁ"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"ଆପ ଲୋଗୋ"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"ସୁନିଶ୍ଚିତ କରନ୍ତୁ"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"ପ୍ରାମାଣିକତା ବାତିଲ କରିବାକୁ ଟାପ୍ କରନ୍ତୁ"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"ଫେସ ଚିହ୍ନଟ କରାଯାଇଛି। ଜାରି ରଖିବାକୁ ଅନଲକ ଆଇକନ ଦବାନ୍ତୁ।"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ପ୍ରାମାଣିକତା ହୋଇଛି"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"ପ୍ରମାଣୀକରଣକୁ ବାତିଲ କରନ୍ତୁ"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"ଅଧିକ ବିକଳ୍ପ"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN ବ୍ୟବହାର କରନ୍ତୁ"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ପାଟର୍ନ ବ୍ୟବହାର କରନ୍ତୁ"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"ପାସ୍ୱାର୍ଡ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"ଷ୍ଟାଣ୍ଡାର୍ଡ"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"ମଧ୍ୟମ"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"ଅଧିକ"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"କାଢ଼ି ଦିଅନ୍ତୁ"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"ୱିଜେଟ ଯୋଗ କରନ୍ତୁ"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"ହୋଇଗଲା"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"ଲକସ୍କ୍ରିନରେ ଯେ କୌଣସି ୱିଜେଟକୁ ଅନୁମତି ଦେବେ?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"ସେଟିଂସ ଖୋଲନ୍ତୁ"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"ୱାର୍କ ଆପ୍ସକୁ ପୁଣି ଚାଲୁ କରିବେ?"</string> @@ -472,7 +479,7 @@ <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଏହି ବିକଳ୍ପକୁ ଅକ୍ଷମ କରିଛି"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"କାଷ୍ଟିଂ ଆରମ୍ଭ କରିବେ?"</string> <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"ଆପଣ କାଷ୍ଟ କରିବା ସମୟରେ, ଆପଣଙ୍କ ସ୍କ୍ରିନରେ ଦେଖାଯାଉଥିବା କିମ୍ବା ଆପଣଙ୍କ ଡିଭାଇସରେ ପ୍ଲେ ହେଉଥିବା ସବୁକିଛିକୁ Androidର ଆକ୍ସେସ ଅଛି। ତେଣୁ ପାସୱାର୍ଡ, ପେମେଣ୍ଟ ବିବରଣୀ, ମେସେଜ, ଫଟୋ ଏବଂ ଅଡିଓ ଓ ଭିଡିଓ ପରି ବିଷୟଗୁଡ଼ିକ ପ୍ରତି ସତର୍କ ରୁହନ୍ତୁ।"</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"ଆପଣ ଏକ ଆପ କାଷ୍ଟ କରିବା ସମୟରେ, ସେହି ଆପରେ ଦେଖାଯାଉଥିବା କିମ୍ବା ପ୍ଲେ ହେଉଥିବା ସବୁକିଛିକୁ Androidର ଆକ୍ସେସ ଅଛି। ତେଣୁ ପାସୱାର୍ଡ, ପେମେଣ୍ଟ ବିବରଣୀ, ମେସେଜ, ଫଟୋ ଏବଂ ଅଡିଓ ଓ ଭିଡିଓ ପରି ବିଷୟଗୁଡ଼ିକ ପ୍ରତି ସତର୍କ ରୁହନ୍ତୁ।"</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"ଆପଣ ଏକ ଆପ କାଷ୍ଟ କରିବା ସମୟରେ, ସେହି ଆପରେ ଦେଖାଯାଉଥିବା କିମ୍ବା ପ୍ଲେ ହେଉଥିବା ସବୁକିଛିକୁ Androidର ଆକ୍ସେସ ଅଛି। ତେଣୁ ପାସୱାର୍ଡ, ପେମେଣ୍ଟ ବିବରଣୀ, ମେସେଜ, ଫଟୋ ଏବଂ ଅଡିଓ ଓ ଭିଡିଓ ପରି ବିଷୟଗୁଡ଼ିକ ପାଇଁ ସତର୍କ ରୁହନ୍ତୁ।"</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"କାଷ୍ଟିଂ ଆରମ୍ଭ କରନ୍ତୁ"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"ସେୟାରିଂ ଆରମ୍ଭ କରିବେ?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"ଆପଣ ସେୟାର, ରେକର୍ଡ କିମ୍ବା କାଷ୍ଟ କରିବା ସମୟରେ, ଆପଣଙ୍କ ସ୍କ୍ରିନରେ ଦେଖାଯାଉଥିବା କିମ୍ବା ଆପଣଙ୍କ ଡିଭାଇସରେ ପ୍ଲେ ହେଉଥିବା ସବୁକିଛିକୁ Androidର ଆକ୍ସେସ ଅଛି। ତେଣୁ ପାସୱାର୍ଡ, ପେମେଣ୍ଟ ବିବରଣୀ, ମେସେଜ, ଫଟୋ ଏବଂ ଅଡିଓ ଓ ଭିଡିଓ ପରି ବିଷୟଗୁଡ଼ିକ ପ୍ରତି ସତର୍କ ରୁହନ୍ତୁ।"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ଏହି ଡିଭାଇସ୍ ଆପଣଙ୍କ ବାପାମାଙ୍କ ଦ୍ୱାରା ପରିଚାଳିତ। ଆପଣଙ୍କ ବାପାମା ଆପଣ ବ୍ୟବହାର କରୁଥିବା ଆପ୍ସ, ଆପଣଙ୍କ ଲୋକେସନ୍ ଓ ସ୍କ୍ରିନ୍ ସମୟ ପରି ସୂଚନା ଦେଖିପାରିବେ ଏବଂ ପରିଚାଳନା କରିପାରିବେ।"</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent ଦ୍ୱାରା ଅନ୍ଲକ୍ ରହିଛି"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"ଡିଭାଇସ ଲକ କରାଯାଇଛି, ଅନେକଗୁଡ଼ିଏ ପ୍ରମାଣୀକରଣ ପ୍ରଚେଷ୍ଟା କରାଯାଇଛି"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"ଡିଭାଇସ ଲକ ହୋଇଛି\nପ୍ରମାଣୀକରଣ ବିଫଳ ହୋଇଛି"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"ସାଉଣ୍ଡ ସେଟିଂସ୍"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"ସ୍ବଚାଳିତ କ୍ୟାପ୍ସନ୍ ମିଡିଆ"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"RHSରେ ବର୍ତ୍ତମାନର ଆପ ସହ ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନକୁ ପ୍ରବେଶ କରାନ୍ତୁ"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"LHSରେ ବର୍ତ୍ତମାନର ଆପ ସହ ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନକୁ ପ୍ରବେଶ କରାନ୍ତୁ"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନରୁ ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନକୁ ସୁଇଚ କରନ୍ତୁ"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ବ୍ୟବହାର କରିବା ସମୟରେ ଡାହାଣପଟର ବା ତଳର ଆପକୁ ସୁଇଚ କରନ୍ତୁ"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ବ୍ୟବହାର କରିବା ସମୟରେ ବାମପଟର ବା ଉପରର ଆପକୁ ସୁଇଚ କରନ୍ତୁ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ସମୟରେ: କୌଣସି ଆପକୁ ଗୋଟିଏରୁ ଅନ୍ୟ ଏକ ଆପରେ ବଦଳାନ୍ତୁ"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ଇନପୁଟ କରନ୍ତୁ"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"ପରବର୍ତ୍ତୀ ଭାଷାକୁ ସୁଇଚ କରନ୍ତୁ"</string> @@ -901,7 +904,7 @@ <string name="mobile_data_text_format" msgid="6806501540022589786">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string> <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"ୱାଇ-ଫାଇ ବନ୍ଦ ଅଛି"</string> - <string name="bt_is_off" msgid="7436344904889461591">"ବ୍ଲୁଟୂଥ୍ ଅଫ୍ ଅଛି"</string> + <string name="bt_is_off" msgid="7436344904889461591">"ବ୍ଲୁଟୁଥ ବନ୍ଦ ଅଛି"</string> <string name="dnd_is_off" msgid="3185706903793094463">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଅଫ୍ ଅଛି"</string> <string name="dnd_is_on" msgid="7009368176361546279">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଚାଲୁ ଅଛି"</string> <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"ଏକ (<xliff:g id="ID_1">%s</xliff:g>) ନିୟମ ଦ୍ୱାରା \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ସ୍ୱଚାଳିତ ଭାବେ ଅନ୍ କରାଗଲା।"</string> diff --git a/packages/SystemUI/res/values-or/tiles_states_strings.xml b/packages/SystemUI/res/values-or/tiles_states_strings.xml index 046db2fbb30a..fd727bfbfe07 100644 --- a/packages/SystemUI/res/values-or/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-or/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"ବନ୍ଦ ଅଛି"</item> <item msgid="5137565285664080143">"ଚାଲୁ ଅଛି"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index 49156bcad8b4..adb328990a1a 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"ਤੁਹਾਡੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਲੈਣ ਦੀ ਸੁਵਿਧਾ ਨੂੰ ਬਲਾਕ ਕੀਤਾ ਗਿਆ ਹੈ"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"ਸੰਪਾਦਨ ਕਰੋ"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"ਸਾਂਝਾ ਕਰੋ"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਸਾਂਝਾ ਕਰੋ"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"ਹੋਰ ਕੈਪਚਰ ਕਰੋ"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਖਾਰਜ ਕਰੋ"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"ਚਿਹਰਾ ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ਭੇਜੋ"</string> <string name="cancel" msgid="1089011503403416730">"ਰੱਦ ਕਰੋ"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"ਐਪ ਲੋਗੋ"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"ਤਸਦੀਕ ਕਰੋ"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"ਪ੍ਰਮਾਣੀਕਰਨ ਰੱਦ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"ਚਿਹਰੇ ਦੀ ਪਛਾਣ ਹੋਈ। ਜਾਰੀ ਰੱਖਣ ਲਈ \'ਅਣਲਾਕ ਕਰੋ\' ਪ੍ਰਤੀਕ ਨੂੰ ਦਬਾਓ।"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ਪ੍ਰਮਾਣਿਤ ਹੋਇਆ"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"ਪ੍ਰਮਾਣੀਕਰਨ ਰੱਦ ਕਰੋ"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"ਹੋਰ ਵਿਕਲਪ"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ਪਿੰਨ ਵਰਤੋ"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ਪੈਟਰਨ ਵਰਤੋ"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"ਪਾਸਵਰਡ ਵਰਤੋ"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"ਮਿਆਰੀ"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"ਦਰਮਿਆਨਾ"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"ਜ਼ਿਆਦਾ"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,13 +442,17 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"ਹਟਾਓ"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"ਵਿਜੇਟ ਸ਼ਾਮਲ ਕਰੋ"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"ਹੋ ਗਿਆ"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"ਕੀ ਲਾਕ-ਸਕ੍ਰੀਨ \'ਤੇ ਕਿਸੇ ਵੀ ਵਿਜੇਟ ਨੂੰ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"ਸੈਟਿੰਗਾਂ ਖੋਲ੍ਹੋ"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੋਂ ਰੋਕ ਹਟਾਈਏ?"</string> <string name="work_mode_turn_on" msgid="907813741770247267">"ਰੋਕ ਹਟਾਓ"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"ਵਰਤੋਂਕਾਰ ਸਵਿੱਚ ਕਰੋ"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"ਪੁੱਲਡਾਊਨ ਮੀਨੂ"</string> - <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"ਇਸ ਸੈਸ਼ਨ ਵਿਚਲੀਆਂ ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ ਡਾਟਾ ਨੂੰ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string> + <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"ਇਸ ਸੈਸ਼ਨ ਵਿਚਲੀਆਂ ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ ਡਾਟੇ ਨੂੰ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"</string> <string name="guest_wipe_session_title" msgid="7147965814683990944">"ਮਹਿਮਾਨ, ਫਿਰ ਤੁਹਾਡਾ ਸੁਆਗਤ ਹੈ!"</string> <string name="guest_wipe_session_message" msgid="3393823610257065457">"ਕੀ ਤੁਸੀਂ ਆਪਣਾ ਸੈਸ਼ਨ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string> <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ"</string> @@ -472,7 +479,7 @@ <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਨੇ ਇਸ ਵਿਕਲਪ ਨੂੰ ਬੰਦ ਕਰ ਦਿੱਤਾ ਹੈ"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"ਕੀ ਕਾਸਟ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨਾ ਹੈ?"</string> <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਕਾਸਟ ਕਰਨ \'ਤੇ, Android ਕੋਲ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਸਣ ਵਾਲੀ ਜਾਂ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਚਲਾਈ ਜਾਣ ਵਾਲੀ ਹਰੇਕ ਚੀਜ਼ ਤੱਕ ਪਹੁੰਚ ਹੁੰਦੀ ਹੈ। ਇਸ ਲਈ ਪਾਸਵਰਡਾਂ, ਭੁਗਤਾਨ ਵੇਰਵਿਆਂ, ਸੁਨੇਹਿਆਂ, ਫ਼ੋਟੋਆਂ ਅਤੇ ਆਡੀਓ ਅਤੇ ਵੀਡੀਓ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਵਾਸਤੇ ਸਾਵਧਾਨ ਰਹੋ।"</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਕਾਸਟ ਕਰਨ \'ਤੇ, Android ਕੋਲ ਉਸ ਐਪ \'ਤੇ ਦਿਖਾਈ ਗਈ ਜਾਂ ਚਲਾਈ ਗਈ ਹਰੇਕ ਚੀਜ਼ ਤੱਕ ਪਹੁੰਚ ਹੁੰਦੀ ਹੈ। ਇਸ ਲਈ ਪਾਸਵਰਡਾਂ, ਭੁਗਤਾਨ ਵੇਰਵਿਆਂ, ਸੁਨੇਹਿਆਂ, ਫ਼ੋਟੋਆਂ ਅਤੇ ਆਡੀਓ ਅਤੇ ਵੀਡੀਓ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਸੰਬੰਧੀ ਸਾਵਧਾਨ ਰਹੋ।"</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਕਿਸੇ ਐਪ ਨੂੰ ਕਾਸਟ ਕਰਨ \'ਤੇ, Android ਕੋਲ ਉਸ ਐਪ \'ਤੇ ਦਿਖਾਈ ਗਈ ਜਾਂ ਚਲਾਈ ਗਈ ਹਰੇਕ ਚੀਜ਼ ਤੱਕ ਪਹੁੰਚ ਹੁੰਦੀ ਹੈ। ਇਸ ਲਈ ਪਾਸਵਰਡਾਂ, ਭੁਗਤਾਨ ਵੇਰਵਿਆਂ, ਸੁਨੇਹਿਆਂ, ਫ਼ੋਟੋਆਂ ਅਤੇ ਆਡੀਓ ਅਤੇ ਵੀਡੀਓ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਸੰਬੰਧੀ ਸਾਵਧਾਨ ਰਹੋ।"</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"ਕਾਸਟ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰੋ"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"ਕੀ ਸਾਂਝਾਕਰਨ ਸ਼ੁਰੂ ਕਰਨਾ ਹੈ?"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਸਾਂਝਾ ਕਰਨ, ਰਿਕਾਰਡ ਕਰਨ, ਜਾਂ ਕਾਸਟ ਕਰਨ \'ਤੇ, Android ਕੋਲ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਸਦੀ ਜਾਂ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਚਲਾਈ ਗਈ ਹਰੇਕ ਚੀਜ਼ ਤੱਕ ਪਹੁੰਚ ਹੁੰਦੀ ਹੈ। ਇਸ ਲਈ ਪਾਸਵਰਡਾਂ, ਭੁਗਤਾਨ ਵੇਰਵਿਆਂ, ਸੁਨੇਹਿਆਂ, ਫ਼ੋਟੋਆਂ ਅਤੇ ਆਡੀਓ ਅਤੇ ਵੀਡੀਓ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਵਾਸਤੇ ਸਾਵਧਾਨ ਰਹੋ।"</string> @@ -494,7 +501,7 @@ <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> + <string name="empty_shade_text" msgid="8935967157319717412">"ਕੋਈ ਸੂਚਨਾ ਨਹੀਂ"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"ਕੋਈ ਨਵੀਂ ਸੂਚਨਾ ਨਹੀਂ ਹੈ"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"ਪੁਰਾਣੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਅਣਲਾਕ ਕਰੋ"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ ਤੁਹਾਡੇ ਮਾਂ-ਪਿਓ ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ ਤੁਹਾਡੇ ਮਾਂ-ਪਿਓ ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਤੁਹਾਡੇ ਮਾਂ-ਪਿਓ ਤੁਹਾਡੀਆਂ ਐਪਾਂ ਦੀ ਵਰਤੋਂ, ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਅਤੇ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਸਮੇਂ ਵਰਗੀ ਜਾਣਕਾਰੀ ਨੂੰ ਦੇਖ ਅਤੇ ਉਸਦਾ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕਦੇ ਹਨ।"</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"ਟਰੱਸਟ-ਏਜੰਟ ਵੱਲੋਂ ਅਣਲਾਕ ਰੱਖਿਆ ਗਿਆ"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"ਡੀਵਾਈਸ ਲਾਕ ਕੀਤਾ ਗਿਆ ਸੀ, ਬਹੁਤ ਸਾਰੀਆਂ ਪ੍ਰਮਾਣੀਕਰਨ ਕੋਸ਼ਿਸ਼ਾਂ ਕੀਤੀਆਂ ਗਈਆਂ"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"ਡੀਵਾਈਸ ਲਾਕ ਹੈ\nਪ੍ਰਮਾਣੀਕਰਨ ਅਸਫਲ ਰਿਹਾ"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"ਧੁਨੀ ਸੈਟਿੰਗਾਂ"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"ਸਵੈਚਲਿਤ ਸੁਰਖੀ ਮੀਡੀਆ"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"RHS ਲਈ ਮੌਜੂਦਾ ਐਪ ਨਾਲ ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਵਿੱਚ ਦਾਖਲ ਹੋਵੋ"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"LHS ਲਈ ਮੌਜੂਦਾ ਐਪ ਨਾਲ ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਵਿੱਚ ਦਾਖਲ ਹੋਵੋ"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਤੋਂ ਪੂਰੀ ਸਕ੍ਰੀਨ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵੇਲੇ ਸੱਜੇ ਜਾਂ ਹੇਠਾਂ ਮੌਜੂਦ ਐਪ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵੇਲੇ ਖੱਬੇ ਜਾਂ ਉੱਪਰ ਮੌਜੂਦ ਐਪ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੌਰਾਨ: ਇੱਕ ਐਪ ਨਾਲ ਦੂਜੀ ਐਪ ਨੂੰ ਬਦਲੋ"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ਇਨਪੁੱਟ"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"ਅਗਲੀ ਭਾਸ਼ਾ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string> diff --git a/packages/SystemUI/res/values-pa/tiles_states_strings.xml b/packages/SystemUI/res/values-pa/tiles_states_strings.xml index df870cd145f5..afb1e8bb3695 100644 --- a/packages/SystemUI/res/values-pa/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-pa/tiles_states_strings.xml @@ -152,7 +152,7 @@ <item msgid="8998632451221157987">"ਚਾਲੂ ਹੈ"</item> </string-array> <string-array name="tile_states_controls"> - <item msgid="8199009425335668294">"ਅਣਉਪਲਬਧ ਹੈ"</item> + <item msgid="8199009425335668294">"ਅਣਉਪਲਬਧ ਹਨ"</item> <item msgid="4544919905196727508">"ਬੰਦ ਹੈ"</item> <item msgid="3422023746567004609">"ਚਾਲੂ ਹੈ"</item> </string-array> @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"ਬੰਦ"</item> <item msgid="5137565285664080143">"ਚਾਲੂ"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 9ee0b78709a3..2274d13fbde1 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -105,8 +105,8 @@ <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> <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"Rozpocząć nagrywanie?"</string> - <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Podczas nagrywania Android ma dostęp do wszystkiego, co jest widoczne na ekranie lub odtwarzane na urządzeniu. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, audio i filmów."</string> - <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Podczas nagrywania treści z aplikacji Android ma dostęp do wszystkiego, co jest w niej wyświetlane lub odtwarzane. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, audio i filmów."</string> + <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Podczas nagrywania Android ma dostęp do wszystkiego, co jest widoczne na ekranie lub odtwarzane na urządzeniu. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, dźwięku i filmów."</string> + <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Podczas nagrywania treści z aplikacji Android ma dostęp do wszystkiego, co jest w niej wyświetlane lub odtwarzane. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, dźwięku i filmów."</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Zacznij nagrywać"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Nagrywaj dźwięk"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Dźwięki z urządzenia"</string> @@ -151,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skanowanie twarzy"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Wyślij"</string> <string name="cancel" msgid="1089011503403416730">"Anuluj"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logo aplikacji"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potwierdź"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Spróbuj jeszcze raz"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Kliknij, by anulować uwierzytelnianie"</string> @@ -165,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Twarz rozpoznana. Aby kontynuować, kliknij ikonę odblokowywania."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Uwierzytelniono"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Anuluj uwierzytelnianie"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Więcej opcji"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Użyj kodu PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Użyj wzoru"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Użyj hasła"</string> @@ -266,7 +268,7 @@ <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Kliknij, aby podłączyć lub odłączyć urządzenie"</string> <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Sparuj nowe urządzenie"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"Pokaż wszystkie"</string> - <string name="turn_on_bluetooth" msgid="5681370462180289071">"Użyj Bluetootha"</string> + <string name="turn_on_bluetooth" msgid="5681370462180289071">"Używaj Bluetootha"</string> <string name="quick_settings_bluetooth_device_connected" msgid="7884777006729260996">"Połączone"</string> <string name="quick_settings_bluetooth_device_saved" msgid="7549938728928069477">"Zapisane"</string> <string name="accessibility_quick_settings_bluetooth_device_tap_to_disconnect" msgid="415980329093277342">"rozłącz"</string> @@ -361,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standardowy"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Średni"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Wysoki"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -438,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Usuń"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Dodaj widżet"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Gotowe"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Zezwolić na dowolny widżet na ekranie blokady?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Otwórz ustawienia"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Cofnąć wstrzymanie aplikacji służbowych?"</string> @@ -465,17 +473,17 @@ <string name="screen_share_permission_dialog_option_single_app" msgid="4350961814397220929">"Pojedyncza aplikacja"</string> <string name="screen_share_permission_app_selector_title" msgid="1404878013670347899">"Udostępnianie i nagrywanie aplikacji"</string> <string name="media_projection_entry_app_permission_dialog_title" msgid="9155535851866407199">"Rozpocząć nagrywanie lub przesyłanie za pomocą aplikacji <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>?"</string> - <string name="media_projection_entry_app_permission_dialog_warning_entire_screen" msgid="8736391633234144237">"Podczas udostępniania, nagrywania lub przesyłania treści aplikacja <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ma dostęp do wszystkiego, co jest widoczne na ekranie lub odtwarzane na urządzeniu. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, audio i filmów."</string> - <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Podczas udostępniania, nagrywania lub przesyłania treści aplikacja <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ma dostęp do wszystkiego, co jest w niej wyświetlane lub odtwarzane. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, audio i filmów."</string> + <string name="media_projection_entry_app_permission_dialog_warning_entire_screen" msgid="8736391633234144237">"Podczas udostępniania, nagrywania lub przesyłania treści aplikacja <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ma dostęp do wszystkiego, co jest widoczne na ekranie lub odtwarzane na urządzeniu. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, dźwięku i filmów."</string> + <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Podczas udostępniania, nagrywania lub przesyłania treści aplikacja <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ma dostęp do wszystkiego, co jest w niej wyświetlane lub odtwarzane. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, dźwięku i filmów."</string> <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"Rozpocznij"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"<xliff:g id="APP_NAME">%1$s</xliff:g> ma wyłączoną tę opcję"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Rozpocząć przesyłanie?"</string> - <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Podczas przesyłania, Android ma dostęp do wszystkiego, co jest widoczne na ekranie lub odtwarzane na urządzeniu. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, audio i filmów."</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Podczas przesyłania treści z aplikacji Android ma dostęp do wszystkiego, co jest w niej wyświetlane lub odtwarzane. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, audio i filmów."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Podczas przesyłania, Android ma dostęp do wszystkiego, co jest widoczne na ekranie lub odtwarzane na urządzeniu. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, dźwięku i filmów."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Podczas przesyłania treści z aplikacji Android ma dostęp do wszystkiego, co jest w niej wyświetlane lub odtwarzane. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, dźwięku i filmów."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Rozpocznij przesyłanie"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Rozpocząć udostępnianie?"</string> - <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Podczas udostępniania, nagrywania lub przesyłania treści Android ma dostęp do wszystkiego, co jest widoczne na ekranie lub odtwarzane na urządzeniu. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, audio i filmów."</string> - <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Podczas udostępniania, nagrywania lub przesyłania treści Android ma dostęp do wszystkiego, co jest w niej wyświetlane lub odtwarzane. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, audio i filmów."</string> + <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Podczas udostępniania, nagrywania lub przesyłania treści Android ma dostęp do wszystkiego, co jest widoczne na ekranie lub odtwarzane na urządzeniu. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, dźwięku i filmów."</string> + <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Podczas udostępniania, nagrywania lub przesyłania treści Android ma dostęp do wszystkiego, co jest w niej wyświetlane lub odtwarzane. Dlatego zachowaj ostrożność w zakresie haseł, danych do płatności, wiadomości, zdjęć, dźwięku i filmów."</string> <string name="media_projection_entry_generic_permission_dialog_continue" msgid="8640381403048097116">"Rozpocznij"</string> <string name="media_projection_task_switcher_text" msgid="590885489897412359">"Udostępnianie zostanie wstrzymane, gdy przełączysz aplikacje"</string> <string name="media_projection_task_switcher_action_switch" msgid="8682258717291921123">"Udostępnij tę aplikację"</string> @@ -585,8 +593,8 @@ <string name="volume_ringer_status_silent" msgid="3691324657849880883">"Wyciszenie"</string> <string name="media_device_cast" msgid="4786241789687569892">"Przesyłanie"</string> <string name="stream_notification_unavailable" msgid="4313854556205836435">"Niedostępne, bo dzwonek jest wyciszony"</string> - <string name="stream_alarm_unavailable" msgid="4059817189292197839">"Niedostępne, bo włączone jest „Nie przeszkadzać”"</string> - <string name="stream_media_unavailable" msgid="6823020894438959853">"Niedostępne, bo włączone jest „Nie przeszkadzać”"</string> + <string name="stream_alarm_unavailable" msgid="4059817189292197839">"Niedostępne, włączone jest „Nie przeszkadzać”"</string> + <string name="stream_media_unavailable" msgid="6823020894438959853">"Niedostępne, włączone jest „Nie przeszkadzać”"</string> <string name="volume_stream_content_description_unmute" msgid="7729576371406792977">"%1$s. Kliknij, by wyłączyć wyciszenie."</string> <string name="volume_stream_content_description_vibrate" msgid="4858111994183089761">"%1$s. Kliknij, by włączyć wibracje. Ułatwienia dostępu mogą być wyciszone."</string> <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. Kliknij, by wyciszyć. Ułatwienia dostępu mogą być wyciszone."</string> @@ -596,7 +604,7 @@ <string name="volume_panel_spatial_audio_title" msgid="3367048857932040660">"Dźwięk przestrzenny"</string> <string name="volume_panel_spatial_audio_off" msgid="4177490084606772989">"Wyłączony"</string> <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Stały"</string> - <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Monitorowanie głowy"</string> + <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Śledzenie głowy"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Kliknij, aby zmienić tryb dzwonka"</string> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"wycisz"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"wyłącz wyciszenie"</string> @@ -656,9 +664,9 @@ <string name="notification_alert_title" msgid="3656229781017543655">"Domyślne"</string> <string name="notification_automatic_title" msgid="3745465364578762652">"Automatycznie"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Bez dźwięku i wibracji"</string> - <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Brak dźwięku i wibracji, wyświetla się niżej w sekcji rozmów"</string> - <string name="notification_channel_summary_default" msgid="777294388712200605">"Może włączać dzwonek lub wibracje w zależności od ustawień urządzenia"</string> - <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Może włączyć dzwonek lub wibracje w zależności od ustawień urządzenia. Rozmowy z aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g> są domyślnie wyświetlane jako dymki."</string> + <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Brak dźwięku i wibracji, wyświetlają się niżej w sekcji rozmów"</string> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Mogą włączać dzwonek lub wibracje w zależności od ustawień urządzenia"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Mogą włączyć dzwonek lub wibracje w zależności od ustawień urządzenia. Rozmowy z aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g> są domyślnie wyświetlane jako dymki."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Pozwól systemowi decydować, czy o powiadomieniu powinien informować dźwięk czy wibracja"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Stan:</b> zmieniony na Domyślny"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Stan:</b> zmieniono na Ciche"</string> @@ -1235,7 +1243,7 @@ <string name="home_quick_affordance_unavailable_configure_the_app" msgid="604424593994493281">"• Dostępne jest co najmniej 1 urządzenie lub panel urządzenia"</string> <string name="notes_app_quick_affordance_unavailable_explanation" msgid="4796955161600178530">"Wybierz domyślną aplikację do obsługi notatek, której skrótu będziesz używać do funkcji notowania"</string> <string name="keyguard_affordance_enablement_dialog_notes_app_action" msgid="6821710209675089470">"Wybierz aplikację"</string> - <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Skrót – naciśnij i przytrzymaj"</string> + <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Naciśnij i przytrzymaj skrót"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Anuluj"</string> <string name="rear_display_bottom_sheet_confirm" msgid="1507591562761552899">"Przełącz ekrany teraz"</string> <string name="rear_display_folded_bottom_sheet_title" msgid="3930008746560711990">"Otwieranie telefonu"</string> diff --git a/packages/SystemUI/res/values-pl/tiles_states_strings.xml b/packages/SystemUI/res/values-pl/tiles_states_strings.xml index c667b99042ed..5d1c02e1bc5f 100644 --- a/packages/SystemUI/res/values-pl/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-pl/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Wyłączono"</item> <item msgid="5137565285664080143">"Włączono"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index a5198834267b..206b0b224f6b 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"As capturas de tela foram bloqueadas pelo administrador de TI"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Editar"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Editar captura de tela"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Compartilhar"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Compartilhar captura de tela"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturar mais"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Dispensar captura de tela"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Verificando rosto"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Enviar"</string> <string name="cancel" msgid="1089011503403416730">"Cancelar"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logotipo do app"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmar"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Tentar novamente"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Toque para cancelar a autenticação"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Rosto reconhecido. Pressione o ícone para continuar."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticado"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Cancelar autenticação"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Mais opções"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Usar PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Usar padrão"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Usar senha"</string> @@ -357,11 +358,13 @@ <item msgid="1627504621139124393">"Interface do usuário"</item> <item msgid="8309220355268900335">"Bateria"</item> </string-array> - <string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modo para uma mão"</string> + <string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modo uma mão"</string> <string name="quick_settings_contrast_label" msgid="988087460210159123">"Contraste"</string> <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Padrão"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Médio"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Alto"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Remover"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Adicionar widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Concluído"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Permitir qualquer widget na tela de bloqueio?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Abrir as configurações"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Reativar apps de trabalho?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Este dispositivo é gerenciado pelo seu familiar responsável, que pode ver e gerenciar informações como os apps que você usa, sua localização e seu tempo de uso."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Desbloqueado pelo TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"O dispositivo foi bloqueado devido a muitas tentativas de autenticação"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Dispositivo bloqueado\nA autenticação falhou"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Configurações de som"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Transcrição automática"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Usar a tela dividida com o app atual à direita"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Usar a tela dividida com o app atual à esquerda"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Mudar da tela dividida para a tela cheia"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Mude para o app à direita ou abaixo ao usar a tela dividida"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Mude para o app à esquerda ou acima ao usar a tela dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Com a tela dividida: substituir um app por outro"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Entrada"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Mudar para o próximo idioma"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/tiles_states_strings.xml b/packages/SystemUI/res/values-pt-rBR/tiles_states_strings.xml index ae2bd051d223..453d8139bd48 100644 --- a/packages/SystemUI/res/values-pt-rBR/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Desativado"</item> <item msgid="5137565285664080143">"Ativado"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index f0f451b3a818..93b4cbe0e44a 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -151,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"A analisar o rosto…"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Enviar"</string> <string name="cancel" msgid="1089011503403416730">"Cancelar"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logótipo da app"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmar"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Tentar novamente"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Toque para cancelar a autenticação."</string> @@ -165,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Rosto reconhecido. Prima ícone de desbloqueio para continuar"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticado"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Cancelar autenticação"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Mais opções"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Usar PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Usar padrão"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Usar palavra-passe"</string> @@ -258,7 +260,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="936972553861524360">"O ecrã está bloqueado na orientação horizontal."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="2356633398683813837">"O ecrã está bloqueado na orientação vertical."</string> <string name="dessert_case" msgid="9104973640704357717">"Vitrina de sobremesas"</string> - <string name="start_dreams" msgid="9131802557946276718">"Proteção de ecrã"</string> + <string name="start_dreams" msgid="9131802557946276718">"Proteção ecrã"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Não incomodar"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> @@ -283,9 +285,9 @@ <string name="quick_settings_rotation_unlocked_label" msgid="2359922767950346112">"Rotação auto."</string> <string name="accessibility_quick_settings_rotation" msgid="4800050198392260738">"Rodar o ecrã automaticamente"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"Localização"</string> - <string name="quick_settings_screensaver_label" msgid="1495003469366524120">"Proteção de ecrã"</string> + <string name="quick_settings_screensaver_label" msgid="1495003469366524120">"Proteção ecrã"</string> <string name="quick_settings_camera_label" msgid="5612076679385269339">"Acesso câmara"</string> - <string name="quick_settings_mic_label" msgid="8392773746295266375">"Ac. microfone"</string> + <string name="quick_settings_mic_label" msgid="8392773746295266375">"Acesso micro"</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> @@ -327,13 +329,13 @@ <string name="quick_settings_work_mode_label" msgid="6440531507319809121">"Apps trabalho"</string> <string name="quick_settings_work_mode_paused_state" msgid="6681788236383735976">"Pausado"</string> <string name="quick_settings_night_display_label" msgid="8180030659141778180">"Luz noturna"</string> - <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"Ativ. ao pôr-do-sol"</string> + <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"Ativa ao pôr do sol"</string> <string name="quick_settings_night_secondary_label_until_sunrise" msgid="4063448287758262485">"Até ao amanhecer"</string> <string name="quick_settings_night_secondary_label_on_at" msgid="3584738542293528235">"Ativada à(s) <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_secondary_label_until" msgid="1883981263191927372">"Até à(s) <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_ui_mode_night_label" msgid="1398928270610780470">"Tema escuro"</string> <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Poup. bateria"</string> - <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Ativ. ao pôr do sol"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Ativa ao pôr do sol"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Até ao amanhecer"</string> <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Ativado à(s) <xliff:g id="TIME">%s</xliff:g>."</string> <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Até à(s) <xliff:g id="TIME">%s</xliff:g>."</string> @@ -361,12 +363,14 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Padrão"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Médio"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Alto"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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âmara do dispositivo?"</string> <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Quer 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="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Esta ação desbloqueia o acesso de todas as apps e serviços com autorização para usar o microfone."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Esta ação desbloqueia o acesso de todas as apps e serviços com autorização para usar a câmara."</string> + <string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Esta ação desbloqueia o acesso de todas as apps e serviços com autorização para usar a câmara ou microfone."</string> <string name="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"O microfone está bloqueado"</string> <string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"A câmara está bloqueada"</string> <string name="sensor_privacy_start_use_mic_camera_blocked_dialog_title" msgid="195236134743281973">"O microfone e a câmara estão bloqueados"</string> @@ -438,6 +442,8 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Remover"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Adicionar widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Concluir"</string> + <string name="label_for_button_in_empty_state_cta" msgid="7314975555382055823">"Adicionar widgets"</string> + <string name="title_for_empty_state_cta" msgid="6161654421223450530">"Tenha acesso rápido aos widgets das suas apps favoritas sem desbloquear o tablet."</string> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Permitir qualquer widget no ecrã de bloqueio?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Abrir definições"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Retomar apps de trabalho?"</string> @@ -568,7 +574,7 @@ <string name="screen_pinning_toast_recents_invisible" msgid="6850978077443052594">"Para soltar esta app, toque sem soltar nos botões Anterior e Página inicial."</string> <string name="screen_pinning_toast_gesture_nav" msgid="170699893395336705">"Para soltar esta app, deslize rapidamente para cima sem soltar."</string> <string name="screen_pinning_positive" msgid="3285785989665266984">"OK"</string> - <string name="screen_pinning_negative" msgid="6882816864569211666">"Não, obrigado"</string> + <string name="screen_pinning_negative" msgid="6882816864569211666">"Não"</string> <string name="screen_pinning_start" msgid="7483998671383371313">"App fixada"</string> <string name="screen_pinning_exit" msgid="4553787518387346893">"App solta"</string> <string name="stream_voice_call" msgid="7468348170702375660">"Chamada"</string> @@ -1084,7 +1090,7 @@ <string name="media_output_dialog_multiple_devices" msgid="1093771040315422350">"<xliff:g id="COUNT">%1$d</xliff:g> dispositivos selecionados"</string> <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(desligado)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Não é possível mudar. Toque para tentar novamente."</string> - <string name="media_output_dialog_pairing_new" msgid="5098212763195577270">"Ligue um dispositivo"</string> + <string name="media_output_dialog_pairing_new" msgid="5098212763195577270">"Ligar um dispositivo"</string> <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Para transmitir esta sessão, abra a app."</string> <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"App desconhecida"</string> <string name="media_output_dialog_button_stop_casting" msgid="6581379537930199189">"Parar transmissão"</string> @@ -1256,7 +1262,7 @@ <string name="call_from_work_profile_action" msgid="2937701298133010724">"Mudar para perfil de trabalho"</string> <string name="install_dialer_on_work_profile_action" msgid="2014659711597862506">"Instalar app telefone de trabalho"</string> <string name="call_from_work_profile_close" msgid="5830072964434474143">"Cancelar"</string> - <string name="lock_screen_settings" msgid="6152703934761402399">"Personalizar o ecrã de bloqueio"</string> + <string name="lock_screen_settings" msgid="6152703934761402399">"Personalizar ecrã de bloqueio"</string> <string name="keyguard_unlock_to_customize_ls" msgid="2068542308086253819">"Desbloqueie para personalizar o ecrã de bloqueio"</string> <string name="wifi_unavailable_dream_overlay_content_description" msgid="2024166212194640100">"Wi-Fi indisponível"</string> <string name="camera_blocked_dream_overlay_content_description" msgid="4074759493559418130">"Câmara bloqueada"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/tiles_states_strings.xml b/packages/SystemUI/res/values-pt-rPT/tiles_states_strings.xml index 666963b697cf..e01b1227d1f9 100644 --- a/packages/SystemUI/res/values-pt-rPT/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/tiles_states_strings.xml @@ -63,8 +63,8 @@ </string-array> <string-array name="tile_states_rotation"> <item msgid="4578491772376121579">"Indisponível"</item> - <item msgid="5776427577477729185">"Desligado"</item> - <item msgid="7105052717007227415">"Ligado"</item> + <item msgid="5776427577477729185">"Desligada"</item> + <item msgid="7105052717007227415">"Ligada"</item> </string-array> <string-array name="tile_states_bt"> <item msgid="5330252067413512277">"Indisponível"</item> @@ -118,7 +118,7 @@ </string-array> <string-array name="tile_states_night"> <item msgid="7857498964264855466">"Indisponível"</item> - <item msgid="2744885441164350155">"Desligado"</item> + <item msgid="2744885441164350155">"Desligada"</item> <item msgid="151121227514952197">"Ligado"</item> </string-array> <string-array name="tile_states_screenrecord"> @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Desativado"</item> <item msgid="5137565285664080143">"Ativado"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index a5198834267b..206b0b224f6b 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"As capturas de tela foram bloqueadas pelo administrador de TI"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Editar"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Editar captura de tela"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Compartilhar"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Compartilhar captura de tela"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capturar mais"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Dispensar captura de tela"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Verificando rosto"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Enviar"</string> <string name="cancel" msgid="1089011503403416730">"Cancelar"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logotipo do app"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmar"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Tentar novamente"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Toque para cancelar a autenticação"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Rosto reconhecido. Pressione o ícone para continuar."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticado"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Cancelar autenticação"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Mais opções"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Usar PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Usar padrão"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Usar senha"</string> @@ -357,11 +358,13 @@ <item msgid="1627504621139124393">"Interface do usuário"</item> <item msgid="8309220355268900335">"Bateria"</item> </string-array> - <string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modo para uma mão"</string> + <string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modo uma mão"</string> <string name="quick_settings_contrast_label" msgid="988087460210159123">"Contraste"</string> <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Padrão"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Médio"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Alto"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Remover"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Adicionar widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Concluído"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Permitir qualquer widget na tela de bloqueio?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Abrir as configurações"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Reativar apps de trabalho?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Este dispositivo é gerenciado pelo seu familiar responsável, que pode ver e gerenciar informações como os apps que você usa, sua localização e seu tempo de uso."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Desbloqueado pelo TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"O dispositivo foi bloqueado devido a muitas tentativas de autenticação"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Dispositivo bloqueado\nA autenticação falhou"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Configurações de som"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Transcrição automática"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Usar a tela dividida com o app atual à direita"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Usar a tela dividida com o app atual à esquerda"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Mudar da tela dividida para a tela cheia"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Mude para o app à direita ou abaixo ao usar a tela dividida"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Mude para o app à esquerda ou acima ao usar a tela dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Com a tela dividida: substituir um app por outro"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Entrada"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Mudar para o próximo idioma"</string> diff --git a/packages/SystemUI/res/values-pt/tiles_states_strings.xml b/packages/SystemUI/res/values-pt/tiles_states_strings.xml index ae2bd051d223..453d8139bd48 100644 --- a/packages/SystemUI/res/values-pt/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-pt/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Desativado"</item> <item msgid="5137565285664080143">"Ativado"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 4fea189b54eb..daa27ab0f554 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Administratorul IT a blocat crearea capturilor de ecran"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Editează"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Editează captura de ecran"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Distribuie"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Trimite captura de ecran"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Surprinde mai mult"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Închide captura de ecran"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanarea chipului"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Trimite"</string> <string name="cancel" msgid="1089011503403416730">"Anulează"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Sigla aplicației"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmă"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Încearcă din nou"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Atinge pentru a anula autentificarea"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Chip recunoscut. Apasă pictograma Deblocare ca să continui."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentificat"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Anulează autentificarea"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Mai multe opțiuni"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Folosește PIN-ul"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Folosește modelul"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Folosește parola"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Mediu"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Ridicat"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Deblochezi microfonul dispozitivului?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Deblochezi camera dispozitivului?"</string> <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Deblochezi camera și microfonul dispozitivului?"</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Elimină"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Adaugă un widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Gata"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Permiți vreun widget pe ecranul de blocare?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Deschide setările"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Reactivezi aplicații de lucru?"</string> @@ -451,13 +458,13 @@ <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"Începe din nou"</string> <string name="guest_wipe_session_dontwipe" msgid="3211052048269304205">"Da, continuă"</string> <string name="guest_notification_app_name" msgid="2110425506754205509">"Modul pentru invitați"</string> - <string name="guest_notification_session_active" msgid="5567273684713471450">"Folosește modul pentru invitați"</string> + <string name="guest_notification_session_active" msgid="5567273684713471450">"Folosești modul pentru invitați"</string> <string name="user_add_user_message_guest_remove" msgid="5589286604543355007">\n\n"Dacă adaugi un utilizator nou, vei ieși din modul pentru invitați și se vor șterge toate aplicațiile și datele din sesiunea actuală pentru invitați."</string> <string name="user_limit_reached_title" msgid="2429229448830346057">"Ai atins limita de utilizatori"</string> <string name="user_limit_reached_message" msgid="1070703858915935796">"{count,plural, =1{Se poate crea doar un utilizator.}few{Poți adăuga până la # utilizatori.}other{Poți adăuga până la # de utilizatori.}}"</string> <string name="user_remove_user_title" msgid="9124124694835811874">"Excluzi utilizatorul?"</string> <string name="user_remove_user_message" msgid="6702834122128031833">"Toate aplicațiile și datele acestui utilizator vor fi șterse."</string> - <string name="user_remove_user_remove" msgid="8387386066949061256">"Elimină"</string> + <string name="user_remove_user_remove" msgid="8387386066949061256">"Exclude"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"Începi să înregistrezi sau să proiectezi cu <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>?"</string> <string name="media_projection_dialog_warning" msgid="1303664408388363598">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> va avea acces la toate informațiile vizibile pe ecran sau redate pe dispozitiv în timp ce înregistrezi sau proiectezi. Între aceste informații se numără parole, detalii de plată, fotografii, mesaje și conținutul audio pe care îl redai."</string> <string name="media_projection_sys_service_dialog_title" msgid="3751133258891897878">"Începi să înregistrezi sau să proiectezi?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Dispozitivul este gestionat de unul dintre părinți. Părintele poate să vadă și să gestioneze informații cum ar fi aplicațiile pe care le folosești, locația ta și durata de folosire a dispozitivului."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Deblocat de TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Dispozitivul a fost blocat. Prea multe încercări de autentificare."</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Dispozitiv blocat\nAutentificare nereușită"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Setări de sunet"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Adaugă subtitrări automate la fișierele media"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Accesează ecranul împărțit cu aplicația actuală în dreapta"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Accesează ecranul împărțit cu aplicația actuală în stânga"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Comută de la ecranul împărțit la ecranul complet"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Treci la aplicația din dreapta sau de mai jos cu ecranul împărțit"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Treci la aplicația din stânga sau de mai sus cu ecranul împărțit"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"În modul ecran împărțit: înlocuiește o aplicație cu alta"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Introducere"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Comută la următoarea limbă"</string> diff --git a/packages/SystemUI/res/values-ro/tiles_states_strings.xml b/packages/SystemUI/res/values-ro/tiles_states_strings.xml index ed8285daa7a2..5b9661884709 100644 --- a/packages/SystemUI/res/values-ro/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-ro/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Dezactivat"</item> <item msgid="5137565285664080143">"Activat"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index d70d8ff88b32..184dc1f45e92 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Системный администратор запретил делать скриншоты."</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Изменить"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Изменить скриншот"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Поделиться"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Поделиться скриншотом"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Увеличить площадь скриншота"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Закрыть скриншот"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Сканирование лица"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Отправить"</string> <string name="cancel" msgid="1089011503403416730">"Отмена"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Логотип приложения"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Подтвердить"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Повторить попытку"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Нажмите, чтобы отменить аутентификацию"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Лицо распознано. Нажмите на значок разблокировки."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Аутентификация выполнена"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Отмена распознавания лица"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Ещё"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN-код"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Использовать графический ключ"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Использовать пароль"</string> @@ -287,7 +288,7 @@ <string name="quick_settings_screensaver_label" msgid="1495003469366524120">"Заставка"</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_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_user_title" msgid="8673045967216204537">"Пользователь"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Стандартная"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Средняя"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Высокая"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Удалить"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Добавить виджет"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Готово"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Разрешить добавлять любые виджеты на заблокированный экран?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Открыть настройки"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Включить рабочие приложения?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Этим устройством управляет один из твоих родителей. Он может видеть, например, какими приложениями ты пользуешься и где находишься, а также задавать определенные настройки (например, ограничивать время использования устройства)."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"Сеть VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Разблокировано агентом доверия"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Устройство заблокировано. Слишком много попыток аутентификации."</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Устройство заблокировано\nСбой аутентификации"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>."</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Настройки звука"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Автоматически добавлять субтитры"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Включить разделение экрана с текущим приложением справа"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Включить разделение экрана с текущим приложением слева"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Изменить режим разделения экрана на полноэкранный режим"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Перейти к приложению справа или внизу на разделенном экране"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Перейти к приложению слева или вверху на разделенном экране"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"В режиме разделения экрана заменить одно приложение другим"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Ввод"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Выбрать следующий язык"</string> diff --git a/packages/SystemUI/res/values-ru/tiles_states_strings.xml b/packages/SystemUI/res/values-ru/tiles_states_strings.xml index 48ecf26fa3a0..cdc4a982dff4 100644 --- a/packages/SystemUI/res/values-ru/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-ru/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Выключено"</item> <item msgid="5137565285664080143">"Включено"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index 720f76da2bc6..e5b566e1761e 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"තිර රූ ගැනීම ඔබගේ IT පරිපාලක විසින් අවහිර කර ඇත"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"සංස්කරණය කරන්න"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"තිර රුව සංස්කරණය කරන්න"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"බෙදා ගන්න"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"තිර රුව බෙදා ගන්න"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"තව ග්රහණය කරන්න"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"තිර රුව ඉවත ලන්න"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"මුහුණ ස්කෑන් කිරීම"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"යවන්න"</string> <string name="cancel" msgid="1089011503403416730">"අවලංගු කරන්න"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"යෙදුම් ලාංඡනය"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"තහවුරු කරන්න"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"නැවත උත්සාහ කරන්න"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"සත්යාපනය අවලංගු කිරීමට තට්ටු කරන්න"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"මුහුණ හඳුනා ගන්නා ලදි. ඉදිරියට යාමට අගුලු හැරීමේ නිරූපකය ඔබන්න."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"සත්යාපනය විය"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"සත්යාපනය අවලංගු කරන්න"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"තවත් විකල්ප"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN භාවිත කරන්න"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"රටාව භාවිත කරන්න"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"මුරපදය භාවිත කරන්න"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"සම්මත"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"මධ්යම"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"ඉහළ"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"ඉවත් කරන්න"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"විජට්ටුව එක් කරන්න"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"නිමයි"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"අගුළු තිරය මත ඕනෑම විජට් එකකට ඉඩ දෙන්න"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"සැකසීම් විවෘත කරන්න"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"කාර්ය යෙදුම් විරාම නොකරන්න ද?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"මෙම උපාංගය ඔබගේ මාපියන් විසින් කළමනාකරණය කෙරේ. ඔබ භාවිත කරන යෙදුම්, ඔබගේ ස්ථානය සහ ඔබගේ තිර කාලය වැනි තොරතුරු ඔබගේ මාපියන්ට බැලීමට සහ කළමනාකරණය කිරීමට හැකිය."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent මඟින් අඟුලු දමා තබා ගන්න"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"උපාංගය අගුළු දමා ඇත, බොහෝ සත්යාපන උත්සාහයන් ගණනකි"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"උපාංගය අගුළු දමා ඇත\nසත්යාපනය අසමත් විය"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"ශබ්ද සැකසීම්"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"මාධ්ය ස්වයංක්රීයව සිරස්තල"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"RHS වෙත වත්මන් යෙදුම සමග බෙදුම් තිරයට ඇතුළු වන්න"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"LHS වෙත වත්මන් යෙදුම සමග බෙදුම් තිරයට ඇතුළු වන්න"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"බෙදුම් තිරයේ සිට පූර්ණ තිරයට මාරු වන්න"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"බෙදුම් තිරය භාවිත කරන අතරතුර දකුණේ හෝ පහළින් ඇති යෙදුමට මාරු වන්න"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"බෙදුම් තිරය භාවිත කරන අතරතුර වමේ හෝ ඉහළ ඇති යෙදුමට මාරු වන්න"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"බෙදුම් තිරය අතරතුර: යෙදුමක් එකකින් තවත් එකක් ප්රතිස්ථාපනය කරන්න"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ආදානය"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"මීළඟ භාෂාවට මාරු වන්න"</string> diff --git a/packages/SystemUI/res/values-si/tiles_states_strings.xml b/packages/SystemUI/res/values-si/tiles_states_strings.xml index cbbc0e783515..e7e90341ecb9 100644 --- a/packages/SystemUI/res/values-si/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-si/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"ක්රියාවිරහිතයි"</item> <item msgid="5137565285664080143">"ක්රියාත්මකයි"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 7722736c8125..ab020ee43062 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Vytváranie snímok obrazovky zablokoval váš správca IT"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Upraviť"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Upraviť snímku obrazovky"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Zdieľať"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Zdieľať snímku obrazovky"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Zachytiť viac"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Zavrieť snímku obrazovky"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skenovanie tváre"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Odoslať"</string> <string name="cancel" msgid="1089011503403416730">"Zrušiť"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logo aplikácie"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potvrdiť"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Skúsiť znova"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Klepnutím zrušíte overenie"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Tvár bola rozpoznaná. Pokračujte stlačením ikony odomknutia"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Overené"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Zrušiť overenie"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Ďalšie možnosti"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Použiť PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Použiť vzor"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Použiť heslo"</string> @@ -328,7 +329,7 @@ <string name="quick_settings_work_mode_label" msgid="6440531507319809121">"Pracovné aplikácie"</string> <string name="quick_settings_work_mode_paused_state" msgid="6681788236383735976">"Pozastavené"</string> <string name="quick_settings_night_display_label" msgid="8180030659141778180">"Nočný režim"</string> - <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"Zap. pri záp. slnka"</string> + <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"Pri západe slnka"</string> <string name="quick_settings_night_secondary_label_until_sunrise" msgid="4063448287758262485">"Do východu slnka"</string> <string name="quick_settings_night_secondary_label_on_at" msgid="3584738542293528235">"Od <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_secondary_label_until" msgid="1883981263191927372">"Do <xliff:g id="TIME">%s</xliff:g>"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Štandardný"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Stredný"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Vysoký"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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ť kameru zariadenia?"</string> <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Chcete odblokovať fotoaparát a mikrofón zariadenia?"</string> @@ -439,6 +442,8 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Odstrániť"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Pridať miniaplikáciu"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Hotovo"</string> + <string name="label_for_button_in_empty_state_cta" msgid="7314975555382055823">"Pridať miniaplikácie"</string> + <string name="title_for_empty_state_cta" msgid="6161654421223450530">"Majte k dispozícii rýchly prístup k svojim obľúbeným miniaplikáciám bez odomykania tabletu"</string> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Chcete povoliť akúkoľvek miniaplikáciu na uzamknutej obrazovke?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Otvoriť nastavenia"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Zrušiť pozast. prac. aplikácií?"</string> @@ -540,10 +545,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Toto zariadenie spravuje tvoj rodič. Vidí a môže spravovať informácie, napríklad aplikácie, ktoré používaš, tvoju polohu a čas používania."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Odomknutie udržiava TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Zariadenie bolo uzamknuté, príliš mnoho pokusov o overenie"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Zariadenie je uzamknuté\nOverenie sa nepodarilo"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Nastavenia zvuku"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Automatické titulkovanie médií"</string> @@ -612,7 +615,7 @@ <string name="volume_panel_hint_mute" msgid="6962563028495243738">"vypnete zvuk %s"</string> <string name="volume_panel_hint_unmute" msgid="7489063242934477382">"zapnete zvuk %s"</string> <string name="media_output_label_title" msgid="872824698593182505">"<xliff:g id="LABEL">%s</xliff:g> sa prehráva v:"</string> - <string name="media_output_title_without_playing" msgid="3825663683169305013">"Zvuk sa prehrá v:"</string> + <string name="media_output_title_without_playing" msgid="3825663683169305013">"Zvuk sa prehrá cez"</string> <string name="system_ui_tuner" msgid="1471348823289954729">"Tuner používateľského rozhrania systému"</string> <string name="status_bar" msgid="4357390266055077437">"Stavový riadok"</string> <string name="demo_mode" msgid="263484519766901593">"Ukážka používateľského rozhrania systému"</string> @@ -765,10 +768,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Rozdelenie obrazovky s aktuálnou aplikáciou vpravo"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Rozdelenie obrazovky s aktuálnou aplikáciou vľavo"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Prepnutie rozdelenej obrazovky na celú"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Prechod na aplikáciu vpravo alebo dole pri rozdelenej obrazovke"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Prechod na aplikáciu vľavo alebo hore pri rozdelenej obrazovke"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Počas rozdelenej obrazovky: nahradenie aplikácie inou"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Vstup"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Prepnutie na ďalší jazyk"</string> @@ -1166,7 +1167,7 @@ <string name="mobile_data_connection_active" msgid="944490013299018227">"Pripojené"</string> <string name="mobile_data_temp_connection_active" msgid="4590222725908806824">"Dočasne pripojené"</string> <string name="mobile_data_poor_connection" msgid="819617772268371434">"Slabé pripojenie"</string> - <string name="mobile_data_off_summary" msgid="3663995422004150567">"Automatické pripojenie cez mobilné dáta nefunguje"</string> + <string name="mobile_data_off_summary" msgid="3663995422004150567">"Mobilné dáta sa nepripájajú automaticky"</string> <string name="mobile_data_no_connection" msgid="1713872434869947377">"Bez pripojenia"</string> <string name="non_carrier_network_unavailable" msgid="770049357024492372">"Nie sú k dispozícii žiadne ďalšie siete"</string> <string name="all_network_unavailable" msgid="4112774339909373349">"Nie sú k dispozícii žiadne siete"</string> diff --git a/packages/SystemUI/res/values-sk/tiles_states_strings.xml b/packages/SystemUI/res/values-sk/tiles_states_strings.xml index 50f5c253bffe..5ba7a0730cb4 100644 --- a/packages/SystemUI/res/values-sk/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-sk/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Vypnuté"</item> <item msgid="5137565285664080143">"Zapnuté"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index cbf55124d039..90dd463807de 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Skrbnik za IT je onemogočil zajemanje posnetkov zaslona."</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Uredi"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Urejanje posnetka zaslona"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Deli"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Deljenje posnetka zaslona"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Zajemi več"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Opusti posnetek zaslona"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Optično branje obraza"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Pošlji"</string> <string name="cancel" msgid="1089011503403416730">"Prekliči"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logotip aplikacije"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potrdite"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Poskusi znova"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Če želite preklicati preverjanje pristnosti, se dotaknite"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Obraz je prepoznan. Za nadaljevanje pritisnite ikono za odklepanje."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Preverjena pristnost"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Prekliči preverjanje pristnosti"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Več možnosti"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Uporabi kodo PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Uporabi vzorec"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Uporabi geslo"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standardni"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Srednji"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Visok"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,8 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Odstrani"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Dodajanje pripomočka"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Končano"</string> + <string name="label_for_button_in_empty_state_cta" msgid="7314975555382055823">"Dodajte pripomočke"</string> + <string name="title_for_empty_state_cta" msgid="6161654421223450530">"Hitro dostopajte do priljubljenih pripomočkov za aplikacije brez odklepanja tabličnega računalnika."</string> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Želite dovoliti poljubne pripomočke na zaklenjenem zaslonu?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Odpri nastavitve"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Želite znova aktivirati delovne aplikacije?"</string> @@ -471,7 +476,7 @@ <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"Začni"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> je onemogočila to možnost"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Želite začeti predvajati?"</string> - <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Pri predvajanju ima Android dostop do vsega, kar je prikazano na zaslonu ali se predvaja v napravi. Zato bodite previdni z gesli, podatki za plačilo, sporočili, fotografijami ter z zvokom in videom."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Pri predvajanju ima Android dostop do vsega, kar je prikazano na zaslonu ali se predvaja v napravi, zato bodite previdni z gesli, podatki za plačilo, sporočili, fotografijami ter z zvokom in videom."</string> <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Pri predvajanju aplikacije ima Android dostop do vsega, kar je prikazano ali predvajano v tej aplikaciji, zato bodite previdni z gesli, podatki za plačilo, sporočili, fotografijami ter z zvokom in videom."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Začni predvajanje"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Želite začeti deliti?"</string> @@ -763,10 +768,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Vklop razdeljenega zaslona s trenutno aplikacijo na desni"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Vklop razdeljenega zaslona s trenutno aplikacijo na levi"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Preklop iz razdeljenega zaslona v celozaslonski način"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Preklop na aplikacijo desno ali spodaj med uporabo razdeljenega zaslona"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Preklop na aplikacijo levo ali zgoraj med uporabo razdeljenega zaslona"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Pri razdeljenem zaslonu: medsebojna zamenjava aplikacij"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Vnosna naprava"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Preklop na naslednji jezik"</string> diff --git a/packages/SystemUI/res/values-sl/tiles_states_strings.xml b/packages/SystemUI/res/values-sl/tiles_states_strings.xml index 33ba21603e32..9f9175e7bd0e 100644 --- a/packages/SystemUI/res/values-sl/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-sl/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Izklopljeno"</item> <item msgid="5137565285664080143">"Vklopljeno"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index ac5955bcc43b..419df19ec54c 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Shkrepja e pamjeve të ekranit është bllokuar nga administratori i teknologjisë së informacionit"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Modifiko"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Modifiko pamjen e ekranit"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Ndaj"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Ndaj pamjen e ekranit"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Regjistro më shumë"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Hiq pamjen e ekranit"</string> @@ -152,6 +151,8 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Po skanon fytyrën"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Dërgo"</string> <string name="cancel" msgid="1089011503403416730">"Anulo"</string> + <!-- no translation found for biometric_dialog_logo (7681107853070774595) --> + <skip /> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Konfirmo"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Provo përsëri"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Trokit për të anuluar vërtetimin"</string> @@ -166,6 +167,8 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Fytyra u njoh. Shtyp ikonën e shkyçjes për të vazhduar."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"U vërtetua"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Anulo vërtetimin"</string> + <!-- no translation found for biometric_dialog_content_view_more_options_button (2663810393874865475) --> + <skip /> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Përdor kodin PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Përdor motivin"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Përdor fjalëkalimin"</string> @@ -362,6 +365,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Mesatar"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"I lartë"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +444,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Hiq"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Shto miniaplikacionin"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"U krye"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Të lejohet ndonjë miniaplikacion te ekrani i kyçjes?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Hap cilësimet"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Hiq nga pauza apl. e punës?"</string> @@ -540,10 +549,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Kjo pajisje menaxhohet nga prindi yt. Prindi yt mund të shikojë dhe menaxhojë informacionet, si p.sh. aplikacionet që përdor, vendndodhjen tënde dhe kohën para ekranit."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Mbajtur shkyçur nga TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Pajisja u kyç. Shumë përpjekje vërtetimi"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Pajisja është kyçur\nVërtetimi dështoi"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Cilësimet e zërit"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Media me titra automatike"</string> @@ -588,8 +595,8 @@ <string name="volume_ringer_status_silent" msgid="3691324657849880883">"Pa zë"</string> <string name="media_device_cast" msgid="4786241789687569892">"Transmeto"</string> <string name="stream_notification_unavailable" msgid="4313854556205836435">"Nuk ofrohet; ziles i është hequr zëri"</string> - <string name="stream_alarm_unavailable" msgid="4059817189292197839">"Nuk ofrohet sepse \"Mos shqetëso\" është aktiv"</string> - <string name="stream_media_unavailable" msgid="6823020894438959853">"Nuk ofrohet sepse \"Mos shqetëso\" është aktiv"</string> + <string name="stream_alarm_unavailable" msgid="4059817189292197839">"Nuk ofrohet; \"Mos shqetëso\" është aktiv"</string> + <string name="stream_media_unavailable" msgid="6823020894438959853">"Nuk ofrohet; \"Mos shqetëso\" është aktiv"</string> <string name="volume_stream_content_description_unmute" msgid="7729576371406792977">"%1$s. Trokit për të aktivizuar."</string> <string name="volume_stream_content_description_vibrate" msgid="4858111994183089761">"%1$s. Trokit për ta caktuar te dridhja. Shërbimet e qasshmërisë mund të çaktivizohen."</string> <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. Trokit për të çaktivizuar. Shërbimet e qasshmërisë mund të çaktivizohen."</string> @@ -765,10 +772,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Hyr në ekranin e ndarë me aplikacionin aktual në anën e djathtë"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Hyr në ekranin e ndarë me aplikacionin aktual në anën e majtë"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Kalo nga ekrani i ndarë në ekranin e plotë"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Kalo tek aplikacioni djathtas ose poshtë kur përdor ekranin e ndarë"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Kalo tek aplikacioni në të majtë ose sipër kur përdor ekranin e ndarë"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Gjatë ekranit të ndarë: zëvendëso një aplikacion me një tjetër"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Hyrja"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Kalo te gjuha tjetër"</string> diff --git a/packages/SystemUI/res/values-sq/tiles_states_strings.xml b/packages/SystemUI/res/values-sq/tiles_states_strings.xml index fa06795e3ae8..aa4832d62b43 100644 --- a/packages/SystemUI/res/values-sq/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-sq/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Joaktive"</item> <item msgid="5137565285664080143">"Aktive"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 085f1b038e1a..ca9eb65c72cf 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"ИТ администратор блокира прављење снимака екрана"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Измени"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Измените снимак екрана"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Делите"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Делите снимак екрана"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Снимите још"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Одбаците снимак екрана"</string> @@ -106,8 +105,8 @@ <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Обрађујемо видео снимка екрана"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Обавештење о сесији снимања екрана је активно"</string> <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"Желите да започнете снимање?"</string> - <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Android има приступ комплетном садржају који је видљив на екрану или се пушта на уређају док снимате. Зато будите пажљиви са лозинкама, информацијама о плаћању, порукама, сликама и аудио и видеима."</string> - <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Када снимате апликацију, Android има приступ комплетном садржају који је видљив или се пушта у тој апликацији. Зато будите пажљиви са лозинкама, информацијама о плаћању, порукама, сликама и аудио и видеима."</string> + <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"Android има приступ комплетном садржају који је видљив на екрану или се пушта на уређају док снимате. Зато пазите на лозинке, информације о плаћању, поруке, слике, и аудио и видео садржај."</string> + <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"Када снимате апликацију, Android има приступ комплетном садржају који је видљив или се пушта у тој апликацији. Зато пазите на лозинке, информације о плаћању, поруке, слике, и аудио и видео садржај."</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Започни снимање"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Снимај звук"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Звук уређаја"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Скенирање лица"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Пошаљи"</string> <string name="cancel" msgid="1089011503403416730">"Откажи"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Логотип апликације"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Потврди"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Пробај поново"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Додирните да бисте отказали потврду идентитета"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Лице препознато. Притисните икону откључавања за наставак."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Идентитет је потврђен"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Откажите потврду идентитета"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Још опција"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Користите PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Користите шаблон"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Користите лозинку"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Стандардно"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Средње"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Високо"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Уклони"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Додај виџет"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Готово"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Желите да дозволите све виџете на закључаном екрану?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Отвори подешавања"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Укључити пословне апликације?"</string> @@ -466,17 +473,17 @@ <string name="screen_share_permission_dialog_option_single_app" msgid="4350961814397220929">"Једна апликација"</string> <string name="screen_share_permission_app_selector_title" msgid="1404878013670347899">"Делите или снимите апликацију"</string> <string name="media_projection_entry_app_permission_dialog_title" msgid="9155535851866407199">"Желите да почнете снимање или пребацивање помоћу апликације <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>?"</string> - <string name="media_projection_entry_app_permission_dialog_warning_entire_screen" msgid="8736391633234144237">"Када делите, снимате или пребацујете, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> има приступ комплетном садржају који је видљив на екрану или се пушта на уређају. Зато будите пажљиви са лозинкама, информацијама о плаћању, порукама, сликама и аудио и видеима."</string> - <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Када делите, снимате или пребацујете апликацију, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> има приступ комплетном садржају који је видљив или се пушта у тој апликацији. Зато будите пажљиви са лозинкама, информацијама о плаћању, порукама, сликама и аудио и видеима."</string> + <string name="media_projection_entry_app_permission_dialog_warning_entire_screen" msgid="8736391633234144237">"Када делите, снимате или пребацујете, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> има приступ комплетном садржају који је видљив на екрану или се пушта на уређају. Зато пазите на лозинке, информације о плаћању, поруке, слике, и аудио и видео садржај."</string> + <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Када делите, снимате или пребацујете апликацију, <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> има приступ комплетном садржају који је видљив или се пушта у тој апликацији. Зато пазите на лозинке, информације о плаћању, поруке, слике, и аудио и видео садржај."</string> <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"Покрени"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"Апликација <xliff:g id="APP_NAME">%1$s</xliff:g> је онемогућила ову опцију"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"Желите да започнете пребацивање?"</string> - <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Када пребацујете, Android има приступ комплетном садржају који је видљив на екрану или се пушта на уређају. Зато будите пажљиви са лозинкама, информацијама о плаћању, порукама, сликама и аудио и видеима."</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Када пребацујете апликацију, Android има приступ комплетном садржају који је видљив или се пушта у тој апликацији. Зато будите пажљиви са лозинкама, информацијама о плаћању, порукама, сликама и аудио и видеима."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"Када пребацујете, Android има приступ комплетном садржају који је видљив на екрану или се пушта на уређају. Зато пазите на лозинке, информације о плаћању, поруке, слике, и аудио и видео садржај."</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"Када пребацујете апликацију, Android има приступ комплетном садржају који је видљив или се пушта у тој апликацији. Зато пазите на лозинке, информације о плаћању, поруке, слике, и аудио и видео садржај."</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"Започни пребацивање"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"Желите да почнете да делите?"</string> - <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Када делите, снимате или пребацујете, Android има приступ комплетном садржају који је видљив на екрану или се пушта на уређају. Зато будите пажљиви са лозинкама, информацијама о плаћању, порукама, сликама и аудио и видеима."</string> - <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Када делите, снимате или пребацујете апликацију, Android има приступ комплетном садржају који је видљив или се пушта у тој апликацији. Зато будите пажљиви са лозинкама, информацијама о плаћању, порукама, сликама и аудио и видеима."</string> + <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"Када делите, снимате или пребацујете, Android има приступ комплетном садржају који је видљив на екрану или се пушта на уређају. Зато пазите на лозинке, информације о плаћању, поруке, слике, и аудио и видео садржај."</string> + <string name="media_projection_entry_generic_permission_dialog_warning_single_app" msgid="3454859977888159495">"Када делите, снимате или пребацујете апликацију, Android има приступ комплетном садржају који је видљив или се пушта у тој апликацији. Зато пазите на лозинке, информације о плаћању, поруке, слике, и аудио и видео садржај."</string> <string name="media_projection_entry_generic_permission_dialog_continue" msgid="8640381403048097116">"Покрени"</string> <string name="media_projection_task_switcher_text" msgid="590885489897412359">"Дељење се зауставља када мењате апликације"</string> <string name="media_projection_task_switcher_action_switch" msgid="8682258717291921123">"Дели ову апликацију"</string> @@ -593,7 +600,7 @@ <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. Додирните да бисте искључили звук. Звук услуга приступачности ће можда бити искључен."</string> <string name="volume_stream_content_description_vibrate_a11y" msgid="2742330052979397471">"%1$s. Додирните да бисте подесили на вибрацију."</string> <string name="volume_stream_content_description_mute_a11y" msgid="5743548478357238156">"%1$s. Додирните да бисте искључили звук."</string> - <string name="volume_panel_noise_control_title" msgid="7413949943872304474">"Контрола шума"</string> + <string name="volume_panel_noise_control_title" msgid="7413949943872304474">"Контрола буке"</string> <string name="volume_panel_spatial_audio_title" msgid="3367048857932040660">"Просторни звук"</string> <string name="volume_panel_spatial_audio_off" msgid="4177490084606772989">"Искључено"</string> <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Фиксно"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Покрени подељени екран за актуелну апликацију на десној страни"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Покрени подељени екран за актуелну апликацију на левој страни"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Пређи са подељеног екрана на цео екран"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Пређите у апликацију здесна или испод док користите подељени екран"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Пређите у апликацију слева или изнад док користите подељени екран"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"У режиму подељеног екрана: замена једне апликације другом"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Унос"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Пређи на следећи језик"</string> @@ -1152,7 +1157,7 @@ <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> - <string name="accessibility_bouncer" msgid="5896923685673320070">"унесите закључавање екрана"</string> + <string name="accessibility_bouncer" msgid="5896923685673320070">"унесите откључавање екрана"</string> <string name="accessibility_fingerprint_label" msgid="5255731221854153660">"Сензор за отисак прста"</string> <string name="accessibility_authenticate_hint" msgid="798914151813205721">"потврдите идентитет"</string> <string name="accessibility_enter_hint" msgid="2617864063504824834">"унесите уређај"</string> @@ -1174,7 +1179,7 @@ <string name="wifi_empty_list_wifi_on" msgid="3864376632067585377">"Траже се мреже…"</string> <string name="wifi_failed_connect_message" msgid="4161863112079000071">"Повезивање са мрежом није успело"</string> <string name="wifi_wont_autoconnect_for_now" msgid="5782282612749867762">"WiFi тренутно не може да се аутоматски повеже"</string> - <string name="see_all_networks" msgid="3773666844913168122">"Погледајте све"</string> + <string name="see_all_networks" msgid="3773666844913168122">"Прикажи све"</string> <string name="to_switch_networks_disconnect_ethernet" msgid="6698111101156951955">"Да бисте променили мрежу, прекините етернет везу"</string> <string name="wifi_scan_notify_message" msgid="3753839537448621794">"Ради бољег доживљаја уређаја, апликације и услуге и даље могу да траже WiFi мреже у било ком тренутку, чак и када је WiFi искључен. То можете да промените у подешавањима WiFi скенирања. "<annotation id="link">"Промените"</annotation></string> <string name="turn_off_airplane_mode" msgid="8425587763226548579">"Искључи режим рада у авиону"</string> diff --git a/packages/SystemUI/res/values-sr/tiles_states_strings.xml b/packages/SystemUI/res/values-sr/tiles_states_strings.xml index 55f5a3f5a45c..22351717d6b4 100644 --- a/packages/SystemUI/res/values-sr/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-sr/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Искључено"</item> <item msgid="5137565285664080143">"Укључено"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 854e5479bba0..14b39fb090e5 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Möjligheten att ta skärmbilder blockeras av IT-administratören"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Redigera"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Redigera skärmbild"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Dela"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Dela skärmbild"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Fånga mer"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Stäng skärmbild"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Registrerar ansikte"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Skicka"</string> <string name="cancel" msgid="1089011503403416730">"Avbryt"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Appens logotyp"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Bekräfta"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Försök igen"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Tryck för att avbryta autentiseringen"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Ansiktet har identifierats. Tryck på ikonen lås upp."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentiserad"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Avbryt autentiseringen"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Fler alternativ"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Använd pinkod"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Använd mönster"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Använd lösenord"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Medelhög"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Hög"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Ta bort"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Lägg till widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Klar"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Vill du tillåta alla widgetar på låsskärmen?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Öppna inställningarna"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Vill du återuppta jobbappar?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Den här enheten hanteras av din förälder. Föräldern kan se och hantera information som vilka appar du använder, din plats och din skärmtid."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Hålls olåst med TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Enheten låstes på grund av för många autentiseringsförsök"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Enheten har låsts\nAutentiseringen misslyckades"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Ljudinställningar"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Texta media automatiskt"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Öppna delad skärm med aktuell app till höger"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Öppna delad skärm med aktuell app till vänster"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Byt mellan delad skärm och helskärm"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Byt till appen till vänster eller nedanför när du använder delad skärm"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Byt till appen till vänster eller ovanför när du använder delad skärm"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Med delad skärm: ersätt en app med en annan"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Inmatning"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Byt till nästa språk"</string> @@ -900,7 +903,7 @@ <string name="mobile_data" msgid="4564407557775397216">"Mobildata"</string> <string name="mobile_data_text_format" msgid="6806501540022589786">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string> <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> - <string name="wifi_is_off" msgid="5389597396308001471">"wifi är inaktiverat"</string> + <string name="wifi_is_off" msgid="5389597396308001471">"Wifi är inaktiverat"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth är inaktiverat"</string> <string name="dnd_is_off" msgid="3185706903793094463">"Stör ej är inaktiverat"</string> <string name="dnd_is_on" msgid="7009368176361546279">"Stör ej har aktiverats"</string> diff --git a/packages/SystemUI/res/values-sv/tiles_states_strings.xml b/packages/SystemUI/res/values-sv/tiles_states_strings.xml index f921f277dcec..522538a79c07 100644 --- a/packages/SystemUI/res/values-sv/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-sv/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Av"</item> <item msgid="5137565285664080143">"På"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 9dc17abf77fd..2e8017a31a9f 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Kupiga picha za skrini kumezuiwa na Msimamizi wako wa TEHAMA"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Badilisha"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Badilisha picha ya skrini"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Tuma"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Shiriki picha ya skrini"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Nasa zaidi"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ondoa picha ya skrini"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Inachanganua uso"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Tuma"</string> <string name="cancel" msgid="1089011503403416730">"Ghairi"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Nembo ya programu"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Thibitisha"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Jaribu tena"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Gusa ili ughairi uthibitishaji"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Uso umetambuliwa. Bonyeza aikoni ya kufungua ili uendelee."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Umethibitishwa"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Ghairi Uthibitishaji"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Chaguo Zaidi"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Tumia PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Tumia mchoro"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Tumia nenosiri"</string> @@ -362,8 +363,10 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Kawaida"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Wastani"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Juu"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Ungependa kuwacha kuzuia maikrofoni ya kifaa?"</string> - <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Ungependa kuwacha kuzuia kamera ya kifaa?"</string> + <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Ungependa kuacha kuzuia kamera ya kifaa?"</string> <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Ungependa kuwacha kuzuia kamera na maikrofoni ya kifaa?"</string> <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Hatua hii huruhusu programu na huduma zote zenye idhini zitumie maikrofoni yako."</string> <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Hatua hii huruhusu programu na huduma zote zenye idhini zitumie kamera yako."</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Ondoa"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Ongeza wijeti"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Nimemaliza"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Ungependa kuruhusu wijeti yoyote kwenye skrini iliyofungwa?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Fungua mipangilio"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Je, ungependa kuacha kusitisha programu za kazini?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Kifaa hiki kinadhibitiwa na mzazi wako. Mzazi wako anaweza kuona na kudhibiti maelezo kama vile programu unazotumia, mahali ulipo na muda unaotumia kwenye kifaa."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Imefunguliwa na kipengele cha kutathmini hali ya kuaminika"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Kifaa kimefungwa, majaribio ya uthibitishaji ni mengi mno"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Kifaa kimefungwa\nImeshindwa kuthibitisha"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Mipangilio ya sauti"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Wekea maudhui manukuu kiotomatiki"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Tumia programu kwenye skrini iliyogawanywa upande wa kulia"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Tumia programu kwenye skrini iliyogawanywa upande wa kushoto"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Badilisha kutoka skrini iliyogawanywa utumie skrini nzima"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Badilisha ili uende kwenye programu iliyo kulia au chini unapotumia hali ya kugawa skrini"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Badilisha uende kwenye programu iliyo kushoto au juu unapotumia hali ya kugawa skrini"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ukigawanya skrini: badilisha kutoka programu moja hadi nyingine"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Vifaa vya kuingiza data"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Badilisha utumie lugha inayofuata"</string> diff --git a/packages/SystemUI/res/values-sw/tiles_states_strings.xml b/packages/SystemUI/res/values-sw/tiles_states_strings.xml index 227eee882fe4..cbc8584c691a 100644 --- a/packages/SystemUI/res/values-sw/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-sw/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Umezima"</item> <item msgid="5137565285664080143">"Umewasha"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index 5d6b131a557a..d623ba092372 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"ஸ்கிரீன்ஷாட்கள் எடுப்பதை உங்கள் IT நிர்வாகி தடைசெய்துள்ளார்"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"திருத்து"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"ஸ்கிரீன்ஷாட்டைத் திருத்தும்"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"பகிர்"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"ஸ்கிரீன்ஷாட்டைப் பகிர்"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"கூடுதலாக படமெடு"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ஸ்கிரீன்ஷாட்டை நிராகரிக்கும்"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"முகத்தை ஸ்கேன் செய்கிறது"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"அனுப்பு"</string> <string name="cancel" msgid="1089011503403416730">"ரத்துசெய்"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"ஆப்ஸ் லோகோ"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"உறுதிப்படுத்துக"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"மீண்டும் முயல்க"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"பயோமெட்ரிக் அடையாளத்தை ரத்துசெய்ய தட்டவும்"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"முகம் அங்கீகரிக்கப்பட்டது. தொடர அன்லாக் ஐகானை அழுத்தவும்."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"அங்கீகரிக்கப்பட்டது"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"அங்கீகரிப்பை ரத்துசெய்"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"கூடுதல் விருப்பங்கள்"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"பின்னைப் பயன்படுத்து"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"பேட்டர்னைப் பயன்படுத்து"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"கடவுச்சொல்லைப் பயன்படுத்து"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"இயல்புநிலை"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"நடுத்தரம்"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"அதிகம்"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"அகற்றும்"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"விட்ஜெட்டைச் சேர்"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"முடிந்தது"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"பூட்டுத் திரையில் எந்தவொரு விட்ஜெட்டையும் அனுமதிக்கவா?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"அமைப்புகளைத் திற"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"பணி ஆப்ஸை மீண்டும் இயக்கவா?"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"வலதுபுறத்தில் தற்போதைய ஆப்ஸ் தோன்றுமாறு திரைப் பிரிப்பை அமைத்தல்"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"இடதுபுறத்தில் தற்போதைய ஆப்ஸ் தோன்றுமாறு திரைப் பிரிப்பை அமைத்தல்"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"திரைப் பிரிப்பு பயன்முறையிலிருந்து முழுத்திரைக்கு மாற்றுதல்"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"திரைப் பிரிப்பைப் பயன்படுத்தும்போது வலது/கீழ் உள்ள ஆப்ஸுக்கு மாறுங்கள்"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"திரைப் பிரிப்பைப் பயன்படுத்தும்போது இடது/மேலே உள்ள ஆப்ஸுக்கு மாறுங்கள்"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"திரைப் பிரிப்பின்போது: ஓர் ஆப்ஸுக்குப் பதிலாக மற்றொன்றை மாற்றுதல்"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"உள்ளீடு"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"அடுத்த மொழிக்கு மாற்றுதல்"</string> @@ -1087,7 +1092,7 @@ <string name="media_output_dialog_multiple_devices" msgid="1093771040315422350">"<xliff:g id="COUNT">%1$d</xliff:g> சாதனங்கள் தேர்ந்தெடுக்கப்பட்டுள்ளன"</string> <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(துண்டிக்கப்பட்டது)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"இணைக்க முடியவில்லை. மீண்டும் முயல தட்டவும்."</string> - <string name="media_output_dialog_pairing_new" msgid="5098212763195577270">"சாதனத்தை இணைத்தல்"</string> + <string name="media_output_dialog_pairing_new" msgid="5098212763195577270">"சாதனத்தை இணை"</string> <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"இந்த அமர்வை அலைபரப்ப ஆப்ஸைத் திறங்கள்."</string> <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"அறியப்படாத ஆப்ஸ்"</string> <string name="media_output_dialog_button_stop_casting" msgid="6581379537930199189">"அலைபரப்புவதை நிறுத்து"</string> diff --git a/packages/SystemUI/res/values-ta/tiles_states_strings.xml b/packages/SystemUI/res/values-ta/tiles_states_strings.xml index 6043cf25c7fa..cacde5ebe57b 100644 --- a/packages/SystemUI/res/values-ta/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-ta/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"முடக்கப்பட்டுள்ளது"</item> <item msgid="5137565285664080143">"இயக்கப்பட்டுள்ளது"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index 5c5d8289bc45..732131a2aa5c 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"స్క్రీన్షాట్లు తీయడాన్ని మీ IT అడ్మిన్ బ్లాక్ చేశారు"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"ఎడిట్ చేయండి"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"స్క్రీన్షాట్ను ఎడిట్ చేయండి"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"షేర్ చేయండి"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"స్క్రీన్షాట్ను షేర్ చేయండి"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"మరిన్ని క్యాప్చర్ చేయండి"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"స్క్రీన్షాట్ను విస్మరించు"</string> @@ -107,7 +106,7 @@ <string name="screenrecord_channel_description" msgid="4147077128486138351">"స్క్రీన్ రికార్డ్ సెషన్ కోసం ఆన్గోయింగ్ నోటిఫికేషన్"</string> <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"రికార్డింగ్ను ప్రారంభించాలా?"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"మీరు రికార్డ్ చేసేటప్పుడు, మీ స్క్రీన్పై కనిపించే దేనికైనా లేదా మీ పరికరంలో ప్లే అయిన దేనికైనా Androidకు యాక్సెస్ ఉంటుంది. కాబట్టి పాస్వర్డ్లు, పేమెంట్ వివరాలు, మెసేజ్లు, ఫోటోలు, ఆడియో, ఇంకా వీడియో వంటి విషయాల్లో జాగ్రత్త వహించండి."</string> - <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"మీరు ఏదైనా యాప్ను రికార్డ్ చేసేటప్పుడు, ఆ యాప్లో చూపబడిన దేనికైనా లేదా ప్లే అయిన దేనికైనా Androidకు యాక్సెస్ ఉంటుంది. కాబట్టి పాస్వర్డ్లు, పేమెంట్ వివరాలు, మెసేజ్లు, ఫోటోలు, ఆడియో, ఇంకా వీడియో వంటి విషయాల్లో జాగ్రత్త వహించండి."</string> + <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"మీరు ఏదైనా యాప్ను రికార్డ్ చేసేటప్పుడు, ఆ యాప్లో చూపబడిన లేదా ప్లే అవుతున్న దేనినైనా Android యాక్సెస్ చేయగలదు. కాబట్టి పాస్వర్డ్లు, పేమెంట్ వివరాలు, మెసేజ్లు, ఫోటోలు, ఆడియో, వీడియో వంటి విషయాల్లో జాగ్రత్త వహించండి."</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"రికార్డింగ్ను ప్రారంభించండి"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"ఆడియోను రికార్డ్ చేయండి"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"పరికరం ఆడియో"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"ముఖాన్ని స్కాన్ చేస్తోంది"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"పంపండి"</string> <string name="cancel" msgid="1089011503403416730">"రద్దు చేయండి"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"యాప్ లోగో"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"నిర్ధారించండి"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"మళ్లీ ట్రై చేయండి"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"ప్రామాణీకరణను రద్దు చేయడానికి నొక్కండి"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"ముఖం గుర్తించబడింది. కొనసాగడానికి అన్లాక్ చిహ్నం నొక్కండి."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ప్రామాణీకరించబడింది"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"ప్రామాణీకరణను రద్దు చేయండి"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"మరిన్ని ఆప్షన్లు"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PINను ఉపయోగించండి"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ఆకృతిని ఉపయోగించండి"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"పాస్వర్డ్ను ఉపయోగించండి"</string> @@ -308,7 +309,7 @@ <string name="quick_settings_font_scaling_label" msgid="5289001009876936768">"ఫాంట్ సైజ్"</string> <string name="quick_settings_more_user_settings" msgid="7634653308485206306">"యూజర్లను మేనేజ్ చేయండి"</string> <string name="quick_settings_done" msgid="2163641301648855793">"పూర్తయింది"</string> - <string name="quick_settings_close_user_panel" msgid="5599724542275896849">"మూసివేయి"</string> + <string name="quick_settings_close_user_panel" msgid="5599724542275896849">"మూసివేయండి"</string> <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> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"స్టాండర్డ్"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"మధ్యస్థం"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"అధికం"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"తీసివేయండి"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"విడ్జెట్ను జోడించండి"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"పూర్తయింది"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"లాక్ స్క్రీన్లో ఏదైనా విడ్జెట్ను అనుమతించాలా?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"సెట్టింగ్లను తెరవండి"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"వర్క్ యాప్స్ అన్పాజ్ చేయాలా?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ఈ పరికరాన్ని మీ తల్లి/తండ్రి మేనేజ్ చేస్తున్నారు. మీ తల్లి/తండ్రి, మీరు ఉపయోగించే యాప్లు, మీ లొకేషన్, అలాగే మీ పరికర వినియోగ వ్యవధి వంటి సమాచారాన్ని చూడగలరు, మేనేజ్ చేయగలరు."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent ద్వారా అన్లాక్ చేయబడింది"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"చాలాసార్లు ప్రామాణీకరించడానికి ప్రయత్నించినందున పరికరం లాక్ అయింది"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"ప్రామాణీకరణ విఫలమైంది\nపరికరం లాక్ అయింది"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"ధ్వని సెట్టింగ్లు"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"మీడియాకు ఆటోమేటిక్ క్యాప్షన్లు"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"RHSకు ప్రస్తుత యాప్తో స్ప్లిట్ స్క్రీన్ను ఎంటర్ చేయండి"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"LHSకు ప్రస్తుత యాప్తో స్ప్లిట్ స్క్రీన్ను ఎంటర్ చేయండి"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"స్ప్లిట్ స్క్రీన్ను ఫుల్ స్క్రీన్కు మార్చండి"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"స్ప్లిట్ స్క్రీన్ ఉపయోగిస్తున్నప్పుడు కుడి లేదా పైన యాప్నకు మారండి"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"స్ప్లిట్ స్క్రీన్ ఉపయోగిస్తున్నప్పుడు ఎడమ లేదా పైన యాప్నకు మారండి"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"స్ప్లిట్ స్క్రీన్ సమయంలో: ఒక దాన్నుండి మరో దానికి యాప్ రీప్లేస్ చేయండి"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ఇన్పుట్"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"తర్వాత భాషకు స్విచ్ అవ్వండి"</string> @@ -1240,7 +1243,7 @@ <string name="home_quick_affordance_unavailable_configure_the_app" msgid="604424593994493281">"• కనీసం ఒక పరికరం లేదా పరికర ప్యానెల్ అందుబాటులో ఉండాలి"</string> <string name="notes_app_quick_affordance_unavailable_explanation" msgid="4796955161600178530">"నోట్టేకింగ్ షార్ట్కట్ను ఉపయోగించడానికి ఆటోమేటిక్ సెట్టింగ్ నోట్స్ యాప్ను ఎంచుకోండి"</string> <string name="keyguard_affordance_enablement_dialog_notes_app_action" msgid="6821710209675089470">"యాప్ను ఎంచుకోండి"</string> - <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"షార్ట్కట్ను తాకి, నొక్కి ఉంచు"</string> + <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"షార్ట్కట్ను నొక్కి, పట్టుకోండి"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"రద్దు చేయండి"</string> <string name="rear_display_bottom_sheet_confirm" msgid="1507591562761552899">"ఇప్పుడే స్క్రీన్లను మార్చండి"</string> <string name="rear_display_folded_bottom_sheet_title" msgid="3930008746560711990">"ఫోన్ను అన్ఫోల్డ్ చేయండి"</string> @@ -1261,7 +1264,7 @@ <string name="call_from_work_profile_action" msgid="2937701298133010724">"వర్క్ ప్రొఫైల్కు మారండి"</string> <string name="install_dialer_on_work_profile_action" msgid="2014659711597862506">"ఆఫీస్ ఫోన్ యాప్ను ఇన్స్టాల్ చేయండి"</string> <string name="call_from_work_profile_close" msgid="5830072964434474143">"రద్దు చేయండి"</string> - <string name="lock_screen_settings" msgid="6152703934761402399">"లాక్ స్క్రీన్ను అనుకూలీకరించండి"</string> + <string name="lock_screen_settings" msgid="6152703934761402399">"లాక్ స్క్రీన్ అనుకూలంగా మార్చండి"</string> <string name="keyguard_unlock_to_customize_ls" msgid="2068542308086253819">"లాక్ స్క్రీన్ను అనుకూలంగా మార్చుకోవడానికి అన్లాక్ చేయండి"</string> <string name="wifi_unavailable_dream_overlay_content_description" msgid="2024166212194640100">"Wi-Fi అందుబాటులో లేదు"</string> <string name="camera_blocked_dream_overlay_content_description" msgid="4074759493559418130">"కెమెరా బ్లాక్ చేయబడింది"</string> diff --git a/packages/SystemUI/res/values-te/tiles_states_strings.xml b/packages/SystemUI/res/values-te/tiles_states_strings.xml index 370aeb0d307c..a1ee29f5f724 100644 --- a/packages/SystemUI/res/values-te/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-te/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"ఆఫ్లో ఉంది"</item> <item msgid="5137565285664080143">"ఆన్లో ఉంది"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 9007437220e9..ab125e9a007c 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"การจับภาพหน้าจอถูกบล็อกโดยผู้ดูแลระบบไอทีของคุณ"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"แก้ไข"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"แก้ไขภาพหน้าจอ"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"แชร์"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"แชร์ภาพหน้าจอ"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"จับภาพได้มากขึ้น"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"ปิดภาพหน้าจอ"</string> @@ -146,12 +145,13 @@ <string name="accessibility_phone_button" msgid="4256353121703100427">"โทรศัพท์"</string> <string name="accessibility_voice_assist_button" msgid="6497706615649754510">"ตัวช่วยเสียง"</string> <string name="accessibility_wallet_button" msgid="1458258783460555507">"Wallet"</string> - <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"เครื่องมือสแกนคิวอาร์โค้ด"</string> + <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"แอปสแกนคิวอาร์โค้ด"</string> <string name="accessibility_unlock_button" msgid="3613812140816244310">"ปลดล็อกแล้ว"</string> <string name="accessibility_lock_icon" msgid="661492842417875775">"อุปกรณ์ถูกล็อก"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"กำลังสแกนใบหน้า"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ส่ง"</string> <string name="cancel" msgid="1089011503403416730">"ยกเลิก"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"โลโก้แอป"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"ยืนยัน"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ลองอีกครั้ง"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"แตะเพื่อยกเลิกการตรวจสอบสิทธิ์"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"จดจำใบหน้าได้ กดไอคอนปลดล็อกเพื่อดำเนินการต่อ"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ตรวจสอบสิทธิ์แล้ว"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"ยกเลิกการตรวจสอบสิทธิ์"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"ตัวเลือกเพิ่มเติม"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ใช้ PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ใช้รูปแบบ"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"ใช้รหัสผ่าน"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"มาตรฐาน"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"ปานกลาง"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"สูง"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"นำออก"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"เพิ่มวิดเจ็ต"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"เสร็จสิ้น"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"อนุญาตวิดเจ็ตบนหน้าจอล็อกไหม"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"เปิดการตั้งค่า"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"ยกเลิกการหยุดแอปงานชั่วคราวไหม"</string> @@ -610,7 +617,7 @@ <string name="volume_panel_hint_mute" msgid="6962563028495243738">"ปิดเสียง%s"</string> <string name="volume_panel_hint_unmute" msgid="7489063242934477382">"เปิดเสียง%s"</string> <string name="media_output_label_title" msgid="872824698593182505">"กำลังเล่น <xliff:g id="LABEL">%s</xliff:g> ใน"</string> - <string name="media_output_title_without_playing" msgid="3825663683169305013">"เสียงจะเล่นต่อไป"</string> + <string name="media_output_title_without_playing" msgid="3825663683169305013">"เสียงจะเล่นต่อใน"</string> <string name="system_ui_tuner" msgid="1471348823289954729">"ตัวรับสัญญาณ UI ระบบ"</string> <string name="status_bar" msgid="4357390266055077437">"แถบสถานะ"</string> <string name="demo_mode" msgid="263484519766901593">"โหมดสาธิต UI ของระบบ"</string> @@ -626,7 +633,7 @@ <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"ปลดล็อกเพื่อใช้"</string> <string name="wallet_error_generic" msgid="257704570182963611">"เกิดปัญหาในการดึงข้อมูลบัตรของคุณ โปรดลองอีกครั้งในภายหลัง"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"การตั้งค่าหน้าจอล็อก"</string> - <string name="qr_code_scanner_title" msgid="1938155688725760702">"เครื่องมือสแกนคิวอาร์โค้ด"</string> + <string name="qr_code_scanner_title" msgid="1938155688725760702">"แอปสแกนคิวอาร์โค้ด"</string> <string name="qr_code_scanner_updating_secondary_label" msgid="8344598017007876352">"กำลังอัปเดต"</string> <string name="status_bar_work" msgid="5238641949837091056">"โปรไฟล์งาน"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"โหมดบนเครื่องบิน"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"เข้าสู่โหมดแยกหน้าจอโดยแอปปัจจุบันอยู่ด้านขวา"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"เข้าสู่โหมดแยกหน้าจอโดยแอปปัจจุบันอยู่ด้านซ้าย"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"เปลี่ยนจากโหมดแยกหน้าจอเป็นเต็มหน้าจอ"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"เปลี่ยนไปใช้แอปทางด้านขวาหรือด้านล่างขณะใช้โหมดแยกหน้าจอ"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"เปลี่ยนไปใช้แอปทางด้านซ้ายหรือด้านบนขณะใช้โหมดแยกหน้าจอ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ระหว่างใช้โหมดแยกหน้าจอ: เปลี่ยนแอปหนึ่งเป็นอีกแอปหนึ่ง"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"อินพุต"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"เปลี่ยนเป็นภาษาถัดไป"</string> @@ -1238,7 +1243,7 @@ <string name="home_quick_affordance_unavailable_configure_the_app" msgid="604424593994493281">"• มีอุปกรณ์หรือแผงอุปกรณ์พร้อมใช้งานอย่างน้อย 1 รายการ"</string> <string name="notes_app_quick_affordance_unavailable_explanation" msgid="4796955161600178530">"เลือกแอปโน้ตเริ่มต้นเพื่อใช้ทางลัดการจดบันทึก"</string> <string name="keyguard_affordance_enablement_dialog_notes_app_action" msgid="6821710209675089470">"เลือกแอป"</string> - <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"แตะแป้นพิมพ์ลัดค้างไว้"</string> + <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"แตะทางลัดค้างไว้"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"ยกเลิก"</string> <string name="rear_display_bottom_sheet_confirm" msgid="1507591562761552899">"สลับหน้าจอเลย"</string> <string name="rear_display_folded_bottom_sheet_title" msgid="3930008746560711990">"กางโทรศัพท์ออก"</string> diff --git a/packages/SystemUI/res/values-th/tiles_states_strings.xml b/packages/SystemUI/res/values-th/tiles_states_strings.xml index acaf9f0f77fe..d6351ce7df4d 100644 --- a/packages/SystemUI/res/values-th/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-th/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"ปิด"</item> <item msgid="5137565285664080143">"เปิด"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 1ecd905484bc..c086b8d9e479 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Na-block ng iyong IT admin ang pagkuha ng mga screenshot"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"I-edit"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"I-edit ang screenshot"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Ibahagi"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Ibahagi ang screenshot"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Mag-capture pa"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"I-dismiss ang screenshot"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Sina-scan ang mukha"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Ipadala"</string> <string name="cancel" msgid="1089011503403416730">"Kanselahin"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Logo ng app"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Kumpirmahin"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Subukang muli"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"I-tap para kanselahin ang pag-authenticate"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Nakilala ang mukha. Pindutin ang unlock para magpatuloy."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Na-authenticate"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Kanselahin ang Pag-authenticate"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Higit Pang Opsyon"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Gumamit ng PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Gumamit ng pattern"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Gumamit ng password"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standard"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Katamtaman"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Mataas"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Alisin"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Magdagdag ng widget"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Tapos na"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Payagan ang anumang widget sa lock screen?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Buksan ang mga setting"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"I-unpause ang mga work app?"</string> @@ -464,7 +471,7 @@ <string name="media_projection_sys_service_dialog_warning" msgid="2443872865267330320">"Ang serbisyong nagbibigay ng function na ito ay magkakaroon ng access sa lahat ng impormasyong nakikita sa iyong screen o pine-play mula sa device mo habang nagre-record o nagka-cast. Kasama rito ang impormasyong tulad ng mga password, detalye ng pagbabayad, larawan, mensahe, at audio na pine-play mo."</string> <string name="screen_share_permission_dialog_option_entire_screen" msgid="3131200488455089620">"Buong screen"</string> <string name="screen_share_permission_dialog_option_single_app" msgid="4350961814397220929">"Isang app"</string> - <string name="screen_share_permission_app_selector_title" msgid="1404878013670347899">"Ibahagi o i-record ang isang app"</string> + <string name="screen_share_permission_app_selector_title" msgid="1404878013670347899">"I-share o i-record ang isang app"</string> <string name="media_projection_entry_app_permission_dialog_title" msgid="9155535851866407199">"Simulang mag-record o mag-cast gamit ang <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>?"</string> <string name="media_projection_entry_app_permission_dialog_warning_entire_screen" msgid="8736391633234144237">"Kapag nagbabahagi, nagre-record, o nagka-cast ka, may access ang <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> sa kahit anong nakikita sa iyong screen o pine-play sa device mo. Kaya mag-ingat sa mga bagay-bagay tulad ng mga password, detalye ng pagbabayad, mensahe, larawan, at audio at video."</string> <string name="media_projection_entry_app_permission_dialog_warning_single_app" msgid="5211695779082563959">"Kapag nagbabahagi, nagre-record, o nagka-cast ka ng app, may access ang <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> sa kahit anong ipinapakita o pine-play sa app na iyon. Kaya mag-ingat sa mga bagay-bagay tulad ng mga password, detalye ng pagbabayad, mensahe, larawan, at audio at video."</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Lumipat sa split screen nang nasa RHS ang kasalukuyang app"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Lumipat sa split screen nang nasa LHS ang kasalukuyang app"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Lumipat sa full screen mula sa split screen"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Lumipat sa app sa kanan o ibaba habang ginagamit ang split screen"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Lumipat sa app sa kaliwa o itaas habang ginagamit ang split screen"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Habang nasa split screen: magpalit-palit ng app"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Lumipat sa susunod na wika"</string> diff --git a/packages/SystemUI/res/values-tl/tiles_states_strings.xml b/packages/SystemUI/res/values-tl/tiles_states_strings.xml index 6de62dff6e74..d4a836ebcc97 100644 --- a/packages/SystemUI/res/values-tl/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-tl/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Naka-off"</item> <item msgid="5137565285664080143">"Naka-on"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 7d10bb82a042..76e0e350310e 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -59,7 +59,7 @@ <string name="hdmi_cec_set_menu_language_description" msgid="8176716678074126619">"Başka bir cihaz tarafından sistem dilinin değiştirilmesi istendi"</string> <string name="hdmi_cec_set_menu_language_accept" msgid="2513689457281009578">"Dili değiştir"</string> <string name="hdmi_cec_set_menu_language_decline" msgid="7650721096558646011">"Mevcut dili koru"</string> - <string name="share_wifi_button_text" msgid="1285273973812029240">"Kablosuz ağı paylaşın"</string> + <string name="share_wifi_button_text" msgid="1285273973812029240">"Kablosuz ağı paylaş"</string> <string name="wifi_debugging_title" msgid="7300007687492186076">"Bu ağda kablosuz hata ayıklamaya izin verilsin mi?"</string> <string name="wifi_debugging_message" msgid="5461204211731802995">"Ağ Adı (SSID)\n<xliff:g id="SSID_0">%1$s</xliff:g>\n\nKablosuz Adresi (BSSID)\n<xliff:g id="BSSID_1">%2$s</xliff:g>"</string> <string name="wifi_debugging_always" msgid="2968383799517975155">"Bu ağda her zaman izin ver"</string> @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"BT yöneticiniz ekran görüntüsü almayı engelledi"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Düzenle"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Ekran görüntüsünü düzenle"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Paylaş"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Ekranı paylaş"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Alanı genişlet"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Ekran görüntüsünü kapat"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Yüz taranıyor"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Gönder"</string> <string name="cancel" msgid="1089011503403416730">"İptal"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Uygulama logosu"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Onayla"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Tekrar dene"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Kimlik doğrulama işlemini iptal etmek için dokunun"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Yüzünüz tanındı. Kilit açma simgesine basın."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Kimliği Doğrulandı"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Kimlik doğrulamayı iptal et"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Diğer Seçenekler"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN kullan"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Deseni kullan"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Şifre kullan"</string> @@ -265,7 +266,7 @@ <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Kullanılabilir eşlenmiş cihaz yok"</string> <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Cihaz bağlamak veya cihazın bağlantısını kesmek için dokunun"</string> - <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Yeni cihaz eşleme"</string> + <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Yeni cihaz eşle"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"Tümünü göster"</string> <string name="turn_on_bluetooth" msgid="5681370462180289071">"Bluetooth\'u kullan"</string> <string name="quick_settings_bluetooth_device_connected" msgid="7884777006729260996">"Bağlandı"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standart"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Orta"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Yüksek"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Kaldır"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Widget ekle"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Bitti"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Kilit ekranında tüm widget\'lara izin verilsin mi?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Ayarları açın"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"İş uygulamaları devam ettirilsin mi?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Bu cihaz ebeveyniniz tarafından yönetiliyor. Kullandığınız uygulamalar, konumunuz ve ekran başında kalma süreniz gibi bilgiler ebeveyniniz tarafından görülüp yönetilebilir."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent tarafından kilit açık tutuldu"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Cihaz kilitlendi. Çok fazla sayıda kimlik doğrulama denemesi yapıldı."</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Cihaz kilitli\nKimlik doğrulama yapılamadı"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Ses ayarları"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Otomatik medya altyazısı"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Mevcut uygulamayı sağ tarafa alarak bölünmüş ekrana geç"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Mevcut uygulamayı sol tarafa alarak bölünmüş ekrana geç"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Bölünmüş ekrandan tam ekrana geç"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Bölünmüş ekran kullanırken sağdaki veya alttaki uygulamaya geçiş yapın"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Bölünmüş ekran kullanırken soldaki veya üstteki uygulamaya geçiş yapın"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Bölünmüş ekran etkinken: Bir uygulamayı başkasıyla değiştir"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Giriş"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Sonraki dile geç"</string> diff --git a/packages/SystemUI/res/values-tr/tiles_states_strings.xml b/packages/SystemUI/res/values-tr/tiles_states_strings.xml index 0c086f839cad..ecd1585e515c 100644 --- a/packages/SystemUI/res/values-tr/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-tr/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Kapalı"</item> <item msgid="5137565285664080143">"Açık"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index b52d25e639ce..260b8c9a494d 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Системний адміністратор заблокував можливість робити знімки екрана"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Редагувати"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Редагувати знімок екрана"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Поділитися"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Поділитися знімком екрана"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Включити більше деталей"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Закрити знімок екрана"</string> @@ -111,9 +110,9 @@ <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"Почати записування"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Записувати звук"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Звук із пристрою"</string> - <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"Звук із пристрою, зокрема музика, виклики та сигнали дзвінка"</string> + <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"Звук із пристрою, зокрема музика, виклики й сигнали дзвінка"</string> <string name="screenrecord_mic_label" msgid="2111264835791332350">"Мікрофон"</string> - <string name="screenrecord_device_audio_and_mic_label" msgid="1831323771978646841">"Звук із пристрою та мікрофона"</string> + <string name="screenrecord_device_audio_and_mic_label" msgid="1831323771978646841">"Звук із пристрою і мікрофона"</string> <string name="screenrecord_continue" msgid="4055347133700593164">"Почати"</string> <string name="screenrecord_ongoing_screen_only" msgid="4459670242451527727">"Запис екрана"</string> <string name="screenrecord_ongoing_screen_and_audio" msgid="5351133763125180920">"Запис екрана та звуку"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Сканування обличчя"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Надіслати"</string> <string name="cancel" msgid="1089011503403416730">"Скасувати"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Логотип додатка"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Підтвердити"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Повторити спробу"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Натисніть, щоб скасувати автентифікацію"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Обличчя розпізнано. Натисніть значок розблокування."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Автентифіковано"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Скасувати автентифікацію"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Інші опції"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Ввести PIN-код"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Намалювати ключ"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Ввести пароль"</string> @@ -362,12 +363,14 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Стандартний"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Середній"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Високий"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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="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="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"Мікрофон заблоковано"</string> <string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"Камеру заблоковано"</string> <string name="sensor_privacy_start_use_mic_camera_blocked_dialog_title" msgid="195236134743281973">"Мікрофон і камеру заблоковано"</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Видалити"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Додати віджет"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Готово"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Дозволити використовувати будь-який віджет на заблокованому екрані?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Відкрити налаштування"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Увімкнути робочі додатки?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Цим пристроєм керують твої батьки. Вони можуть бачити та контролювати, якими додатками ти користуєшся, де перебуваєш і скільки часу проводиш за пристроєм."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Розблоковує довірчий агент"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Пристрій заблоковано. Забагато спроб автентифікації."</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Пристрій заблоковано\nПомилка автентифікації"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Налаштування звуку"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Автоматичні субтитри (медіа)"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Розділити екран із поточним додатком праворуч"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Розділити екран із поточним додатком ліворуч"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Перейти з розділення екрана на весь екран"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Під час розділення екрана перемикатися на додаток праворуч або внизу"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Під час розділення екрана перемикатися на додаток ліворуч або вгорі"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Під час розділення екрана: замінити додаток іншим"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Метод введення"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Вибрати наступну мову"</string> diff --git a/packages/SystemUI/res/values-uk/tiles_states_strings.xml b/packages/SystemUI/res/values-uk/tiles_states_strings.xml index fd3fb083b244..be779eb51330 100644 --- a/packages/SystemUI/res/values-uk/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-uk/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Вимкнено"</item> <item msgid="5137565285664080143">"Увімкнено"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index 69ab8df51cec..44ea082506c2 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"IT منتظم نے اسکرین شاٹس لینا مسدود کر دیا ہے"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"ترمیم کریں"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"اسکرین شاٹ میں ترمیم کریں"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"اشتراک کریں"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"اسکرین شاٹ کا اشتراک کریں"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"مزید کیپچر کریں"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"اسکرین شاٹ برخاست کریں"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"اسکیننگ چہرہ"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"بھیجیں"</string> <string name="cancel" msgid="1089011503403416730">"منسوخ کريں"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"ایپ لوگو"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"تصدیق کریں"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"دوبارہ کوشش کریں"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"تصدیق کو منسوخ کرنے کے لیے تھپتھپائیں"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"چہرے کی شناخت ہو گئی۔ جاری رکھنے کیلئے انلاک آئیکن دبائیں۔"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"تصدیق کردہ"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"تصدیق کو منسوخ کریں"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"مزید اختیارات"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN استعمال کریں"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"پیٹرن کا استعمال کریں"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"پاس ورڈ استعمال کریں"</string> @@ -267,7 +268,7 @@ <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"کسی آلے کو منسلک یا غیر منسلک کرنے کے لیے تھپتھپائیں"</string> <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"نئے آلے کا جوڑا بنائیں"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"سبھی دیکھیں"</string> - <string name="turn_on_bluetooth" msgid="5681370462180289071">"استعمال کریں"</string> + <string name="turn_on_bluetooth" msgid="5681370462180289071">"بلوٹوتھ استعمال کریں"</string> <string name="quick_settings_bluetooth_device_connected" msgid="7884777006729260996">"منسلک ہے"</string> <string name="quick_settings_bluetooth_device_saved" msgid="7549938728928069477">"محفوظ ہے"</string> <string name="accessibility_quick_settings_bluetooth_device_tap_to_disconnect" msgid="415980329093277342">"غیر منسلک کریں"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"معیاری"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"متوسط"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"زیادہ"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"ہٹائیں"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"ویجیٹ شامل کریں"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"ہو گیا"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"مقفل اسکرین پر کسی ویجیٹ کی اجازت دیں؟"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"ترتیبات کھولیں"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"ورک ایپس کو غیر موقوف کریں؟"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"یہ آلہ آپ کے والدین کے زیر انتظام ہے۔ آپ کے والدین آپ کی استعمال والی ایپس، آپ کا مقام اور آپ کے اسکرین کے وقت جیسی معلومات کو دیکھ اور اس کا نظم کر سکتے ہیں۔"</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"ٹرسٹ ایجنٹ نے غیر مقفل رکھا ہے"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"آلہ مقفل ہو گیا، تصدیق کی کافی زیادہ کوششیں کی گئیں"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"آلہ مقفل ہو گیا\nتصدیق ناکام ہو گئی"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>۔ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"صوتی ترتیبات"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"خودکار طور پر میڈیا پر کیپشن لگائیں"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"موجودہ ایپ کے ساتھ دائیں جانب اسپلٹ اسکرین انٹر کریں"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"موجودہ ایپ کے ساتھ بائیں جانب اسپلٹ اسکرین انٹر کریں"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"اسپلٹ اسکرین سے پوری سکرین پر سوئچ کریں"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"اسپلٹ اسکرین کا استعمال کرتے ہوئے دائیں یا نیچے ایپ پر سوئچ کریں"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"اسپلٹ اسکرین کا استعمال کرتے ہوئے بائیں یا اوپر ایپ پر سوئچ کریں"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"اسپلٹ اسکرین کے دوران: ایک ایپ کو دوسرے سے تبدیل کریں"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ان پٹ"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"اگلی زبان پر سوئچ کریں"</string> diff --git a/packages/SystemUI/res/values-ur/tiles_states_strings.xml b/packages/SystemUI/res/values-ur/tiles_states_strings.xml index 4957e5924a54..36a9dfcfd92a 100644 --- a/packages/SystemUI/res/values-ur/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-ur/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"آف ہے"</item> <item msgid="5137565285664080143">"آن ہے"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index 1fab3220b59d..80a6a245ea14 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Skrinshot olishni AT administratori taqiqlagan"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Tahrirlash"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Skrinshotni tahrirlash"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Ulashish"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Skrinshot yuborish"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Skrinshot sohasini kengaytirish"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Skrinshotni yopish"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Yuzni skanerlash"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Yuborish"</string> <string name="cancel" msgid="1089011503403416730">"Bekor qilish"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Ilova logotipi"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"OK"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Qayta urinish"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Tekshiruvni bekor qilish uchun bosing"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Yuz aniqlandi. Davom etish uchun ochish belgisini bosing."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Tasdiqlandi"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Autentifikatsiyani bekor qilish"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Boshqa parametrlar"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN kod kiritish"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Grafik kalitdan foydalanish"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Paroldan foydalanish"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Standart"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Oʻrtacha"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Yuqori"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Olib tashlash"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Vidjet kiritish"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Tayyor"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Ekran qulfida istalgan vidjet chiqsinmi?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Sozlamalarni ochish"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Ishga oid ilovalar qaytarilsinmi?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Bu – ota-onangiz tomonidan boshqariladigan qurilma. Ota-onangiz siz foydalangan ilovalar, joylashuvingiz va qurilmadan foydalanish vaqti kabi axborotlarni koʻrishi va boshqarishi mumkin."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent tomonidan ochilgan"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Qurilma qulflandi. Juda koʻp marta hisob tekshiruvi uchun urinildi"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Qurilma qulflandi\nHisob tekshiruvi amalga oshmadi"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Tovush sozlamalari"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Avtomatik taglavha yaratish"</string> @@ -623,7 +628,7 @@ <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> <string name="wallet_empty_state_label" msgid="7776761245237530394">"Telefonda tezroq va xavfsizroq xarid qilish uchun sozlang"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Hammasi"</string> - <string name="wallet_secondary_label_no_card" msgid="8488069304491125713">"Ochish uchun ustiga bosing"</string> + <string name="wallet_secondary_label_no_card" msgid="8488069304491125713">"Ochish uchun bosing"</string> <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Yangilanmoqda"</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> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Oʻng tomondagi ajratilgan ekran rejimiga kirish"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Chap tomondagi ajratilgan ekran rejimiga kirish"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Ajratilgan ekran rejimidan butun ekranga almashtirish"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Ajratilgan ekranda oʻngdagi yoki pastdagi ilovaga almashish"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Ajratilgan ekranda chapdagi yoki yuqoridagi ilovaga almashish"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ajratilgan rejimda ilovalarni oʻzaro almashtirish"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Kiritish"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Keyingi tilga almashtirish"</string> @@ -1240,7 +1243,7 @@ <string name="home_quick_affordance_unavailable_configure_the_app" msgid="604424593994493281">"• Kamida bitta qurilma yoki qurilma paneli mavjud"</string> <string name="notes_app_quick_affordance_unavailable_explanation" msgid="4796955161600178530">"Qayd yozish yorligʻidan foydalanish uchun birlamchi qayd ilovasini tanlang"</string> <string name="keyguard_affordance_enablement_dialog_notes_app_action" msgid="6821710209675089470">"Ilovani tanlang"</string> - <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Bosib turish yorligʻi"</string> + <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Yorliqni bosib turing"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Bekor qilish"</string> <string name="rear_display_bottom_sheet_confirm" msgid="1507591562761552899">"Ekranlarni hozir almashtirish"</string> <string name="rear_display_folded_bottom_sheet_title" msgid="3930008746560711990">"Telefonni yoying"</string> diff --git a/packages/SystemUI/res/values-uz/tiles_states_strings.xml b/packages/SystemUI/res/values-uz/tiles_states_strings.xml index 670c56ca517a..82d073393baa 100644 --- a/packages/SystemUI/res/values-uz/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-uz/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Oʻchiq"</item> <item msgid="5137565285664080143">"Yoniq"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 3ddb4db4a9b9..355c1353f20d 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Quản trị viên CNTT chặn tính năng chụp ảnh màn hình"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Chỉnh sửa"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Chỉnh sửa ảnh chụp màn hình"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"Chia sẻ"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"Chia sẻ ảnh chụp màn hình"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"Chụp thêm"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Đóng ảnh chụp màn hình"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Quét tìm khuôn mặt"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Gửi"</string> <string name="cancel" msgid="1089011503403416730">"Hủy"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Biểu trưng của ứng dụng"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Xác nhận"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Thử lại"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Nhấn để hủy quá trình xác thực"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Đã nhận diện khuôn mặt. Nhấn biểu tượng mở khoá để tiếp tục."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Đã xác thực"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Huỷ quy trình xác thực"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Tuỳ chọn khác"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Dùng mã PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Dùng hình mở khóa"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Dùng mật khẩu"</string> @@ -362,11 +363,13 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Chuẩn"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Vừa"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Cao"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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_camera_dialog_title" msgid="8807639852654305227">"Bỏ chặn camera 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">"Sau khi được bỏ chặn, mọi ứng dụng và dịch vụ có quyền sẽ có thể sử dụng micrô của bạn."</string> - <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Sau khi được bỏ chặn, mọi ứng dụng và dịch vụ có quyền sẽ có thể sử dụng máy ảnh của bạn."</string> + <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Sau khi được bỏ chặn, mọi ứng dụng và dịch vụ có quyền sẽ có thể sử dụng micrô trên thiết bị của bạn."</string> + <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Sau khi được bỏ chặn, mọi ứng dụng và dịch vụ có quyền sẽ có thể sử dụng camera trên thiết bị 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="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"Micrô bị chặn"</string> <string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"Máy ảnh bị chặn"</string> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Xoá"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Thêm tiện ích"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Xong"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Cho phép mọi tiện ích trên màn hình khoá?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Mở phần Cài đặt"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Tiếp tục dùng ứng dụng công việc?"</string> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Thiết bị này do cha mẹ bạn quản lý. Cha mẹ có thể có thể xem và quản lý những thông tin như ứng dụng bạn dùng, vị trí của bạn và thời gian bạn sử dụng thiết bị."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Luôn được TrustAgent mở khóa"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Thiết bị đã bị khoá do quá nhiều lần thử xác thực"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Thiết bị đã bị khoá\nKhông xác thực được"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Cài đặt âm thanh"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Tự động tạo phụ đề cho nội dung nghe nhìn"</string> @@ -577,7 +582,7 @@ <string name="stream_voice_call" msgid="7468348170702375660">"Gọi"</string> <string name="stream_system" msgid="7663148785370565134">"Hệ thống"</string> <string name="stream_ring" msgid="7550670036738697526">"Chuông"</string> - <string name="stream_music" msgid="2188224742361847580">"Phương tiện"</string> + <string name="stream_music" msgid="2188224742361847580">"Nội dung nghe nhìn"</string> <string name="stream_alarm" msgid="16058075093011694">"Báo thức"</string> <string name="stream_notification" msgid="7930294049046243939">"Thông báo"</string> <string name="stream_bluetooth_sco" msgid="6234562365528664331">"Bluetooth"</string> @@ -588,8 +593,8 @@ <string name="volume_ringer_status_silent" msgid="3691324657849880883">"Tắt tiếng"</string> <string name="media_device_cast" msgid="4786241789687569892">"Truyền"</string> <string name="stream_notification_unavailable" msgid="4313854556205836435">"Không hoạt động vì chuông bị tắt"</string> - <string name="stream_alarm_unavailable" msgid="4059817189292197839">"Không làm được vì chế độ Không làm phiền đang bật"</string> - <string name="stream_media_unavailable" msgid="6823020894438959853">"Không làm được vì chế độ Không làm phiền đang bật"</string> + <string name="stream_alarm_unavailable" msgid="4059817189292197839">"Bị tắt vì đang bật chế độ Không làm phiền"</string> + <string name="stream_media_unavailable" msgid="6823020894438959853">"Bị tắt vì đang bật chế độ Không làm phiền"</string> <string name="volume_stream_content_description_unmute" msgid="7729576371406792977">"%1$s. Nhấn để bật tiếng."</string> <string name="volume_stream_content_description_vibrate" msgid="4858111994183089761">"%1$s. Nhấn để đặt chế độ rung. Bạn có thể tắt tiếng dịch vụ trợ năng."</string> <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. Nhấn để tắt tiếng. Bạn có thể tắt tiếng dịch vụ trợ năng."</string> @@ -612,7 +617,7 @@ <string name="volume_panel_hint_mute" msgid="6962563028495243738">"tắt tiếng %s"</string> <string name="volume_panel_hint_unmute" msgid="7489063242934477382">"bật tiếng %s"</string> <string name="media_output_label_title" msgid="872824698593182505">"Đang phát <xliff:g id="LABEL">%s</xliff:g> trên"</string> - <string name="media_output_title_without_playing" msgid="3825663683169305013">"Âm thanh sẽ phát ra"</string> + <string name="media_output_title_without_playing" msgid="3825663683169305013">"Âm thanh sẽ phát trên"</string> <string name="system_ui_tuner" msgid="1471348823289954729">"Bộ điều hướng giao diện người dùng hệ thống"</string> <string name="status_bar" msgid="4357390266055077437">"Thanh trạng thái"</string> <string name="demo_mode" msgid="263484519766901593">"Chế độ thử nghiệm giao diện người dùng hệ thống"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"Vào chế độ chia đôi màn hình, ứng dụng hiện tại ở màn hình bên phải"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"Vào chế độ chia đôi màn hình, ứng dụng hiện tại ở màn hình bên trái"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Chuyển từ chế độ chia đôi màn hình sang chế độ toàn màn hình"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Chuyển sang ứng dụng bên phải hoặc ở dưới khi đang chia đôi màn hình"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Chuyển sang ứng dụng bên trái hoặc ở trên khi đang chia đôi màn hình"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Trong chế độ chia đôi màn hình: thay một ứng dụng bằng ứng dụng khác"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Đầu vào"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Chuyển sang ngôn ngữ tiếp theo"</string> @@ -1240,7 +1243,7 @@ <string name="home_quick_affordance_unavailable_configure_the_app" msgid="604424593994493281">"• Ít nhất phải có một thiết bị hoặc bảng điều khiển thiết bị"</string> <string name="notes_app_quick_affordance_unavailable_explanation" msgid="4796955161600178530">"Chọn một ứng dụng ghi chú mặc định để dùng lối tắt ghi chú"</string> <string name="keyguard_affordance_enablement_dialog_notes_app_action" msgid="6821710209675089470">"Chọn ứng dụng"</string> - <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Chạm và giữ phím tắt"</string> + <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Chạm và giữ lối tắt"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Huỷ"</string> <string name="rear_display_bottom_sheet_confirm" msgid="1507591562761552899">"Chuyển đổi màn hình ngay"</string> <string name="rear_display_folded_bottom_sheet_title" msgid="3930008746560711990">"Mở điện thoại"</string> diff --git a/packages/SystemUI/res/values-vi/tiles_states_strings.xml b/packages/SystemUI/res/values-vi/tiles_states_strings.xml index 4df2d910da28..83c6a1866ed2 100644 --- a/packages/SystemUI/res/values-vi/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-vi/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Đang tắt"</item> <item msgid="5137565285664080143">"Đang bật"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index b98643e3a1f3..812df78449d6 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"您的 IT 管理员已禁止截取屏幕截图"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"编辑"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"编辑屏幕截图"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"分享"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"分享屏幕截图"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"截取更多内容"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"关闭屏幕截图"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"正在扫描面孔"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"发送"</string> <string name="cancel" msgid="1089011503403416730">"取消"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"应用徽标"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"确认"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"重试"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"点按即可取消身份验证"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"识别出面孔。按下解锁图标即可继续。"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"已经过身份验证"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"取消身份验证"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"更多选项"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"使用 PIN 码"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"使用图案"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"使用密码"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"标准"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"中"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"高"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"移除"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"添加微件"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"完成"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"允许在锁屏状态下显示任何微件？"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"打开设置"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"是否为工作应用解除暂停状态？"</string> @@ -491,7 +498,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> @@ -540,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"此设备由您的家长管理。您的家长可以查看和管理相关信息，例如您使用的应用、您的位置信息和设备使用时间。"</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"由 TrustAgent 保持解锁状态"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"尝试验证身份的次数过多，设备已锁定"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"设备已锁定\n未能验证身份"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>（<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>）"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"声音设置"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"自动生成媒体字幕"</string> @@ -595,7 +600,7 @@ <string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s。点按即可设为静音，但可能会同时将无障碍服务设为静音。"</string> <string name="volume_stream_content_description_vibrate_a11y" msgid="2742330052979397471">"%1$s。点按即可设为振动。"</string> <string name="volume_stream_content_description_mute_a11y" msgid="5743548478357238156">"%1$s。点按即可设为静音。"</string> - <string name="volume_panel_noise_control_title" msgid="7413949943872304474">"噪声控制"</string> + <string name="volume_panel_noise_control_title" msgid="7413949943872304474">"降噪"</string> <string name="volume_panel_spatial_audio_title" msgid="3367048857932040660">"空间音频"</string> <string name="volume_panel_spatial_audio_off" msgid="4177490084606772989">"关闭"</string> <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"固定"</string> @@ -765,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"进入分屏模式，当前应用显示于右侧"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"进入分屏模式，当前应用显示于左侧"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"从分屏模式切换为全屏"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"使用分屏模式时，切换到右侧或下方的应用"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"使用分屏模式时，切换到左侧或上方的应用"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"在分屏期间：将一个应用替换为另一个应用"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"输入"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"切换到下一种语言"</string> @@ -1166,7 +1169,7 @@ <string name="mobile_data_connection_active" msgid="944490013299018227">"已连接"</string> <string name="mobile_data_temp_connection_active" msgid="4590222725908806824">"已暂时连接"</string> <string name="mobile_data_poor_connection" msgid="819617772268371434">"连接状况不佳"</string> - <string name="mobile_data_off_summary" msgid="3663995422004150567">"系统将不会自动连接到移动数据网络"</string> + <string name="mobile_data_off_summary" msgid="3663995422004150567">"不会自动连接到移动数据网络"</string> <string name="mobile_data_no_connection" msgid="1713872434869947377">"无网络连接"</string> <string name="non_carrier_network_unavailable" msgid="770049357024492372">"没有其他可用网络"</string> <string name="all_network_unavailable" msgid="4112774339909373349">"没有可用网络"</string> @@ -1261,7 +1264,7 @@ <string name="call_from_work_profile_action" msgid="2937701298133010724">"切换到工作资料"</string> <string name="install_dialer_on_work_profile_action" msgid="2014659711597862506">"安装工作电话应用"</string> <string name="call_from_work_profile_close" msgid="5830072964434474143">"取消"</string> - <string name="lock_screen_settings" msgid="6152703934761402399">"自定义锁屏状态"</string> + <string name="lock_screen_settings" msgid="6152703934761402399">"自定义锁屏"</string> <string name="keyguard_unlock_to_customize_ls" msgid="2068542308086253819">"解锁以自定义锁定屏幕"</string> <string name="wifi_unavailable_dream_overlay_content_description" msgid="2024166212194640100">"没有 WLAN 连接"</string> <string name="camera_blocked_dream_overlay_content_description" msgid="4074759493559418130">"已禁用摄像头"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/tiles_states_strings.xml b/packages/SystemUI/res/values-zh-rCN/tiles_states_strings.xml index 08a155183839..a9a377a0fbff 100644 --- a/packages/SystemUI/res/values-zh-rCN/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"已关闭"</item> <item msgid="5137565285664080143">"已开启"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 9080ff5923b6..5a4b63aa08f8 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"你的 IT 管理員已禁止擷取螢幕截圖"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"編輯"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"編輯螢幕截圖"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"分享"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"分享螢幕截圖"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"擷取更大範圍的螢幕內容"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"關閉螢幕截圖"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"掃瞄緊面孔"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"傳送"</string> <string name="cancel" msgid="1089011503403416730">"取消"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"應用程式標誌"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"確認"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"請再試一次"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"輕按即可取消驗證"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"已識別面孔。按解鎖圖示即可繼續。"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"驗證咗"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"取消驗證"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"更多選項"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"使用 PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"使用圖案"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"使用密碼"</string> @@ -362,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"標準"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"中"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"高"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -439,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"移除"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"新增小工具"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"完成"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"要允許在上鎖畫面上顯示任何小工具嗎？"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"開啟設定"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"要取消暫停工作應用程式嗎？"</string> @@ -540,7 +547,7 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"此裝置由你的家長管理。家長可以查看及管理裝置上的資料，例如你使用的應用程式、位置和裝置使用時間。"</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"由信任的代理保持解鎖狀態"</string> - <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"驗證錯誤次數過多，裝置已鎖定"</string> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"嘗試驗證次數過多，裝置已鎖定"</string> <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"裝置已鎖定\n驗證失敗"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"音效設定"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"進入分割螢幕模式，並將目前的應用程式顯示在右側"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"進入分割螢幕模式，並將目前的應用程式顯示在左側"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"將分割螢幕切換為全螢幕"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"使用分割螢幕時，切換至右邊或下方的應用程式"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"使用分割螢幕時，切換至左邊或上方的應用程式"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"使用分割螢幕期間：更換應用程式"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"輸入"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"切換至下一個語言"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/tiles_states_strings.xml b/packages/SystemUI/res/values-zh-rHK/tiles_states_strings.xml index e29d23004bce..f0ccd9e3d864 100644 --- a/packages/SystemUI/res/values-zh-rHK/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"關閉"</item> <item msgid="5137565285664080143">"開啟"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 9c0c37673912..78dd82c97ef9 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -86,8 +86,7 @@ <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"你的 IT 管理員已禁止擷取螢幕畫面"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"編輯"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"編輯螢幕截圖"</string> - <!-- no translation found for screenshot_share_label (1653061117238861559) --> - <skip /> + <string name="screenshot_share_label" msgid="1653061117238861559">"分享"</string> <string name="screenshot_share_description" msgid="2861628935812656612">"分享螢幕截圖"</string> <string name="screenshot_scroll_label" msgid="2930198809899329367">"擴大螢幕截圖範圍"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"關閉螢幕截圖"</string> @@ -105,19 +104,19 @@ <string name="screenrecord_title" msgid="4257171601439507792">"螢幕錄影器"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"處理螢幕錄影內容"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"持續顯示螢幕畫面錄製工作階段通知"</string> - <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"要開始錄製嗎？"</string> - <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"當你錄製內容時，Android 可存取畫面上顯示的任何資訊或裝置播放的任何內容。因此，請謹慎處理密碼、付款資料、訊息、相片和影音內容等資訊。"</string> - <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"當你錄製應用程式內容時，Android 可存取應用程式中顯示的任何資訊或播放的任何內容。因此，請謹慎處理密碼、付款資料、訊息、相片和影音內容等資訊。"</string> + <string name="screenrecord_permission_dialog_title" msgid="303380743267672953">"要開始錄影嗎？"</string> + <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="4152602778470789965">"你在錄影時，Android 可存取畫面上的所有資訊或裝置播放的所有內容。因此，請謹慎處理密碼、付款資料、訊息、相片和影音等內容。"</string> + <string name="screenrecord_permission_dialog_warning_single_app" msgid="6818309727772146138">"當你錄製應用程式畫面時，Android 可存取應用程式中顯示或播放的所有內容。因此，請謹慎處理密碼、付款資料、訊息、相片和影音等內容。"</string> <string name="screenrecord_permission_dialog_continue" msgid="5811122652514424967">"開始錄影"</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"錄音"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"裝置音訊"</string> - <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"裝置所播放的音效，例如音樂、通話和鈴聲等等"</string> + <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"來自裝置的音訊，例如音樂、通話和鈴聲等等"</string> <string name="screenrecord_mic_label" msgid="2111264835791332350">"麥克風"</string> <string name="screenrecord_device_audio_and_mic_label" msgid="1831323771978646841">"裝置音訊和麥克風"</string> <string name="screenrecord_continue" msgid="4055347133700593164">"開始"</string> <string name="screenrecord_ongoing_screen_only" msgid="4459670242451527727">"正在錄製螢幕畫面"</string> <string name="screenrecord_ongoing_screen_and_audio" msgid="5351133763125180920">"錄製螢幕畫面和音訊"</string> - <string name="screenrecord_taps_label" msgid="1595690528298857649">"顯示輕觸螢幕的位置"</string> + <string name="screenrecord_taps_label" msgid="1595690528298857649">"顯示在螢幕上點按的位置"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"停止"</string> <string name="screenrecord_share_label" msgid="5025590804030086930">"分享"</string> <string name="screenrecord_save_title" msgid="1886652605520893850">"已儲存螢幕錄影檔"</string> @@ -152,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"掃描臉孔"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"傳送"</string> <string name="cancel" msgid="1089011503403416730">"取消"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"應用程式標誌"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"確認"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"再試一次"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"輕觸即可取消驗證"</string> @@ -166,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"臉孔辨識完成，按下「解鎖」圖示即可繼續操作。"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"已通過驗證"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"取消驗證"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"更多選項"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"使用 PIN 碼"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"使用解鎖圖案"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"使用密碼"</string> @@ -362,12 +363,14 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"標準"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"中"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"高"</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> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> + <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="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="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"無法使用麥克風"</string> <string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"無法使用攝影機"</string> <string name="sensor_privacy_start_use_mic_camera_blocked_dialog_title" msgid="195236134743281973">"無法使用麥克風和相機"</string> @@ -439,13 +442,17 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"移除"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"新增小工具"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"完成"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"要允許在螢幕鎖定畫面上顯示任何小工具嗎？"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"開啟設定"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"要解除工作應用程式的暫停狀態嗎？"</string> <string name="work_mode_turn_on" msgid="907813741770247267">"取消暫停"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"切換使用者"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"下拉式選單"</string> - <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"這個工作階段中的所有應用程式和資料都會遭到刪除。"</string> + <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"這個工作階段中的所有應用程式和資料都會刪除。"</string> <string name="guest_wipe_session_title" msgid="7147965814683990944">"訪客你好，歡迎回來！"</string> <string name="guest_wipe_session_message" msgid="3393823610257065457">"你要繼續這個工作階段嗎？"</string> <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"重新開始"</string> @@ -471,8 +478,8 @@ <string name="media_projection_entry_app_permission_dialog_continue" msgid="295463518195075840">"開始"</string> <string name="media_projection_entry_app_permission_dialog_single_app_disabled" msgid="8999903044874669995">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」已停用此選項"</string> <string name="media_projection_entry_cast_permission_dialog_title" msgid="8860150223172993547">"要開始投放嗎？"</string> - <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"當你投放內容時，Android 可存取畫面上顯示的任何資訊或裝置播放的任何內容。因此，請謹慎處理密碼、付款資料、訊息、相片和影音內容等資訊。"</string> - <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"當你投放應用程式內容時，Android 可存取應用程式中顯示的任何資訊或播放的任何內容。因此，請謹慎處理密碼、付款資料、訊息、相片和影音內容等資訊。"</string> + <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen" msgid="1986212276016817231">"投放時，Android 可存取畫面上顯示的任何資訊或裝置播放的任何內容。因此，請謹慎處理密碼、付款資料、訊息、相片和影音等內容。"</string> + <string name="media_projection_entry_cast_permission_dialog_warning_single_app" msgid="9900961380294292">"當你投放應用程式時，Android 可存取應用程式顯示的任何資訊或播放的任何內容。因此，請謹慎處理密碼、付款資料、訊息、相片和影音等內容。"</string> <string name="media_projection_entry_cast_permission_dialog_continue" msgid="7209890669948870042">"開始投放"</string> <string name="media_projection_entry_generic_permission_dialog_title" msgid="4519802931547483628">"要開始分享嗎？"</string> <string name="media_projection_entry_generic_permission_dialog_warning_entire_screen" msgid="5407906851409410209">"當你分享、錄製或投放內容時，Android 將可存取畫面上顯示的任何資訊或裝置播放的任何內容。因此，請謹慎處理密碼、付款資料、訊息、相片和影音內容等資訊。"</string> @@ -763,10 +770,8 @@ <string name="system_multitasking_rhs" msgid="2454557648974553729">"進入分割畫面模式，並將目前的應用程式顯示於右側"</string> <string name="system_multitasking_lhs" msgid="3516599774920979402">"進入分割畫面模式，並將目前的應用程式顯示於左側"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"從分割畫面切換到完整畫面"</string> - <!-- no translation found for system_multitasking_splitscreen_focus_rhs (3838578650313318508) --> - <skip /> - <!-- no translation found for system_multitasking_splitscreen_focus_lhs (3164261844398662518) --> - <skip /> + <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"使用分割畫面時，切換到右邊或上方的應用程式"</string> + <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"使用分割畫面時，切換到左邊或上方的應用程式"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"使用分割畫面期間：更換應用程式"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"輸入"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"切換到下一個語言"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/tiles_states_strings.xml b/packages/SystemUI/res/values-zh-rTW/tiles_states_strings.xml index 85e179661bbd..2c474f624ca7 100644 --- a/packages/SystemUI/res/values-zh-rTW/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"關閉"</item> <item msgid="5137565285664080143">"開啟"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 8b03cba3ea71..06f469f66397 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -151,6 +151,7 @@ <string name="accessibility_scanning_face" msgid="3093828357921541387">"Ukuskena ubuso"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Thumela"</string> <string name="cancel" msgid="1089011503403416730">"Khansela"</string> + <string name="biometric_dialog_logo" msgid="7681107853070774595">"Ilogo ye-app"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Qinisekisa"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Zama futhi"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Thepha ukuze ukhansele ukufakazela ubuqiniso"</string> @@ -165,6 +166,7 @@ <string name="biometric_dialog_tap_confirm_with_face_alt_3" msgid="2192670471930606539">"Ubuso buyaziwa. Cindezela isithonjana sokuvula ukuze uqhubeke."</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Kugunyaziwe"</string> <string name="biometric_dialog_cancel_authentication" msgid="981316588773442637">"Khansela Ukuqinisekisa"</string> + <string name="biometric_dialog_content_view_more_options_button" msgid="2663810393874865475">"Okukhethwayo Okwengeziwe"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Sebenzisa iphinikhodi"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Sebenzisa iphethini"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Sebenzisa iphasiwedi"</string> @@ -361,6 +363,8 @@ <string name="quick_settings_contrast_standard" msgid="2538227821968061832">"Okujwayelekile"</string> <string name="quick_settings_contrast_medium" msgid="5158352575583902566">"Okuphakathi"</string> <string name="quick_settings_contrast_high" msgid="656049259587494499">"Phezulu"</string> + <!-- no translation found for quick_settings_hearing_devices_label (7277170419679404129) --> + <skip /> <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> @@ -438,6 +442,10 @@ <string name="button_to_remove_widget" msgid="3948204829181214098">"Susa"</string> <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"Engeza iwijethi"</string> <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"Kwenziwe"</string> + <!-- no translation found for label_for_button_in_empty_state_cta (7314975555382055823) --> + <skip /> + <!-- no translation found for title_for_empty_state_cta (6161654421223450530) --> + <skip /> <string name="dialog_title_to_allow_any_widget" msgid="1004820948962675644">"Vumela noma iyiphi iwijethi ekukhiyeni isikrini?"</string> <string name="button_text_to_open_settings" msgid="1987729256950941628">"Vula amasethingi"</string> <string name="work_mode_off_title" msgid="5794818421357835873">"Susa ukumisa ama-app omsebenzi?"</string> @@ -539,10 +547,8 @@ <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Le divayisi iphethwe ngumzali wakho. Umzali wakho angabona futhi aphathe ulwazi olunjengezinhlelo zokusebenza ozisebenzisayo, indawo yakho, kanye nesikhathi sesikrini."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"I-VPN"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Igcinwa ivuliwe ngo-TrustAgent"</string> - <!-- no translation found for kg_prompt_after_adaptive_auth_lock (2587481497846342760) --> - <skip /> - <!-- no translation found for keyguard_indication_after_adaptive_auth_lock (2323400645470712787) --> - <skip /> + <string name="kg_prompt_after_adaptive_auth_lock" msgid="2587481497846342760">"Idivayisi ibikhiyiwe, imizamo eminingi kakhulu yokufakazela ubuqiniso"</string> + <string name="keyguard_indication_after_adaptive_auth_lock" msgid="2323400645470712787">"Idivayisi ikhiyiwe\nUkufakazela ubuqiniso kwehlulekile"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Izilungiselelo zomsindo"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Yenza amagama-ngcazo ngokuzenzakalela emidiya"</string> diff --git a/packages/SystemUI/res/values-zu/tiles_states_strings.xml b/packages/SystemUI/res/values-zu/tiles_states_strings.xml index 5c5a67ca0eff..8877268e4130 100644 --- a/packages/SystemUI/res/values-zu/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-zu/tiles_states_strings.xml @@ -186,4 +186,7 @@ <item msgid="2478289035899842865">"Valiwe"</item> <item msgid="5137565285664080143">"Vuliwe"</item> </string-array> + <!-- no translation found for tile_states_hearing_devices:0 (1235334096484287173) --> + <!-- no translation found for tile_states_hearing_devices:1 (3079622119444911877) --> + <!-- no translation found for tile_states_hearing_devices:2 (3028994095749238254) --> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index d2efccd546b6..fe8f2fff550a 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -164,8 +164,9 @@ so the width of the icon should be 13.0sp * (12.0 / 20.0) --> <dimen name="status_bar_battery_icon_width">7.8sp</dimen> - <dimen name="status_bar_battery_unified_icon_width">24sp</dimen> - <dimen name="status_bar_battery_unified_icon_height">14sp</dimen> + <!-- Original canvas is 24x14. These dimens reflect that ratio, with 12sp height instead --> + <dimen name="status_bar_battery_unified_icon_width">20.6sp</dimen> + <dimen name="status_bar_battery_unified_icon_height">12sp</dimen> <!-- The battery icon is 13sp tall, but the other system icons are 15sp tall (see @*android:dimen/status_bar_system_icon_size) with some top and bottom padding embedded in diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index b0d98e7c09d0..71353b6774af 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -899,8 +899,15 @@ <!-- QuickSettings: Contrast tile description: high [CHAR LIMIT=NONE] --> <string name="quick_settings_contrast_high">High</string> + <!-- Hearing devices --> <!-- QuickSettings: Hearing devices [CHAR LIMIT=NONE] --> <string name="quick_settings_hearing_devices_label">Hearing devices</string> + <!-- QuickSettings: Quick Settings Hearing devices dialog title [CHAR LIMIT=30] --> + <string name="quick_settings_hearing_devices_dialog_title">Hearing devices</string> + <!-- QuickSettings: Hearing devices dialog pair new device [CHAR LIMIT=NONE]--> + <string name="quick_settings_pair_hearing_devices">Pair new device</string> + <!-- QuickSettings: Content description of the hearing devices dialog pair new device [CHAR LIMIT=NONE] --> + <string name="accessibility_hearing_device_pair_new_device">Click to pair new device</string> <!--- Title of dialog triggered if the microphone is disabled but an app tried to access it. [CHAR LIMIT=150] --> <string name="sensor_privacy_start_use_mic_dialog_title">Unblock device microphone?</string> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java index d6a5477fd096..3250a0cbb347 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java @@ -85,4 +85,10 @@ public final class InteractionJankMonitorWrapper { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return; InteractionJankMonitor.getInstance().cancel(cujType); } + + /** Return true if currently instrumenting a trace session. */ + public static boolean isInstrumenting(@Cuj.CujType int cujType) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return false; + return InteractionJankMonitor.getInstance().isInstrumenting(cujType); + } } diff --git a/packages/SystemUI/src/com/android/keyguard/EmptyLockIconViewController.kt b/packages/SystemUI/src/com/android/keyguard/EmptyLockIconViewController.kt new file mode 100644 index 000000000000..b792db354b36 --- /dev/null +++ b/packages/SystemUI/src/com/android/keyguard/EmptyLockIconViewController.kt @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.keyguard + +import android.view.MotionEvent +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.keyguard.ui.view.KeyguardRootView +import com.android.systemui.res.R +import dagger.Lazy +import javax.inject.Inject + +/** + * Lock icon view logic now lives in DeviceEntryIconViewBinder and ViewModels. Icon is positioned in + * [com.android.systemui.keyguard.ui.view.layout.sections.DefaultDeviceEntrySection]. + * + * This class is to bridge the gap between the logic when the DeviceEntryUdfpsRefactor is enabled + * and the KeyguardBottomAreaRefactor is NOT enabled. This class can and should be removed when both + * flags are enabled. + */ +@SysUISingleton +class EmptyLockIconViewController +@Inject +constructor( + private val keyguardRootView: Lazy<KeyguardRootView>, +) : LockIconViewController { + private val deviceEntryIconViewId = R.id.device_entry_icon_view + override fun setLockIconView(lockIconView: LockIconView) { + // no-op + } + + override fun getTop(): Float { + return keyguardRootView.get().getViewById(deviceEntryIconViewId)?.top?.toFloat() ?: 0f + } + + override fun getBottom(): Float { + return keyguardRootView.get().getViewById(deviceEntryIconViewId)?.bottom?.toFloat() ?: 0f + } + + override fun dozeTimeTick() { + // no-op + } + + override fun setAlpha(alpha: Float) { + // no-op + } + + override fun willHandleTouchWhileDozing(event: MotionEvent): Boolean { + return false + } +} diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LegacyLockIconViewController.java index 985f6c8bc59f..4e5df3543451 100644 --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/LegacyLockIconViewController.java @@ -98,7 +98,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi; * icon will show a set distance from the bottom of the device. */ @SysUISingleton -public class LockIconViewController implements Dumpable { +public class LegacyLockIconViewController implements Dumpable, LockIconViewController { private static final String TAG = "LockIconViewController"; private static final float sDefaultDensity = (float) DisplayMetrics.DENSITY_DEVICE_STABLE / (float) DisplayMetrics.DENSITY_DEFAULT; @@ -189,7 +189,7 @@ public class LockIconViewController implements Dumpable { }; @Inject - public LockIconViewController( + public LegacyLockIconViewController( @NonNull StatusBarStateController statusBarStateController, @NonNull KeyguardUpdateMonitor keyguardUpdateMonitor, @NonNull KeyguardViewController keyguardViewController, @@ -262,6 +262,7 @@ public class LockIconViewController implements Dumpable { /** Sets the LockIconView to the controller and rebinds any that depend on it. */ @SuppressLint("ClickableViewAccessibility") + @Override public void setLockIconView(LockIconView lockIconView) { mView = lockIconView; mView.setAccessibilityDelegate(mAccessibilityDelegate); @@ -344,10 +345,12 @@ public class LockIconViewController implements Dumpable { } } + @Override public float getTop() { return mView.getLocationTop(); } + @Override public float getBottom() { return mView.getLocationBottom(); } @@ -499,6 +502,7 @@ public class LockIconViewController implements Dumpable { } /** Every minute, update the aod icon's burn in offset */ + @Override public void dozeTimeTick() { updateBurnInOffsets(); } @@ -774,6 +778,7 @@ public class LockIconViewController implements Dumpable { /** * Set the alpha of this view. */ + @Override public void setAlpha(float alpha) { mView.setAlpha(alpha); } @@ -823,6 +828,7 @@ public class LockIconViewController implements Dumpable { /** * Whether the lock icon will handle a touch while dozing. */ + @Override public boolean willHandleTouchWhileDozing(MotionEvent event) { // is in lock icon area mView.getHitRect(mSensorTouchLocation); diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.kt b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.kt new file mode 100644 index 000000000000..10d5a0cc3dd5 --- /dev/null +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.keyguard + +import android.view.MotionEvent + +/** Controls the [LockIconView]. */ +interface LockIconViewController { + fun setLockIconView(lockIconView: LockIconView) + fun getTop(): Float + fun getBottom(): Float + fun dozeTimeTick() + fun setAlpha(alpha: Float) + fun willHandleTouchWhileDozing(event: MotionEvent): Boolean +} diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIService.java b/packages/SystemUI/src/com/android/systemui/SystemUIService.java index b26be0c74ece..0cc3be2abf2c 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIService.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIService.java @@ -99,9 +99,10 @@ public class SystemUIService extends Service { if (Build.IS_DEBUGGABLE) { // b/71353150 - looking for leaked binder proxies BinderInternal.nSetBinderProxyCountEnabled(true); - BinderInternal.nSetBinderProxyCountWatermarks(1000,900); + BinderInternal.nSetBinderProxyCountWatermarks( + /* high= */ 1000, /* low= */ 900, /* warning= */ 950); BinderInternal.setBinderProxyCountCallback( - new BinderInternal.BinderProxyLimitListener() { + new BinderInternal.BinderProxyCountEventListener() { @Override public void onLimitReached(int uid) { Slog.w(SystemUIApplication.TAG, diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSizePrefs.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSizePrefs.java index 4d7ad2647c1f..a401f2a980c1 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSizePrefs.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSizePrefs.java @@ -23,7 +23,7 @@ import android.util.Size; /** * Class to handle SharedPreference for window magnification size. */ -public final class WindowMagnificationSizePrefs { +final class WindowMagnificationSizePrefs { private static final String WINDOW_MAGNIFICATION_PREFERENCES = "window_magnification_preferences"; diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java index 1f5a0bf328af..be75e1035ea6 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java @@ -36,7 +36,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.android.internal.accessibility.dialog.AccessibilityTarget; -import com.android.internal.annotations.VisibleForTesting; import com.android.modules.expresslog.Counter; import com.android.systemui.Flags; import com.android.systemui.util.settings.SecureSettings; @@ -418,18 +417,11 @@ class MenuView extends FrameLayout implements onPositionChanged(); } - void incrementTexMetricForAllTargets(String metric) { + void incrementTexMetric(String metric) { if (!Flags.floatingMenuDragToEdit()) { return; } - for (AccessibilityTarget target : mTargetFeatures) { - incrementTexMetric(metric, target.getUid()); - } - } - - @VisibleForTesting - void incrementTexMetric(String metric, int uid) { - Counter.logIncrementWithUid(metric, uid); + Counter.logIncrement(metric); } private InstantInsetLayerDrawable getContainerViewInsetLayer() { diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java index 85bf784d623b..86279befc2ba 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java @@ -105,14 +105,14 @@ class MenuViewLayer extends FrameLayout implements * * <p>Defined in frameworks/proto_logging/stats/express/catalog/accessibility.cfg. */ - static final String TEX_METRIC_DISMISS = "accessibility.value_fab_shortcut_action_dismiss"; + static final String TEX_METRIC_DISMISS = "accessibility.value_fab_shortcut_dismiss"; /** * Counter indicating the FAB was dragged to the Edit action button. * * <p>Defined in frameworks/proto_logging/stats/express/catalog/accessibility.cfg. */ - static final String TEX_METRIC_EDIT = "accessibility.value_fab_shortcut_action_edit"; + static final String TEX_METRIC_EDIT = "accessibility.value_fab_shortcut_edit"; private final WindowManager mWindowManager; private final MenuView mMenuView; @@ -492,11 +492,11 @@ class MenuViewLayer extends FrameLayout implements } else { hideMenuAndShowMessage(); } - mMenuView.incrementTexMetricForAllTargets(TEX_METRIC_DISMISS); + mMenuView.incrementTexMetric(TEX_METRIC_DISMISS); } else if (id == R.id.action_edit && Flags.floatingMenuDragToEdit()) { gotoEditScreen(); - mMenuView.incrementTexMetricForAllTargets(TEX_METRIC_EDIT); + mMenuView.incrementTexMetric(TEX_METRIC_EDIT); } mDismissView.hide(); mDragToInteractView.hide(); diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java new file mode 100644 index 000000000000..96eb4b3a4c3f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java @@ -0,0 +1,263 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.accessibility.hearingaid; + +import static android.view.View.GONE; +import static android.view.View.VISIBLE; + +import static java.util.Collections.emptyList; + +import android.content.Context; +import android.content.Intent; +import android.media.AudioManager; +import android.os.Bundle; +import android.os.Handler; +import android.provider.Settings; +import android.view.LayoutInflater; +import android.view.View; +import android.view.View.Visibility; +import android.widget.Button; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.android.settingslib.bluetooth.BluetoothCallback; +import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.systemui.accessibility.hearingaid.HearingDevicesListAdapter.HearingDeviceItemCallback; +import com.android.systemui.animation.DialogTransitionAnimator; +import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.plugins.ActivityStarter; +import com.android.systemui.qs.tiles.dialog.bluetooth.ActiveHearingDeviceItemFactory; +import com.android.systemui.qs.tiles.dialog.bluetooth.AvailableHearingDeviceItemFactory; +import com.android.systemui.qs.tiles.dialog.bluetooth.ConnectedDeviceItemFactory; +import com.android.systemui.qs.tiles.dialog.bluetooth.DeviceItem; +import com.android.systemui.qs.tiles.dialog.bluetooth.DeviceItemFactory; +import com.android.systemui.qs.tiles.dialog.bluetooth.SavedHearingDeviceItemFactory; +import com.android.systemui.res.R; +import com.android.systemui.statusbar.phone.SystemUIDialog; + +import dagger.assisted.Assisted; +import dagger.assisted.AssistedFactory; +import dagger.assisted.AssistedInject; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * Dialog for showing hearing devices controls. + */ +public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, + HearingDeviceItemCallback, BluetoothCallback { + + @VisibleForTesting + static final String ACTION_BLUETOOTH_DEVICE_DETAILS = + "com.android.settings.BLUETOOTH_DEVICE_DETAIL_SETTINGS"; + private static final String EXTRA_SHOW_FRAGMENT_ARGUMENTS = ":settings:show_fragment_args"; + private static final String KEY_BLUETOOTH_ADDRESS = "device_address"; + private final SystemUIDialog.Factory mSystemUIDialogFactory; + private final DialogTransitionAnimator mDialogTransitionAnimator; + private final ActivityStarter mActivityStarter; + private final boolean mShowPairNewDevice; + private final LocalBluetoothManager mLocalBluetoothManager; + private final Handler mMainHandler; + private final AudioManager mAudioManager; + + private HearingDevicesListAdapter mDeviceListAdapter; + private SystemUIDialog mDialog; + private RecyclerView mDeviceList; + private Button mPairButton; + private final List<DeviceItemFactory> mHearingDeviceItemFactoryList = List.of( + new ActiveHearingDeviceItemFactory(), + new AvailableHearingDeviceItemFactory(), + // TODO(b/331305850): setHearingAidInfo() for connected but not connect to profile + // hearing device only called from + // settings/bluetooth/DeviceListPreferenceFragment#handleLeScanResult, so we don't know + // it is connected but not yet connect to profile hearing device in systemui. + // Show all connected but not connect to profile bluetooth device for now. + new ConnectedDeviceItemFactory(), + new SavedHearingDeviceItemFactory() + ); + + /** Factory to create a {@link HearingDevicesDialogDelegate} dialog instance. */ + @AssistedFactory + public interface Factory { + /** Create a {@link HearingDevicesDialogDelegate} instance */ + HearingDevicesDialogDelegate create( + boolean showPairNewDevice); + } + + @AssistedInject + public HearingDevicesDialogDelegate( + @Assisted boolean showPairNewDevice, + SystemUIDialog.Factory systemUIDialogFactory, + ActivityStarter activityStarter, + DialogTransitionAnimator dialogTransitionAnimator, + @Nullable LocalBluetoothManager localBluetoothManager, + @Main Handler handler, + AudioManager audioManager) { + mShowPairNewDevice = showPairNewDevice; + mSystemUIDialogFactory = systemUIDialogFactory; + mActivityStarter = activityStarter; + mDialogTransitionAnimator = dialogTransitionAnimator; + mLocalBluetoothManager = localBluetoothManager; + mMainHandler = handler; + mAudioManager = audioManager; + } + + @Override + public SystemUIDialog createDialog() { + SystemUIDialog dialog = mSystemUIDialogFactory.create(this); + dismissDialogIfExists(); + mDialog = dialog; + + return dialog; + } + + @Override + public void onDeviceItemGearClicked(@NonNull DeviceItem deviceItem, @NonNull View view) { + dismissDialogIfExists(); + Intent intent = new Intent(ACTION_BLUETOOTH_DEVICE_DETAILS); + Bundle bundle = new Bundle(); + bundle.putString(KEY_BLUETOOTH_ADDRESS, deviceItem.getCachedBluetoothDevice().getAddress()); + intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, bundle); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + mActivityStarter.postStartActivityDismissingKeyguard(intent, /* delay= */ 0, + mDialogTransitionAnimator.createActivityTransitionController(view)); + } + + @Override + public void onDeviceItemOnClicked(@NonNull DeviceItem deviceItem, @NonNull View view) { + CachedBluetoothDevice cachedBluetoothDevice = deviceItem.getCachedBluetoothDevice(); + switch (deviceItem.getType()) { + case ACTIVE_MEDIA_BLUETOOTH_DEVICE, CONNECTED_BLUETOOTH_DEVICE -> + cachedBluetoothDevice.disconnect(); + case AVAILABLE_MEDIA_BLUETOOTH_DEVICE -> cachedBluetoothDevice.setActive(); + case SAVED_BLUETOOTH_DEVICE -> cachedBluetoothDevice.connect(); + } + } + + @Override + public void onActiveDeviceChanged(@Nullable CachedBluetoothDevice activeDevice, + int bluetoothProfile) { + mMainHandler.post(() -> mDeviceListAdapter.refreshDeviceItemList(getHearingDevicesList())); + } + + @Override + public void onProfileConnectionStateChanged(@NonNull CachedBluetoothDevice cachedDevice, + int state, int bluetoothProfile) { + mMainHandler.post(() -> mDeviceListAdapter.refreshDeviceItemList(getHearingDevicesList())); + } + + @Override + public void onAclConnectionStateChanged(@NonNull CachedBluetoothDevice cachedDevice, + int state) { + mMainHandler.post(() -> mDeviceListAdapter.refreshDeviceItemList(getHearingDevicesList())); + } + + @Override + public void beforeCreate(@NonNull SystemUIDialog dialog, @Nullable Bundle savedInstanceState) { + dialog.setTitle(R.string.quick_settings_hearing_devices_dialog_title); + dialog.setView(LayoutInflater.from(dialog.getContext()).inflate( + R.layout.hearing_devices_tile_dialog, null)); + dialog.setPositiveButton( + R.string.quick_settings_done, + /* onClick = */ null, + /* dismissOnClick = */ true + ); + } + + @Override + public void onCreate(@NonNull SystemUIDialog dialog, @Nullable Bundle savedInstanceState) { + mPairButton = dialog.requireViewById(R.id.pair_new_device_button); + mDeviceList = dialog.requireViewById(R.id.device_list); + + setupDeviceListView(dialog); + setupPairNewDeviceButton(dialog, mShowPairNewDevice ? VISIBLE : GONE); + } + + @Override + public void onStart(@NonNull SystemUIDialog dialog) { + if (mLocalBluetoothManager == null) { + return; + } + mLocalBluetoothManager.getEventManager().registerCallback(this); + } + + @Override + public void onStop(@NonNull SystemUIDialog dialog) { + if (mLocalBluetoothManager == null) { + return; + } + mLocalBluetoothManager.getEventManager().unregisterCallback(this); + } + + private void setupDeviceListView(SystemUIDialog dialog) { + mDeviceList.setLayoutManager(new LinearLayoutManager(dialog.getContext())); + mDeviceListAdapter = new HearingDevicesListAdapter(getHearingDevicesList(), this); + mDeviceList.setAdapter(mDeviceListAdapter); + } + + private void setupPairNewDeviceButton(SystemUIDialog dialog, @Visibility int visibility) { + if (visibility == VISIBLE) { + mPairButton.setOnClickListener(v -> { + dismissDialogIfExists(); + final Intent intent = new Intent(Settings.ACTION_HEARING_DEVICE_PAIRING_SETTINGS); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + mActivityStarter.postStartActivityDismissingKeyguard(intent, /* delay= */ 0, + mDialogTransitionAnimator.createActivityTransitionController(dialog)); + }); + } else { + mPairButton.setVisibility(GONE); + } + } + + private List<DeviceItem> getHearingDevicesList() { + if (mLocalBluetoothManager == null + || !mLocalBluetoothManager.getBluetoothAdapter().isEnabled()) { + return emptyList(); + } + + return mLocalBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy().stream() + .map(this::createHearingDeviceItem) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + } + + private DeviceItem createHearingDeviceItem(CachedBluetoothDevice cachedDevice) { + final Context context = mDialog.getContext(); + if (cachedDevice == null) { + return null; + } + for (DeviceItemFactory itemFactory : mHearingDeviceItemFactoryList) { + if (itemFactory.isFilterMatched(context, cachedDevice, mAudioManager)) { + return itemFactory.create(context, cachedDevice); + } + } + return null; + } + + private void dismissDialogIfExists() { + if (mDialog != null) { + mDialog.dismiss(); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManager.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManager.java new file mode 100644 index 000000000000..623b40f144eb --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManager.java @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.accessibility.hearingaid; + +import android.bluetooth.BluetoothDevice; +import android.util.Log; +import android.view.View; + +import androidx.annotation.Nullable; + +import com.android.internal.jank.InteractionJankMonitor; +import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.systemui.animation.DialogCuj; +import com.android.systemui.animation.DialogTransitionAnimator; +import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.statusbar.phone.SystemUIDialog; + +import javax.inject.Inject; + +/** + * Factory to create {@link HearingDevicesDialogDelegate} objects and manage its lifecycle. + */ +@SysUISingleton +public class HearingDevicesDialogManager { + + private static final boolean DEBUG = true; + private static final String TAG = "HearingDevicesDialogManager"; + private static final String INTERACTION_JANK_TAG = "hearing_devices_tile"; + private SystemUIDialog mDialog; + private final DialogTransitionAnimator mDialogTransitionAnimator; + private final HearingDevicesDialogDelegate.Factory mDialogFactory; + private final LocalBluetoothManager mLocalBluetoothManager; + + @Inject + public HearingDevicesDialogManager( + DialogTransitionAnimator dialogTransitionAnimator, + HearingDevicesDialogDelegate.Factory dialogFactory, + @Nullable LocalBluetoothManager localBluetoothManager) { + mDialogTransitionAnimator = dialogTransitionAnimator; + mDialogFactory = dialogFactory; + mLocalBluetoothManager = localBluetoothManager; + } + + /** + * Shows the dialog. + * + * @param view The view from which the dialog is shown. + */ + public void showDialog(View view) { + if (mDialog != null) { + if (DEBUG) { + Log.d(TAG, "HearingDevicesDialog already showing. Destroy it first."); + } + destroyDialog(); + } + + mDialog = mDialogFactory.create(!isAnyBondedHearingDevice()).createDialog(); + + if (view != null) { + mDialogTransitionAnimator.showFromView(mDialog, view, + new DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, + INTERACTION_JANK_TAG), /* animateBackgroundBoundsChange= */ true); + } else { + mDialog.show(); + } + } + + private void destroyDialog() { + mDialog.dismiss(); + mDialog = null; + } + + private boolean isAnyBondedHearingDevice() { + if (mLocalBluetoothManager == null) { + return false; + } + if (!mLocalBluetoothManager.getBluetoothAdapter().isEnabled()) { + return false; + } + + return mLocalBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy().stream() + .anyMatch(device -> device.isHearingAidDevice() + && device.getBondState() != BluetoothDevice.BOND_NONE); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogReceiver.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogReceiver.java new file mode 100644 index 000000000000..6a34d1969fe5 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogReceiver.java @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.accessibility.hearingaid; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; + +import com.android.systemui.Flags; + +import javax.inject.Inject; + +/** + * BroadcastReceiver for handling hearing devices dialog intent. + * + * <p> This is not exported. Need to call from framework and use SYSTEM user to send the intent. + */ +public class HearingDevicesDialogReceiver extends BroadcastReceiver { + public static String ACTION = "com.android.systemui.action.LAUNCH_HEARING_DEVICES_DIALOG"; + + private final HearingDevicesDialogManager mDialogManager; + @Inject + public HearingDevicesDialogReceiver( + HearingDevicesDialogManager hearingDevicesDialogManager) { + mDialogManager = hearingDevicesDialogManager; + } + + @Override + public void onReceive(Context context, Intent intent) { + if (!Flags.hearingAidsQsTileDialog()) { + return; + } + + if (ACTION.equals(intent.getAction())) { + mDialogManager.showDialog(/* view= */ null); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesListAdapter.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesListAdapter.java new file mode 100644 index 000000000000..695d04f5df9d --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesListAdapter.java @@ -0,0 +1,137 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.accessibility.hearingaid; + +import android.content.Context; +import android.graphics.drawable.Drawable; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.android.systemui.qs.tiles.dialog.bluetooth.DeviceItem; +import com.android.systemui.res.R; + +import kotlin.Pair; + +import java.util.List; + +/** + * Adapter for showing hearing device item list {@link DeviceItem}. + */ +public class HearingDevicesListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { + private final List<DeviceItem> mItemList; + private final HearingDeviceItemCallback mCallback; + + public HearingDevicesListAdapter(List<DeviceItem> itemList, + HearingDeviceItemCallback callback) { + mItemList = itemList; + mCallback = callback; + } + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int position) { + View view = LayoutInflater.from(viewGroup.getContext()).inflate( + R.layout.bluetooth_device_item, viewGroup, false); + return new DeviceItemViewHolder(view, viewGroup.getContext()); + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) { + DeviceItem item = mItemList.get(position); + ((DeviceItemViewHolder) viewHolder).bindView(item, mCallback); + } + + @Override + public int getItemCount() { + return mItemList.size(); + } + + /** + * Updates items in the adapter. + * + * @param itemList bluetooth device item list + */ + public void refreshDeviceItemList(List<DeviceItem> itemList) { + mItemList.clear(); + mItemList.addAll(itemList); + notifyDataSetChanged(); + } + + /** + * Interface to provide callbacks when click on the device item in hearing device quick + * settings tile. + */ + public interface HearingDeviceItemCallback { + /** + * Called when gear view in device item is clicked. + * + * @param deviceItem bluetooth device item + * @param view the view that was clicked + */ + void onDeviceItemGearClicked(@NonNull DeviceItem deviceItem, @NonNull View view); + + /** + * Called when device item is clicked. + * + * @param deviceItem bluetooth device item + * @param view the view that was clicked + */ + void onDeviceItemOnClicked(@NonNull DeviceItem deviceItem, @NonNull View view); + } + + private static class DeviceItemViewHolder extends RecyclerView.ViewHolder { + private final Context mContext; + private final View mContainer; + private final TextView mNameView; + private final TextView mSummaryView; + private final ImageView mIconView; + private final View mGearView; + + DeviceItemViewHolder(@NonNull View itemView, Context context) { + super(itemView); + mContext = context; + mContainer = itemView.requireViewById(R.id.bluetooth_device_row); + mNameView = itemView.requireViewById(R.id.bluetooth_device_name); + mSummaryView = itemView.requireViewById(R.id.bluetooth_device_summary); + mIconView = itemView.requireViewById(R.id.bluetooth_device_icon); + mGearView = itemView.requireViewById(R.id.gear_icon); + } + + public void bindView(DeviceItem item, HearingDeviceItemCallback callback) { + mContainer.setEnabled(item.isEnabled()); + mContainer.setOnClickListener(view -> callback.onDeviceItemOnClicked(item, view)); + Integer backgroundResId = item.getBackground(); + if (backgroundResId != null) { + mContainer.setBackground(mContext.getDrawable(item.getBackground())); + } + mNameView.setText(item.getDeviceName()); + mSummaryView.setText(item.getConnectionSummary()); + Pair<Drawable, String> iconPair = item.getIconWithDescription(); + if (iconPair != null) { + mIconView.setImageDrawable(iconPair.getFirst()); + mIconView.setContentDescription(iconPair.getSecond()); + } + mGearView.setOnClickListener(view -> callback.onDeviceItemGearClicked(item, view)); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/backup/BackupHelper.kt b/packages/SystemUI/src/com/android/systemui/backup/BackupHelper.kt index 6721c5d5e413..c4d282e24a92 100644 --- a/packages/SystemUI/src/com/android/systemui/backup/BackupHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/backup/BackupHelper.kt @@ -27,6 +27,7 @@ import android.os.Environment import android.os.ParcelFileDescriptor import android.os.UserHandle import android.util.Log +import com.android.app.tracing.traceSection import com.android.systemui.controls.controller.AuxiliaryPersistenceWrapper import com.android.systemui.controls.controller.ControlsFavoritePersistenceWrapper import com.android.systemui.keyguard.domain.backup.KeyguardQuickAffordanceBackupHelper @@ -119,14 +120,22 @@ open class BackupHelper : BackupAgentHelper() { ) : FileBackupHelper(context, *fileNamesAndPostProcess.keys.toTypedArray()) { override fun restoreEntity(data: BackupDataInputStream) { + Log.d(TAG, "Starting restore for ${data.key} for user ${context.userId}") val file = Environment.buildPath(context.filesDir, data.key) if (file.exists()) { Log.w(TAG, "File " + data.key + " already exists. Skipping restore.") return } synchronized(lock) { - super.restoreEntity(data) - fileNamesAndPostProcess.get(data.key)?.invoke() + traceSection("File restore: ${data.key}") { + super.restoreEntity(data) + } + Log.d(TAG, "Finishing restore for ${data.key} for user ${context.userId}. " + + "Starting postProcess.") + traceSection("Postprocess: ${data.key}") { + fileNamesAndPostProcess.get(data.key)?.invoke() + } + Log.d(TAG, "Finishing postprocess for ${data.key} for user ${context.userId}.") } } diff --git a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java index 01c2cc4fe874..5c53234f74eb 100644 --- a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java @@ -27,6 +27,7 @@ import android.animation.ObjectAnimator; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.Nullable; +import android.annotation.SuppressLint; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; @@ -52,6 +53,7 @@ import com.android.systemui.DualToneHandler; import com.android.systemui.battery.unified.BatteryColors; import com.android.systemui.battery.unified.BatteryDrawableState; import com.android.systemui.battery.unified.BatteryLayersDrawable; +import com.android.systemui.battery.unified.ColorProfile; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver; import com.android.systemui.res.R; @@ -252,7 +254,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { new BatteryDrawableState( level, mUnifiedBatteryState.getShowPercent(), - level <= 20, + getCurrentColorProfile(), attr ); @@ -261,6 +263,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { } // Potentially reloads any attribution. Should not be called if the state hasn't changed + @SuppressLint("UseCompatLoadingForDrawables") private Drawable getBatteryAttribution(boolean isCharging) { if (!newStatusBarIcons()) return null; @@ -281,6 +284,30 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { return attr; } + /** Calculate the appropriate color for the current state */ + private ColorProfile getCurrentColorProfile() { + return getColorProfile( + mPowerSaveEnabled, + mIsBatteryDefender && mDisplayShieldEnabled, + mPluggedIn, + mLevel <= 20); + } + + /** pure function to compute the correct color profile for our battery icon */ + private ColorProfile getColorProfile( + boolean isPowerSave, + boolean isBatteryDefender, + boolean isCharging, + boolean isLowBattery + ) { + if (isCharging) return ColorProfile.Active; + if (isPowerSave) return ColorProfile.Warning; + if (isBatteryDefender) return ColorProfile.None; + if (isLowBattery) return ColorProfile.Error; + + return ColorProfile.None; + } + void onPowerSaveChanged(boolean isPowerSave) { if (isPowerSave == mPowerSaveEnabled) { return; @@ -293,7 +320,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { new BatteryDrawableState( mUnifiedBatteryState.getLevel(), mUnifiedBatteryState.getShowPercent(), - mUnifiedBatteryState.getShowErrorState(), + getCurrentColorProfile(), getBatteryAttribution(isCharging()) ) ); @@ -318,7 +345,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { new BatteryDrawableState( mUnifiedBatteryState.getLevel(), mUnifiedBatteryState.getShowPercent(), - mUnifiedBatteryState.getShowErrorState(), + getCurrentColorProfile(), getBatteryAttribution(isCharging()) ) ); @@ -334,7 +361,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { new BatteryDrawableState( mUnifiedBatteryState.getLevel(), mUnifiedBatteryState.getShowPercent(), - mUnifiedBatteryState.getShowErrorState(), + getCurrentColorProfile(), getBatteryAttribution(isCharging()) ) ); @@ -522,7 +549,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { new BatteryDrawableState( mUnifiedBatteryState.getLevel(), shouldShow, - mUnifiedBatteryState.getShowErrorState(), + mUnifiedBatteryState.getColor(), mUnifiedBatteryState.getAttribution() ) ); @@ -755,6 +782,9 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { pw.println(" mPluggedIn: " + mPluggedIn); pw.println(" mLevel: " + mLevel); pw.println(" mMode: " + mShowPercentMode); + if (newStatusBarIcons()) { + pw.println(" mUnifiedBatteryState: " + mUnifiedBatteryState); + } } @VisibleForTesting diff --git a/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryDrawableState.kt b/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryDrawableState.kt index e172cad8f0b8..fd7e98f1865c 100644 --- a/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryDrawableState.kt +++ b/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryDrawableState.kt @@ -20,6 +20,21 @@ import android.graphics.Color import android.graphics.drawable.Drawable /** + * States that might set a color profile (e.g., red for low battery) and are mutually exclusive. + * This enum allows us to address which colors we want to use based on their function. + */ +enum class ColorProfile { + // Grayscale is the default color + None, + // Green for e.g., charging + Active, + // Yellow for e.g., battery saver + Warning, + // Red for e.t., low battery + Error, +} + +/** * Encapsulates all drawing information needed by BatteryMeterDrawable to render properly. Rendered * state will be equivalent to the most recent state passed in. */ @@ -28,12 +43,9 @@ data class BatteryDrawableState( val level: Int, /** Whether or not to render the percent as a foreground text layer */ val showPercent: Boolean, - /** - * In an error state, the drawable will use the error colors and removes the third layer. If - * [showPercent] is false, then the fill will be rendered in the foreground error color. Else - * the fill is not rendered. - */ - val showErrorState: Boolean, + + /** Set the [ColorProfile] to get the appropriate fill colors */ + val color: ColorProfile = ColorProfile.None, /** * An attribution is a drawable that shows either alongside the percent, or centered in the @@ -59,7 +71,6 @@ data class BatteryDrawableState( BatteryDrawableState( level = 50, showPercent = false, - showErrorState = false, attribution = null, ) } @@ -82,12 +93,14 @@ sealed interface BatteryColors { */ val fillOnly: Int - /** Error colors are used for low battery states typically */ - val errorForeground: Int - val errorBackground: Int + /** Used when charging */ + val activeFill: Int - /** Currently unused */ - val warnBackground: Int + /** Warning color is used for battery saver mode */ + val warnFill: Int + + /** Error colors are used for low battery states typically */ + val errorFill: Int /** Color scheme appropriate for light mode (dark icons) */ data object LightThemeColors : BatteryColors { @@ -100,13 +113,12 @@ sealed interface BatteryColors { // GM Gray 700 override val fillOnly = Color.parseColor("#5F6368") - // GM Red 600 - override val errorForeground = Color.parseColor("#D93025") - // GM Red 100 - override val errorBackground = Color.parseColor("#FAD2CF") - + // GM Green 700 + override val activeFill = Color.parseColor("#188038") // GM Yellow 500 - override val warnBackground = Color.parseColor("#FBBC04") + override val warnFill = Color.parseColor("#FBBC04") + // GM Red 600 + override val errorFill = Color.parseColor("#D93025") } /** Color scheme appropriate for dark mode (light icons) */ @@ -120,12 +132,12 @@ sealed interface BatteryColors { // GM Gray 400 override val fillOnly = Color.parseColor("#BDC1C6") - // GM Red 600 - override val errorForeground = Color.parseColor("#D93025") - // GM Red 200 - override val errorBackground = Color.parseColor("#F6AEA9") + // GM Green 500 + override val activeFill = Color.parseColor("#34A853") // GM Yellow - override val warnBackground = Color.parseColor("#FBBC04") + override val warnFill = Color.parseColor("#FBBC04") + // GM Red 600 + override val errorFill = Color.parseColor("#D93025") } companion object { diff --git a/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryFillDrawable.kt b/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryFillDrawable.kt index e1ae4980079b..63ff6cb4e53a 100644 --- a/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryFillDrawable.kt +++ b/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryFillDrawable.kt @@ -44,6 +44,29 @@ class BatteryFillDrawable(private val framePath: Path) : Drawable() { private var scaledLeftOffset = 0f private var scaledRightInset = 0f + /** Scale this to the viewport so we fill correctly! */ + private val fillRectNotScaled = RectF() + private var leftInsetNotScaled = 0f + private var rightInsetNotScaled = 0f + + /** + * Configure how much space between the battery frame (drawn at 1.5dp stroke width) and the + * inner fill. This is accomplished by tracing the exact same path as the frame, but using + * [BlendMode.CLEAR] as the blend mode. + * + * This value also affects the overall width of the fill, so it requires us to re-draw + * everything + */ + var fillInsetAmount = -1f + set(value) { + if (field != value) { + field = value + updateInsets() + updateScale() + invalidateSelf() + } + } + // Drawable.level cannot be overloaded var batteryLevel = 0 set(value) { @@ -87,15 +110,32 @@ class BatteryFillDrawable(private val framePath: Path) : Drawable() { updateScale() } + /** + * To support dynamic insets, we have to keep mutable references to the left/right unscaled + * insets, as well as the fill rect. + */ + private fun updateInsets() { + leftInsetNotScaled = LeftFillOffsetExcludingPadding + fillInsetAmount + rightInsetNotScaled = RightFillInsetExcludingPadding + fillInsetAmount + + fillRectNotScaled.set( + leftInsetNotScaled, + 0f, + Metrics.ViewportWidth - rightInsetNotScaled, + Metrics.ViewportHeight + ) + } + private fun updateScale() { framePath.transform(/* matrix = */ scaleMatrix, /* dst = */ scaledPath) - scaleMatrix.mapRect(/* dst = */ scaledFillRect, /* src = */ FillRect) + scaleMatrix.mapRect(/* dst = */ scaledFillRect, /* src = */ fillRectNotScaled) - scaledLeftOffset = LeftFillOffset * hScale - scaledRightInset = RightFillInset * hScale + scaledLeftOffset = leftInsetNotScaled * hScale + scaledRightInset = rightInsetNotScaled * hScale - // Ensure 0.5dp space between the frame stroke and the fill - clearPaint.strokeWidth = 2.5f * hScale + // stroke width = 1.5 (same as the outer frame) + 2x fillInsetAmount, since N px of padding + // requires the entire stroke to be 2N px wider + clearPaint.strokeWidth = (1.5f + 2 * fillInsetAmount) * hScale } override fun draw(canvas: Canvas) { @@ -157,23 +197,13 @@ class BatteryFillDrawable(private val framePath: Path) : Drawable() { override fun setAlpha(alpha: Int) {} companion object { - // 4f = + // 3.5f = // 2.75 (left-most edge of the frame path) // + 0.75 (1/2 of the stroke width) - // + 0.5 (padding between stroke and fill edge) - private const val LeftFillOffset = 4f + private const val LeftFillOffsetExcludingPadding = 3.5f - // 2, calculated the same way, but from the right edge (without the battery cap), which + // 1.5, calculated the same way, but from the right edge (without the battery cap), which // consumes 2 units of width. - private const val RightFillInset = 2f - - /** Scale this to the viewport so we fill correctly! */ - private val FillRect = - RectF( - LeftFillOffset, - 0f, - Metrics.ViewportWidth - RightFillInset, - Metrics.ViewportHeight - ) + private const val RightFillInsetExcludingPadding = 1.5f } } diff --git a/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryLayersDrawable.kt b/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryLayersDrawable.kt index 706b9ec563c9..a179c35e4927 100644 --- a/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryLayersDrawable.kt +++ b/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryLayersDrawable.kt @@ -56,9 +56,6 @@ import kotlin.math.roundToInt * - The internal space is divided into 12x10 and 6x6 rectangles * - The attribution is aligned left * - The percent text is scaled based on the number of characters (1,2, or 3) in the string - * - * When [BatteryDrawableState.showErrorState] is true, we will only show either the percent text OR - * the battery fill, in order to maximize contrast when using the error colors. */ @Suppress("RtlHardcoded") class BatteryLayersDrawable( @@ -91,7 +88,7 @@ class BatteryLayersDrawable( var colors: BatteryColors = BatteryColors.LightThemeColors set(value) { field = value - updateColors(batteryState.showErrorState, value) + updateColorProfile(batteryState.hasForegroundContent(), batteryState.color, value) } init { @@ -101,53 +98,66 @@ class BatteryLayersDrawable( } private fun handleUpdateState(old: BatteryDrawableState, new: BatteryDrawableState) { - if (new.showErrorState != old.showErrorState) { - updateColors(new.showErrorState, colors) - } - if (new.level != old.level) { fill.batteryLevel = new.level textOnly.batteryLevel = new.level spaceSharingText.batteryLevel = new.level } + val shouldUpdateColors = + new.color != old.color || + new.attribution != attribution.drawable || + new.hasForegroundContent() != old.hasForegroundContent() + if (new.attribution != null && new.attribution != attribution.drawable) { attribution.drawable = new.attribution - updateColors(new.showErrorState, colors) } if (new.hasForegroundContent() != old.hasForegroundContent()) { - setFillColor(new.hasForegroundContent(), new.showErrorState, colors) + setFillInsets(new.hasForegroundContent()) } - } - /** In error states, we don't draw fill unless there is no foreground content (e.g., percent) */ - private fun updateColors(showErrorState: Boolean, colorInfo: BatteryColors) { - frameBg.setTint(if (showErrorState) colorInfo.errorBackground else colorInfo.bg) - frame.setTint(colorInfo.fg) - attribution.setTint(if (showErrorState) colorInfo.errorForeground else colorInfo.fg) - textOnly.setTint(if (showErrorState) colorInfo.errorForeground else colorInfo.fg) - spaceSharingText.setTint(if (showErrorState) colorInfo.errorForeground else colorInfo.fg) - setFillColor(batteryState.hasForegroundContent(), showErrorState, colorInfo) + // Finally, update colors last if any of the above conditions were met, so that everything + // is properly tinted + if (shouldUpdateColors) { + updateColorProfile(new.hasForegroundContent(), new.color, colors) + } } - /** - * If there is a foreground layer, then we draw the fill with the low opacity - * [BatteryColors.fill] color. Otherwise, if there is no other foreground layer, we will use - * either the error or fillOnly colors for more contrast - */ - private fun setFillColor( + private fun updateColorProfile( hasFg: Boolean, - error: Boolean, + color: ColorProfile, colorInfo: BatteryColors, ) { - if (hasFg) { - fill.fillColor = colorInfo.fill - } else { - fill.fillColor = if (error) colorInfo.errorForeground else colorInfo.fillOnly + frame.setTint(colorInfo.fg) + frameBg.setTint(colorInfo.bg) + textOnly.setTint(colorInfo.fg) + spaceSharingText.setTint(colorInfo.fg) + attribution.setTint(colorInfo.fg) + + when (color) { + ColorProfile.None -> { + fill.fillColor = if (hasFg) colorInfo.fill else colorInfo.fillOnly + } + ColorProfile.Active -> { + fill.fillColor = colorInfo.activeFill + } + ColorProfile.Warning -> { + fill.fillColor = colorInfo.warnFill + } + ColorProfile.Error -> { + fill.fillColor = colorInfo.errorFill + } } } + private fun setFillInsets( + hasFg: Boolean, + ) { + // Extra padding around the fill if there is nothing in the foreground + fill.fillInsetAmount = if (hasFg) 0f else 1.5f + } + override fun onBoundsChange(bounds: Rect) { super.onBoundsChange(bounds) @@ -200,10 +210,9 @@ class BatteryLayersDrawable( // 2. Then the frame itself frame.draw(canvas) - // 3. Fill it the appropriate amount if non-error state or error + no attribute - if (!batteryState.showErrorState || !batteryState.hasForegroundContent()) { - fill.draw(canvas) - } + // 3. Fill it the appropriate amount + fill.draw(canvas) + // 4. Decide what goes inside if (batteryState.showPercent && batteryState.attribution != null) { // 4a. percent & attribution. Implies space-sharing @@ -309,6 +318,7 @@ class BatteryLayersDrawable( * * See [BatteryDrawableState] for how to set the properties of the resulting class */ + @Suppress("UseCompatLoadingForDrawables") fun newBatteryDrawable( context: Context, initialState: BatteryDrawableState = BatteryDrawableState.DefaultInitialState, diff --git a/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt b/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt index 86b254b910b8..246d5d92f8b0 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt @@ -81,6 +81,7 @@ import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.shareIn +import kotlinx.coroutines.flow.stateIn /** Encapsulates business-logic related to communal mode. */ @OptIn(ExperimentalCoroutinesApi::class) @@ -239,10 +240,14 @@ constructor( * This will not be true while transitioning to the hub and will turn false immediately when a * swipe to exit the hub starts. */ - val isIdleOnCommunal: Flow<Boolean> = - communalRepository.transitionState.map { - it is ObservableTransitionState.Idle && it.scene == CommunalScenes.Communal - } + val isIdleOnCommunal: StateFlow<Boolean> = + communalRepository.transitionState + .map { it is ObservableTransitionState.Idle && it.scene == CommunalScenes.Communal } + .stateIn( + scope = applicationScope, + started = SharingStarted.Eagerly, + initialValue = false, + ) /** * Flow that emits a boolean if any portion of the communal UI is visible at all. diff --git a/packages/SystemUI/src/com/android/systemui/dagger/DefaultBroadcastReceiverBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/DefaultBroadcastReceiverBinder.java index 6aa5e8b6d098..2fa42ec3904d 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/DefaultBroadcastReceiverBinder.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/DefaultBroadcastReceiverBinder.java @@ -19,6 +19,7 @@ package com.android.systemui.dagger; import android.content.BroadcastReceiver; import com.android.systemui.GuestResetOrExitSessionReceiver; +import com.android.systemui.accessibility.hearingaid.HearingDevicesDialogReceiver; import com.android.systemui.media.dialog.MediaOutputDialogReceiver; import com.android.systemui.people.widget.PeopleSpaceWidgetPinnedReceiver; import com.android.systemui.people.widget.PeopleSpaceWidgetProvider; @@ -88,4 +89,13 @@ public abstract class DefaultBroadcastReceiverBinder { @ClassKey(GuestResetOrExitSessionReceiver.class) public abstract BroadcastReceiver bindGuestResetOrExitSessionReceiver( GuestResetOrExitSessionReceiver broadcastReceiver); + + /** + * + */ + @Binds + @IntoMap + @ClassKey(HearingDevicesDialogReceiver.class) + public abstract BroadcastReceiver bindHearingDevicesDialogReceiver( + HearingDevicesDialogReceiver broadcastReceiver); } diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/DeviceEntryModule.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/DeviceEntryModule.kt index 71b5ab2d61ed..b8c03c071572 100644 --- a/packages/SystemUI/src/com/android/systemui/deviceentry/DeviceEntryModule.kt +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/DeviceEntryModule.kt @@ -1,9 +1,32 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.android.systemui.deviceentry +import com.android.keyguard.EmptyLockIconViewController +import com.android.keyguard.LegacyLockIconViewController +import com.android.keyguard.LockIconViewController +import com.android.systemui.dagger.SysUISingleton import com.android.systemui.deviceentry.data.repository.DeviceEntryRepositoryModule import com.android.systemui.deviceentry.data.repository.FaceWakeUpTriggersConfigModule +import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition +import dagger.Lazy import dagger.Module +import dagger.Provides import dagger.multibindings.Multibinds @Module( @@ -18,4 +41,19 @@ abstract class DeviceEntryModule { * A set of DeviceEntryIconTransitions. Ensures that this can be injected even if it's empty. */ @Multibinds abstract fun deviceEntryIconTransitionSet(): Set<DeviceEntryIconTransition> + + companion object { + @Provides + @SysUISingleton + fun provideLockIconViewController( + legacyLockIconViewController: Lazy<LegacyLockIconViewController>, + emptyLockIconViewController: Lazy<EmptyLockIconViewController>, + ): LockIconViewController { + return if (DeviceEntryUdfpsRefactor.isEnabled) { + emptyLockIconViewController.get() + } else { + legacyLockIconViewController.get() + } + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java index 7f3b5eba96c6..926f7f1aee48 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java @@ -172,19 +172,18 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { final float screenTravelPercentage = Math.abs(e1.getY() - e2.getY()) / mTouchSession.getBounds().height(); setPanelExpansion(mBouncerInitiallyShowing - ? screenTravelPercentage : 1 - screenTravelPercentage, dragDownAmount); + ? screenTravelPercentage : 1 - screenTravelPercentage); return true; } }; - private void setPanelExpansion(float expansion, float dragDownAmount) { + private void setPanelExpansion(float expansion) { mCurrentExpansion = expansion; ShadeExpansionChangeEvent event = new ShadeExpansionChangeEvent( /* fraction= */ mCurrentExpansion, /* expanded= */ mExpanded, - /* tracking= */ true, - /* dragDownPxAmount= */ dragDownAmount); + /* tracking= */ true); mCurrentScrimController.expand(event); } @@ -333,7 +332,7 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { animation -> { float expansionFraction = (float) animation.getAnimatedValue(); float dragDownAmount = expansionFraction * expansionHeight; - setPanelExpansion(expansionFraction, dragDownAmount); + setPanelExpansion(expansionFraction); }); if (!mBouncerInitiallyShowing && targetExpansion == KeyguardBouncerConstants.EXPANSION_VISIBLE) { diff --git a/packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt b/packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt index 1bcee74d70fc..8b1f8d387392 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt @@ -53,7 +53,7 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha // SceneContainer dependencies SceneContainerFlag.getFlagDependencies().forEach { (alpha, beta) -> alpha dependsOn beta } - SceneContainerFlag.getMainStaticFlag() dependsOn MIGRATE_KEYGUARD_STATUS_BAR_VIEW + SceneContainerFlag.getMainAconfigFlag() dependsOn MIGRATE_KEYGUARD_STATUS_BAR_VIEW // ComposeLockscreen dependencies ComposeLockscreen.token dependsOn KeyguardBottomAreaRefactor.token diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index d33e7fffef98..42c2da7be7b7 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -415,14 +415,6 @@ object Flags { unreleasedFlag("clipboard_shared_transitions", teamfood = true) /** - * Whether the scene container (Flexiglass) is enabled. Note that SceneContainerFlags#isEnabled - * should be checked and toggled together with [SCENE_CONTAINER_ENABLED] so that ProGuard can - * remove unused code from our APK at compile time. - */ - // TODO(b/283300105): Tracking Bug - @JvmField val SCENE_CONTAINER_ENABLED = false - - /** * Whether the compose bouncer is enabled. This ensures ProGuard can * remove unused code from our APK at compile time. */ diff --git a/packages/SystemUI/src/com/android/systemui/haptics/qs/QSLongPressEffectViewBinder.kt b/packages/SystemUI/src/com/android/systemui/haptics/qs/QSLongPressEffectViewBinder.kt index 17059097e053..f4998a7b8789 100644 --- a/packages/SystemUI/src/com/android/systemui/haptics/qs/QSLongPressEffectViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/haptics/qs/QSLongPressEffectViewBinder.kt @@ -18,10 +18,10 @@ package com.android.systemui.haptics.qs import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle +import com.android.app.tracing.coroutines.launch import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.qs.tileimpl.QSTileViewImpl import kotlinx.coroutines.DisposableHandle -import kotlinx.coroutines.launch class QSLongPressEffectViewBinder { @@ -31,16 +31,18 @@ class QSLongPressEffectViewBinder { fun bind( tile: QSTileViewImpl, + tileSpec: String?, effect: QSLongPressEffect?, ) { if (effect == null) return handle = tile.repeatWhenAttached { - repeatOnLifecycle(Lifecycle.State.STARTED) { + repeatOnLifecycle(Lifecycle.State.CREATED) { effect.scope = this + val tag = "${tileSpec ?: "unknownTileSpec"}#LongPressEffect" - launch { + launch("$tag#progress") { effect.effectProgress.collect { progress -> progress?.let { if (it == 0f) { @@ -51,7 +53,7 @@ class QSLongPressEffectViewBinder { } } - launch { + launch("$tag#action") { effect.actionType.collect { action -> action?.let { when (it) { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt index 3da3e2f9cbcc..30beca7d00e1 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt @@ -35,8 +35,8 @@ import com.android.compose.animation.scene.transitions import com.android.internal.jank.InteractionJankMonitor import com.android.keyguard.KeyguardStatusView import com.android.keyguard.KeyguardStatusViewController +import com.android.keyguard.LegacyLockIconViewController import com.android.keyguard.LockIconView -import com.android.keyguard.LockIconViewController import com.android.keyguard.dagger.KeyguardStatusViewComponent import com.android.systemui.CoreStartable import com.android.systemui.common.ui.ConfigurationState @@ -95,7 +95,7 @@ constructor( private val configuration: ConfigurationState, private val context: Context, private val keyguardIndicationController: KeyguardIndicationController, - private val lockIconViewController: Lazy<LockIconViewController>, + private val lockIconViewController: Lazy<LegacyLockIconViewController>, private val shadeInteractor: ShadeInteractor, private val interactionJankMonitor: InteractionJankMonitor, private val deviceEntryHapticsInteractor: DeviceEntryHapticsInteractor, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt index 88eadd7be066..b3d9a7670c8a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt @@ -92,7 +92,8 @@ constructor( walletController.setupWalletChangeObservers( callback, QuickAccessWalletController.WalletChangeEvent.WALLET_PREFERENCE_CHANGE, - QuickAccessWalletController.WalletChangeEvent.DEFAULT_PAYMENT_APP_CHANGE + QuickAccessWalletController.WalletChangeEvent.DEFAULT_PAYMENT_APP_CHANGE, + QuickAccessWalletController.WalletChangeEvent.DEFAULT_WALLET_APP_CHANGE ) withContext(backgroundDispatcher) { @@ -104,7 +105,8 @@ constructor( awaitClose { walletController.unregisterWalletChangeObservers( QuickAccessWalletController.WalletChangeEvent.WALLET_PREFERENCE_CHANGE, - QuickAccessWalletController.WalletChangeEvent.DEFAULT_PAYMENT_APP_CHANGE + QuickAccessWalletController.WalletChangeEvent.DEFAULT_PAYMENT_APP_CHANGE, + QuickAccessWalletController.WalletChangeEvent.DEFAULT_WALLET_APP_CHANGE ) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt index a36bf8bf8751..8cc077992f7f 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt @@ -23,6 +23,7 @@ import android.annotation.FloatRange import android.os.Trace import android.util.Log import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionInfo import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled @@ -30,12 +31,17 @@ import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep import java.util.UUID import javax.inject.Inject +import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asSharedFlow +import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.withContext /** * The source of truth for all keyguard transitions. @@ -65,6 +71,9 @@ interface KeyguardTransitionRepository { */ val transitions: Flow<TransitionStep> + /** The [TransitionInfo] of the most recent call to [startTransition]. */ + val currentTransitionInfoInternal: StateFlow<TransitionInfo> + /** * Interactors that require information about changes between [KeyguardState]s will call this to * register themselves for flowable [TransitionStep]s when that transition occurs. @@ -77,7 +86,7 @@ interface KeyguardTransitionRepository { * Begin a transition from one state to another. Transitions are interruptible, and will issue a * [TransitionStep] with state = [TransitionState.CANCELED] before beginning the next one. */ - fun startTransition(info: TransitionInfo): UUID? + suspend fun startTransition(info: TransitionInfo): UUID? /** * Allows manual control of a transition. When calling [startTransition], the consumer must pass @@ -95,7 +104,11 @@ interface KeyguardTransitionRepository { } @SysUISingleton -class KeyguardTransitionRepositoryImpl @Inject constructor() : KeyguardTransitionRepository { +class KeyguardTransitionRepositoryImpl +@Inject +constructor( + @Main val mainDispatcher: CoroutineDispatcher, +) : KeyguardTransitionRepository { /* * Each transition between [KeyguardState]s will have an associated Flow. * In order to collect these events, clients should call [transition]. @@ -110,6 +123,17 @@ class KeyguardTransitionRepositoryImpl @Inject constructor() : KeyguardTransitio private var lastStep: TransitionStep = TransitionStep() private var lastAnimator: ValueAnimator? = null + private val _currentTransitionInfo: MutableStateFlow<TransitionInfo> = + MutableStateFlow( + TransitionInfo( + ownerName = "", + from = KeyguardState.OFF, + to = KeyguardState.LOCKSCREEN, + animator = null + ) + ) + override var currentTransitionInfoInternal = _currentTransitionInfo.asStateFlow() + /* * When manual control of the transition is requested, a unique [UUID] is used as the handle * to permit calls to [updateTransition] @@ -122,77 +146,85 @@ class KeyguardTransitionRepositoryImpl @Inject constructor() : KeyguardTransitio initialTransitionSteps.forEach(::emitTransition) } - override fun startTransition(info: TransitionInfo): UUID? { - if (lastStep.from == info.from && lastStep.to == info.to) { - Log.i(TAG, "Duplicate call to start the transition, rejecting: $info") - return null - } - val startingValue = - if (lastStep.transitionState != TransitionState.FINISHED) { - Log.i(TAG, "Transition still active: $lastStep, canceling") - when (info.modeOnCanceled) { - TransitionModeOnCanceled.LAST_VALUE -> lastStep.value - TransitionModeOnCanceled.RESET -> 0f - TransitionModeOnCanceled.REVERSE -> 1f - lastStep.value - } - } else { - 0f + override suspend fun startTransition(info: TransitionInfo): UUID? { + _currentTransitionInfo.value = info + + // Animators must be started on the main thread. + return withContext(mainDispatcher) { + if (lastStep.from == info.from && lastStep.to == info.to) { + Log.i(TAG, "Duplicate call to start the transition, rejecting: $info") + return@withContext null } + val startingValue = + if (lastStep.transitionState != TransitionState.FINISHED) { + Log.i(TAG, "Transition still active: $lastStep, canceling") + when (info.modeOnCanceled) { + TransitionModeOnCanceled.LAST_VALUE -> lastStep.value + TransitionModeOnCanceled.RESET -> 0f + TransitionModeOnCanceled.REVERSE -> 1f - lastStep.value + } + } else { + 0f + } - lastAnimator?.cancel() - lastAnimator = info.animator + lastAnimator?.cancel() + lastAnimator = info.animator - // Cancel any existing manual transitions - updateTransitionId?.let { uuid -> - updateTransition(uuid, lastStep.value, TransitionState.CANCELED) - } + // Cancel any existing manual transitions + updateTransitionId?.let { uuid -> + updateTransition(uuid, lastStep.value, TransitionState.CANCELED) + } - info.animator?.let { animator -> - // An animator was provided, so use it to run the transition - animator.setFloatValues(startingValue, 1f) - animator.duration = ((1f - startingValue) * animator.duration).toLong() - val updateListener = AnimatorUpdateListener { animation -> - emitTransition( - TransitionStep( - info, - (animation.animatedValue as Float), - TransitionState.RUNNING + info.animator?.let { animator -> + // An animator was provided, so use it to run the transition + animator.setFloatValues(startingValue, 1f) + animator.duration = ((1f - startingValue) * animator.duration).toLong() + val updateListener = AnimatorUpdateListener { animation -> + emitTransition( + TransitionStep( + info, + (animation.animatedValue as Float), + TransitionState.RUNNING + ) ) - ) - } - val adapter = - object : AnimatorListenerAdapter() { - override fun onAnimationStart(animation: Animator) { - emitTransition(TransitionStep(info, startingValue, TransitionState.STARTED)) - } + } - override fun onAnimationCancel(animation: Animator) { - endAnimation(lastStep.value, TransitionState.CANCELED) - } + val adapter = + object : AnimatorListenerAdapter() { + override fun onAnimationStart(animation: Animator) { + emitTransition( + TransitionStep(info, startingValue, TransitionState.STARTED) + ) + } - override fun onAnimationEnd(animation: Animator) { - endAnimation(1f, TransitionState.FINISHED) - } + override fun onAnimationCancel(animation: Animator) { + endAnimation(lastStep.value, TransitionState.CANCELED) + } - private fun endAnimation(value: Float, state: TransitionState) { - emitTransition(TransitionStep(info, value, state)) - animator.removeListener(this) - animator.removeUpdateListener(updateListener) - lastAnimator = null + override fun onAnimationEnd(animation: Animator) { + endAnimation(1f, TransitionState.FINISHED) + } + + private fun endAnimation(value: Float, state: TransitionState) { + emitTransition(TransitionStep(info, value, state)) + animator.removeListener(this) + animator.removeUpdateListener(updateListener) + lastAnimator = null + } } + animator.addListener(adapter) + animator.addUpdateListener(updateListener) + animator.start() + return@withContext null + } + ?: run { + emitTransition(TransitionStep(info, startingValue, TransitionState.STARTED)) + + // No animator, so it's manual. Provide a mechanism to callback + updateTransitionId = UUID.randomUUID() + return@withContext updateTransitionId } - animator.addListener(adapter) - animator.addUpdateListener(updateListener) - animator.start() - return@startTransition null } - ?: run { - emitTransition(TransitionStep(info, startingValue, TransitionState.STARTED)) - - // No animator, so it's manual. Provide a mechanism to callback - updateTransitionId = UUID.randomUUID() - return@startTransition updateTransitionId - } } override fun updateTransition( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/backup/KeyguardQuickAffordanceBackupHelper.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/backup/KeyguardQuickAffordanceBackupHelper.kt index fa6efa504623..f763e6223a81 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/backup/KeyguardQuickAffordanceBackupHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/backup/KeyguardQuickAffordanceBackupHelper.kt @@ -17,14 +17,17 @@ package com.android.systemui.keyguard.domain.backup +import android.app.backup.BackupDataInputStream import android.app.backup.SharedPreferencesBackupHelper import android.content.Context +import android.util.Log +import com.android.app.tracing.traceSection import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceSelectionManager import com.android.systemui.settings.UserFileManagerImpl /** Handles backup & restore for keyguard quick affordances. */ class KeyguardQuickAffordanceBackupHelper( - context: Context, + private val context: Context, userId: Int, ) : SharedPreferencesBackupHelper( @@ -34,4 +37,17 @@ class KeyguardQuickAffordanceBackupHelper( fileName = KeyguardQuickAffordanceSelectionManager.FILE_NAME, ) .getPath() - ) + ) { + + override fun restoreEntity(data: BackupDataInputStream?) { + Log.d(TAG, "Starting restore for ${data?.key} for user ${context.userId}") + traceSection("$TAG File restore: ${data?.key}") { + super.restoreEntity(data) + } + Log.d(TAG, "Finished restore for ${data?.key} for user ${context.userId}") + } + + companion object { + private const val TAG = "KeyguardQuickAffordanceBackupHelper" + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAlternateBouncerTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAlternateBouncerTransitionInteractor.kt index 47f8046a92ad..dfe56c839283 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAlternateBouncerTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAlternateBouncerTransitionInteractor.kt @@ -100,40 +100,30 @@ constructor( .onEach { delay(150L) } .sampleCombine( keyguardInteractor.primaryBouncerShowing, - startedKeyguardTransitionStep, powerInteractor.isAwake, keyguardInteractor.isAodAvailable, communalInteractor.isIdleOnCommunal ) - .collect { - ( - isAlternateBouncerShowing, - isPrimaryBouncerShowing, - lastStartedTransitionStep, - isAwake, - isAodAvailable, - isIdleOnCommunal) -> - if ( - !isAlternateBouncerShowing && - !isPrimaryBouncerShowing && - lastStartedTransitionStep.to == KeyguardState.ALTERNATE_BOUNCER - ) { - val to = - if (!isAwake) { - if (isAodAvailable) { - KeyguardState.AOD - } else { - KeyguardState.DOZING - } + .filterRelevantKeyguardStateAnd { + (isAlternateBouncerShowing, isPrimaryBouncerShowing, _, _, _) -> + !isAlternateBouncerShowing && !isPrimaryBouncerShowing + } + .collect { (_, _, isAwake, isAodAvailable, isIdleOnCommunal) -> + val to = + if (!isAwake) { + if (isAodAvailable) { + KeyguardState.AOD } else { - if (isIdleOnCommunal) { - KeyguardState.GLANCEABLE_HUB - } else { - KeyguardState.LOCKSCREEN - } + KeyguardState.DOZING } - startTransitionTo(to) - } + } else { + if (isIdleOnCommunal) { + KeyguardState.GLANCEABLE_HUB + } else { + KeyguardState.LOCKSCREEN + } + } + startTransitionTo(to) } } } @@ -158,15 +148,10 @@ constructor( private fun listenForAlternateBouncerToPrimaryBouncer() { scope.launch { keyguardInteractor.primaryBouncerShowing - .sampleUtil(startedKeyguardTransitionStep, ::Pair) - .collect { (isPrimaryBouncerShowing, startedKeyguardState) -> - if ( - isPrimaryBouncerShowing && - startedKeyguardState.to == KeyguardState.ALTERNATE_BOUNCER - ) { - startTransitionTo(KeyguardState.PRIMARY_BOUNCER) - } + .filterRelevantKeyguardStateAnd { isPrimaryBouncerShowing -> + isPrimaryBouncerShowing } + .collect { startTransitionTo(KeyguardState.PRIMARY_BOUNCER) } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt index d09ee54f2029..8682dd383a7d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt @@ -30,14 +30,12 @@ import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled import com.android.systemui.keyguard.shared.model.TransitionStep import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.util.kotlin.Utils.Companion.sample -import com.android.systemui.util.kotlin.sample import java.util.UUID import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.debounce -import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch @SysUISingleton @@ -97,14 +95,13 @@ constructor( scope.launch { powerInteractor.detailedWakefulness // React only to wake events. - .filter { it.isAwake() } + .filterRelevantKeyguardStateAnd { it.isAwake() } .sample( startedKeyguardTransitionStep, keyguardInteractor.biometricUnlockState, keyguardInteractor.primaryBouncerShowing, ) // Make sure we've at least STARTED a transition to AOD. - .filter { (_, startedStep, _, _) -> startedStep.to == KeyguardState.AOD } .collect { (_, startedStep, biometricUnlockState, primaryBouncerShowing) -> // Check with the superclass to see if an occlusion transition is needed. // Also, don't react to wake and unlock events, as we'll be receiving a call @@ -122,6 +119,7 @@ constructor( scope.launch { keyguardInteractor .dozeTransitionTo(DozeStateModel.FINISH) + .filterRelevantKeyguardState() .sample( keyguardInteractor.isKeyguardShowing, startedKeyguardTransitionStep, @@ -138,8 +136,7 @@ constructor( biometricUnlockState, primaryBouncerShowing) -> if ( - lastStartedStep.to == KeyguardState.AOD && - !occluded && + !occluded && !isWakeAndUnlock(biometricUnlockState) && isKeyguardShowing && !primaryBouncerShowing @@ -164,14 +161,12 @@ constructor( scope.launch { keyguardInteractor.isKeyguardOccluded - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { (isOccluded, lastStartedStep) -> - if (isOccluded && lastStartedStep.to == KeyguardState.AOD) { - startTransitionTo( - toState = KeyguardState.OCCLUDED, - modeOnCanceled = TransitionModeOnCanceled.RESET - ) - } + .filterRelevantKeyguardStateAnd { isOccluded -> isOccluded } + .collect { + startTransitionTo( + toState = KeyguardState.OCCLUDED, + modeOnCanceled = TransitionModeOnCanceled.RESET + ) } } } @@ -183,12 +178,8 @@ constructor( private fun listenForAodToPrimaryBouncer() { scope.launch { keyguardInteractor.primaryBouncerShowing - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { (isBouncerShowing, lastStartedTransitionStep) -> - if (isBouncerShowing && lastStartedTransitionStep.to == KeyguardState.AOD) { - startTransitionTo(KeyguardState.PRIMARY_BOUNCER) - } - } + .filterRelevantKeyguardStateAnd { primaryBouncerShowing -> primaryBouncerShowing } + .collect { startTransitionTo(KeyguardState.PRIMARY_BOUNCER) } } } @@ -201,23 +192,17 @@ constructor( scope.launch { powerInteractor.isAwake .debounce(50L) + .filterRelevantKeyguardState() .sample( keyguardInteractor.biometricUnlockState, - startedKeyguardTransitionStep, keyguardInteractor.isKeyguardShowing, keyguardInteractor.isKeyguardDismissible, ) - .collect { - ( - isAwake, - biometricUnlockState, - lastStartedTransitionStep, - isKeyguardShowing, - isKeyguardDismissible) -> + .collect { (isAwake, biometricUnlockState, isKeyguardShowing, isKeyguardDismissible) + -> KeyguardWmStateRefactor.assertInLegacyMode() if ( isAwake && - lastStartedTransitionStep.to == KeyguardState.AOD && (isWakeAndUnlock(biometricUnlockState) || (!isKeyguardShowing && isKeyguardDismissible)) ) { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt index 57b2a632008a..ca7fc669cb91 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt @@ -35,7 +35,6 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.debounce -import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch @SysUISingleton @@ -83,9 +82,9 @@ constructor( scope.launch { powerInteractor.isAwake .debounce(50L) + .filterRelevantKeyguardStateAnd { isAwake -> isAwake } .sample( keyguardInteractor.biometricUnlockState, - startedKeyguardTransitionStep, keyguardInteractor.isKeyguardOccluded, communalInteractor.isIdleOnCommunal, canDismissLockScreen, @@ -93,16 +92,12 @@ constructor( ) .collect { ( - isAwake, + _, biometricUnlockState, - lastStartedTransition, occluded, isIdleOnCommunal, canDismissLockScreen, primaryBouncerShowing) -> - if (!(isAwake && lastStartedTransition.to == KeyguardState.DOZING)) { - return@collect - } startTransitionTo( if (isWakeAndUnlock(biometricUnlockState)) { KeyguardState.GONE @@ -130,20 +125,16 @@ constructor( scope.launch { powerInteractor.detailedWakefulness - .filter { it.isAwake() } + .filterRelevantKeyguardStateAnd { it.isAwake() } .sample( - startedKeyguardTransitionStep, communalInteractor.isIdleOnCommunal, keyguardInteractor.biometricUnlockState, canDismissLockScreen, keyguardInteractor.primaryBouncerShowing, ) - // If we haven't at least STARTED a transition to DOZING, ignore. - .filter { (_, startedStep, _, _) -> startedStep.to == KeyguardState.DOZING } .collect { ( _, - _, isIdleOnCommunal, biometricUnlockState, canDismissLockscreen, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingLockscreenHostedTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingLockscreenHostedTransitionInteractor.kt index 6433d0ede796..10d1e150e6d2 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingLockscreenHostedTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingLockscreenHostedTransitionInteractor.kt @@ -26,14 +26,12 @@ import com.android.systemui.keyguard.shared.model.BiometricUnlockModel import com.android.systemui.keyguard.shared.model.DozeStateModel import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.power.domain.interactor.PowerInteractor -import com.android.systemui.util.kotlin.Utils.Companion.toTriple import com.android.systemui.util.kotlin.sample import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch @@ -73,91 +71,50 @@ constructor( // Add a slight delay to prevent transitioning to lockscreen from happening too soon // as dozing can arrive in a slight gap after the lockscreen hosted dream stops. .onEach { delay(50) } - .sample( - combine( - keyguardInteractor.dozeTransitionModel, - startedKeyguardTransitionStep, - ::Pair - ), - ::toTriple - ) - .collect { - (isActiveDreamLockscreenHosted, dozeTransitionModel, lastStartedTransition) -> - if ( - !isActiveDreamLockscreenHosted && - DozeStateModel.isDozeOff(dozeTransitionModel.to) && - lastStartedTransition.to == KeyguardState.DREAMING_LOCKSCREEN_HOSTED - ) { - startTransitionTo(KeyguardState.LOCKSCREEN) - } + .sample(keyguardInteractor.dozeTransitionModel, ::Pair) + .filterRelevantKeyguardStateAnd { + (isActiveDreamLockscreenHosted, dozeTransitionModel) -> + !isActiveDreamLockscreenHosted && + DozeStateModel.isDozeOff(dozeTransitionModel.to) } + .collect { startTransitionTo(KeyguardState.LOCKSCREEN) } } } private fun listenForDreamingLockscreenHostedToOccluded() { scope.launch { keyguardInteractor.isActiveDreamLockscreenHosted - .sample( - combine( - keyguardInteractor.isKeyguardOccluded, - startedKeyguardTransitionStep, - ::Pair, - ), - ::toTriple - ) - .collect { (isActiveDreamLockscreenHosted, isOccluded, lastStartedTransition) -> - if ( - isOccluded && - !isActiveDreamLockscreenHosted && - lastStartedTransition.to == KeyguardState.DREAMING_LOCKSCREEN_HOSTED - ) { - startTransitionTo(KeyguardState.OCCLUDED) - } + .sample(keyguardInteractor.isKeyguardOccluded, ::Pair) + .filterRelevantKeyguardStateAnd { (isActiveDreamLockscreenHosted, isOccluded) -> + isOccluded && !isActiveDreamLockscreenHosted } + .collect { startTransitionTo(KeyguardState.OCCLUDED) } } } private fun listenForDreamingLockscreenHostedToPrimaryBouncer() { scope.launch { keyguardInteractor.primaryBouncerShowing - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { (isBouncerShowing, lastStartedTransitionStep) -> - if ( - isBouncerShowing && - lastStartedTransitionStep.to == KeyguardState.DREAMING_LOCKSCREEN_HOSTED - ) { - startTransitionTo(KeyguardState.PRIMARY_BOUNCER) - } - } + .filterRelevantKeyguardStateAnd { isBouncerShowing -> isBouncerShowing } + .collect { startTransitionTo(KeyguardState.PRIMARY_BOUNCER) } } } private fun listenForDreamingLockscreenHostedToGone() { scope.launch { keyguardInteractor.biometricUnlockState - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { (biometricUnlockState, lastStartedTransitionStep) -> - if ( - lastStartedTransitionStep.to == KeyguardState.DREAMING_LOCKSCREEN_HOSTED && - biometricUnlockState == BiometricUnlockModel.WAKE_AND_UNLOCK_FROM_DREAM - ) { - startTransitionTo(KeyguardState.GONE) - } + .filterRelevantKeyguardStateAnd { biometricUnlockState -> + biometricUnlockState == BiometricUnlockModel.WAKE_AND_UNLOCK_FROM_DREAM } + .collect { startTransitionTo(KeyguardState.GONE) } } } private fun listenForDreamingLockscreenHostedToDozing() { scope.launch { - combine(keyguardInteractor.dozeTransitionModel, startedKeyguardTransitionStep, ::Pair) - .collect { (dozeTransitionModel, lastStartedTransitionStep) -> - if ( - dozeTransitionModel.to == DozeStateModel.DOZE && - lastStartedTransitionStep.to == KeyguardState.DREAMING_LOCKSCREEN_HOSTED - ) { - startTransitionTo(KeyguardState.DOZING) - } - } + keyguardInteractor.dozeTransitionModel + .filterRelevantKeyguardStateAnd { it.to == DozeStateModel.DOZE } + .collect { startTransitionTo(KeyguardState.DOZING) } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt index 1f24fc23bbdd..8d7c964cc71d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt @@ -29,17 +29,13 @@ import com.android.systemui.keyguard.shared.model.BiometricUnlockModel import com.android.systemui.keyguard.shared.model.DozeStateModel import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.power.domain.interactor.PowerInteractor -import com.android.systemui.util.kotlin.Utils import com.android.systemui.util.kotlin.Utils.Companion.sample as sampleCombine -import com.android.systemui.util.kotlin.Utils.Companion.toTriple -import com.android.systemui.util.kotlin.sample import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.combine -import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch @SysUISingleton @@ -118,10 +114,7 @@ constructor( keyguardOcclusionInteractor.isShowWhenLockedActivityOnTop, ::Pair ) - .sample(startedKeyguardTransitionStep, ::toTriple) - .filter { (isDreaming, _, startedStep) -> - !isDreaming && startedStep.to == KeyguardState.DREAMING - } + .filterRelevantKeyguardStateAnd { (isDreaming, _) -> !isDreaming } .collect { maybeStartTransitionToOccludedOrInsecureCamera() } } } else { @@ -131,16 +124,10 @@ constructor( keyguardInteractor.isDreaming, ::Pair ) - .sample(startedKeyguardTransitionStep, Utils.Companion::toTriple) - .collect { (isOccluded, isDreaming, lastStartedTransition) -> - if ( - isOccluded && - !isDreaming && - lastStartedTransition.to == KeyguardState.DREAMING - ) { - startTransitionTo(KeyguardState.OCCLUDED) - } + .filterRelevantKeyguardStateAnd { (isOccluded, isDreaming) -> + isOccluded && !isDreaming } + .collect { startTransitionTo(KeyguardState.OCCLUDED) } } } } @@ -152,13 +139,8 @@ constructor( scope.launch { keyguardOcclusionInteractor.isShowWhenLockedActivityOnTop - .filter { onTop -> !onTop } - .sample(startedKeyguardState) - .collect { startedState -> - if (startedState == KeyguardState.DREAMING) { - startTransitionTo(KeyguardState.LOCKSCREEN) - } - } + .filterRelevantKeyguardStateAnd { onTop -> !onTop } + .collect { startTransitionTo(KeyguardState.LOCKSCREEN) } } } @@ -168,49 +150,35 @@ constructor( .sampleCombine( keyguardInteractor.isKeyguardShowing, keyguardInteractor.isKeyguardDismissible, - startedKeyguardTransitionStep, ) - .collect { - (isDreaming, isKeyguardShowing, isKeyguardDismissible, lastStartedTransition) -> - if ( - !isDreaming && - lastStartedTransition.to == KeyguardState.DREAMING && - isKeyguardDismissible && - !isKeyguardShowing - ) { - startTransitionTo(KeyguardState.GONE) - } + .filterRelevantKeyguardStateAnd { + (isDreaming, isKeyguardShowing, isKeyguardDismissible) -> + !isDreaming && isKeyguardDismissible && !isKeyguardShowing } + .collect { startTransitionTo(KeyguardState.GONE) } } } private fun listenForDreamingToGoneFromBiometricUnlock() { scope.launch { keyguardInteractor.biometricUnlockState - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { (biometricUnlockState, lastStartedTransitionStep) -> - if ( - lastStartedTransitionStep.to == KeyguardState.DREAMING && - biometricUnlockState == BiometricUnlockModel.WAKE_AND_UNLOCK_FROM_DREAM - ) { - startTransitionTo(KeyguardState.GONE) - } + .filterRelevantKeyguardStateAnd { biometricUnlockState -> + biometricUnlockState == BiometricUnlockModel.WAKE_AND_UNLOCK_FROM_DREAM } + .collect { startTransitionTo(KeyguardState.GONE) } } } private fun listenForDreamingToAodOrDozing() { scope.launch { - combine(keyguardInteractor.dozeTransitionModel, finishedKeyguardState, ::Pair) - .collect { (dozeTransitionModel, keyguardState) -> - if (keyguardState == KeyguardState.DREAMING) { - if (dozeTransitionModel.to == DozeStateModel.DOZE) { - startTransitionTo(KeyguardState.DOZING) - } else if (dozeTransitionModel.to == DozeStateModel.DOZE_AOD) { - startTransitionTo(KeyguardState.AOD) - } - } + keyguardInteractor.dozeTransitionModel.filterRelevantKeyguardState().collect { + dozeTransitionModel -> + if (dozeTransitionModel.to == DozeStateModel.DOZE) { + startTransitionTo(KeyguardState.DOZING) + } else if (dozeTransitionModel.to == DozeStateModel.DOZE_AOD) { + startTransitionTo(KeyguardState.AOD) } + } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGlanceableHubTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGlanceableHubTransitionInteractor.kt index 51bc3ae778e5..54d9a78620e5 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGlanceableHubTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGlanceableHubTransitionInteractor.kt @@ -30,13 +30,11 @@ import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.util.kotlin.BooleanFlowOperators.and import com.android.systemui.util.kotlin.BooleanFlowOperators.not -import com.android.systemui.util.kotlin.sample import javax.inject.Inject import kotlin.time.Duration.Companion.seconds import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.collectLatest -import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -113,46 +111,31 @@ constructor( private fun listenForHubToPrimaryBouncer() { scope.launch("$TAG#listenForHubToPrimaryBouncer") { keyguardInteractor.primaryBouncerShowing - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { pair -> - val (isBouncerShowing, lastStartedTransitionStep) = pair - if ( - isBouncerShowing && - lastStartedTransitionStep.to == KeyguardState.GLANCEABLE_HUB - ) { - startTransitionTo(KeyguardState.PRIMARY_BOUNCER) - } - } + .filterRelevantKeyguardStateAnd { primaryBouncerShowing -> primaryBouncerShowing } + .collect { startTransitionTo(KeyguardState.PRIMARY_BOUNCER) } } } private fun listenForHubToAlternateBouncer() { scope.launch("$TAG#listenForHubToAlternateBouncer") { keyguardInteractor.alternateBouncerShowing - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { pair -> - val (isAlternateBouncerShowing, lastStartedTransitionStep) = pair - if ( - isAlternateBouncerShowing && - lastStartedTransitionStep.to == KeyguardState.GLANCEABLE_HUB - ) { - startTransitionTo(KeyguardState.ALTERNATE_BOUNCER) - } + .filterRelevantKeyguardStateAnd { alternateBouncerShowing -> + alternateBouncerShowing } + .collect { pair -> startTransitionTo(KeyguardState.ALTERNATE_BOUNCER) } } } private fun listenForHubToDozing() { scope.launch { - powerInteractor.isAsleep.sample(startedKeyguardTransitionStep, ::Pair).collect { - (isAsleep, lastStartedStep) -> - if (lastStartedStep.to == fromState && isAsleep) { + powerInteractor.isAsleep + .filterRelevantKeyguardStateAnd { isAsleep -> isAsleep } + .collect { startTransitionTo( toState = KeyguardState.DOZING, modeOnCanceled = TransitionModeOnCanceled.LAST_VALUE, ) } - } } } @@ -160,22 +143,17 @@ constructor( if (KeyguardWmStateRefactor.isEnabled) { scope.launch { keyguardOcclusionInteractor.isShowWhenLockedActivityOnTop - .filter { onTop -> onTop } - .sample(startedKeyguardState) - .collect { - if (it == KeyguardState.GLANCEABLE_HUB) { - maybeStartTransitionToOccludedOrInsecureCamera() - } - } + .filterRelevantKeyguardStateAnd { onTop -> onTop } + .collect { maybeStartTransitionToOccludedOrInsecureCamera() } } } else { scope.launch { and(keyguardInteractor.isKeyguardOccluded, not(keyguardInteractor.isDreaming)) - .sample(startedKeyguardState, ::Pair) - .collect { (isOccludedAndNotDreaming, keyguardState) -> - if (isOccludedAndNotDreaming && keyguardState == fromState) { - startTransitionTo(KeyguardState.OCCLUDED) - } + .filterRelevantKeyguardStateAnd { isOccludedAndNotDreaming -> + isOccludedAndNotDreaming + } + .collect { isOccludedAndNotDreaming -> + startTransitionTo(KeyguardState.OCCLUDED) } } } @@ -184,12 +162,8 @@ constructor( private fun listenForHubToGone() { scope.launch { keyguardInteractor.isKeyguardGoingAway - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { (isKeyguardGoingAway, lastStartedStep) -> - if (isKeyguardGoingAway && lastStartedStep.to == fromState) { - startTransitionTo(KeyguardState.GONE) - } - } + .filterRelevantKeyguardStateAnd { isKeyguardGoingAway -> isKeyguardGoingAway } + .collect { startTransitionTo(KeyguardState.GONE) } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt index 4a3232e755bd..4a8818207568 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt @@ -28,16 +28,12 @@ import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepositor import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled import com.android.systemui.power.domain.interactor.PowerInteractor -import com.android.systemui.util.kotlin.Utils.Companion.sample -import com.android.systemui.util.kotlin.Utils.Companion.toTriple import com.android.systemui.util.kotlin.sample import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch @SysUISingleton @@ -81,40 +77,31 @@ constructor( scope.launch { biometricSettingsRepository.isCurrentUserInLockdown .distinctUntilChanged() - .filter { inLockdown -> inLockdown } - .sample( - startedKeyguardState, - communalInteractor.isIdleOnCommunal, - ) - .collect { (_, startedState, isIdleOnCommunal) -> - if (startedState == KeyguardState.GONE) { - val to = - if (isIdleOnCommunal) { - KeyguardState.GLANCEABLE_HUB - } else { - KeyguardState.LOCKSCREEN - } - startTransitionTo(to, ownerReason = "User initiated lockdown") - } + .filterRelevantKeyguardStateAnd { inLockdown -> inLockdown } + .sample(communalInteractor.isIdleOnCommunal, ::Pair) + .collect { (_, isIdleOnCommunal) -> + val to = + if (isIdleOnCommunal) { + KeyguardState.GLANCEABLE_HUB + } else { + KeyguardState.LOCKSCREEN + } + startTransitionTo(to, ownerReason = "User initiated lockdown") } } } else { scope.launch { keyguardInteractor.isKeyguardShowing - .sample( - startedKeyguardState, - communalInteractor.isIdleOnCommunal, - ) - .collect { (isKeyguardShowing, startedState, isIdleOnCommunal) -> - if (isKeyguardShowing && startedState == KeyguardState.GONE) { - val to = - if (isIdleOnCommunal) { - KeyguardState.GLANCEABLE_HUB - } else { - KeyguardState.LOCKSCREEN - } - startTransitionTo(to) - } + .filterRelevantKeyguardStateAnd { isKeyguardShowing -> isKeyguardShowing } + .sample(communalInteractor.isIdleOnCommunal, ::Pair) + .collect { (_, isIdleOnCommunal) -> + val to = + if (isIdleOnCommunal) { + KeyguardState.GLANCEABLE_HUB + } else { + KeyguardState.LOCKSCREEN + } + startTransitionTo(to) } } } @@ -123,42 +110,27 @@ constructor( private fun listenForGoneToDreamingLockscreenHosted() { scope.launch { keyguardInteractor.isActiveDreamLockscreenHosted - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { (isActiveDreamLockscreenHosted, lastStartedStep) -> - if (isActiveDreamLockscreenHosted && lastStartedStep.to == KeyguardState.GONE) { - startTransitionTo(KeyguardState.DREAMING_LOCKSCREEN_HOSTED) - } + .filterRelevantKeyguardStateAnd { isActiveDreamLockscreenHosted -> + isActiveDreamLockscreenHosted } + .collect { startTransitionTo(KeyguardState.DREAMING_LOCKSCREEN_HOSTED) } } } private fun listenForGoneToDreaming() { scope.launch { keyguardInteractor.isAbleToDream - .sample( - combine( - startedKeyguardTransitionStep, - keyguardInteractor.isActiveDreamLockscreenHosted, - ::Pair - ), - ::toTriple - ) - .collect { (isAbleToDream, lastStartedStep, isActiveDreamLockscreenHosted) -> - if ( - isAbleToDream && - lastStartedStep.to == KeyguardState.GONE && - !isActiveDreamLockscreenHosted - ) { - startTransitionTo(KeyguardState.DREAMING) - } + .sample(keyguardInteractor.isActiveDreamLockscreenHosted, ::Pair) + .filterRelevantKeyguardStateAnd { (isAbleToDream, isActiveDreamLockscreenHosted) -> + isAbleToDream && !isActiveDreamLockscreenHosted } + .collect { startTransitionTo(KeyguardState.DREAMING) } } } private fun listenForGoneToAodOrDozing() { scope.launch { listenForSleepTransition( - from = KeyguardState.GONE, modeOnCanceledFromStartedStep = { TransitionModeOnCanceled.RESET }, ) } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt index 2649d4347495..b35faf753ba9 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt @@ -32,8 +32,7 @@ import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.shade.data.repository.ShadeRepository -import com.android.systemui.util.kotlin.Utils.Companion.toQuad -import com.android.systemui.util.kotlin.sample +import com.android.systemui.util.kotlin.Utils.Companion.sample as sampleCombine import java.util.UUID import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds @@ -41,14 +40,11 @@ import kotlin.time.Duration.Companion.seconds import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext @SysUISingleton class FromLockscreenTransitionInteractor @@ -125,25 +121,22 @@ constructor( val invalidFromStates = setOf(KeyguardState.AOD, KeyguardState.DOZING) scope.launch { keyguardInteractor.isAbleToDream - .sample( - combine( - startedKeyguardTransitionStep, - finishedKeyguardState, - keyguardInteractor.isActiveDreamLockscreenHosted, - ::Triple - ), - ::toQuad + .filterRelevantKeyguardState() + .sampleCombine( + transitionInteractor.currentTransitionInfoInternal, + finishedKeyguardState, + keyguardInteractor.isActiveDreamLockscreenHosted, ) .collect { ( isAbleToDream, - lastStartedTransition, + transitionInfo, finishedKeyguardState, isActiveDreamLockscreenHosted) -> val isOnLockscreen = finishedKeyguardState == KeyguardState.LOCKSCREEN val isTransitionInterruptible = - lastStartedTransition.to == KeyguardState.LOCKSCREEN && - !invalidFromStates.contains(lastStartedTransition.from) + transitionInfo.to == KeyguardState.LOCKSCREEN && + !invalidFromStates.contains(transitionInfo.from) if (isAbleToDream && (isOnLockscreen || isTransitionInterruptible)) { if (isActiveDreamLockscreenHosted) { startTransitionTo(KeyguardState.DREAMING_LOCKSCREEN_HOSTED) @@ -158,17 +151,12 @@ constructor( private fun listenForLockscreenToPrimaryBouncer() { scope.launch { keyguardInteractor.primaryBouncerShowing - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { pair -> - val (isBouncerShowing, lastStartedTransitionStep) = pair - if ( - isBouncerShowing && lastStartedTransitionStep.to == KeyguardState.LOCKSCREEN - ) { - startTransitionTo( - KeyguardState.PRIMARY_BOUNCER, - ownerReason = "#listenForLockscreenToPrimaryBouncer" - ) - } + .filterRelevantKeyguardStateAnd { isBouncerShowing -> isBouncerShowing } + .collect { + startTransitionTo( + KeyguardState.PRIMARY_BOUNCER, + ownerReason = "#listenForLockscreenToPrimaryBouncer" + ) } } } @@ -176,16 +164,10 @@ constructor( private fun listenForLockscreenToAlternateBouncer() { scope.launch { keyguardInteractor.alternateBouncerShowing - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { pair -> - val (isAlternateBouncerShowing, lastStartedTransitionStep) = pair - if ( - isAlternateBouncerShowing && - lastStartedTransitionStep.to == KeyguardState.LOCKSCREEN - ) { - startTransitionTo(KeyguardState.ALTERNATE_BOUNCER) - } + .filterRelevantKeyguardStateAnd { isAlternateBouncerShowing -> + isAlternateBouncerShowing } + .collect { pair -> startTransitionTo(KeyguardState.ALTERNATE_BOUNCER) } } } @@ -194,81 +176,82 @@ constructor( var transitionId: UUID? = null scope.launch { shadeRepository.legacyShadeExpansion - .sample( - combine( - startedKeyguardTransitionStep, - keyguardInteractor.statusBarState, - keyguardInteractor.isKeyguardDismissible, - ::Triple - ), - ::toQuad + .sampleCombine( + startedKeyguardTransitionStep, + transitionInteractor.currentTransitionInfoInternal, + keyguardInteractor.statusBarState, + keyguardInteractor.isKeyguardDismissible, ) - .collect { (shadeExpansion, keyguardState, statusBarState, isKeyguardUnlocked) -> - withContext(mainDispatcher) { - val id = transitionId - if (id != null) { - if (keyguardState.to == KeyguardState.PRIMARY_BOUNCER) { - // An existing `id` means a transition is started, and calls to - // `updateTransition` will control it until FINISHED or CANCELED - var nextState = - if (shadeExpansion == 0f) { - TransitionState.FINISHED - } else if (shadeExpansion == 1f) { - TransitionState.CANCELED - } else { - TransitionState.RUNNING - } - transitionRepository.updateTransition( - id, - // This maps the shadeExpansion to a much faster curve, to match - // the existing logic - 1f - - MathUtils.constrainedMap(0f, 1f, 0.95f, 1f, shadeExpansion), - nextState, - ) - - if ( - nextState == TransitionState.CANCELED || - nextState == TransitionState.FINISHED - ) { - transitionId = null + .collect { + ( + shadeExpansion, + startedStep, + currentTransitionInfo, + statusBarState, + isKeyguardUnlocked) -> + val id = transitionId + if (id != null) { + if (startedStep.to == KeyguardState.PRIMARY_BOUNCER) { + // An existing `id` means a transition is started, and calls to + // `updateTransition` will control it until FINISHED or CANCELED + var nextState = + if (shadeExpansion == 0f) { + TransitionState.FINISHED + } else if (shadeExpansion == 1f) { + TransitionState.CANCELED + } else { + TransitionState.RUNNING } + transitionRepository.updateTransition( + id, + // This maps the shadeExpansion to a much faster curve, to match + // the existing logic + 1f - MathUtils.constrainedMap(0f, 1f, 0.95f, 1f, shadeExpansion), + nextState, + ) - // If canceled, just put the state back - // TODO(b/278086361): This logic should happen in - // FromPrimaryBouncerInteractor. - if (nextState == TransitionState.CANCELED) { - transitionRepository.startTransition( - TransitionInfo( - ownerName = name, - from = KeyguardState.PRIMARY_BOUNCER, - to = KeyguardState.LOCKSCREEN, - animator = - getDefaultAnimatorForTransitionsToState( - KeyguardState.LOCKSCREEN - ) - .apply { duration = 0 } - ) - ) - } - } - } else { - // TODO (b/251849525): Remove statusbarstate check when that state is - // integrated into KeyguardTransitionRepository if ( - keyguardState.to == KeyguardState.LOCKSCREEN && - shadeRepository.legacyShadeTracking.value && - !isKeyguardUnlocked && - statusBarState == KEYGUARD + nextState == TransitionState.CANCELED || + nextState == TransitionState.FINISHED ) { - transitionId = - startTransitionTo( - toState = KeyguardState.PRIMARY_BOUNCER, - animator = null, // transition will be manually controlled, - ownerReason = "#listenForLockscreenToPrimaryBouncerDragging" + transitionId = null + } + + // If canceled, just put the state back + // TODO(b/278086361): This logic should happen in + // FromPrimaryBouncerInteractor. + if (nextState == TransitionState.CANCELED) { + transitionRepository.startTransition( + TransitionInfo( + ownerName = name, + from = KeyguardState.PRIMARY_BOUNCER, + to = KeyguardState.LOCKSCREEN, + animator = + getDefaultAnimatorForTransitionsToState( + KeyguardState.LOCKSCREEN + ) + .apply { duration = 0 } ) + ) } } + } else { + // TODO (b/251849525): Remove statusbarstate check when that state is + // integrated into KeyguardTransitionRepository + if ( + // Use currentTransitionInfo to decide whether to start the transition. + currentTransitionInfo.to == KeyguardState.LOCKSCREEN && + shadeRepository.legacyShadeTracking.value && + !isKeyguardUnlocked && + statusBarState == KEYGUARD + ) { + transitionId = + startTransitionTo( + toState = KeyguardState.PRIMARY_BOUNCER, + animator = null, // transition will be manually controlled, + ownerReason = "#listenForLockscreenToPrimaryBouncerDragging" + ) + } } } } @@ -285,15 +268,12 @@ constructor( scope.launch { keyguardInteractor.isKeyguardGoingAway - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { pair -> - val (isKeyguardGoingAway, lastStartedStep) = pair - if (isKeyguardGoingAway && lastStartedStep.to == KeyguardState.LOCKSCREEN) { - startTransitionTo( - KeyguardState.GONE, - modeOnCanceled = TransitionModeOnCanceled.RESET, - ) - } + .filterRelevantKeyguardStateAnd { isKeyguardGoingAway -> isKeyguardGoingAway } + .collect { + startTransitionTo( + KeyguardState.GONE, + modeOnCanceled = TransitionModeOnCanceled.RESET, + ) } } } @@ -302,9 +282,10 @@ constructor( if (KeyguardWmStateRefactor.isEnabled) { // When the refactor is enabled, we no longer use isKeyguardGoingAway. scope.launch { - swipeToDismissInteractor.dismissFling.filterNotNull().collect { _ -> - startTransitionTo(KeyguardState.GONE) - } + swipeToDismissInteractor.dismissFling + .filterNotNull() + .filterRelevantKeyguardState() + .collect { _ -> startTransitionTo(KeyguardState.GONE) } } } } @@ -313,29 +294,22 @@ constructor( if (KeyguardWmStateRefactor.isEnabled) { scope.launch { keyguardOcclusionInteractor.showWhenLockedActivityInfo - .filter { it.isOnTop } - .sample(startedKeyguardState, ::Pair) - .collect { (taskInfo, startedState) -> - if (startedState == KeyguardState.LOCKSCREEN) { - startTransitionTo( - if (taskInfo.isDream()) { - KeyguardState.DREAMING - } else { - KeyguardState.OCCLUDED - } - ) - } + .filterRelevantKeyguardStateAnd { it.isOnTop } + .collect { taskInfo -> + startTransitionTo( + if (taskInfo.isDream()) { + KeyguardState.DREAMING + } else { + KeyguardState.OCCLUDED + } + ) } } } else { scope.launch { keyguardInteractor.isKeyguardOccluded - .sample(startedKeyguardState, ::Pair) - .collect { (isOccluded, keyguardState) -> - if (isOccluded && keyguardState == KeyguardState.LOCKSCREEN) { - startTransitionTo(KeyguardState.OCCLUDED) - } - } + .filterRelevantKeyguardStateAnd { isOccluded -> isOccluded } + .collect { startTransitionTo(KeyguardState.OCCLUDED) } } } } @@ -343,7 +317,6 @@ constructor( private fun listenForLockscreenToAodOrDozing() { scope.launch { listenForSleepTransition( - from = KeyguardState.LOCKSCREEN, modeOnCanceledFromStartedStep = { startedStep -> if ( transitionInteractor.asleepKeyguardState.value == KeyguardState.AOD && diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromOccludedTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromOccludedTransitionInteractor.kt index a0ab8699ca48..b6289d44e2c3 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromOccludedTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromOccludedTransitionInteractor.kt @@ -32,7 +32,6 @@ import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch @SysUISingleton @@ -70,25 +69,16 @@ constructor( private fun listenForOccludedToPrimaryBouncer() { scope.launch { keyguardInteractor.primaryBouncerShowing - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { (isBouncerShowing, lastStartedTransitionStep) -> - if ( - isBouncerShowing && lastStartedTransitionStep.to == KeyguardState.OCCLUDED - ) { - startTransitionTo(KeyguardState.PRIMARY_BOUNCER) - } - } + .filterRelevantKeyguardStateAnd { isBouncerShowing -> isBouncerShowing } + .collect { startTransitionTo(KeyguardState.PRIMARY_BOUNCER) } } } private fun listenForOccludedToDreaming() { scope.launch { - keyguardInteractor.isAbleToDream.sample(finishedKeyguardState, ::Pair).collect { - (isAbleToDream, keyguardState) -> - if (isAbleToDream && keyguardState == KeyguardState.OCCLUDED) { - startTransitionTo(KeyguardState.DREAMING) - } - } + keyguardInteractor.isAbleToDream + .filterRelevantKeyguardStateAnd { isAbleToDream -> isAbleToDream } + .collect { startTransitionTo(KeyguardState.DREAMING) } } } @@ -96,23 +86,18 @@ constructor( if (KeyguardWmStateRefactor.isEnabled) { scope.launch { keyguardOcclusionInteractor.isShowWhenLockedActivityOnTop - .filter { onTop -> !onTop } - .sample( - startedKeyguardState, - communalInteractor.isIdleOnCommunal, - ) - .collect { (_, startedState, isIdleOnCommunal) -> + .filterRelevantKeyguardStateAnd { onTop -> !onTop } + .sample(communalInteractor.isIdleOnCommunal, ::Pair) + .collect { (_, isIdleOnCommunal) -> // Occlusion signals come from the framework, and should interrupt any // existing transition - if (startedState == KeyguardState.OCCLUDED) { - val to = - if (isIdleOnCommunal) { - KeyguardState.GLANCEABLE_HUB - } else { - KeyguardState.LOCKSCREEN - } - startTransitionTo(to) - } + val to = + if (isIdleOnCommunal) { + KeyguardState.GLANCEABLE_HUB + } else { + KeyguardState.LOCKSCREEN + } + startTransitionTo(to) } } } else { @@ -120,26 +105,21 @@ constructor( keyguardInteractor.isKeyguardOccluded .sample( keyguardInteractor.isKeyguardShowing, - startedKeyguardTransitionStep, communalInteractor.isIdleOnCommunal, ) - .collect { (isOccluded, isShowing, lastStartedKeyguardState, isIdleOnCommunal) - -> + .filterRelevantKeyguardStateAnd { (isOccluded, isShowing, _) -> + !isOccluded && isShowing + } + .collect { (_, _, isIdleOnCommunal) -> // Occlusion signals come from the framework, and should interrupt any // existing transition - if ( - !isOccluded && - isShowing && - lastStartedKeyguardState.to == KeyguardState.OCCLUDED - ) { - val to = - if (isIdleOnCommunal) { - KeyguardState.GLANCEABLE_HUB - } else { - KeyguardState.LOCKSCREEN - } - startTransitionTo(to) - } + val to = + if (isIdleOnCommunal) { + KeyguardState.GLANCEABLE_HUB + } else { + KeyguardState.LOCKSCREEN + } + startTransitionTo(to) } } } @@ -156,20 +136,12 @@ constructor( scope.launch { keyguardInteractor.isKeyguardOccluded - .sample( - keyguardInteractor.isKeyguardShowing, - startedKeyguardTransitionStep, - ) - .collect { (isOccluded, isShowing, lastStartedKeyguardState) -> + .sample(keyguardInteractor.isKeyguardShowing, ::Pair) + .filterRelevantKeyguardStateAnd { (occluded, showing) -> !occluded && !showing } + .collect { // Occlusion signals come from the framework, and should interrupt any // existing transition - if ( - !isOccluded && - !isShowing && - lastStartedKeyguardState.to == KeyguardState.OCCLUDED - ) { - startTransitionTo(KeyguardState.GONE) - } + startTransitionTo(KeyguardState.GONE) } } } @@ -179,21 +151,16 @@ constructor( } private fun listenForOccludedToAsleep() { - scope.launch { listenForSleepTransition(from = KeyguardState.OCCLUDED) } + scope.launch { listenForSleepTransition() } } private fun listenForOccludedToAlternateBouncer() { scope.launch { keyguardInteractor.alternateBouncerShowing - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { (isAlternateBouncerShowing, lastStartedTransitionStep) -> - if ( - isAlternateBouncerShowing && - lastStartedTransitionStep.to == KeyguardState.OCCLUDED - ) { - startTransitionTo(KeyguardState.ALTERNATE_BOUNCER) - } + .filterRelevantKeyguardStateAnd { isAlternateBouncerShowing -> + isAlternateBouncerShowing } + .collect { startTransitionTo(KeyguardState.ALTERNATE_BOUNCER) } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt index c7fafba3aa19..181a551b0537 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt @@ -30,7 +30,6 @@ import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.user.domain.interactor.SelectedUserInteractor import com.android.systemui.util.kotlin.Utils.Companion.sample -import com.android.systemui.util.kotlin.Utils.Companion.toTriple import com.android.systemui.util.kotlin.sample import com.android.wm.shell.animation.Interpolators import javax.inject.Inject @@ -40,7 +39,6 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.launch @@ -104,21 +102,14 @@ constructor( scope.launch { keyguardInteractor.primaryBouncerShowing .sample( - startedKeyguardTransitionStep, powerInteractor.isAwake, keyguardInteractor.isActiveDreamLockscreenHosted, communalInteractor.isIdleOnCommunal ) - .filter { (_, startedStep, _, _) -> - startedStep.to == KeyguardState.PRIMARY_BOUNCER - } + .filterRelevantKeyguardState() .collect { - ( - isBouncerShowing, - _, - isAwake, - isActiveDreamLockscreenHosted, - isIdleOnCommunal) -> + (isBouncerShowing, isAwake, isActiveDreamLockscreenHosted, isIdleOnCommunal) + -> if ( !maybeStartTransitionToOccludedOrInsecureCamera() && !isBouncerShowing && @@ -140,69 +131,45 @@ constructor( keyguardInteractor.primaryBouncerShowing .sample( powerInteractor.isAwake, - startedKeyguardTransitionStep, keyguardInteractor.isKeyguardOccluded, keyguardInteractor.isDreaming, keyguardInteractor.isActiveDreamLockscreenHosted, communalInteractor.isIdleOnCommunal, ) - .collect { - ( - isBouncerShowing, - isAwake, - lastStartedTransitionStep, - occluded, - isDreaming, - isActiveDreamLockscreenHosted, - isIdleOnCommunal) -> - if ( - !isBouncerShowing && - lastStartedTransitionStep.to == KeyguardState.PRIMARY_BOUNCER && - isAwake && - !isActiveDreamLockscreenHosted - ) { - val toState = - if (occluded && !isDreaming) { - KeyguardState.OCCLUDED - } else if (isIdleOnCommunal) { - KeyguardState.GLANCEABLE_HUB - } else if (isDreaming) { - KeyguardState.DREAMING - } else { - KeyguardState.LOCKSCREEN - } - startTransitionTo(toState) - } + .filterRelevantKeyguardStateAnd { + (isBouncerShowing, isAwake, _, _, isActiveDreamLockscreenHosted, _) -> + !isBouncerShowing && isAwake && !isActiveDreamLockscreenHosted + } + .collect { (_, _, occluded, isDreaming, _, isIdleOnCommunal) -> + val toState = + if (occluded && !isDreaming) { + KeyguardState.OCCLUDED + } else if (isIdleOnCommunal) { + KeyguardState.GLANCEABLE_HUB + } else if (isDreaming) { + KeyguardState.DREAMING + } else { + KeyguardState.LOCKSCREEN + } + startTransitionTo(toState) } } } } private fun listenForPrimaryBouncerToAsleep() { - scope.launch { listenForSleepTransition(from = KeyguardState.PRIMARY_BOUNCER) } + scope.launch { listenForSleepTransition() } } private fun listenForPrimaryBouncerToDreamingLockscreenHosted() { scope.launch { keyguardInteractor.primaryBouncerShowing - .sample( - combine( - keyguardInteractor.isActiveDreamLockscreenHosted, - startedKeyguardTransitionStep, - ::Pair - ), - ::toTriple - ) - .collect { - (isBouncerShowing, isActiveDreamLockscreenHosted, lastStartedTransitionStep) -> - if ( - !isBouncerShowing && - isActiveDreamLockscreenHosted && - lastStartedTransitionStep.to == KeyguardState.PRIMARY_BOUNCER - ) { - startTransitionTo(KeyguardState.DREAMING_LOCKSCREEN_HOSTED) - } + .sample(keyguardInteractor.isActiveDreamLockscreenHosted, ::Pair) + .filterRelevantKeyguardStateAnd { (isBouncerShowing, isActiveDreamLockscreenHosted) + -> + !isBouncerShowing && isActiveDreamLockscreenHosted } + .collect { startTransitionTo(KeyguardState.DREAMING_LOCKSCREEN_HOSTED) } } } @@ -216,33 +183,28 @@ constructor( scope.launch { keyguardInteractor.isKeyguardGoingAway - .sample(startedKeyguardTransitionStep, ::Pair) - .collect { (isKeyguardGoingAway, lastStartedTransitionStep) -> - if ( - isKeyguardGoingAway && - lastStartedTransitionStep.to == KeyguardState.PRIMARY_BOUNCER - ) { - val securityMode = - keyguardSecurityModel.getSecurityMode( - selectedUserInteractor.getSelectedUserId() - ) - // IME for password requires a slightly faster animation - val duration = - if (securityMode == KeyguardSecurityModel.SecurityMode.Password) { - TO_GONE_SHORT_DURATION - } else { - TO_GONE_DURATION - } - - startTransitionTo( - toState = KeyguardState.GONE, - animator = - getDefaultAnimatorForTransitionsToState(KeyguardState.GONE).apply { - this.duration = duration.inWholeMilliseconds - }, - modeOnCanceled = TransitionModeOnCanceled.RESET, + .filterRelevantKeyguardStateAnd { isKeyguardGoingAway -> isKeyguardGoingAway } + .collect { + val securityMode = + keyguardSecurityModel.getSecurityMode( + selectedUserInteractor.getSelectedUserId() ) - } + // IME for password requires a slightly faster animation + val duration = + if (securityMode == KeyguardSecurityModel.SecurityMode.Password) { + TO_GONE_SHORT_DURATION + } else { + TO_GONE_DURATION + } + + startTransitionTo( + toState = KeyguardState.GONE, + animator = + getDefaultAnimatorForTransitionsToState(KeyguardState.GONE).apply { + this.duration = duration.inWholeMilliseconds + }, + modeOnCanceled = TransitionModeOnCanceled.RESET, + ) } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardClockInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardClockInteractor.kt index d492135bd482..99b691ebd6ae 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardClockInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardClockInteractor.kt @@ -29,8 +29,7 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow private val TAG = KeyguardClockInteractor::class.simpleName -/** Manages keyguard clock for the lockscreen root view. */ -/** Encapsulates business-logic related to the keyguard clock. */ +/** Manages and ecapsulates the clock components of the lockscreen root view. */ @SysUISingleton class KeyguardClockInteractor @Inject @@ -46,6 +45,8 @@ constructor( val previewClock: Flow<ClockController> = keyguardClockRepository.previewClock + val clockEventController: ClockEventController by keyguardClockRepository::clockEventController + var clock: ClockController? by keyguardClockRepository.clockEventController::clock val clockSize: StateFlow<Int> = keyguardClockRepository.clockSize @@ -53,8 +54,10 @@ constructor( keyguardClockRepository.setClockSize(size) } - val clockEventController: ClockEventController - get() { - return keyguardClockRepository.clockEventController + fun animateFoldToAod(foldFraction: Float) { + clock?.let { clock -> + clock.smallClock.animations.fold(foldFraction) + clock.largeClock.animations.fold(foldFraction) } + } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt index 804b630c3288..97081d93892a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt @@ -35,6 +35,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.LOCKSCREEN import com.android.systemui.keyguard.shared.model.KeyguardState.OCCLUDED import com.android.systemui.keyguard.shared.model.KeyguardState.OFF import com.android.systemui.keyguard.shared.model.KeyguardState.PRIMARY_BOUNCER +import com.android.systemui.keyguard.shared.model.TransitionInfo import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep import com.android.systemui.util.kotlin.pairwise @@ -391,6 +392,31 @@ constructor( .distinctUntilChanged() .shareIn(scope, SharingStarted.Eagerly, replay = 1) + /** + * The [TransitionInfo] of the most recent call to + * [KeyguardTransitionRepository.startTransition]. + * + * This should only be used by keyguard transition internals (From*TransitionInteractor and + * related classes). Other consumers of keyguard state in System UI should use + * [startedKeyguardState], [currentKeyguardState], and related flows. + * + * Keyguard internals use this to determine the most up-to-date KeyguardState that we've + * requested a transition to, even if the animator running the transition on the main thread has + * not yet emitted the STARTED TransitionStep. + * + * For example: if we're finished in GONE and press the power button twice very quickly, we may + * request a transition to AOD, but then receive the second power button press prior to the + * STARTED -> AOD transition step emitting. We still need the FromAodTransitionInteractor to + * request a transition from AOD -> LOCKSCREEN in response to the power press, even though the + * main thread animator hasn't emitted STARTED > AOD yet (which means [startedKeyguardState] is + * still GONE, which is not relevant to FromAodTransitionInteractor). In this case, the + * interactor can use this current transition info to determine that a STARTED -> AOD step + * *will* be emitted, and therefore that it can safely request an AOD -> LOCKSCREEN transition + * which will subsequently cancel GONE -> AOD. + */ + internal val currentTransitionInfoInternal: StateFlow<TransitionInfo> = + repository.currentTransitionInfoInternal + /** Whether we've currently STARTED a transition and haven't yet FINISHED it. */ val isInTransitionToAnyState = isInTransitionWhere({ true }, { true }) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/ToAodFoldTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/ToAodFoldTransitionInteractor.kt new file mode 100644 index 000000000000..3b25128fa878 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/ToAodFoldTransitionInteractor.kt @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.systemui.keyguard.domain.interactor + +import android.animation.ValueAnimator +import android.view.ViewGroup +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository +import com.android.systemui.keyguard.shared.model.TransitionInfo +import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled +import com.android.systemui.shade.NotificationPanelViewController +import com.android.systemui.shade.ShadeFoldAnimator +import javax.inject.Inject +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.launch + +@SysUISingleton +class ToAodFoldTransitionInteractor +@Inject +constructor( + private val keyguardClockInteractor: KeyguardClockInteractor, + private val transitionInteractor: KeyguardTransitionInteractor, + private val transitionRepository: KeyguardTransitionRepository, + @Application private val mainScope: CoroutineScope, + @Main private val mainDispatcher: CoroutineDispatcher, +) { + private var parentAnimator: NotificationPanelViewController.ShadeFoldAnimatorImpl? = null + + // TODO(b/331770313): Migrate to PowerInteractor; Deprecate ShadeFoldAnimator again + val foldAnimator = + object : ShadeFoldAnimator { + override val view: ViewGroup? + get() = throw NotImplementedError("Deprecated. Do not call.") + + override fun prepareFoldToAodAnimation() { + forceToAod() + parentAnimator?.prepareFoldToAodAnimation() + } + + override fun startFoldToAodAnimation( + startAction: Runnable, + endAction: Runnable, + cancelAction: Runnable + ) { + parentAnimator?.let { + it.buildViewAnimator(startAction, endAction, cancelAction) + .setUpdateListener { + keyguardClockInteractor.animateFoldToAod(it.animatedFraction) + } + .start() + } + } + + override fun cancelFoldToAodAnimation() { + parentAnimator?.cancelFoldToAodAnimation() + } + } + + fun initialize(parentAnimator: ShadeFoldAnimator) { + this.parentAnimator = + parentAnimator as NotificationPanelViewController.ShadeFoldAnimatorImpl? + } + + /** Forces the keyguard into AOD or Doze */ + private fun forceToAod() { + mainScope.launch(mainDispatcher) { + transitionRepository.startTransition( + TransitionInfo( + "$TAG (Fold transition triggered)", + transitionInteractor.getCurrentState(), + transitionInteractor.asleepKeyguardState.value, + ValueAnimator().apply { duration = 0 }, + TransitionModeOnCanceled.LAST_VALUE, + ) + ) + } + } + + companion object { + private val TAG = ToAodFoldTransitionInteractor::class.simpleName!! + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/TransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/TransitionInteractor.kt index 375df3e8f5f5..599285e797a0 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/TransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/TransitionInteractor.kt @@ -29,11 +29,11 @@ import com.android.systemui.util.kotlin.sample import java.util.UUID import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext /** * Each TransitionInteractor is responsible for determining under which conditions to notify @@ -78,32 +78,38 @@ sealed class TransitionInteractor( // a bugreport. ownerReason: String = "", ): UUID? { - if ( - fromState != transitionInteractor.startedKeyguardState.replayCache.last() && - fromState != transitionInteractor.finishedKeyguardState.replayCache.last() - ) { + if (fromState != transitionInteractor.currentTransitionInfoInternal.value.to) { Log.e( name, - "startTransition: We were asked to transition from " + - "$fromState to $toState, however we last finished a transition to " + - "${transitionInteractor.finishedKeyguardState.replayCache.last()}, " + - "and last started a transition to " + - "${transitionInteractor.startedKeyguardState.replayCache.last()}. " + - "Ignoring startTransition, but this should never happen." + "Ignoring startTransition: This interactor asked to transition from " + + "$fromState -> $toState, but we last transitioned to " + + "${transitionInteractor.currentTransitionInfoInternal.value.to}, not " + + "$fromState. This should never happen - check currentTransitionInfoInternal " + + "or use filterRelevantKeyguardState before starting transitions." ) + + if (fromState == transitionInteractor.finishedKeyguardState.replayCache.last()) { + Log.e( + name, + "This transition would not have been ignored prior to ag/26681239, since we " + + "are FINISHED in $fromState (but have since started another transition). " + + "If ignoring this transition has caused a regression, fix it by ensuring " + + "that transitions are exclusively started from the most recently started " + + "state." + ) + } return null } - return withContext(mainDispatcher) { - transitionRepository.startTransition( - TransitionInfo( - name + if (ownerReason.isNotBlank()) "($ownerReason)" else "", - fromState, - toState, - animator, - modeOnCanceled, - ) + + return transitionRepository.startTransition( + TransitionInfo( + name + if (ownerReason.isNotBlank()) "($ownerReason)" else "", + fromState, + toState, + animator, + modeOnCanceled, ) - } + ) } /** @@ -166,15 +172,14 @@ sealed class TransitionInteractor( * state, [startTransitionTo] would complain anyway. */ suspend fun listenForSleepTransition( - from: KeyguardState, modeOnCanceledFromStartedStep: (TransitionStep) -> TransitionModeOnCanceled = { TransitionModeOnCanceled.LAST_VALUE } ) { powerInteractor.isAsleep .filter { isAsleep -> isAsleep } + .filterRelevantKeyguardState() .sample(startedKeyguardTransitionStep) - .filter { startedStep -> startedStep.to == from } .map(modeOnCanceledFromStartedStep) .collect { modeOnCanceled -> startTransitionTo( @@ -211,6 +216,34 @@ sealed class TransitionInteractor( } /** + * Whether we're in the KeyguardState relevant to this From*TransitionInteractor (which we know + * from [fromState]). + * + * This uses [KeyguardTransitionInteractor.currentTransitionInfoInternal], which is more up to + * date than [startedKeyguardState] as it does not wait for the emission of the first STARTED + * step. + */ + fun inOrTransitioningToRelevantKeyguardState(): Boolean { + return transitionInteractor.currentTransitionInfoInternal.value.to == fromState + } + + /** + * Filters emissions whenever we're not in a KeyguardState relevant to this + * From*TransitionInteractor (which we know from [fromState]). + */ + fun <T> Flow<T>.filterRelevantKeyguardState(): Flow<T> { + return filter { inOrTransitioningToRelevantKeyguardState() } + } + + /** + * Filters emissions whenever we're not in a KeyguardState relevant to this + * From*TransitionInteractor (which we know from [fromState]). + */ + fun <T> Flow<T>.filterRelevantKeyguardStateAnd(predicate: (T) -> Boolean): Flow<T> { + return filter { inOrTransitioningToRelevantKeyguardState() && predicate.invoke(it) } + } + + /** * Returns a ValueAnimator to be used for transitions to [toState], if one is not explicitly * passed to [startTransitionTo]. */ diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt index 4d9354dd1572..33052befadfc 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt @@ -82,7 +82,6 @@ import kotlinx.coroutines.launch /** Bind occludingAppDeviceEntryMessageViewModel to run whenever the keyguard view is attached. */ @OptIn(ExperimentalCoroutinesApi::class) object KeyguardRootViewBinder { - @SuppressLint("ClickableViewAccessibility") @JvmStatic fun bind( @@ -102,14 +101,6 @@ object KeyguardRootViewBinder { ): DisposableHandle { var onLayoutChangeListener: OnLayoutChange? = null val childViews = mutableMapOf<Int, View>() - val statusViewId = R.id.keyguard_status_view - val burnInLayerId = R.id.burn_in_layer - val aodNotificationIconContainerId = R.id.aod_notification_icon_container - val largeClockId = R.id.lockscreen_clock_view_large - val indicationArea = R.id.keyguard_indication_area - val startButton = R.id.start_button - val endButton = R.id.end_button - val lockIcon = R.id.lock_icon_view if (KeyguardBottomAreaRefactor.isEnabled) { view.setOnTouchListener { _, event -> @@ -214,7 +205,7 @@ object KeyguardRootViewBinder { val px = state.value ?: return@collect when { state.isToOrFrom(KeyguardState.AOD) -> { - childViews[largeClockId]?.translationX = px + // Large Clock is not translated in the x direction childViews[burnInLayerId]?.translationX = px childViews[aodNotificationIconContainerId]?.translationX = px @@ -436,7 +427,7 @@ object KeyguardRootViewBinder { oldRight: Int, oldBottom: Int ) { - childViews[R.id.nssl_placeholder]?.let { notificationListPlaceholder -> + childViews[nsslPlaceholderId]?.let { notificationListPlaceholder -> // After layout, ensure the notifications are positioned correctly viewModel.onNotificationContainerBoundsChanged( notificationListPlaceholder.top.toFloat(), @@ -460,14 +451,14 @@ object KeyguardRootViewBinder { ) } } else { - childViews[R.id.keyguard_status_view]?.top ?: 0 + childViews[statusViewId]?.top ?: 0 } ) } } private fun isUserVisible(view: View): Boolean { - return view.id != R.id.burn_in_layer && + return view.id != burnInLayerId && view.visibility == VISIBLE && view.width > 0 && view.height > 0 @@ -589,6 +580,17 @@ object KeyguardRootViewBinder { private fun ViewPropertyAnimator.animateInIconTranslation(): ViewPropertyAnimator = setInterpolator(Interpolators.DECELERATE_QUINT).translationY(0f) + private val statusViewId = R.id.keyguard_status_view + private val burnInLayerId = R.id.burn_in_layer + private val aodNotificationIconContainerId = R.id.aod_notification_icon_container + private val largeClockId = R.id.lockscreen_clock_view_large + private val smallClockId = R.id.lockscreen_clock_view + private val indicationArea = R.id.keyguard_indication_area + private val startButton = R.id.start_button + private val endButton = R.id.end_button + private val lockIcon = R.id.lock_icon_view + private val nsslPlaceholderId = R.id.nssl_placeholder + private const val ID = "occluding_app_device_entry_unlock_msg" private const val AOD_ICONS_APPEAR_DURATION: Long = 200 } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryBackgroundViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryBackgroundViewModel.kt index 1b91c4949018..87324a233cef 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryBackgroundViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryBackgroundViewModel.kt @@ -20,6 +20,7 @@ package com.android.systemui.keyguard.ui.viewmodel import android.content.Context import com.android.settingslib.Utils import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor +import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.shared.model.KeyguardState import javax.inject.Inject @@ -34,6 +35,7 @@ import kotlinx.coroutines.flow.onStart /** Models the UI state for the device entry icon background view. */ @Suppress("WHEN_ENUM_CAN_BE_NULL_IN_JAVA") @ExperimentalCoroutinesApi +@SysUISingleton class DeviceEntryBackgroundViewModel @Inject constructor( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryForegroundViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryForegroundViewModel.kt index 62810974be80..0aa6d129f247 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryForegroundViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryForegroundViewModel.kt @@ -21,6 +21,7 @@ import android.content.Context import com.android.settingslib.Utils import com.android.systemui.biometrics.domain.interactor.UdfpsOverlayInteractor import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor +import com.android.systemui.dagger.SysUISingleton import com.android.systemui.deviceentry.domain.interactor.DeviceEntryUdfpsInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.shared.model.KeyguardState @@ -39,6 +40,7 @@ import kotlinx.coroutines.flow.onStart /** Models the UI state for the device entry icon foreground view (displayed icon). */ @ExperimentalCoroutinesApi +@SysUISingleton class DeviceEntryForegroundViewModel @Inject constructor( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt index bc4fd1c88298..49fffdd9ce9b 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt @@ -19,6 +19,7 @@ package com.android.systemui.keyguard.ui.viewmodel import android.animation.FloatEvaluator import android.animation.IntEvaluator import com.android.keyguard.KeyguardViewController +import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor import com.android.systemui.deviceentry.domain.interactor.DeviceEntrySourceInteractor @@ -52,6 +53,7 @@ import kotlinx.coroutines.flow.shareIn /** Models the UI state for the containing device entry icon & long-press handling view. */ @ExperimentalCoroutinesApi +@SysUISingleton class DeviceEntryIconViewModel @Inject constructor( diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/BaseMediaProjectionPermissionDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/BaseMediaProjectionPermissionDialogDelegate.kt index 1983a670b5a8..dba0173afb1c 100644 --- a/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/BaseMediaProjectionPermissionDialogDelegate.kt +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/BaseMediaProjectionPermissionDialogDelegate.kt @@ -53,19 +53,17 @@ abstract class BaseMediaProjectionPermissionDialogDelegate<T : AlertDialog>( private lateinit var cancelButton: TextView private lateinit var warning: TextView private lateinit var screenShareModeSpinner: Spinner - private var hasCancelBeenLogged: Boolean = false protected lateinit var dialog: AlertDialog + private var shouldLogCancel: Boolean = true var selectedScreenShareOption: ScreenShareOption = screenShareOptions.first() @CallSuper override fun onStop(dialog: T) { // onStop can be called multiple times and we only want to log once. - if (hasCancelBeenLogged) { - return + if (shouldLogCancel) { + mediaProjectionMetricsLogger.notifyProjectionRequestCancelled(hostUid) + shouldLogCancel = false } - - mediaProjectionMetricsLogger.notifyProjectionRequestCancelled(hostUid) - hasCancelBeenLogged = true } @CallSuper @@ -140,7 +138,10 @@ abstract class BaseMediaProjectionPermissionDialogDelegate<T : AlertDialog>( } protected fun setStartButtonOnClickListener(listener: View.OnClickListener?) { - startButton.setOnClickListener(listener) + startButton.setOnClickListener { view -> + shouldLogCancel = false + listener?.onClick(view) + } } protected fun setCancelButtonOnClickListener(listener: View.OnClickListener?) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/dagger/QSModule.java b/packages/SystemUI/src/com/android/systemui/qs/dagger/QSModule.java index 1aef9206d99f..8d3500a4f9f0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/dagger/QSModule.java +++ b/packages/SystemUI/src/com/android/systemui/qs/dagger/QSModule.java @@ -29,6 +29,7 @@ import com.android.systemui.qs.AutoAddTracker; import com.android.systemui.qs.QSHost; import com.android.systemui.qs.ReduceBrightColorsController; import com.android.systemui.qs.external.QSExternalModule; +import com.android.systemui.qs.panels.dagger.PanelsModule; import com.android.systemui.qs.pipeline.dagger.QSPipelineModule; import com.android.systemui.qs.tileimpl.QSTileImpl; import com.android.systemui.qs.tiles.di.QSTilesModule; @@ -44,21 +45,22 @@ import com.android.systemui.statusbar.policy.SafetyController; import com.android.systemui.statusbar.policy.WalletController; import com.android.systemui.util.settings.SecureSettings; -import java.util.Map; - -import javax.inject.Named; - import dagger.Binds; import dagger.Module; import dagger.Provides; import dagger.multibindings.Multibinds; +import java.util.Map; + +import javax.inject.Named; + /** * Module for QS dependencies */ @Module(subcomponents = {QSFragmentComponent.class, QSSceneComponent.class}, includes = { MediaModule.class, + PanelsModule.class, QSExternalModule.class, QSFlagsModule.class, QSHostModule.class, diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/dagger/PanelsModule.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/dagger/PanelsModule.kt new file mode 100644 index 000000000000..1307296dd2b7 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/dagger/PanelsModule.kt @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.panels.dagger + +import com.android.systemui.qs.panels.data.repository.IconTilesRepository +import com.android.systemui.qs.panels.data.repository.IconTilesRepositoryImpl +import dagger.Binds +import dagger.Module + +@Module +interface PanelsModule { + @Binds fun bindIconTilesRepository(impl: IconTilesRepositoryImpl): IconTilesRepository +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/IconTilesRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/IconTilesRepository.kt new file mode 100644 index 000000000000..92f87e78f090 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/IconTilesRepository.kt @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.panels.data.repository + +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.qs.pipeline.shared.TileSpec +import javax.inject.Inject +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flowOf + +/** Repository for retrieving the list of [TileSpec] to be displayed as icons. */ +interface IconTilesRepository { + val iconTilesSpecs: Flow<Set<TileSpec>> +} + +@SysUISingleton +class IconTilesRepositoryImpl @Inject constructor() : IconTilesRepository { + + /** Set of toggleable tiles that are suitable for being shown as an icon. */ + override val iconTilesSpecs: Flow<Set<TileSpec>> = + flowOf( + setOf( + TileSpec.create("airplane"), + TileSpec.create("battery"), + TileSpec.create("cameratoggle"), + TileSpec.create("cast"), + TileSpec.create("color_correction"), + TileSpec.create("inversion"), + TileSpec.create("saver"), + TileSpec.create("dnd"), + TileSpec.create("flashlight"), + TileSpec.create("location"), + TileSpec.create("mictoggle"), + TileSpec.create("nfc"), + TileSpec.create("night"), + TileSpec.create("rotation") + ) + ) +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/IconTilesInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/IconTilesInteractor.kt new file mode 100644 index 000000000000..367c67093605 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/IconTilesInteractor.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.panels.domain.interactor + +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.qs.panels.data.repository.IconTilesRepository +import com.android.systemui.qs.pipeline.shared.TileSpec +import javax.inject.Inject +import kotlinx.coroutines.flow.Flow + +/** Interactor for retrieving the list of [TileSpec] to be displayed as icons. */ +@SysUISingleton +class IconTilesInteractor @Inject constructor(private val repo: IconTilesRepository) { + val iconTilesSpecs: Flow<Set<TileSpec>> = repo.iconTilesSpecs +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt index 2360f27fc115..30044856a7d4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt @@ -620,7 +620,7 @@ open class QSTileViewImpl @JvmOverloads constructor( showRippleEffect = false setOnTouchListener(longPressEffect) if (!longPressEffectViewBinder.isBound) { - longPressEffectViewBinder.bind(this, longPressEffect) + longPressEffectViewBinder.bind(this, state.spec, longPressEffect) } } else { // Long-press effects might have been enabled before but the new state does not diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java index 1fb701e95b85..81a20260792a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java @@ -26,6 +26,7 @@ import androidx.annotation.Nullable; import com.android.internal.logging.MetricsLogger; import com.android.systemui.Flags; +import com.android.systemui.accessibility.hearingaid.HearingDevicesDialogManager; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.ActivityStarter; @@ -45,6 +46,8 @@ public class HearingDevicesTile extends QSTileImpl<State> { public static final String TILE_SPEC = "hearing_devices"; + private final HearingDevicesDialogManager mDialogManager; + @Inject public HearingDevicesTile( QSHost host, @@ -55,10 +58,12 @@ public class HearingDevicesTile extends QSTileImpl<State> { MetricsLogger metricsLogger, StatusBarStateController statusBarStateController, ActivityStarter activityStarter, - QSLogger qsLogger + QSLogger qsLogger, + HearingDevicesDialogManager hearingDevicesDialogManager ) { super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger, statusBarStateController, activityStarter, qsLogger); + mDialogManager = hearingDevicesDialogManager; } @Override @@ -68,7 +73,7 @@ public class HearingDevicesTile extends QSTileImpl<State> { @Override protected void handleClick(@Nullable View view) { - + mUiHandler.post(() -> mDialogManager.showDialog(view)); } @Override 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 1b7322592b41..e1b742e1e7f0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java @@ -182,12 +182,19 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> { @Override public boolean isAvailable() { + if (isWalletRoleAvailable()) { + return !mPackageManager.hasSystemFeature(FEATURE_CHROME_OS); + } return mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION) && !mPackageManager.hasSystemFeature(FEATURE_CHROME_OS) && mSecureSettings.getStringForUser(NFC_PAYMENT_DEFAULT_COMPONENT, UserHandle.USER_CURRENT) != null; } + private boolean isWalletRoleAvailable() { + return mHost.getUserId() == UserHandle.USER_SYSTEM && mController.isWalletRoleAvailable(); + } + @Nullable @Override public Intent getLongClickIntent() { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/DeviceItemFactory.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/DeviceItemFactory.kt index f13ecf3e91b9..56ba07941e4d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/DeviceItemFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/DeviceItemFactory.kt @@ -45,7 +45,7 @@ internal abstract class DeviceItemFactory { abstract fun create(context: Context, cachedDevice: CachedBluetoothDevice): DeviceItem } -internal class ActiveMediaDeviceItemFactory : DeviceItemFactory() { +internal open class ActiveMediaDeviceItemFactory : DeviceItemFactory() { override fun isFilterMatched( context: Context, cachedDevice: CachedBluetoothDevice, @@ -72,7 +72,18 @@ internal class ActiveMediaDeviceItemFactory : DeviceItemFactory() { } } -internal class AvailableMediaDeviceItemFactory : DeviceItemFactory() { +internal class ActiveHearingDeviceItemFactory : ActiveMediaDeviceItemFactory() { + override fun isFilterMatched( + context: Context, + cachedDevice: CachedBluetoothDevice, + audioManager: AudioManager? + ): Boolean { + return BluetoothUtils.isActiveMediaDevice(cachedDevice) && + BluetoothUtils.isAvailableHearingDevice(cachedDevice) + } +} + +internal open class AvailableMediaDeviceItemFactory : DeviceItemFactory() { override fun isFilterMatched( context: Context, cachedDevice: CachedBluetoothDevice, @@ -101,6 +112,17 @@ internal class AvailableMediaDeviceItemFactory : DeviceItemFactory() { } } +internal class AvailableHearingDeviceItemFactory : ActiveMediaDeviceItemFactory() { + override fun isFilterMatched( + context: Context, + cachedDevice: CachedBluetoothDevice, + audioManager: AudioManager? + ): Boolean { + return !BluetoothUtils.isActiveMediaDevice(cachedDevice) && + BluetoothUtils.isAvailableHearingDevice(cachedDevice) + } +} + internal class ConnectedDeviceItemFactory : DeviceItemFactory() { override fun isFilterMatched( context: Context, @@ -135,7 +157,7 @@ internal class ConnectedDeviceItemFactory : DeviceItemFactory() { } } -internal class SavedDeviceItemFactory : DeviceItemFactory() { +internal open class SavedDeviceItemFactory : DeviceItemFactory() { override fun isFilterMatched( context: Context, cachedDevice: CachedBluetoothDevice, @@ -168,3 +190,25 @@ internal class SavedDeviceItemFactory : DeviceItemFactory() { ) } } + +internal class SavedHearingDeviceItemFactory : SavedDeviceItemFactory() { + override fun isFilterMatched( + context: Context, + cachedDevice: CachedBluetoothDevice, + audioManager: AudioManager? + ): Boolean { + return if (Flags.enableHideExclusivelyManagedBluetoothDevice()) { + !BluetoothUtils.isExclusivelyManagedBluetoothDevice( + context, + cachedDevice.getDevice() + ) && + cachedDevice.isHearingAidDevice && + cachedDevice.bondState == BluetoothDevice.BOND_BONDED && + !cachedDevice.isConnected + } else { + cachedDevice.isHearingAidDevice && + cachedDevice.bondState == BluetoothDevice.BOND_BONDED && + !cachedDevice.isConnected + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/DeviceItemInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/DeviceItemInteractor.kt index 1df496b17aa5..fce25ec68190 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/DeviceItemInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/DeviceItemInteractor.kt @@ -137,7 +137,6 @@ constructor( ?.create(context, cachedDevice) } .sort(displayPriority, bluetoothAdapter?.mostRecentlyConnectedDevices) - // Only emit when the job is not cancelled if (isActive) { mutableDeviceItemUpdate.tryEmit(deviceItems) diff --git a/packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt b/packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt index 54ec398cd9a7..9e27dad0ea73 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt @@ -22,7 +22,6 @@ import com.android.systemui.Flags.FLAG_SCENE_CONTAINER import com.android.systemui.Flags.sceneContainer import com.android.systemui.dagger.SysUISingleton import com.android.systemui.flags.FlagToken -import com.android.systemui.flags.Flags.SCENE_CONTAINER_ENABLED import com.android.systemui.flags.RefactorFlagUtils import com.android.systemui.keyguard.KeyguardBottomAreaRefactor import com.android.systemui.keyguard.KeyguardWmStateRefactor @@ -40,23 +39,14 @@ object SceneContainerFlag { @JvmStatic inline val isEnabled get() = - SCENE_CONTAINER_ENABLED && // mainStaticFlag sceneContainer() && // mainAconfigFlag - KeyguardBottomAreaRefactor.isEnabled && + KeyguardBottomAreaRefactor.isEnabled && MigrateClocksToBlueprint.isEnabled && ComposeLockscreen.isEnabled && MediaInSceneContainerFlag.isEnabled && KeyguardWmStateRefactor.isEnabled // NOTE: Changes should also be made in getSecondaryFlags and @EnableSceneContainer - /** - * The main static flag, SCENE_CONTAINER_ENABLED. This is an explicit static flag check that - * helps with downstream optimizations (like unused code stripping) in builds where aconfig - * flags are still writable. Do not remove! - */ - inline fun getMainStaticFlag() = - FlagToken("Flags.SCENE_CONTAINER_ENABLED", SCENE_CONTAINER_ENABLED) - /** The main aconfig flag. */ inline fun getMainAconfigFlag() = FlagToken(FLAG_SCENE_CONTAINER, sceneContainer()) @@ -73,19 +63,13 @@ object SceneContainerFlag { /** The full set of requirements for SceneContainer */ inline fun getAllRequirements(): Sequence<FlagToken> { - return sequenceOf(getMainStaticFlag(), getMainAconfigFlag()) + getSecondaryFlags() + return sequenceOf(getMainAconfigFlag()) + getSecondaryFlags() } /** Return all dependencies of this flag in pairs where [Pair.first] depends on [Pair.second] */ inline fun getFlagDependencies(): Sequence<Pair<FlagToken, FlagToken>> { - val mainStaticFlag = getMainStaticFlag() val mainAconfigFlag = getMainAconfigFlag() - return sequence { - // The static and aconfig flags should be equal; make them co-dependent - yield(mainAconfigFlag to mainStaticFlag) - yield(mainStaticFlag to mainAconfigFlag) - // all other flags depend on the static flag for brevity - } + getSecondaryFlags().map { mainStaticFlag to it } + return getSecondaryFlags().map { mainAconfigFlag to it } } /** diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/data/repository/ProfileTypeRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/screenshot/data/repository/ProfileTypeRepositoryImpl.kt index 42ad21bdf5e9..17ddf802b172 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/data/repository/ProfileTypeRepositoryImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/data/repository/ProfileTypeRepositoryImpl.kt @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:SuppressLint("MissingPermission") +@file:Suppress("MissingPermission") package com.android.systemui.screenshot.data.repository -import android.annotation.SuppressLint import android.annotation.UserIdInt import android.os.UserManager import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelView.java index c501d88b77ce..6bf5535b0761 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelView.java @@ -27,6 +27,8 @@ import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.FrameLayout; +import com.android.systemui.scene.shared.flag.SceneContainerFlag; + /** The shade view. */ public final class NotificationPanelView extends FrameLayout { static final boolean DEBUG = false; @@ -41,14 +43,20 @@ public final class NotificationPanelView extends FrameLayout { public NotificationPanelView(Context context, AttributeSet attrs) { super(context, attrs); - setWillNotDraw(!DEBUG); - mAlphaPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.MULTIPLY)); + if (!SceneContainerFlag.isEnabled()) { + setWillNotDraw(!DEBUG); + mAlphaPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.MULTIPLY)); - setBackgroundColor(Color.TRANSPARENT); + setBackgroundColor(Color.TRANSPARENT); + } } @Override public void onRtlPropertiesChanged(int layoutDirection) { + if (SceneContainerFlag.isEnabled()) { + super.onRtlPropertiesChanged(layoutDirection); + return; + } if (mRtlChangeListener != null) { mRtlChangeListener.onRtlPropertielsChanged(layoutDirection); } @@ -56,14 +64,19 @@ public final class NotificationPanelView extends FrameLayout { @Override public boolean shouldDelayChildPressedState() { + if (SceneContainerFlag.isEnabled()) { + return super.shouldDelayChildPressedState(); + } return true; } @Override protected void dispatchDraw(Canvas canvas) { super.dispatchDraw(canvas); - if (mCurrentPanelAlpha != 255) { - canvas.drawRect(0, 0, canvas.getWidth(), canvas.getHeight(), mAlphaPaint); + if (!SceneContainerFlag.isEnabled()) { + if (mCurrentPanelAlpha != 255) { + canvas.drawRect(0, 0, canvas.getWidth(), canvas.getHeight(), mAlphaPaint); + } } } @@ -83,6 +96,9 @@ public final class NotificationPanelView extends FrameLayout { @Override public boolean hasOverlappingRendering() { + if (SceneContainerFlag.isEnabled()) { + return super.hasOverlappingRendering(); + } return !mDozing; } @@ -102,6 +118,9 @@ public final class NotificationPanelView extends FrameLayout { @Override public boolean onInterceptTouchEvent(MotionEvent event) { + if (SceneContainerFlag.isEnabled()) { + return super.onInterceptTouchEvent(event); + } return mTouchHandler.onInterceptTouchEvent(event); } @@ -113,7 +132,9 @@ public final class NotificationPanelView extends FrameLayout { @Override public void dispatchConfigurationChanged(Configuration newConfig) { super.dispatchConfigurationChanged(newConfig); - mOnConfigurationChangedListener.onConfigurationChanged(newConfig); + if (!SceneContainerFlag.isEnabled()) { + mOnConfigurationChangedListener.onConfigurationChanged(newConfig); + } } /** Callback for right-to-left setting changes. */ diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index e4f5aeb5028c..015054b32bb0 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -96,12 +96,12 @@ import com.android.internal.policy.SystemBarUtils; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.util.LatencyTracker; import com.android.keyguard.ActiveUnlockConfig; +import com.android.keyguard.LockIconViewController; import com.android.keyguard.KeyguardClockSwitch.ClockSize; import com.android.keyguard.KeyguardStatusView; import com.android.keyguard.KeyguardStatusViewController; import com.android.keyguard.KeyguardUnfoldTransition; import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.keyguard.LockIconViewController; import com.android.keyguard.dagger.KeyguardQsUserSwitchComponent; import com.android.keyguard.dagger.KeyguardStatusBarViewComponent; import com.android.keyguard.dagger.KeyguardStatusViewComponent; @@ -437,7 +437,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump private final FalsingManager mFalsingManager; private final FalsingCollector mFalsingCollector; private final ShadeHeadsUpTrackerImpl mShadeHeadsUpTracker = new ShadeHeadsUpTrackerImpl(); - private final ShadeFoldAnimator mShadeFoldAnimator = new ShadeFoldAnimatorImpl(); + private final ShadeFoldAnimatorImpl mShadeFoldAnimator = new ShadeFoldAnimatorImpl(); private boolean mShowIconsWhenExpanded; private int mIndicationBottomPadding; @@ -982,6 +982,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump }); mAlternateBouncerInteractor = alternateBouncerInteractor; dumpManager.registerDumpable(this); + SceneContainerFlag.assertInLegacyMode(); } private void unlockAnimationFinished() { @@ -3310,19 +3311,19 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump } @Override - public ShadeFoldAnimator getShadeFoldAnimator() { + public ShadeFoldAnimatorImpl getShadeFoldAnimator() { return mShadeFoldAnimator; } - private final class ShadeFoldAnimatorImpl implements ShadeFoldAnimator { + @Deprecated + public final class ShadeFoldAnimatorImpl implements ShadeFoldAnimator { /** Updates the views to the initial state for the fold to AOD animation. */ @Override public void prepareFoldToAodAnimation() { - if (MigrateClocksToBlueprint.isEnabled()) { - return; + if (!MigrateClocksToBlueprint.isEnabled()) { + // Force show AOD UI even if we are not locked + showAodUi(); } - // Force show AOD UI even if we are not locked - showAodUi(); // Move the content of the AOD all the way to the left // so we can animate to the initial position @@ -3340,14 +3341,29 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump * @param cancelAction invoked when the animation is cancelled, before endAction. */ @Override - public void startFoldToAodAnimation(Runnable startAction, Runnable endAction, - Runnable cancelAction) { + public void startFoldToAodAnimation( + Runnable startAction, Runnable endAction, Runnable cancelAction) { if (MigrateClocksToBlueprint.isEnabled()) { return; } + + buildViewAnimator(startAction, endAction, cancelAction) + .setUpdateListener(anim -> mKeyguardStatusViewController + .animateFoldToAod(anim.getAnimatedFraction())) + .start(); + } + + /** + * Builds the default NPVC fold animator + * + * @deprecated Temporary stop-gap. Do not use outside of keyguard fold transition. + */ + @Deprecated + public ViewPropertyAnimator buildViewAnimator( + Runnable startAction, Runnable endAction, Runnable cancelAction) { final ViewPropertyAnimator viewAnimator = mView.animate(); viewAnimator.cancel(); - viewAnimator + return viewAnimator .translationX(0) .alpha(1f) .setDuration(ANIMATION_DURATION_FOLD_TO_AOD) @@ -3370,19 +3386,12 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump viewAnimator.setListener(null); viewAnimator.setUpdateListener(null); } - }) - .setUpdateListener(anim -> - mKeyguardStatusViewController.animateFoldToAod( - anim.getAnimatedFraction())) - .start(); + }); } /** Cancels fold to AOD transition and resets view state. */ @Override public void cancelFoldToAodAnimation() { - if (MigrateClocksToBlueprint.isEnabled()) { - return; - } cancelAnimation(); resetAlpha(); resetTranslation(); @@ -3555,9 +3564,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump } @Override - public ViewPropertyAnimator fadeOut(long startDelayMs, long durationMs, Runnable endAction) { + public void fadeOut(long startDelayMs, long durationMs, Runnable endAction) { mView.animate().cancel(); - return mView.animate().alpha(0).setStartDelay(startDelayMs).setDuration( + mView.animate().alpha(0).setStartDelay(startDelayMs).setDuration( durationMs).setInterpolator(Interpolators.ALPHA_OUT).withLayer().withEndAction( endAction); } @@ -4121,9 +4130,10 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump @Override public void updateExpansionAndVisibility() { - mShadeExpansionStateManager.onPanelExpansionChanged( - mExpandedFraction, isExpanded(), isTracking(), mExpansionDragDownAmountPx); - + if (!SceneContainerFlag.isEnabled()) { + mShadeExpansionStateManager.onPanelExpansionChanged( + mExpandedFraction, isExpanded(), isTracking()); + } updateVisibility(); } @@ -4159,7 +4169,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump } /** Sends an external (e.g. Status Bar) intercept touch event to the Shade touch handler. */ - boolean handleExternalInterceptTouch(MotionEvent event) { + @Override + public boolean handleExternalInterceptTouch(MotionEvent event) { try { mUseExternalTouch = true; return mTouchHandler.onInterceptTouchEvent(event); diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java index 59da8f1d5841..324dfdf32a3f 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java @@ -52,6 +52,7 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInterac import com.android.systemui.keyguard.shared.model.TransitionState; import com.android.systemui.keyguard.shared.model.TransitionStep; import com.android.systemui.res.R; +import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor; import com.android.systemui.shared.animation.DisableSubpixelTextTransitionListener; import com.android.systemui.statusbar.DragDownHelper; import com.android.systemui.statusbar.LockscreenShadeTransitionController; @@ -132,7 +133,8 @@ public class NotificationShadeWindowViewController implements Dumpable { private DragDownHelper mDragDownHelper; private boolean mExpandingBelowNotch; private final DockManager mDockManager; - private final NotificationPanelViewController mNotificationPanelViewController; + private final ShadeViewController mShadeViewController; + private final PanelExpansionInteractor mPanelExpansionInteractor; private final ShadeExpansionStateManager mShadeExpansionStateManager; private boolean mIsTrackingBarGesture = false; @@ -154,7 +156,8 @@ public class NotificationShadeWindowViewController implements Dumpable { DockManager dockManager, NotificationShadeDepthController depthController, NotificationShadeWindowView notificationShadeWindowView, - NotificationPanelViewController notificationPanelViewController, + ShadeViewController shadeViewController, + PanelExpansionInteractor panelExpansionInteractor, ShadeExpansionStateManager shadeExpansionStateManager, NotificationStackScrollLayoutController notificationStackScrollLayoutController, StatusBarKeyguardViewManager statusBarKeyguardViewManager, @@ -187,7 +190,8 @@ public class NotificationShadeWindowViewController implements Dumpable { mStatusBarStateController = statusBarStateController; mView = notificationShadeWindowView; mDockManager = dockManager; - mNotificationPanelViewController = notificationPanelViewController; + mShadeViewController = shadeViewController; + mPanelExpansionInteractor = panelExpansionInteractor; mShadeExpansionStateManager = shadeExpansionStateManager; mDepthController = depthController; mNotificationStackScrollLayoutController = notificationStackScrollLayoutController; @@ -374,7 +378,7 @@ public class NotificationShadeWindowViewController implements Dumpable { } if (!mIsTrackingBarGesture && isDown - && mNotificationPanelViewController.isFullyCollapsed()) { + && mPanelExpansionInteractor.isFullyCollapsed()) { float x = ev.getRawX(); float y = ev.getRawY(); if (mStatusBarViewController.touchIsWithinView(x, y)) { @@ -447,7 +451,7 @@ public class NotificationShadeWindowViewController implements Dumpable { } else { bouncerShowing = mService.isBouncerShowing(); } - if (mNotificationPanelViewController.isFullyExpanded() + if (mPanelExpansionInteractor.isFullyExpanded() && !bouncerShowing && !mStatusBarStateController.isDozing()) { if (mDragDownHelper.isDragDownEnabled()) { @@ -503,7 +507,7 @@ public class NotificationShadeWindowViewController implements Dumpable { cancellation.setAction(MotionEvent.ACTION_CANCEL); mStackScrollLayout.onInterceptTouchEvent(cancellation); if (!MigrateClocksToBlueprint.isEnabled()) { - mNotificationPanelViewController.handleExternalInterceptTouch(cancellation); + mShadeViewController.handleExternalInterceptTouch(cancellation); } cancellation.recycle(); } @@ -522,7 +526,7 @@ public class NotificationShadeWindowViewController implements Dumpable { // we still want to finish our drag down gesture when locking the screen handled |= mDragDownHelper.onTouchEvent(ev) || handled; } - if (!handled && mNotificationPanelViewController.handleExternalTouch(ev)) { + if (!handled && mShadeViewController.handleExternalTouch(ev)) { return true; } } else { @@ -611,7 +615,7 @@ public class NotificationShadeWindowViewController implements Dumpable { // Since NotificationStackScrollLayout is now a sibling of notification_panel, we need // to also ask NotificationPanelViewController directly, in order to process swipe up // events originating from notifications - if (mNotificationPanelViewController.handleExternalInterceptTouch(ev)) { + if (mShadeViewController.handleExternalInterceptTouch(ev)) { mShadeLogger.d("NSWVC: NPVC intercepted"); return true; } diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeExpansionChangeEvent.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeExpansionChangeEvent.kt index 71dfafa09d52..d9c1f0a91d0c 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeExpansionChangeEvent.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeExpansionChangeEvent.kt @@ -23,7 +23,5 @@ data class ShadeExpansionChangeEvent( /** Whether the panel should be considered expanded */ val expanded: Boolean, /** Whether the user is actively dragging the panel. */ - val tracking: Boolean, - /** The amount of pixels that the user has dragged during the expansion. */ - val dragDownPxAmount: Float + val tracking: Boolean ) diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeExpansionStateManager.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeExpansionStateManager.kt index df5ff5a8b1f5..359ddd86f115 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeExpansionStateManager.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeExpansionStateManager.kt @@ -18,13 +18,13 @@ package com.android.systemui.shade import android.annotation.IntDef import android.os.Trace -import android.os.Trace.TRACE_TAG_APP as TRACE_TAG import android.util.Log import androidx.annotation.FloatRange import com.android.systemui.dagger.SysUISingleton import com.android.systemui.util.Compile import java.util.concurrent.CopyOnWriteArrayList import javax.inject.Inject +import android.os.Trace.TRACE_TAG_APP as TRACE_TAG /** * A class responsible for managing the notification panel's current state. @@ -42,7 +42,6 @@ class ShadeExpansionStateManager @Inject constructor() { @FloatRange(from = 0.0, to = 1.0) private var fraction: Float = 0f private var expanded: Boolean = false private var tracking: Boolean = false - private var dragDownPxAmount: Float = 0f /** * Adds a listener that will be notified when the panel expansion fraction has changed and @@ -53,7 +52,7 @@ class ShadeExpansionStateManager @Inject constructor() { @Deprecated("Use ShadeInteractor instead") fun addExpansionListener(listener: ShadeExpansionListener): ShadeExpansionChangeEvent { expansionListeners.add(listener) - return ShadeExpansionChangeEvent(fraction, expanded, tracking, dragDownPxAmount) + return ShadeExpansionChangeEvent(fraction, expanded, tracking) } /** Adds a listener that will be notified when the panel state has changed. */ @@ -76,8 +75,7 @@ class ShadeExpansionStateManager @Inject constructor() { fun onPanelExpansionChanged( @FloatRange(from = 0.0, to = 1.0) fraction: Float, expanded: Boolean, - tracking: Boolean, - dragDownPxAmount: Float + tracking: Boolean ) { require(!fraction.isNaN()) { "fraction cannot be NaN" } val oldState = state @@ -85,7 +83,6 @@ class ShadeExpansionStateManager @Inject constructor() { this.fraction = fraction this.expanded = expanded this.tracking = tracking - this.dragDownPxAmount = dragDownPxAmount var fullyClosed = true var fullyOpened = false @@ -111,7 +108,6 @@ class ShadeExpansionStateManager @Inject constructor() { "f=$fraction " + "expanded=$expanded " + "tracking=$tracking " + - "dragDownPxAmount=$dragDownPxAmount " + "${if (fullyOpened) " fullyOpened" else ""} " + if (fullyClosed) " fullyClosed" else "" ) @@ -124,8 +120,7 @@ class ShadeExpansionStateManager @Inject constructor() { } } - val expansionChangeEvent = - ShadeExpansionChangeEvent(fraction, expanded, tracking, dragDownPxAmount) + val expansionChangeEvent = ShadeExpansionChangeEvent(fraction, expanded, tracking) expansionListeners.forEach { it.onPanelExpansionChanged(expansionChangeEvent) } } diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt index 2d3833c55199..648d4b55370e 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt @@ -162,9 +162,7 @@ abstract class ShadeModule { @Binds @SysUISingleton - abstract fun bindsShadeViewController( - notificationPanelViewController: NotificationPanelViewController - ): ShadeViewController + abstract fun bindsShadeViewController(shadeSurface: ShadeSurface): ShadeViewController @Binds @SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeSurface.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeSurface.kt index d02c2154279b..7346a28dc7a7 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeSurface.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeSurface.kt @@ -15,7 +15,6 @@ */ package com.android.systemui.shade -import android.view.ViewPropertyAnimator import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor import com.android.systemui.shade.domain.interactor.ShadeBackActionInteractor import com.android.systemui.shade.domain.interactor.ShadeLockscreenInteractor @@ -48,7 +47,7 @@ interface ShadeSurface : fun cancelAnimation() /** Animates the view from its current alpha to zero then runs the runnable. */ - fun fadeOut(startDelayMs: Long, durationMs: Long, endAction: Runnable): ViewPropertyAnimator + fun fadeOut(startDelayMs: Long, durationMs: Long, endAction: Runnable) /** Set whether the bouncer is showing. */ fun setBouncerShowing(bouncerShowing: Boolean) diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeSurfaceImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeSurfaceImpl.kt new file mode 100644 index 000000000000..adb29287e40e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeSurfaceImpl.kt @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.shade + +import com.android.systemui.statusbar.GestureRecorder +import com.android.systemui.statusbar.phone.CentralSurfaces +import com.android.systemui.statusbar.policy.HeadsUpManager +import javax.inject.Inject + +class ShadeSurfaceImpl @Inject constructor() : ShadeSurface, ShadeViewControllerEmptyImpl() { + override fun initDependencies( + centralSurfaces: CentralSurfaces, + recorder: GestureRecorder, + hideExpandedRunnable: Runnable, + headsUpManager: HeadsUpManager + ) {} + + override fun cancelPendingCollapse() { + // Do nothing + } + + override fun cancelAnimation() { + // Do nothing + } + + override fun fadeOut(startDelayMs: Long, durationMs: Long, endAction: Runnable) { + // Do nothing + } + + override fun setBouncerShowing(bouncerShowing: Boolean) { + // Do nothing + } + + override fun setTouchAndAnimationDisabled(disabled: Boolean) { + // TODO(b/322197941): determine if still needed + } + + override fun setWillPlayDelayedDozeAmountAnimation(willPlay: Boolean) { + // TODO(b/322494538): determine if still needed + } + + override fun setDozing(dozing: Boolean, animate: Boolean) { + // Do nothing + } + + override fun setImportantForAccessibility(mode: Int) { + // Do nothing + } + + override fun resetTranslation() { + // Do nothing + } + + override fun resetAlpha() { + // Do nothing + } + + override fun onScreenTurningOn() { + // Do nothing + } + + override fun onThemeChanged() { + // Do nothing + } + + override fun updateExpansionAndVisibility() { + // Do nothing + } + + override fun updateResources() { + // Do nothing + } +} diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt index 5b2377f7f610..04ac687fd6ca 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt @@ -33,14 +33,12 @@ interface ShadeViewController { /** Returns whether the shade's top level view is enabled. */ @Deprecated("No longer supported. Do not add new calls to this.") val isViewEnabled: Boolean - /** Returns whether status bar icons should be hidden when the shade is expanded. */ - fun shouldHideStatusBarIconsWhenExpanded(): Boolean - /** If the latency tracker is enabled, begins tracking expand latency. */ @Deprecated("No longer supported. Do not add new calls to this.") fun startExpandLatencyTracking() /** Sets the alpha value of the shade to a value between 0 and 255. */ + @Deprecated("No longer supported. Do not add new calls to this.") fun setAlpha(alpha: Int, animate: Boolean) /** @@ -48,6 +46,7 @@ interface ShadeViewController { * * @see .setAlpha */ + @Deprecated("No longer supported. Do not add new calls to this.") fun setAlphaChangeAnimationEndAction(r: Runnable) /** Sets Qs ScrimEnabled and updates QS state. */ @@ -61,7 +60,7 @@ interface ShadeViewController { @Deprecated("Does nothing when scene container is enabled.") fun updateSystemUiStateFlags() /** Ensures that the touchable region is updated. */ - fun updateTouchableRegion() + @Deprecated("No longer supported. Do not add new calls to this.") fun updateTouchableRegion() /** * Sends an external (e.g. Status Bar) touch event to the Shade touch handler. @@ -72,6 +71,8 @@ interface ShadeViewController { */ fun handleExternalTouch(event: MotionEvent): Boolean + fun handleExternalInterceptTouch(event: MotionEvent): Boolean + /** * Triggered when an input focus transfer gesture has started. * @@ -143,10 +144,11 @@ interface ShadeHeadsUpTracker { } /** Handles the lifecycle of the shade's animation that happens when folding a foldable. */ -@Deprecated("This interface should not be used in scene container.") +@Deprecated("This interface should not be used in scene container. Needs flexiglass equivalent.") interface ShadeFoldAnimator { /** Updates the views to the initial state for the fold to AOD animation. */ - @Deprecated("Not used when migrateClocksToBlueprint enabled") fun prepareFoldToAodAnimation() + @Deprecated("Used by the Keyguard Fold Transition. Needs flexiglass equivalent.") + fun prepareFoldToAodAnimation() /** * Starts fold to AOD animation. @@ -155,14 +157,15 @@ interface ShadeFoldAnimator { * @param endAction invoked when the animation finishes, also if it was cancelled. * @param cancelAction invoked when the animation is cancelled, before endAction. */ - @Deprecated("Not used when migrateClocksToBlueprint enabled") + @Deprecated("Not used when migrateClocksToBlueprint enabled.") fun startFoldToAodAnimation(startAction: Runnable, endAction: Runnable, cancelAction: Runnable) /** Cancels fold to AOD transition and resets view state. */ - @Deprecated("Not used when migrateClocksToBlueprint enabled") fun cancelFoldToAodAnimation() + @Deprecated("Used by the Keyguard Fold Transition. Needs flexiglass equivalent.") + fun cancelFoldToAodAnimation() /** Returns the main view of the shade. */ - @Deprecated("Not used in Scene Container") val view: ViewGroup? + @Deprecated("Not used when migrateClocksToBlueprint enabled.") val view: ViewGroup? } /** diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt index e037c701a165..0c41efd513ad 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt @@ -28,7 +28,7 @@ import javax.inject.Inject import kotlinx.coroutines.flow.flowOf /** Empty implementation of ShadeViewController for variants with no shade. */ -class ShadeViewControllerEmptyImpl @Inject constructor() : +open class ShadeViewControllerEmptyImpl @Inject constructor() : ShadeViewController, ShadeBackActionInteractor, ShadeLockscreenInteractor, @@ -81,6 +81,10 @@ class ShadeViewControllerEmptyImpl @Inject constructor() : override fun handleExternalTouch(event: MotionEvent): Boolean { return false } + override fun handleExternalInterceptTouch(event: MotionEvent): Boolean { + return false + } + override fun startInputFocusTransfer() {} override fun cancelInputFocusTransfer() {} override fun finishInputFocusTransfer(velocity: Float) {} diff --git a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractor.kt b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractor.kt index 661130317854..dfdf2ad564db 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractor.kt @@ -72,4 +72,8 @@ interface PanelExpansionInteractor { /** Returns the StatusBarState. Note: System UI was formerly known simply as Status Bar. */ @Deprecated("Use SceneInteractor or ShadeInteractor instead") val barState: Int + + /** Returns whether status bar icons should be hidden when the shade is expanded. */ + @Deprecated("No longer supported. Do not add new calls to this.") + fun shouldHideStatusBarIconsWhenExpanded(): Boolean } diff --git a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractorImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractorImpl.kt index 561d0bc8e6ef..58bcd2e0d7eb 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractorImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractorImpl.kt @@ -69,27 +69,21 @@ constructor( state.fromScene == Scenes.Gone -> if (state.toScene.isExpandable()) { // Moving from Gone to a scene that can animate-expand has a - // panel - // expansion - // that tracks with the transition. + // panel expansion that tracks with the transition. state.progress } else { // Moving from Gone to a scene that doesn't animate-expand - // immediately makes - // the panel fully expanded. + // immediately makes the panel fully expanded. flowOf(1f) } state.toScene == Scenes.Gone -> if (state.fromScene.isExpandable()) { // Moving to Gone from a scene that can animate-expand has a - // panel - // expansion - // that tracks with the transition. + // panel expansion that tracks with the transition. state.progress.map { 1 - it } } else { // Moving to Gone from a scene that doesn't animate-expand - // immediately makes - // the panel fully collapsed. + // immediately makes the panel fully collapsed. flowOf(0f) } else -> flowOf(1f) @@ -126,6 +120,15 @@ constructor( override val barState get() = statusBarStateController.state + @Deprecated("No longer supported. Do not add new calls to this.") + override fun shouldHideStatusBarIconsWhenExpanded(): Boolean { + if (shadeAnimationInteractor.isLaunchingActivity.value) { + return false + } + // TODO(b/325936094) if a HUN is showing, return false + return sceneInteractor.currentScene.value == Scenes.Lockscreen + } + private fun SceneKey.isExpandable(): Boolean { return this == Scenes.Shade || this == Scenes.QuickSettings } diff --git a/packages/SystemUI/src/com/android/systemui/shade/domain/startable/ShadeStartable.kt b/packages/SystemUI/src/com/android/systemui/shade/domain/startable/ShadeStartable.kt index d8216dcfdec6..f3802da9bc9b 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/domain/startable/ShadeStartable.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/domain/startable/ShadeStartable.kt @@ -23,13 +23,20 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.log.LogBuffer import com.android.systemui.log.dagger.ShadeTouchLog +import com.android.systemui.scene.domain.interactor.SceneInteractor +import com.android.systemui.scene.shared.flag.SceneContainerFlag +import com.android.systemui.shade.ShadeExpansionStateManager import com.android.systemui.shade.TouchLogger.Companion.logTouchesTo import com.android.systemui.shade.data.repository.ShadeRepository +import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor import com.android.systemui.shade.shared.model.ShadeMode import com.android.systemui.shade.transition.ScrimShadeTransitionController import com.android.systemui.statusbar.policy.SplitShadeStateController import javax.inject.Inject +import javax.inject.Provider import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.launch @@ -43,23 +50,44 @@ constructor( @ShadeTouchLog private val touchLog: LogBuffer, private val configurationRepository: ConfigurationRepository, private val shadeRepository: ShadeRepository, - private val controller: SplitShadeStateController, + private val splitShadeStateController: SplitShadeStateController, private val scrimShadeTransitionController: ScrimShadeTransitionController, + private val sceneInteractorProvider: Provider<SceneInteractor>, + private val panelExpansionInteractorProvider: Provider<PanelExpansionInteractor>, + private val shadeExpansionStateManager: ShadeExpansionStateManager, ) : CoreStartable { override fun start() { hydrateShadeMode() + hydrateShadeExpansionStateManager() logTouchesTo(touchLog) scrimShadeTransitionController.init() } + private fun hydrateShadeExpansionStateManager() { + if (SceneContainerFlag.isEnabled) { + combine( + panelExpansionInteractorProvider.get().legacyPanelExpansion, + sceneInteractorProvider.get().isTransitionUserInputOngoing, + ) { panelExpansion, tracking -> + shadeExpansionStateManager.onPanelExpansionChanged( + fraction = panelExpansion, + expanded = panelExpansion > 0f, + tracking = tracking, + ) + }.launchIn(applicationScope) + } + } + private fun hydrateShadeMode() { applicationScope.launch { configurationRepository.onAnyConfigurationChange // Force initial collection. .onStart { emit(Unit) } .map { applicationContext.resources } - .map { resources -> controller.shouldUseSplitNotificationShade(resources) } + .map { resources -> + splitShadeStateController.shouldUseSplitNotificationShade(resources) + } .collect { isSplitShade -> shadeRepository.setShadeMode( if (isSplitShade) { diff --git a/packages/SystemUI/src/com/android/systemui/shade/transition/ScrimShadeTransitionController.kt b/packages/SystemUI/src/com/android/systemui/shade/transition/ScrimShadeTransitionController.kt index 151e28903fba..e38e53d67f61 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/transition/ScrimShadeTransitionController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/transition/ScrimShadeTransitionController.kt @@ -17,28 +17,20 @@ package com.android.systemui.shade.transition import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dump.DumpManager -import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.shade.PanelState import com.android.systemui.shade.ShadeExpansionChangeEvent import com.android.systemui.shade.ShadeExpansionStateManager -import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor import com.android.systemui.statusbar.phone.ScrimController -import dagger.Lazy import java.io.PrintWriter import javax.inject.Inject -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.launch /** Controls the scrim properties during the shade expansion transition on non-lockscreen. */ @SysUISingleton class ScrimShadeTransitionController @Inject constructor( - @Application private val applicationScope: CoroutineScope, private val shadeExpansionStateManager: ShadeExpansionStateManager, - private val panelExpansionInteractor: Lazy<PanelExpansionInteractor>, private val dumpManager: DumpManager, private val scrimController: ScrimController, ) { @@ -47,32 +39,17 @@ constructor( private var currentPanelState: Int? = null fun init() { - if (SceneContainerFlag.isEnabled) { - applicationScope.launch { - panelExpansionInteractor.get().legacyPanelExpansion.collect { panelExpansion -> - onPanelExpansionChanged( - ShadeExpansionChangeEvent( - fraction = panelExpansion, - expanded = panelExpansion > 0f, - tracking = true, - dragDownPxAmount = 0f, - ) - ) - } - } - } else { - val currentState = - shadeExpansionStateManager.addExpansionListener(this::onPanelExpansionChanged) - onPanelExpansionChanged(currentState) - shadeExpansionStateManager.addStateListener(this::onPanelStateChanged) - } + val currentState = + shadeExpansionStateManager.addExpansionListener(this::onPanelExpansionChanged) + onPanelExpansionChanged(currentState) + shadeExpansionStateManager.addStateListener(this::onPanelStateChanged) dumpManager.registerDumpable( ScrimShadeTransitionController::class.java.simpleName, this::dump ) } - fun onPanelStateChanged(@PanelState state: Int) { + private fun onPanelStateChanged(@PanelState state: Int) { currentPanelState = state onStateChanged() } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameView.java b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameView.java index 8d7fc98164c0..acb5339b1a0b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameView.java @@ -19,8 +19,6 @@ import android.text.TextUtils; import android.util.AttributeSet; import android.widget.TextView; -import com.android.settingslib.WirelessUtils; - /** Shows the operator name */ public class OperatorNameView extends TextView { private boolean mDemoMode; @@ -41,13 +39,14 @@ public class OperatorNameView extends TextView { mDemoMode = demoMode; } - void update(boolean showOperatorName, + void update( + boolean showOperatorName, boolean hasMobile, + boolean airplaneMode, OperatorNameViewController.SubInfo sub ) { setVisibility(showOperatorName ? VISIBLE : GONE); - boolean airplaneMode = WirelessUtils.isAirplaneModeOn(mContext); if (!hasMobile || airplaneMode) { setText(null); setVisibility(GONE); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java index 8afc72f08656..6e7d8f485195 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java @@ -16,11 +16,9 @@ package com.android.systemui.statusbar; -import android.annotation.NonNull; import android.os.Bundle; import android.telephony.ServiceState; import android.telephony.SubscriptionInfo; -import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.view.View; @@ -28,47 +26,60 @@ import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.systemui.demomode.DemoModeCommandReceiver; import com.android.systemui.plugins.DarkIconDispatcher; -import com.android.systemui.statusbar.connectivity.IconState; -import com.android.systemui.statusbar.connectivity.NetworkController; -import com.android.systemui.statusbar.connectivity.SignalCallback; import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment; +import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor; +import com.android.systemui.statusbar.pipeline.mobile.util.SubscriptionManagerProxy; import com.android.systemui.tuner.TunerService; import com.android.systemui.util.CarrierConfigTracker; import com.android.systemui.util.ViewController; +import com.android.systemui.util.kotlin.JavaAdapter; import javax.inject.Inject; +import kotlinx.coroutines.Job; + /** Controller for {@link OperatorNameView}. */ public class OperatorNameViewController extends ViewController<OperatorNameView> { private static final String KEY_SHOW_OPERATOR_NAME = "show_operator_name"; private final DarkIconDispatcher mDarkIconDispatcher; - private final NetworkController mNetworkController; private final TunerService mTunerService; private final TelephonyManager mTelephonyManager; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; private final CarrierConfigTracker mCarrierConfigTracker; + private final AirplaneModeInteractor mAirplaneModeInteractor; + private final SubscriptionManagerProxy mSubscriptionManagerProxy; + private final JavaAdapter mJavaAdapter; + + private Job mAirplaneModeJob; private OperatorNameViewController(OperatorNameView view, DarkIconDispatcher darkIconDispatcher, - NetworkController networkController, TunerService tunerService, TelephonyManager telephonyManager, KeyguardUpdateMonitor keyguardUpdateMonitor, - CarrierConfigTracker carrierConfigTracker) { + CarrierConfigTracker carrierConfigTracker, + AirplaneModeInteractor airplaneModeInteractor, + SubscriptionManagerProxy subscriptionManagerProxy, + JavaAdapter javaAdapter) { super(view); mDarkIconDispatcher = darkIconDispatcher; - mNetworkController = networkController; mTunerService = tunerService; mTelephonyManager = telephonyManager; mKeyguardUpdateMonitor = keyguardUpdateMonitor; mCarrierConfigTracker = carrierConfigTracker; + mAirplaneModeInteractor = airplaneModeInteractor; + mSubscriptionManagerProxy = subscriptionManagerProxy; + mJavaAdapter = javaAdapter; } @Override protected void onViewAttached() { mDarkIconDispatcher.addDarkReceiver(mDarkReceiver); - mNetworkController.addCallback(mSignalCallback); + mAirplaneModeJob = + mJavaAdapter.alwaysCollectFlow( + mAirplaneModeInteractor.isAirplaneMode(), + (isAirplaneMode) -> update()); mTunerService.addTunable(mTunable, KEY_SHOW_OPERATOR_NAME); mKeyguardUpdateMonitor.registerCallback(mKeyguardUpdateMonitorCallback); } @@ -76,7 +87,7 @@ public class OperatorNameViewController extends ViewController<OperatorNameView> @Override protected void onViewDetached() { mDarkIconDispatcher.removeDarkReceiver(mDarkReceiver); - mNetworkController.removeCallback(mSignalCallback); + mAirplaneModeJob.cancel(null); mTunerService.removeTunable(mTunable); mKeyguardUpdateMonitor.removeCallback(mKeyguardUpdateMonitorCallback); } @@ -87,11 +98,17 @@ public class OperatorNameViewController extends ViewController<OperatorNameView> mCarrierConfigTracker .getShowOperatorNameInStatusBarConfig(defaultSubInfo.getSubId()) && (mTunerService.getValue(KEY_SHOW_OPERATOR_NAME, 1) != 0); - mView.update(showOperatorName, mTelephonyManager.isDataCapable(), getDefaultSubInfo()); + mView.update( + showOperatorName, + mTelephonyManager.isDataCapable(), + mAirplaneModeInteractor.isAirplaneMode().getValue(), + getDefaultSubInfo() + ); } private SubInfo getDefaultSubInfo() { - int defaultSubId = SubscriptionManager.getDefaultDataSubscriptionId(); + int defaultSubId = mSubscriptionManagerProxy.getDefaultDataSubscriptionId(); + SubscriptionInfo sI = mKeyguardUpdateMonitor.getSubscriptionInfoForSubId(defaultSubId); return new SubInfo( sI.getSubscriptionId(), @@ -103,36 +120,44 @@ public class OperatorNameViewController extends ViewController<OperatorNameView> /** Factory for constructing an {@link OperatorNameViewController}. */ public static class Factory { private final DarkIconDispatcher mDarkIconDispatcher; - private final NetworkController mNetworkController; private final TunerService mTunerService; private final TelephonyManager mTelephonyManager; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; private final CarrierConfigTracker mCarrierConfigTracker; + private final AirplaneModeInteractor mAirplaneModeInteractor; + private final SubscriptionManagerProxy mSubscriptionManagerProxy; + private final JavaAdapter mJavaAdapter; @Inject public Factory(DarkIconDispatcher darkIconDispatcher, - NetworkController networkController, TunerService tunerService, TelephonyManager telephonyManager, KeyguardUpdateMonitor keyguardUpdateMonitor, - CarrierConfigTracker carrierConfigTracker) { + CarrierConfigTracker carrierConfigTracker, + AirplaneModeInteractor airplaneModeInteractor, + SubscriptionManagerProxy subscriptionManagerProxy, + JavaAdapter javaAdapter) { mDarkIconDispatcher = darkIconDispatcher; - mNetworkController = networkController; mTunerService = tunerService; mTelephonyManager = telephonyManager; mKeyguardUpdateMonitor = keyguardUpdateMonitor; mCarrierConfigTracker = carrierConfigTracker; + mAirplaneModeInteractor = airplaneModeInteractor; + mSubscriptionManagerProxy = subscriptionManagerProxy; + mJavaAdapter = javaAdapter; } /** Create an {@link OperatorNameViewController}. */ public OperatorNameViewController create(OperatorNameView view) { return new OperatorNameViewController(view, mDarkIconDispatcher, - mNetworkController, mTunerService, mTelephonyManager, mKeyguardUpdateMonitor, - mCarrierConfigTracker); + mCarrierConfigTracker, + mAirplaneModeInteractor, + mSubscriptionManagerProxy, + mJavaAdapter); } } @@ -149,13 +174,6 @@ public class OperatorNameViewController extends ViewController<OperatorNameView> (area, darkIntensity, tint) -> mView.setTextColor(DarkIconDispatcher.getTint(area, mView, tint)); - private final SignalCallback mSignalCallback = new SignalCallback() { - @Override - public void setIsAirplaneMode(@NonNull IconState icon) { - update(); - } - }; - private final TunerService.Tunable mTunable = (key, newValue) -> update(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java index 9b2a6df9a015..080b5340c045 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java @@ -680,7 +680,8 @@ public class StatusBarStateControllerImpl implements Scenes.Bouncer, StatusBarState.KEYGUARD, Scenes.Communal, StatusBarState.KEYGUARD, Scenes.Shade, StatusBarState.SHADE_LOCKED, - Scenes.QuickSettings, StatusBarState.SHADE_LOCKED + Scenes.QuickSettings, StatusBarState.SHADE_LOCKED, + Scenes.Gone, StatusBarState.SHADE ); /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java index f960fcafafc6..e5b64970c5b0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java @@ -35,9 +35,11 @@ import com.android.systemui.dump.DumpHandler; import com.android.systemui.dump.DumpManager; import com.android.systemui.media.controls.domain.pipeline.MediaDataManager; import com.android.systemui.power.domain.interactor.PowerInteractor; +import com.android.systemui.scene.shared.flag.SceneContainerFlags; import com.android.systemui.settings.DisplayTracker; import com.android.systemui.shade.NotificationPanelViewController; import com.android.systemui.shade.ShadeSurface; +import com.android.systemui.shade.ShadeSurfaceImpl; import com.android.systemui.shade.carrier.ShadeCarrierGroupController; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationClickNotifier; @@ -59,6 +61,8 @@ import com.android.systemui.statusbar.phone.StatusBarIconList; import com.android.systemui.statusbar.phone.StatusBarRemoteInputCallback; import com.android.systemui.statusbar.policy.KeyguardStateController; +import javax.inject.Provider; + import dagger.Binds; import dagger.Lazy; import dagger.Module; @@ -178,9 +182,20 @@ public interface CentralSurfacesDependenciesModule { * The {@link com.android.systemui.shade.ShadeViewController} interface is bound in * {@link com.android.systemui.shade.ShadeModule} so others can access it. */ - @Binds + @Provides @SysUISingleton - ShadeSurface provideShadeSurface(NotificationPanelViewController impl); + static ShadeSurface provideShadeSurface( + SceneContainerFlags sceneContainerFlags, + Provider<ShadeSurfaceImpl> sceneContainerOn, + Provider<NotificationPanelViewController> sceneContainerOff) { + if (sceneContainerFlags.isEnabled()) { + return sceneContainerOn.get(); + } else { + return sceneContainerOff.get(); + } + + } + /** */ @Binds diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt index 7c718645bc74..4c66f6617312 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt @@ -23,7 +23,9 @@ import androidx.core.animation.ObjectAnimator import com.android.app.animation.Interpolators import com.android.app.animation.InterpolatorsAndroidX import com.android.systemui.Dumpable +import com.android.systemui.communal.domain.interactor.CommunalInteractor import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dump.DumpManager import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.shade.ShadeExpansionChangeEvent @@ -47,11 +49,14 @@ import java.io.PrintWriter import javax.inject.Inject import kotlin.math.max import kotlin.math.min +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.launch @SysUISingleton class NotificationWakeUpCoordinator @Inject constructor( + @Application applicationScope: CoroutineScope, dumpManager: DumpManager, private val mHeadsUpManager: HeadsUpManager, private val statusBarStateController: StatusBarStateController, @@ -60,6 +65,7 @@ constructor( private val screenOffAnimationController: ScreenOffAnimationController, private val logger: NotificationWakeUpCoordinatorLogger, private val notifsKeyguardInteractor: NotificationsKeyguardInteractor, + private val communalInteractor: CommunalInteractor, ) : OnHeadsUpChangedListener, StatusBarStateController.StateListener, @@ -201,6 +207,13 @@ constructor( } } ) + applicationScope.launch { + communalInteractor.isIdleOnCommunal.collect { + if (!overrideDozeAmountIfCommunalShowing()) { + maybeClearHardDozeAmountOverrideHidingNotifs() + } + } + } } fun setStackScroller(stackScrollerController: NotificationStackScrollLayoutController) { @@ -302,6 +315,10 @@ constructor( return } + if (overrideDozeAmountIfCommunalShowing()) { + return + } + if (clearHardDozeAmountOverride()) { return } @@ -311,9 +328,12 @@ constructor( private fun setHardDozeAmountOverride(dozing: Boolean, source: String) { logger.logSetDozeAmountOverride(dozing = dozing, source = source) + val previousOverride = hardDozeAmountOverride hardDozeAmountOverride = if (dozing) 1f else 0f hardDozeAmountOverrideSource = source - updateDozeAmount() + if (previousOverride != hardDozeAmountOverride) { + updateDozeAmount() + } } private fun clearHardDozeAmountOverride(): Boolean { @@ -434,6 +454,11 @@ constructor( return } + if (overrideDozeAmountIfCommunalShowing()) { + this.state = newState + return + } + maybeClearHardDozeAmountOverrideHidingNotifs() this.state = newState @@ -471,6 +496,18 @@ constructor( return false } + private fun overrideDozeAmountIfCommunalShowing(): Boolean { + if (communalInteractor.isIdleOnCommunal.value) { + if (statusBarStateController.state == StatusBarState.KEYGUARD) { + setHardDozeAmountOverride(dozing = true, source = "Override: communal (keyguard)") + } else { + setHardDozeAmountOverride(dozing = false, source = "Override: communal (shade)") + } + return true + } + return false + } + /** * If the last [setDozeAmount] call was an override to hide notifications, then this call will * check for the set of states that may have caused that override, and if none of them still @@ -483,20 +520,23 @@ constructor( val onKeyguard = statusBarStateController.state == StatusBarState.KEYGUARD val dozing = statusBarStateController.isDozing val bypass = bypassController.bypassEnabled + val idleOnCommunal = communalInteractor.isIdleOnCommunal.value val animating = screenOffAnimationController.overrideNotificationsFullyDozingOnKeyguard() - // Overrides are set by [overrideDozeAmountIfAnimatingScreenOff] and - // [overrideDozeAmountIfBypass] based on 'animating' and 'bypass' respectively, so only - // clear the override if both those conditions are cleared. But also require either + // Overrides are set by [overrideDozeAmountIfAnimatingScreenOff], + // [overrideDozeAmountIfBypass] and [overrideDozeAmountIfCommunalShowing] based on + // 'animating', 'bypass' and 'idleOnCommunal' respectively, so only clear the override + // if all of those conditions are cleared. But also require either // !dozing or !onKeyguard because those conditions should indicate that we intend // notifications to be visible, and thus it is safe to unhide them. - val willRemove = (!onKeyguard || !dozing) && !bypass && !animating + val willRemove = (!onKeyguard || !dozing) && !bypass && !animating && !idleOnCommunal logger.logMaybeClearHardDozeAmountOverrideHidingNotifs( willRemove = willRemove, onKeyguard = onKeyguard, dozing = dozing, bypass = bypass, animating = animating, + idleOnCommunal = idleOnCommunal, ) if (willRemove) { clearHardDozeAmountOverride() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorLogger.kt index 502e1d9ea639..9619bea5efd4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorLogger.kt @@ -95,6 +95,7 @@ constructor(@NotificationLockscreenLog private val buffer: LogBuffer) { onKeyguard: Boolean, dozing: Boolean, bypass: Boolean, + idleOnCommunal: Boolean, animating: Boolean, ) { buffer.log( @@ -103,7 +104,7 @@ constructor(@NotificationLockscreenLog private val buffer: LogBuffer) { { str1 = "willRemove=$willRemove onKeyguard=$onKeyguard dozing=$dozing" + - " bypass=$bypass animating=$animating" + " bypass=$bypass animating=$animating idleOnCommunal=$idleOnCommunal" }, { "maybeClearHardDozeAmountOverrideHidingNotifs() $str1" } ) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/SortBySectionTimeFlag.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/SortBySectionTimeFlag.kt new file mode 100644 index 000000000000..09cb31043606 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/SortBySectionTimeFlag.kt @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.statusbar.notification.collection + +import android.app.Flags; +import com.android.systemui.flags.FlagToken +import com.android.systemui.flags.RefactorFlagUtils + +/** + * Helper for android.app.Flags.FLAG_SORT_BY_SECTION_TIME + */ +@Suppress("NOTHING_TO_INLINE") +object SortBySectionTimeFlag { + const val FLAG_NAME = Flags.FLAG_SORT_SECTION_BY_TIME + + /** A token used for dependency declaration */ + val token: FlagToken + get() = FlagToken(FLAG_NAME, isEnabled) + + /** Are sections sorted by time? */ + @JvmStatic + inline val isEnabled + get() = Flags.sortSectionByTime() + + /** + * Called to ensure code is only run when the flag is enabled. This protects users from the + * unintended behaviors caused by accidentally running new logic, while also crashing on an eng + * build to ensure that the refactor author catches issues in testing. + */ + @JvmStatic + inline fun isUnexpectedlyInLegacyMode() = + RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME) + + /** + * Called to ensure code is only run when the flag is disabled. This will throw an exception if + * the flag is enabled to ensure that the refactor author catches issues in testing. + */ + @JvmStatic + inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME) +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt index 1631ae28bf5e..3d0fd89dce88 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt @@ -19,6 +19,7 @@ package com.android.systemui.statusbar.notification.collection.coordinator import com.android.systemui.statusbar.notification.collection.ListEntry import com.android.systemui.statusbar.notification.collection.NotifPipeline import com.android.systemui.statusbar.notification.collection.NotificationEntry +import com.android.systemui.statusbar.notification.collection.SortBySectionTimeFlag import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeRenderListListener import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifComparator @@ -80,11 +81,20 @@ class ConversationCoordinator @Inject constructor( } } + // TODO(b/330193582): Rename to just "People" val peopleAlertingSectioner = object : NotifSectioner("People(alerting)", BUCKET_PEOPLE) { - override fun isInSection(entry: ListEntry): Boolean = - highPriorityProvider.isHighPriorityConversation(entry) + override fun isInSection(entry: ListEntry): Boolean { + if (SortBySectionTimeFlag.isEnabled) { + return highPriorityProvider.isHighPriorityConversation(entry) + || isConversation(entry) + } else { + return highPriorityProvider.isHighPriorityConversation(entry) + } + } - override fun getComparator(): NotifComparator = notifComparator + override fun getComparator(): NotifComparator? { + return if (SortBySectionTimeFlag.isEnabled) null else notifComparator + } override fun getHeaderNodeController(): NodeController? = conversationHeaderNodeController } @@ -92,11 +102,20 @@ class ConversationCoordinator @Inject constructor( val peopleSilentSectioner = object : NotifSectioner("People(silent)", BUCKET_PEOPLE) { // Because the peopleAlertingSectioner is above this one, it will claim all conversations that are alerting. // All remaining conversations must be silent. - override fun isInSection(entry: ListEntry): Boolean = isConversation(entry) + override fun isInSection(entry: ListEntry): Boolean { + SortBySectionTimeFlag.assertInLegacyMode() + return isConversation(entry) + } - override fun getComparator(): NotifComparator = notifComparator + override fun getComparator(): NotifComparator { + SortBySectionTimeFlag.assertInLegacyMode() + return notifComparator + } - override fun getHeaderNodeController(): NodeController? = conversationHeaderNodeController + override fun getHeaderNodeController(): NodeController? { + SortBySectionTimeFlag.assertInLegacyMode() + return conversationHeaderNodeController + } } override fun attach(pipeline: NotifPipeline) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt index b9d1dde82eeb..36c12a719570 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt @@ -20,6 +20,7 @@ import com.android.systemui.flags.Flags.LOCKSCREEN_WALLPAPER_DREAM_ENABLED import com.android.systemui.statusbar.notification.collection.NotifPipeline import com.android.systemui.statusbar.notification.collection.PipelineDumpable import com.android.systemui.statusbar.notification.collection.PipelineDumper +import com.android.systemui.statusbar.notification.collection.SortBySectionTimeFlag import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner import com.android.systemui.statusbar.notification.collection.provider.SectionStyleProvider @@ -114,17 +115,26 @@ class NotifCoordinatorsImpl @Inject constructor( mOrderedSections.add(headsUpCoordinator.sectioner) // HeadsUp mOrderedSections.add(colorizedFgsCoordinator.sectioner) // ForegroundService mOrderedSections.add(conversationCoordinator.peopleAlertingSectioner) // People Alerting - mOrderedSections.add(conversationCoordinator.peopleSilentSectioner) // People Silent + if (!SortBySectionTimeFlag.isEnabled) { + mOrderedSections.add(conversationCoordinator.peopleSilentSectioner) // People Silent + } mOrderedSections.add(rankingCoordinator.alertingSectioner) // Alerting mOrderedSections.add(rankingCoordinator.silentSectioner) // Silent mOrderedSections.add(rankingCoordinator.minimizedSectioner) // Minimized sectionStyleProvider.setMinimizedSections(setOf(rankingCoordinator.minimizedSectioner)) - sectionStyleProvider.setSilentSections(listOf( - conversationCoordinator.peopleSilentSectioner, - rankingCoordinator.silentSectioner, - rankingCoordinator.minimizedSectioner, - )) + if (SortBySectionTimeFlag.isEnabled) { + sectionStyleProvider.setSilentSections(listOf( + rankingCoordinator.silentSectioner, + rankingCoordinator.minimizedSectioner, + )) + } else { + sectionStyleProvider.setSilentSections(listOf( + conversationCoordinator.peopleSilentSectioner, + rankingCoordinator.silentSectioner, + rankingCoordinator.minimizedSectioner, + )) + } } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinator.kt index c8ca63d9de91..1511abd6b60c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinator.kt @@ -17,6 +17,8 @@ package com.android.systemui.statusbar.notification.collection.coordinator import com.android.app.tracing.traceSection +import com.android.server.notification.Flags.screenshareNotificationHiding +import com.android.systemui.Flags.screenshareNotificationHidingBugFix import com.android.systemui.statusbar.notification.collection.ListEntry import com.android.systemui.statusbar.notification.collection.NotifPipeline import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope @@ -29,6 +31,7 @@ import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefac import com.android.systemui.statusbar.notification.shared.NotificationIconContainerRefactor import com.android.systemui.statusbar.notification.stack.BUCKET_SILENT import com.android.systemui.statusbar.phone.NotificationIconAreaController +import com.android.systemui.statusbar.policy.SensitiveNotificationProtectionController import javax.inject.Inject /** @@ -43,6 +46,8 @@ internal constructor( private val notificationIconAreaController: NotificationIconAreaController, private val renderListInteractor: RenderNotificationListInteractor, private val activeNotificationsInteractor: ActiveNotificationsInteractor, + private val sensitiveNotificationProtectionController: + SensitiveNotificationProtectionController, ) : Coordinator { override fun attach(pipeline: NotifPipeline) { @@ -71,13 +76,16 @@ internal constructor( var hasClearableAlertingNotifs = false var hasNonClearableSilentNotifs = false var hasClearableSilentNotifs = false + val isSensitiveContentProtectionActive = screenshareNotificationHiding() && + screenshareNotificationHidingBugFix() && + sensitiveNotificationProtectionController.isSensitiveStateActive entries.forEach { val section = checkNotNull(it.section) { "Null section for ${it.key}" } val entry = checkNotNull(it.representativeEntry) { "Null notif entry for ${it.key}" } val isSilent = section.bucket == BUCKET_SILENT // NOTE: NotificationEntry.isClearable will internally check group children to ensure // the group itself definitively clearable. - val isClearable = entry.isClearable + val isClearable = !isSensitiveContentProtectionActive && entry.isClearable when { isSilent && isClearable -> hasClearableSilentNotifs = true isSilent && !isClearable -> hasNonClearableSilentNotifs = true diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinator.java index dfe6cd5f25b8..350e88ea9df5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinator.java @@ -24,6 +24,7 @@ import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import com.android.systemui.Dumpable; +import com.android.systemui.communal.domain.interactor.CommunalInteractor; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dump.DumpManager; @@ -68,6 +69,7 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { private final VisibilityLocationProvider mVisibilityLocationProvider; private final VisualStabilityProvider mVisualStabilityProvider; private final WakefulnessLifecycle mWakefulnessLifecycle; + private final CommunalInteractor mCommunalInteractor; private boolean mSleepy = true; private boolean mFullyDozed; @@ -75,6 +77,7 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { private boolean mPulsing; private boolean mNotifPanelCollapsing; private boolean mNotifPanelLaunchingActivity; + private boolean mCommunalShowing = false; private boolean mPipelineRunAllowed; private boolean mReorderingAllowed; @@ -101,7 +104,8 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { StatusBarStateController statusBarStateController, VisibilityLocationProvider visibilityLocationProvider, VisualStabilityProvider visualStabilityProvider, - WakefulnessLifecycle wakefulnessLifecycle) { + WakefulnessLifecycle wakefulnessLifecycle, + CommunalInteractor communalInteractor) { mHeadsUpManager = headsUpManager; mShadeAnimationInteractor = shadeAnimationInteractor; mJavaAdapter = javaAdapter; @@ -110,6 +114,7 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { mWakefulnessLifecycle = wakefulnessLifecycle; mStatusBarStateController = statusBarStateController; mDelayableExecutor = delayableExecutor; + mCommunalInteractor = communalInteractor; dumpManager.registerDumpable(this); } @@ -126,6 +131,8 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { this::onShadeOrQsClosingChanged); mJavaAdapter.alwaysCollectFlow(mShadeAnimationInteractor.isLaunchingActivity(), this::onLaunchingActivityChanged); + mJavaAdapter.alwaysCollectFlow(mCommunalInteractor.isIdleOnCommunal(), + this::onCommunalShowingChanged); pipeline.setVisualStabilityManager(mNotifStabilityManager); } @@ -231,7 +238,7 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { } private boolean isReorderingAllowed() { - return ((mFullyDozed && mSleepy) || !mPanelExpanded) && !mPulsing; + return ((mFullyDozed && mSleepy) || !mPanelExpanded || mCommunalShowing) && !mPulsing; } /** @@ -315,6 +322,7 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { pw.println(" fullyDozed: " + mFullyDozed); pw.println(" panelExpanded: " + mPanelExpanded); pw.println(" pulsing: " + mPulsing); + pw.println(" communalShowing: " + mCommunalShowing); pw.println("isSuppressingPipelineRun: " + mIsSuppressingPipelineRun); pw.println("isSuppressingGroupChange: " + mIsSuppressingGroupChange); pw.println("isSuppressingEntryReorder: " + mIsSuppressingEntryReorder); @@ -338,4 +346,9 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { mNotifPanelLaunchingActivity = isLaunchingActivity; updateAllowedStates("notifPanelLaunchingActivity", isLaunchingActivity); } + + private void onCommunalShowingChanged(boolean isShowing) { + mCommunalShowing = isShowing; + updateAllowedStates("communalShowing", isShowing); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/SectionStyleProvider.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/SectionStyleProvider.kt index 5a3edf4ac8fd..ea9f29521459 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/SectionStyleProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/SectionStyleProvider.kt @@ -18,8 +18,10 @@ package com.android.systemui.statusbar.notification.collection.provider import com.android.systemui.dagger.SysUISingleton import com.android.systemui.statusbar.notification.collection.ListEntry +import com.android.systemui.statusbar.notification.collection.SortBySectionTimeFlag import com.android.systemui.statusbar.notification.collection.listbuilder.NotifSection import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner +import com.android.systemui.statusbar.notification.stack.BUCKET_PEOPLE import javax.inject.Inject /** @@ -27,7 +29,8 @@ import javax.inject.Inject * NOTE: This class exists to avoid putting metadata like "isMinimized" on the NotifSection */ @SysUISingleton -class SectionStyleProvider @Inject constructor() { +class SectionStyleProvider @Inject constructor( + private val highPriorityProvider: HighPriorityProvider) { private lateinit var silentSections: Set<NotifSectioner> private lateinit var lowPrioritySections: Set<NotifSectioner> @@ -76,6 +79,13 @@ class SectionStyleProvider @Inject constructor() { @JvmOverloads fun isSilent(entry: ListEntry, ifNotInSection: Boolean = true): Boolean { val section = entry.section ?: return ifNotInSection - return isSilentSection(section) + if (SortBySectionTimeFlag.isEnabled) { + if (entry.section?.bucket == BUCKET_PEOPLE) { + return !highPriorityProvider.isHighPriorityConversation(entry) + } + return isSilentSection(section) + } else { + return isSilentSection(section) + } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index ec111a13a3bf..59901aca0425 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -83,7 +83,6 @@ import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.power.domain.interactor.PowerInteractor; import com.android.systemui.res.R; -import com.android.systemui.scene.shared.flag.SceneContainerFlags; import com.android.systemui.scene.ui.view.WindowRootView; import com.android.systemui.shade.ShadeController; import com.android.systemui.shade.ShadeViewController; @@ -115,7 +114,6 @@ import com.android.systemui.statusbar.notification.collection.render.NotifStats; import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider; import com.android.systemui.statusbar.notification.collection.render.SectionHeaderController; import com.android.systemui.statusbar.notification.dagger.SilentHeader; -import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor; import com.android.systemui.statusbar.notification.domain.interactor.SeenNotificationsInteractor; import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor; import com.android.systemui.statusbar.notification.init.NotificationsController; @@ -132,7 +130,6 @@ import com.android.systemui.statusbar.notification.stack.ui.viewbinder.Notificat import com.android.systemui.statusbar.phone.HeadsUpAppearanceController; import com.android.systemui.statusbar.phone.HeadsUpTouchHelper; import com.android.systemui.statusbar.phone.KeyguardBypassController; -import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener; import com.android.systemui.statusbar.policy.DeviceProvisionedController; @@ -185,7 +182,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { private final FalsingCollector mFalsingCollector; private final FalsingManager mFalsingManager; private final NotificationSwipeHelper.Builder mNotificationSwipeHelperBuilder; - private final ScrimController mScrimController; private final NotifPipeline mNotifPipeline; private final NotifCollection mNotifCollection; private final UiEventLogger mUiEventLogger; @@ -734,7 +730,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { FalsingCollector falsingCollector, FalsingManager falsingManager, NotificationSwipeHelper.Builder notificationSwipeHelperBuilder, - ScrimController scrimController, GroupExpansionManager groupManager, @SilentHeader SectionHeaderController silentHeaderController, NotifPipeline notifPipeline, @@ -743,11 +738,9 @@ public class NotificationStackScrollLayoutController implements Dumpable { UiEventLogger uiEventLogger, NotificationRemoteInputManager remoteInputManager, VisibilityLocationProviderDelegator visibilityLocationProviderDelegator, - ActiveNotificationsInteractor activeNotificationsInteractor, SeenNotificationsInteractor seenNotificationsInteractor, NotificationListViewBinder viewBinder, ShadeController shadeController, - SceneContainerFlags sceneContainerFlags, Provider<WindowRootView> windowRootView, NotificationStackAppearanceInteractor stackAppearanceInteractor, InteractionJankMonitor jankMonitor, @@ -790,7 +783,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { mFalsingCollector = falsingCollector; mFalsingManager = falsingManager; mNotificationSwipeHelperBuilder = notificationSwipeHelperBuilder; - mScrimController = scrimController; mJankMonitor = jankMonitor; mNotificationStackSizeCalculator = notificationStackSizeCalculator; mGroupExpansionManager = groupManager; @@ -1178,7 +1170,7 @@ public class NotificationStackScrollLayoutController implements Dumpable { /** Get the y-coordinate of the top bound of the stack. */ public float getPlaceholderTop() { - return mStackAppearanceInteractor.getStackBounds().getValue().getTop(); + return mStackAppearanceInteractor.getShadeScrimBounds().getValue().getTop(); } /** @@ -1191,7 +1183,7 @@ public class NotificationStackScrollLayoutController implements Dumpable { /** Set the intrinsic height of the stack content without additional padding. */ public void setIntrinsicContentHeight(float intrinsicContentHeight) { - mStackAppearanceInteractor.setIntrinsicContentHeight(intrinsicContentHeight); + mStackAppearanceInteractor.setStackHeight(intrinsicContentHeight); } public void setIntrinsicPadding(int intrinsicPadding) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationPlaceholderRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationPlaceholderRepository.kt new file mode 100644 index 000000000000..462547ea2385 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationPlaceholderRepository.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.notification.stack.data.repository + +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrimBounds +import javax.inject.Inject +import kotlinx.coroutines.flow.MutableStateFlow + +/** + * This repository contains state generated by the composable placeholders to define the position + * and appearance of the notification stack and related visual elements + */ +@SysUISingleton +class NotificationPlaceholderRepository @Inject constructor() { + /** The bounds of the notification shade scrim / container in the current scene. */ + val shadeScrimBounds = MutableStateFlow(ShadeScrimBounds()) + + /** + * The y-coordinate in px of top of the contents of the notification stack. This value can be + * negative, if the stack is scrolled such that its top extends beyond the top edge of the + * screen. + */ + val stackTop = MutableStateFlow(0f) + + /** the bottom-most acceptable y-position for the bottom of the stack / shelf */ + val stackBottom = MutableStateFlow(0f) + + /** the y position of the top of the HUN area */ + val headsUpTop = MutableStateFlow(0f) + + /** height made available to the notifications in the size-constrained mode of lock screen. */ + val constrainedAvailableSpace = MutableStateFlow(0f) + + /** + * Whether the notification stack is scrolled to the top; i.e., it cannot be scrolled down any + * further. + */ + val scrolledToTop = MutableStateFlow(true) +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationStackAppearanceRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationViewHeightRepository.kt index 79ba25e1e23e..938e43e4a2d4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationStackAppearanceRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationViewHeightRepository.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 The Android Open Source Project + * Copyright (C) 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,41 +12,30 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * */ package com.android.systemui.statusbar.notification.stack.data.repository import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.statusbar.notification.stack.shared.model.StackBounds import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow -/** A repository which holds state about and controlling the appearance of the notification stack */ +/** + * This repository contains state generated by the NSSL and required by the composable placeholders + * to ensure they are representing the actual contents that will be rendered. + */ @SysUISingleton -class NotificationStackAppearanceRepository @Inject constructor() { - /** The bounds of the notification stack in the current scene. */ - val stackBounds = MutableStateFlow(StackBounds()) +class NotificationViewHeightRepository @Inject constructor() { /** * The height in px of the contents of notification stack. Depending on the number of * notifications, this can exceed the space available on screen to show notifications, at which * point the notification stack should become scrollable. */ - val intrinsicContentHeight = MutableStateFlow(0f) + val stackHeight = MutableStateFlow(0f) - /** - * The y-coordinate in px of top of the contents of the notification stack. This value can be - * negative, if the stack is scrolled such that its top extends beyond the top edge of the - * screen. - */ - val contentTop = MutableStateFlow(0f) - - /** - * Whether the notification stack is scrolled to the top; i.e., it cannot be scrolled down any - * further. - */ - val scrolledToTop = MutableStateFlow(true) + /** The height in px of the current heads up notification. */ + val activeHeadsUpRowHeight = MutableStateFlow(0f) /** * The amount in px that the notification stack should scroll due to internal expansion. This diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractor.kt index f05d01717a44..32562f109252 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractor.kt @@ -20,9 +20,10 @@ package com.android.systemui.statusbar.notification.stack.domain.interactor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.shade.shared.model.ShadeMode -import com.android.systemui.statusbar.notification.stack.data.repository.NotificationStackAppearanceRepository -import com.android.systemui.statusbar.notification.stack.shared.model.StackBounds -import com.android.systemui.statusbar.notification.stack.shared.model.StackRounding +import com.android.systemui.statusbar.notification.stack.data.repository.NotificationPlaceholderRepository +import com.android.systemui.statusbar.notification.stack.data.repository.NotificationViewHeightRepository +import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrimBounds +import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrimRounding import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow @@ -36,11 +37,13 @@ import kotlinx.coroutines.flow.flowOf class NotificationStackAppearanceInteractor @Inject constructor( - private val repository: NotificationStackAppearanceRepository, + private val viewHeightRepository: NotificationViewHeightRepository, + private val placeholderRepository: NotificationPlaceholderRepository, shadeInteractor: ShadeInteractor, ) { /** The bounds of the notification stack in the current scene. */ - val stackBounds: StateFlow<StackBounds> = repository.stackBounds.asStateFlow() + val shadeScrimBounds: StateFlow<ShadeScrimBounds> = + placeholderRepository.shadeScrimBounds.asStateFlow() /** * Whether the stack is expanding from GONE-with-HUN to SHADE @@ -50,12 +53,12 @@ constructor( private val isExpandingFromHeadsUp: Flow<Boolean> = flowOf(false) /** The rounding of the notification stack. */ - val stackRounding: Flow<StackRounding> = + val shadeScrimRounding: Flow<ShadeScrimRounding> = combine( shadeInteractor.shadeMode, isExpandingFromHeadsUp, ) { shadeMode, isExpandingFromHeadsUp -> - StackRounding( + ShadeScrimRounding( roundTop = !(shadeMode == ShadeMode.Split && isExpandingFromHeadsUp), roundBottom = shadeMode != ShadeMode.Single, ) @@ -67,47 +70,47 @@ constructor( * notifications, this can exceed the space available on screen to show notifications, at which * point the notification stack should become scrollable. */ - val intrinsicContentHeight: StateFlow<Float> = repository.intrinsicContentHeight.asStateFlow() + val stackHeight: StateFlow<Float> = viewHeightRepository.stackHeight.asStateFlow() /** The y-coordinate in px of top of the contents of the notification stack. */ - val contentTop: StateFlow<Float> = repository.contentTop.asStateFlow() + val stackTop: StateFlow<Float> = placeholderRepository.stackTop.asStateFlow() /** * Whether the notification stack is scrolled to the top; i.e., it cannot be scrolled down any * further. */ - val scrolledToTop: StateFlow<Boolean> = repository.scrolledToTop.asStateFlow() + val scrolledToTop: StateFlow<Boolean> = placeholderRepository.scrolledToTop.asStateFlow() /** * The amount in px that the notification stack should scroll due to internal expansion. This * should only happen when a notification expansion hits the bottom of the screen, so it is * necessary to scroll up to keep expanding the notification. */ - val syntheticScroll: Flow<Float> = repository.syntheticScroll.asStateFlow() + val syntheticScroll: Flow<Float> = viewHeightRepository.syntheticScroll.asStateFlow() /** Sets the position of the notification stack in the current scene. */ - fun setStackBounds(bounds: StackBounds) { + fun setShadeScrimBounds(bounds: ShadeScrimBounds) { check(bounds.top <= bounds.bottom) { "Invalid bounds: $bounds" } - repository.stackBounds.value = bounds + placeholderRepository.shadeScrimBounds.value = bounds } /** Sets the height of the contents of the notification stack. */ - fun setIntrinsicContentHeight(height: Float) { - repository.intrinsicContentHeight.value = height + fun setStackHeight(height: Float) { + viewHeightRepository.stackHeight.value = height } /** Sets the y-coord in px of the top of the contents of the notification stack. */ - fun setContentTop(startY: Float) { - repository.contentTop.value = startY + fun setStackTop(startY: Float) { + placeholderRepository.stackTop.value = startY } /** Sets whether the notification stack is scrolled to the top. */ fun setScrolledToTop(scrolledToTop: Boolean) { - repository.scrolledToTop.value = scrolledToTop + placeholderRepository.scrolledToTop.value = scrolledToTop } /** Sets the amount (px) that the notification stack should scroll due to internal expansion. */ fun setSyntheticScroll(delta: Float) { - repository.syntheticScroll.value = delta + viewHeightRepository.syntheticScroll.value = delta } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackBounds.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/ShadeScrimBounds.kt index 1fc9a182a10c..448127a55b89 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackBounds.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/ShadeScrimBounds.kt @@ -17,7 +17,7 @@ package com.android.systemui.statusbar.notification.stack.shared.model /** Models the bounds of the notification stack. */ -data class StackBounds( +data class ShadeScrimBounds( /** The position of the left of the stack in its window coordinate system, in pixels. */ val left: Float = 0f, /** The position of the top of the stack in its window coordinate system, in pixels. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackClipping.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/ShadeScrimClipping.kt index 0c92b5023d1d..621dd0c49f54 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackClipping.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/ShadeScrimClipping.kt @@ -17,4 +17,7 @@ package com.android.systemui.statusbar.notification.stack.shared.model /** Models the clipping rounded rectangle of the notification stack */ -data class StackClipping(val bounds: StackBounds, val rounding: StackRounding) +data class ShadeScrimClipping( + val bounds: ShadeScrimBounds = ShadeScrimBounds(), + val rounding: ShadeScrimRounding = ShadeScrimRounding() +) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackRounding.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/ShadeScrimRounding.kt index ddc5d7ea0d7f..2fe265f35604 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackRounding.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/ShadeScrimRounding.kt @@ -17,7 +17,7 @@ package com.android.systemui.statusbar.notification.stack.shared.model /** Models the corner rounds of the notification stack. */ -data class StackRounding( +data class ShadeScrimRounding( /** Whether the top corners of the notification stack should be rounded. */ val roundTop: Boolean = false, /** Whether the bottom corners of the notification stack should be rounded. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationStackViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationStackViewBinder.kt index 1a34bb4f02c7..d6d31db86e61 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationStackViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationStackViewBinder.kt @@ -57,7 +57,8 @@ constructor( suspend fun bind() = coroutineScope { launch { - combine(viewModel.stackClipping, clipRadius, ::Pair).collect { (clipping, clipRadius) -> + combine(viewModel.shadeScrimClipping, clipRadius, ::Pair).collect { + (clipping, clipRadius) -> val (bounds, rounding) = clipping val viewLeft = controller.view.left val viewTop = controller.view.top @@ -73,7 +74,7 @@ constructor( } launch { - viewModel.contentTop.collect { + viewModel.stackTop.collect { controller.updateTopPadding(it, controller.isAddOrRemoveAnimationPending) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationStackAppearanceViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationStackAppearanceViewModel.kt index a7cbc3374a0e..071127c03202 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationStackAppearanceViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationStackAppearanceViewModel.kt @@ -19,17 +19,15 @@ package com.android.systemui.statusbar.notification.stack.ui.viewmodel import com.android.compose.animation.scene.ObservableTransitionState import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dump.DumpManager import com.android.systemui.scene.domain.interactor.SceneInteractor import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.scene.shared.model.Scenes.Shade import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.notification.stack.domain.interactor.NotificationStackAppearanceInteractor -import com.android.systemui.statusbar.notification.stack.shared.model.StackClipping +import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrimClipping import com.android.systemui.util.kotlin.FlowDumperImpl import javax.inject.Inject -import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.combine @@ -41,7 +39,6 @@ import kotlinx.coroutines.flow.map class NotificationStackAppearanceViewModel @Inject constructor( - @Application applicationScope: CoroutineScope, dumpManager: DumpManager, stackAppearanceInteractor: NotificationStackAppearanceInteractor, shadeInteractor: ShadeInteractor, @@ -83,16 +80,16 @@ constructor( .dumpWhileCollecting("expandFraction") /** The bounds of the notification stack in the current scene. */ - val stackClipping: Flow<StackClipping> = + val shadeScrimClipping: Flow<ShadeScrimClipping> = combine( - stackAppearanceInteractor.stackBounds, - stackAppearanceInteractor.stackRounding, - ::StackClipping + stackAppearanceInteractor.shadeScrimBounds, + stackAppearanceInteractor.shadeScrimRounding, + ::ShadeScrimClipping ) .dumpWhileCollecting("stackClipping") /** The y-coordinate in px of top of the contents of the notification stack. */ - val contentTop: StateFlow<Float> = stackAppearanceInteractor.contentTop.dumpValue("contentTop") + val stackTop: StateFlow<Float> = stackAppearanceInteractor.stackTop.dumpValue("stackTop") /** Whether the notification stack is scrollable or not. */ val isScrollable: Flow<Boolean> = diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModel.kt index bd83121d9a34..477f139bcd7d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModel.kt @@ -24,8 +24,8 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor import com.android.systemui.scene.shared.flag.SceneContainerFlags import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.notification.stack.domain.interactor.NotificationStackAppearanceInteractor -import com.android.systemui.statusbar.notification.stack.shared.model.StackBounds -import com.android.systemui.statusbar.notification.stack.shared.model.StackRounding +import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrimBounds +import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrimRounding import javax.inject.Inject import kotlinx.coroutines.flow.Flow @@ -66,20 +66,20 @@ constructor( keyguardInteractor.setNotificationContainerBounds( NotificationContainerBounds(top = top, bottom = bottom) ) - interactor.setStackBounds( - StackBounds(top = top, bottom = bottom, left = left, right = right) + interactor.setShadeScrimBounds( + ShadeScrimBounds(top = top, bottom = bottom, left = left, right = right) ) } /** Corner rounding of the stack */ - val stackRounding: Flow<StackRounding> = interactor.stackRounding + val shadeScrimRounding: Flow<ShadeScrimRounding> = interactor.shadeScrimRounding /** * The height in px of the contents of notification stack. Depending on the number of * notifications, this can exceed the space available on screen to show notifications, at which * point the notification stack should become scrollable. */ - val intrinsicContentHeight = interactor.intrinsicContentHeight + val stackHeight = interactor.stackHeight /** * The amount [0-1] that the shade has been opened. At 0, the shade is closed; at 1, the shade @@ -96,7 +96,7 @@ constructor( /** Sets the y-coord in px of the top of the contents of the notification stack. */ fun onContentTopChanged(padding: Float) { - interactor.setContentTop(padding) + interactor.setStackTop(padding) } /** Sets whether the notification stack is scrolled to the top. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index b6f653fabdc4..2798dbfc62e4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -164,6 +164,7 @@ import com.android.systemui.qs.QSFragmentLegacy; import com.android.systemui.qs.QSPanelController; import com.android.systemui.res.R; import com.android.systemui.scene.domain.interactor.WindowRootViewVisibilityInteractor; +import com.android.systemui.scene.shared.flag.SceneContainerFlag; import com.android.systemui.scene.shared.flag.SceneContainerFlags; import com.android.systemui.scrim.ScrimView; import com.android.systemui.settings.UserTracker; @@ -1256,11 +1257,13 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mScreenOffAnimationController.initialize(this, mShadeSurface, mLightRevealScrim); updateLightRevealScrimVisibility(); - mShadeSurface.initDependencies( - this, - mGestureRec, - mShadeController::makeExpandedInvisible, - mHeadsUpManager); + if (!SceneContainerFlag.isEnabled()) { + mShadeSurface.initDependencies( + this, + mGestureRec, + mShadeController::makeExpandedInvisible, + mHeadsUpManager); + } // Set up the quick settings tile panel final View container = getNotificationShadeWindowView().findViewById(R.id.qs_frame); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.kt index 82b10bc11cc1..eadb7f5a1684 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.kt @@ -23,12 +23,12 @@ import android.view.ViewGroup import android.widget.FrameLayout import androidx.annotation.StringRes import com.android.keyguard.LockIconViewController -import com.android.systemui.res.R import com.android.systemui.keyguard.ui.binder.KeyguardBottomAreaViewBinder import com.android.systemui.keyguard.ui.binder.KeyguardBottomAreaViewBinder.bind import com.android.systemui.keyguard.ui.viewmodel.KeyguardBottomAreaViewModel import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.FalsingManager +import com.android.systemui.res.R import com.android.systemui.statusbar.VibratorHelper /** @@ -155,13 +155,13 @@ constructor( // make top of ambient indication view the bottom of the lock icon it.layout( ambientLeft, - lockIconViewController?.bottom?.toInt() ?: 0, + lockIconViewController?.getBottom()?.toInt() ?: 0, right - ambientLeft, ambientTop + it.measuredHeight ) } else { // make bottom of ambient indication view the top of the lock icon - val lockLocationTop = lockIconViewController?.top ?: 0 + val lockLocationTop = lockIconViewController?.getTop() ?: 0 it.layout( ambientLeft, lockLocationTop.toInt() - it.measuredHeight, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index febe5a25d3aa..afd2415ad7a8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -579,7 +579,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb ViewRootImpl viewRoot = getViewRootImpl(); if (viewRoot != null) { viewRoot.getOnBackInvokedDispatcher().registerOnBackInvokedCallback( - OnBackInvokedDispatcher.PRIORITY_OVERLAY, mOnBackInvokedCallback); + OnBackInvokedDispatcher.PRIORITY_DEFAULT, mOnBackInvokedCallback); mIsBackCallbackRegistered = true; } else { if (DEBUG) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java index 617e1076fca3..c52132f66813 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java @@ -46,7 +46,7 @@ import com.android.systemui.dump.DumpManager; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.res.R; import com.android.systemui.shade.ShadeExpansionStateManager; -import com.android.systemui.shade.ShadeViewController; +import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.OperatorNameView; import com.android.systemui.statusbar.OperatorNameViewController; @@ -79,6 +79,8 @@ import com.android.systemui.util.CarrierConfigTracker.CarrierConfigChangedListen import com.android.systemui.util.CarrierConfigTracker.DefaultDataSubscriptionChangedListener; import com.android.systemui.util.settings.SecureSettings; +import kotlin.Unit; + import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; @@ -89,8 +91,6 @@ import java.util.concurrent.Executor; import javax.inject.Inject; -import kotlin.Unit; - import kotlinx.coroutines.DisposableHandle; /** @@ -115,7 +115,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue private PhoneStatusBarView mStatusBar; private final StatusBarStateController mStatusBarStateController; private final KeyguardStateController mKeyguardStateController; - private final ShadeViewController mShadeViewController; + private final PanelExpansionInteractor mPanelExpansionInteractor; private MultiSourceMinAlphaController mEndSideAlphaController; private LinearLayout mEndSideContent; private View mClockView; @@ -227,7 +227,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue CollapsedStatusBarViewBinder collapsedStatusBarViewBinder, StatusBarHideIconsForBouncerManager statusBarHideIconsForBouncerManager, KeyguardStateController keyguardStateController, - ShadeViewController shadeViewController, + PanelExpansionInteractor panelExpansionInteractor, StatusBarStateController statusBarStateController, NotificationIconContainerStatusBarViewBinder nicViewBinder, CommandQueue commandQueue, @@ -252,7 +252,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue mStatusBarHideIconsForBouncerManager = statusBarHideIconsForBouncerManager; mDarkIconManagerFactory = darkIconManagerFactory; mKeyguardStateController = keyguardStateController; - mShadeViewController = shadeViewController; + mPanelExpansionInteractor = panelExpansionInteractor; mStatusBarStateController = statusBarStateController; mNicViewBinder = nicViewBinder; mCommandQueue = commandQueue; @@ -603,7 +603,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue private boolean shouldHideStatusBar() { if (!mShadeExpansionStateManager.isClosed() - && mShadeViewController.shouldHideStatusBarIconsWhenExpanded()) { + && mPanelExpansionInteractor.shouldHideStatusBarIconsWhenExpanded()) { return true; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/airplane/domain/interactor/AirplaneModeInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/airplane/domain/interactor/AirplaneModeInteractor.kt index c6c88230586f..684e38e25acd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/airplane/domain/interactor/AirplaneModeInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/airplane/domain/interactor/AirplaneModeInteractor.kt @@ -23,6 +23,7 @@ import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlo import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository import javax.inject.Inject import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.map /** @@ -40,7 +41,7 @@ constructor( private val mobileConnectionsRepository: MobileConnectionsRepository, ) { /** True if the device is currently in airplane mode. */ - val isAirplaneMode: Flow<Boolean> = airplaneModeRepository.isAirplaneMode + val isAirplaneMode: StateFlow<Boolean> = airplaneModeRepository.isAirplaneMode /** True if we're configured to force-hide the airplane mode icon and false otherwise. */ val isForceHidden: Flow<Boolean> = diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt index 8f00b43e79f8..317c0634a364 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt @@ -44,6 +44,9 @@ interface MobileConnectionRepository { /** The carrierId for this connection. See [TelephonyManager.getSimCarrierId] */ val carrierId: StateFlow<Int> + /** Reflects the value from the carrier config INFLATE_SIGNAL_STRENGTH for this connection */ + val inflateSignalStrength: StateFlow<Boolean> + /** * The table log buffer created for this connection. Will have the name "MobileConnectionLog * [subId]" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepository.kt index af34a57c7242..90cdfeb05d4e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepository.kt @@ -43,6 +43,7 @@ import com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.model.F import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn /** @@ -67,6 +68,17 @@ class DemoMobileConnectionRepository( ) .stateIn(scope, SharingStarted.WhileSubscribed(), _carrierId.value) + private val _inflateSignalStrength: MutableStateFlow<Boolean> = MutableStateFlow(false) + override val inflateSignalStrength = + _inflateSignalStrength + .logDiffsForTable( + tableLogBuffer, + columnPrefix = "", + columnName = "inflate", + _inflateSignalStrength.value + ) + .stateIn(scope, SharingStarted.WhileSubscribed(), _inflateSignalStrength.value) + private val _isEmergencyOnly = MutableStateFlow(false) override val isEmergencyOnly = _isEmergencyOnly @@ -191,7 +203,16 @@ class DemoMobileConnectionRepository( .logDiffsForTable(tableLogBuffer, columnPrefix = "", _resolvedNetworkType.value) .stateIn(scope, SharingStarted.WhileSubscribed(), _resolvedNetworkType.value) - override val numberOfLevels = MutableStateFlow(MobileConnectionRepository.DEFAULT_NUM_LEVELS) + override val numberOfLevels = + _inflateSignalStrength + .map { shouldInflate -> + if (shouldInflate) { + DEFAULT_NUM_LEVELS + 1 + } else { + DEFAULT_NUM_LEVELS + } + } + .stateIn(scope, SharingStarted.WhileSubscribed(), DEFAULT_NUM_LEVELS) override val dataEnabled = MutableStateFlow(true) @@ -226,8 +247,7 @@ class DemoMobileConnectionRepository( _carrierId.value = event.carrierId ?: INVALID_SUBSCRIPTION_ID - numberOfLevels.value = - if (event.inflateStrength) DEFAULT_NUM_LEVELS + 1 else DEFAULT_NUM_LEVELS + _inflateSignalStrength.value = event.inflateStrength cdmaRoaming.value = event.roaming _isRoaming.value = event.roaming @@ -258,7 +278,6 @@ class DemoMobileConnectionRepository( carrierName.value = NetworkNameModel.SubscriptionDerived(CARRIER_MERGED_NAME) // TODO(b/276943904): is carrierId a thing with carrier merged networks? _carrierId.value = INVALID_SUBSCRIPTION_ID - numberOfLevels.value = event.numberOfLevels cdmaRoaming.value = false _primaryLevel.value = event.level _cdmaLevel.value = event.level diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt index 2bc3bcbc8bf5..cb99d11e79b7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt @@ -165,6 +165,7 @@ class CarrierMergedConnectionRepository( override val isRoaming = MutableStateFlow(false).asStateFlow() override val carrierId = MutableStateFlow(INVALID_SUBSCRIPTION_ID).asStateFlow() + override val inflateSignalStrength = MutableStateFlow(false).asStateFlow() override val isEmergencyOnly = MutableStateFlow(false).asStateFlow() override val operatorAlphaShort = MutableStateFlow(null).asStateFlow() override val isInService = MutableStateFlow(true).asStateFlow() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepository.kt index b085d8046b12..bb0af775f820 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepository.kt @@ -291,6 +291,21 @@ class FullMobileConnectionRepository( ) .stateIn(scope, SharingStarted.WhileSubscribed(), activeRepo.value.dataEnabled.value) + override val inflateSignalStrength = + activeRepo + .flatMapLatest { it.inflateSignalStrength } + .logDiffsForTable( + tableLogBuffer, + columnPrefix = "", + columnName = "inflate", + initialValue = activeRepo.value.inflateSignalStrength.value, + ) + .stateIn( + scope, + SharingStarted.WhileSubscribed(), + activeRepo.value.inflateSignalStrength.value + ) + override val numberOfLevels = activeRepo .flatMapLatest { it.numberOfLevels } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt index 5ab2ae899370..2cbe965b0ea9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt @@ -302,8 +302,10 @@ class MobileConnectionRepositoryImpl( } .stateIn(scope, SharingStarted.WhileSubscribed(), UnknownNetworkType) + override val inflateSignalStrength = systemUiCarrierConfig.shouldInflateSignalStrength + override val numberOfLevels = - systemUiCarrierConfig.shouldInflateSignalStrength + inflateSignalStrength .map { shouldInflate -> if (shouldInflate) { DEFAULT_NUM_LEVELS + 1 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt index 9d194cfca350..cbebfd0587ab 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt @@ -367,8 +367,11 @@ class MobileIconInteractorImpl( combine( level, isInService, - ) { level, isInService -> - if (isInService) level else 0 + connectionRepository.inflateSignalStrength, + ) { level, isInService, inflate -> + if (isInService) { + if (inflate) level + 1 else level + } else 0 } .stateIn(scope, SharingStarted.WhileSubscribed(), 0) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerImpl.java index 068e0a6056f3..860068c137a3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerImpl.java @@ -94,7 +94,8 @@ public class SensitiveNotificationProtectionControllerImpl int packageUid; try { - packageUid = mPackageManager.getPackageUid(info.getPackageName(), 0); + packageUid = mPackageManager.getPackageUidAsUser(info.getPackageName(), + info.getUserHandle().getIdentifier()); } catch (PackageManager.NameNotFoundException e) { Log.w(LOG_TAG, "Package " + info.getPackageName() + " not found"); packageUid = -1; diff --git a/packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt b/packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt index 81c8d5039d1d..a382cf921152 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt @@ -23,10 +23,11 @@ import android.os.PowerManager import android.provider.Settings import androidx.core.view.OneShotPreDrawListener import com.android.internal.util.LatencyTracker -import com.android.systemui.Flags.migrateClocksToBlueprint import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.keyguard.MigrateClocksToBlueprint import com.android.systemui.keyguard.WakefulnessLifecycle import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor +import com.android.systemui.keyguard.domain.interactor.ToAodFoldTransitionInteractor import com.android.systemui.shade.ShadeFoldAnimator import com.android.systemui.shade.ShadeViewController import com.android.systemui.statusbar.LightRevealScrim @@ -55,6 +56,7 @@ constructor( private val globalSettings: GlobalSettings, private val latencyTracker: LatencyTracker, private val keyguardInteractor: Lazy<KeyguardInteractor>, + private val foldTransitionInteractor: Lazy<ToAodFoldTransitionInteractor>, ) : CallbackController<FoldAodAnimationStatus>, ScreenOffAnimation, WakefulnessLifecycle.Observer { private lateinit var shadeViewController: ShadeViewController @@ -74,7 +76,7 @@ constructor( private val foldToAodLatencyTracker = FoldToAodLatencyTracker() private val startAnimationRunnable = Runnable { - getShadeFoldAnimator().startFoldToAodAnimation( + shadeFoldAnimator.startFoldToAodAnimation( /* startAction= */ { foldToAodLatencyTracker.onAnimationStarted() }, /* endAction= */ { setAnimationState(playing = false) }, /* cancelAction= */ { setAnimationState(playing = false) }, @@ -82,11 +84,12 @@ constructor( } override fun initialize( - centralSurfaces: CentralSurfaces, - shadeViewController: ShadeViewController, - lightRevealScrim: LightRevealScrim, + centralSurfaces: CentralSurfaces, + shadeViewController: ShadeViewController, + lightRevealScrim: LightRevealScrim, ) { this.shadeViewController = shadeViewController + foldTransitionInteractor.get().initialize(shadeViewController.shadeFoldAnimator) deviceStateManager.registerCallback(mainExecutor, FoldListener()) wakefulnessLifecycle.addObserver(this) @@ -103,7 +106,7 @@ constructor( override fun startAnimation(): Boolean = if (shouldStartAnimation()) { setAnimationState(playing = true) - getShadeFoldAnimator().prepareFoldToAodAnimation() + shadeFoldAnimator.prepareFoldToAodAnimation() true } else { setAnimationState(playing = false) @@ -114,14 +117,20 @@ constructor( if (isAnimationPlaying) { foldToAodLatencyTracker.cancel() cancelAnimation?.run() - getShadeFoldAnimator().cancelFoldToAodAnimation() + shadeFoldAnimator.cancelFoldToAodAnimation() } setAnimationState(playing = false) } - private fun getShadeFoldAnimator(): ShadeFoldAnimator = - shadeViewController.shadeFoldAnimator + private val shadeFoldAnimator: ShadeFoldAnimator + get() { + return if (MigrateClocksToBlueprint.isEnabled) { + foldTransitionInteractor.get().foldAnimator + } else { + shadeViewController.shadeFoldAnimator + } + } private fun setAnimationState(playing: Boolean) { shouldPlayAnimation = playing @@ -137,41 +146,45 @@ constructor( * @see [com.android.systemui.keyguard.KeyguardViewMediator] */ @BinderThread - fun onScreenTurningOn(onReady: Runnable) = mainExecutor.execute { - if (shouldPlayAnimation) { - // The device was not dozing and going to sleep after folding, play the animation - - if (isScrimOpaque) { - onReady.run() - } else { - pendingScrimReadyCallback = onReady - } - } else if (isFolded && !isFoldHandled && alwaysOnEnabled && - keyguardInteractor.get().isDozing.value) { - setAnimationState(playing = true) - getShadeFoldAnimator().prepareFoldToAodAnimation() - - // We don't need to wait for the scrim as it is already displayed - // but we should wait for the initial animation preparations to be drawn - // (setting initial alpha/translation) - // TODO(b/254878364): remove this call to NPVC.getView() - if (!migrateClocksToBlueprint()) { - getShadeFoldAnimator().view?.let { - OneShotPreDrawListener.add(it, onReady) + fun onScreenTurningOn(onReady: Runnable) = + mainExecutor.execute { + if (shouldPlayAnimation) { + // The device was not dozing and going to sleep after folding, play the animation + if (isScrimOpaque) { + onReady.run() + } else { + pendingScrimReadyCallback = onReady } + } else if ( + isFolded && + !isFoldHandled && + alwaysOnEnabled && + keyguardInteractor.get().isDozing.value + ) { + setAnimationState(playing = true) + shadeFoldAnimator.prepareFoldToAodAnimation() + + // We don't need to wait for the scrim as it is already displayed + // but we should wait for the initial animation preparations to be drawn + // (setting initial alpha/translation) + // TODO(b/254878364): remove this call to NPVC.getView() + if (!MigrateClocksToBlueprint.isEnabled) { + shadeFoldAnimator.view?.let { OneShotPreDrawListener.add(it, onReady) } + } else { + onReady.run() + } + } else { + // No animation, call ready callback immediately + onReady.run() } - } else { - // No animation, call ready callback immediately - onReady.run() - } - if (isFolded) { - // Any time the screen turns on, this state needs to be reset if the device has been - // folded. Reaching this line implies AOD has been shown in one way or another, - // if enabled - isFoldHandled = true + if (isFolded) { + // Any time the screen turns on, this state needs to be reset if the device has been + // folded. Reaching this line implies AOD has been shown in one way or another, + // if enabled + isFoldHandled = true + } } - } /** Called when keyguard scrim opaque changed */ override fun onScrimOpaqueChanged(isOpaque: Boolean) { @@ -184,18 +197,17 @@ constructor( } @BinderThread - fun onScreenTurnedOn() = mainExecutor.execute { - if (shouldPlayAnimation) { - cancelAnimation?.run() - - // Post starting the animation to the next frame to avoid junk due to inset changes - cancelAnimation = mainExecutor.executeDelayed( - startAnimationRunnable, - /* delayMillis= */ 0 - ) - shouldPlayAnimation = false + fun onScreenTurnedOn() = + mainExecutor.execute { + if (shouldPlayAnimation) { + cancelAnimation?.run() + + // Post starting the animation to the next frame to avoid junk due to inset changes + cancelAnimation = + mainExecutor.executeDelayed(startAnimationRunnable, /* delayMillis= */ 0) + shouldPlayAnimation = false + } } - } override fun isAnimationPlaying(): Boolean = isAnimationPlaying @@ -247,11 +259,10 @@ constructor( * Tracks the latency of fold to AOD using [LatencyTracker]. * * Events that trigger start and end are: - * * - Start: Once [DeviceStateManager] sends the folded signal [FoldToAodLatencyTracker.onFolded] - * is called and latency tracking starts. + * is called and latency tracking starts. * - End: Once the fold -> AOD animation starts, [FoldToAodLatencyTracker.onAnimationStarted] is - * called, and latency tracking stops. + * called, and latency tracking stops. */ private inner class FoldToAodLatencyTracker { diff --git a/packages/SystemUI/src/com/android/systemui/wallet/controller/QuickAccessWalletController.java b/packages/SystemUI/src/com/android/systemui/wallet/controller/QuickAccessWalletController.java index 1d9b90ac67af..ff1841819dea 100644 --- a/packages/SystemUI/src/com/android/systemui/wallet/controller/QuickAccessWalletController.java +++ b/packages/SystemUI/src/com/android/systemui/wallet/controller/QuickAccessWalletController.java @@ -91,17 +91,22 @@ public class QuickAccessWalletController { @Background Executor bgExecutor, SecureSettings secureSettings, QuickAccessWalletClient quickAccessWalletClient, - SystemClock clock) { + SystemClock clock, + RoleManager roleManager) { mContext = context; mExecutor = executor; mBgExecutor = bgExecutor; mSecureSettings = secureSettings; - mRoleManager = mContext.getSystemService(RoleManager.class); + mRoleManager = roleManager; mQuickAccessWalletClient = quickAccessWalletClient; mClock = clock; mQawClientCreatedTimeMillis = mClock.elapsedRealtime(); } + public boolean isWalletRoleAvailable() { + return mRoleManager.isRoleAvailable(RoleManager.ROLE_WALLET); + } + /** * Returns true if the Quick Access Wallet service & feature is available. */ diff --git a/packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/keyguard/LegacyLockIconViewControllerBaseTest.java index 1c773512e590..f924ab4a4617 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/LegacyLockIconViewControllerBaseTest.java @@ -68,7 +68,7 @@ import org.mockito.MockitoAnnotations; import org.mockito.MockitoSession; import org.mockito.quality.Strictness; -public class LockIconViewControllerBaseTest extends SysuiTestCase { +public class LegacyLockIconViewControllerBaseTest extends SysuiTestCase { protected static final String UNLOCKED_LABEL = "unlocked"; protected static final String LOCKED_LABEL = "locked"; protected static final int PADDING = 10; @@ -98,7 +98,7 @@ public class LockIconViewControllerBaseTest extends SysuiTestCase { protected @Mock PrimaryBouncerInteractor mPrimaryBouncerInteractor; - protected LockIconViewController mUnderTest; + protected LegacyLockIconViewController mUnderTest; // Capture listeners so that they can be used to send events @Captor protected ArgumentCaptor<View.OnAttachStateChangeListener> mAttachCaptor = @@ -153,7 +153,7 @@ public class LockIconViewControllerBaseTest extends SysuiTestCase { mFeatureFlags.set(LOCKSCREEN_WALLPAPER_DREAM_ENABLED, false); mFeatureFlags.set(LOCKSCREEN_ENABLE_LANDSCAPE, false); - mUnderTest = new LockIconViewController( + mUnderTest = new LegacyLockIconViewController( mStatusBarStateController, mKeyguardUpdateMonitor, mKeyguardViewController, diff --git a/packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/LegacyLockIconViewControllerTest.java index b0887efed4d7..868984233816 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/LegacyLockIconViewControllerTest.java @@ -51,7 +51,7 @@ import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper -public class LockIconViewControllerTest extends LockIconViewControllerBaseTest { +public class LegacyLockIconViewControllerTest extends LegacyLockIconViewControllerBaseTest { @Override public void setUp() throws Exception { diff --git a/packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerWithCoroutinesTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/LegacyLockIconViewControllerWithCoroutinesTest.kt index 12135182ac15..25a87b8aaf60 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerWithCoroutinesTest.kt +++ b/packages/SystemUI/tests/src/com/android/keyguard/LegacyLockIconViewControllerWithCoroutinesTest.kt @@ -39,7 +39,7 @@ import org.mockito.Mockito.verify @RunWith(AndroidTestingRunner::class) @SmallTest -class LockIconViewControllerWithCoroutinesTest : LockIconViewControllerBaseTest() { +class LegacyLockIconViewControllerWithCoroutinesTest : LegacyLockIconViewControllerBaseTest() { /** After migration, replaces LockIconViewControllerTest version */ @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java index f1b0c1874511..6f285fb01cf5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java @@ -100,6 +100,7 @@ import com.android.systemui.kosmos.KosmosJavaAdapter; import com.android.systemui.model.SysUiState; import com.android.systemui.res.R; import com.android.systemui.settings.FakeDisplayTracker; +import com.android.systemui.util.FakeSharedPreferences; import com.android.systemui.util.leak.ReferenceTestUtils; import com.android.systemui.util.settings.SecureSettings; import com.android.systemui.utils.os.FakeHandler; @@ -169,6 +170,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { private View.OnTouchListener mTouchListener; private MotionEventHelper mMotionEventHelper = new MotionEventHelper(); private KosmosJavaAdapter mKosmos; + private FakeSharedPreferences mSharedPreferences; /** * return whether window magnification is supported for current test context. @@ -180,6 +182,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); + mContext = spy(mContext); mKosmos = new KosmosJavaAdapter(this); mContext = Mockito.spy(getContext()); mHandler = new FakeHandler(TestableLooper.get(this).getLooper()); @@ -219,6 +222,10 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { mWindowMagnificationAnimationController = new WindowMagnificationAnimationController( mContext, mValueAnimator); + mSharedPreferences = new FakeSharedPreferences(); + when(mContext.getSharedPreferences( + eq("window_magnification_preferences"), anyInt())) + .thenReturn(mSharedPreferences); mWindowMagnificationController = new WindowMagnificationController( mContext, @@ -249,7 +256,9 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @After public void tearDown() { mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.deleteWindowMagnification()); + () -> { + mWindowMagnificationController.deleteWindowMagnification(); + }); mValueAnimator.cancel(); } @@ -600,22 +609,41 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { } @Test - public void onScreenChangedToSavedDensity_enabled_restoreSavedMagnifierWindow() { - mContext.getResources().getConfiguration().smallestScreenWidthDp = + public void onScreenSizeAndDensityChanged_enabled_restoreSavedMagnifierWindow() { + int newSmallestScreenWidthDp = mContext.getResources().getConfiguration().smallestScreenWidthDp * 2; int windowFrameSize = mResources.getDimensionPixelSize( com.android.internal.R.dimen.accessibility_window_magnifier_min_size); - mWindowMagnificationController.mWindowMagnificationSizePrefs.saveSizeForCurrentDensity( - new Size(windowFrameSize, windowFrameSize)); + Size preferredWindowSize = new Size(windowFrameSize, windowFrameSize); + mSharedPreferences + .edit() + .putString(String.valueOf(newSmallestScreenWidthDp), + preferredWindowSize.toString()) + .commit(); + mInstrumentation.runOnMainSync(() -> { + mWindowMagnificationController + .enableWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); + }); + // Change screen density and size to trigger restoring the preferred window size + mContext.getResources().getConfiguration().smallestScreenWidthDp = newSmallestScreenWidthDp; + final Rect testWindowBounds = new Rect( + mWindowManager.getCurrentWindowMetrics().getBounds()); + testWindowBounds.set(testWindowBounds.left, testWindowBounds.top, + testWindowBounds.right + 100, testWindowBounds.bottom + 100); + mWindowManager.setWindowBounds(testWindowBounds); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, - Float.NaN); + mWindowMagnificationController.onConfigurationChanged(ActivityInfo.CONFIG_SCREEN_SIZE); }); + // wait for rect update + waitForIdleSync(); WindowManager.LayoutParams params = mWindowManager.getLayoutParamsFromAttachedView(); - assertTrue(params.width == windowFrameSize); - assertTrue(params.height == windowFrameSize); + final int mirrorSurfaceMargin = mResources.getDimensionPixelSize( + R.dimen.magnification_mirror_surface_margin); + // The width and height of the view include the magnification frame and the margins. + assertTrue(params.width == (windowFrameSize + 2 * mirrorSurfaceMargin)); + assertTrue(params.height == (windowFrameSize + 2 * mirrorSurfaceMargin)); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerWindowlessMagnifierTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerWindowlessMagnifierTest.java index cbdc69608367..e9d36b861776 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerWindowlessMagnifierTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerWindowlessMagnifierTest.java @@ -102,6 +102,7 @@ import com.android.systemui.kosmos.KosmosJavaAdapter; import com.android.systemui.model.SysUiState; import com.android.systemui.res.R; import com.android.systemui.settings.FakeDisplayTracker; +import com.android.systemui.util.FakeSharedPreferences; import com.android.systemui.util.leak.ReferenceTestUtils; import com.android.systemui.util.settings.SecureSettings; import com.android.systemui.utils.os.FakeHandler; @@ -176,6 +177,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT // The most recently created SurfaceControlViewHost. private SurfaceControlViewHost mSurfaceControlViewHost; private KosmosJavaAdapter mKosmos; + private FakeSharedPreferences mSharedPreferences; /** * return whether window magnification is supported for current test context. @@ -187,6 +189,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); + mContext = spy(mContext); mKosmos = new KosmosJavaAdapter(this); mContext = Mockito.spy(getContext()); mHandler = new FakeHandler(TestableLooper.get(this).getLooper()); @@ -228,6 +231,10 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT return mSurfaceControlViewHost; }; mTransaction = spy(new SurfaceControl.Transaction()); + mSharedPreferences = new FakeSharedPreferences(); + when(mContext.getSharedPreferences( + eq("window_magnification_preferences"), anyInt())) + .thenReturn(mSharedPreferences); mWindowMagnificationController = new WindowMagnificationController( mContext, @@ -258,7 +265,9 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @After public void tearDown() { mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.deleteWindowMagnification()); + () -> { + mWindowMagnificationController.deleteWindowMagnification(); + }); mValueAnimator.cancel(); } @@ -614,22 +623,41 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT } @Test - public void onScreenChangedToSavedDensity_enabled_restoreSavedMagnifierWindow() { - mContext.getResources().getConfiguration().smallestScreenWidthDp = + public void onScreenSizeAndDensityChanged_enabled_restoreSavedMagnifierWindow() { + int newSmallestScreenWidthDp = mContext.getResources().getConfiguration().smallestScreenWidthDp * 2; int windowFrameSize = mResources.getDimensionPixelSize( com.android.internal.R.dimen.accessibility_window_magnifier_min_size); - mWindowMagnificationController.mWindowMagnificationSizePrefs.saveSizeForCurrentDensity( - new Size(windowFrameSize, windowFrameSize)); + Size preferredWindowSize = new Size(windowFrameSize, windowFrameSize); + mSharedPreferences + .edit() + .putString(String.valueOf(newSmallestScreenWidthDp), + preferredWindowSize.toString()) + .commit(); + mInstrumentation.runOnMainSync(() -> { + mWindowMagnificationController + .enableWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); + }); + // Screen density and size change + mContext.getResources().getConfiguration().smallestScreenWidthDp = newSmallestScreenWidthDp; + final Rect testWindowBounds = new Rect( + mWindowManager.getCurrentWindowMetrics().getBounds()); + testWindowBounds.set(testWindowBounds.left, testWindowBounds.top, + testWindowBounds.right + 100, testWindowBounds.bottom + 100); + mWindowManager.setWindowBounds(testWindowBounds); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, - Float.NaN); + mWindowMagnificationController.onConfigurationChanged(ActivityInfo.CONFIG_SCREEN_SIZE); }); + // wait for rect update + waitForIdleSync(); ViewGroup.LayoutParams params = mSurfaceControlViewHost.getView().getLayoutParams(); - assertTrue(params.width == windowFrameSize); - assertTrue(params.height == windowFrameSize); + final int mirrorSurfaceMargin = mResources.getDimensionPixelSize( + R.dimen.magnification_mirror_surface_margin); + // The width and height of the view include the magnification frame and the margins. + assertTrue(params.width == (windowFrameSize + 2 * mirrorSurfaceMargin)); + assertTrue(params.height == (windowFrameSize + 2 * mirrorSurfaceMargin)); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationSizePrefsTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationSizePrefsTest.java index 04b0d7085115..b843fda34ced 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationSizePrefsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationSizePrefsTest.java @@ -18,13 +18,20 @@ package com.android.systemui.accessibility; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + import android.test.suitebuilder.annotation.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.util.Size; import com.android.systemui.SysuiTestCase; +import com.android.systemui.util.FakeSharedPreferences; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -33,8 +40,18 @@ import org.junit.runner.RunWith; @TestableLooper.RunWithLooper public class WindowMagnificationSizePrefsTest extends SysuiTestCase { - WindowMagnificationSizePrefs mWindowMagnificationSizePrefs = - new WindowMagnificationSizePrefs(mContext); + WindowMagnificationSizePrefs mWindowMagnificationSizePrefs; + FakeSharedPreferences mSharedPreferences; + + @Before + public void setUp() { + mContext = spy(mContext); + mSharedPreferences = new FakeSharedPreferences(); + when(mContext.getSharedPreferences( + eq("window_magnification_preferences"), anyInt())) + .thenReturn(mSharedPreferences); + mWindowMagnificationSizePrefs = new WindowMagnificationSizePrefs(mContext); + } @Test public void saveSizeForCurrentDensity_getExpectedSize() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerTest.java index de696f4b9a2e..71f6081edc23 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerTest.java @@ -165,7 +165,7 @@ public class MenuViewLayerTest extends SysuiTestCase { mMenuView = spy( new MenuView(mSpyContext, mMenuViewModel, menuViewAppearance, mSecureSettings)); // Ensure tests don't actually update metrics. - doNothing().when(mMenuView).incrementTexMetric(any(), anyInt()); + doNothing().when(mMenuView).incrementTexMetric(any()); mMenuViewLayer = spy(new MenuViewLayer(mSpyContext, mStubWindowManager, mStubAccessibilityManager, mMenuViewModel, menuViewAppearance, mMenuView, @@ -414,33 +414,25 @@ public class MenuViewLayerTest extends SysuiTestCase { @Test @EnableFlags(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT) public void onDismissAction_incrementsTexMetricDismiss() { - int uid1 = 1234, uid2 = 5678; mMenuViewModel.onTargetFeaturesChanged( - List.of(new TestAccessibilityTarget(mSpyContext, uid1), - new TestAccessibilityTarget(mSpyContext, uid2))); + List.of(new TestAccessibilityTarget(mSpyContext, 1234), + new TestAccessibilityTarget(mSpyContext, 5678))); mMenuViewLayer.dispatchAccessibilityAction(R.id.action_remove_menu); - ArgumentCaptor<Integer> uidCaptor = ArgumentCaptor.forClass(Integer.class); - verify(mMenuView, times(2)).incrementTexMetric(eq(MenuViewLayer.TEX_METRIC_DISMISS), - uidCaptor.capture()); - assertThat(uidCaptor.getAllValues()).containsExactly(uid1, uid2); + verify(mMenuView, times(1)).incrementTexMetric(eq(MenuViewLayer.TEX_METRIC_DISMISS)); } @Test @EnableFlags(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT) public void onEditAction_incrementsTexMetricEdit() { - int uid1 = 1234, uid2 = 5678; mMenuViewModel.onTargetFeaturesChanged( - List.of(new TestAccessibilityTarget(mSpyContext, uid1), - new TestAccessibilityTarget(mSpyContext, uid2))); + List.of(new TestAccessibilityTarget(mSpyContext, 1234), + new TestAccessibilityTarget(mSpyContext, 5678))); mMenuViewLayer.dispatchAccessibilityAction(R.id.action_edit); - ArgumentCaptor<Integer> uidCaptor = ArgumentCaptor.forClass(Integer.class); - verify(mMenuView, times(2)).incrementTexMetric(eq(MenuViewLayer.TEX_METRIC_EDIT), - uidCaptor.capture()); - assertThat(uidCaptor.getAllValues()).containsExactly(uid1, uid2); + verify(mMenuView, times(1)).incrementTexMetric(eq(MenuViewLayer.TEX_METRIC_EDIT)); } /** Simplified AccessibilityTarget for testing MenuViewLayer. */ diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java new file mode 100644 index 000000000000..b0f0363a3e97 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java @@ -0,0 +1,211 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.accessibility.hearingaid; + +import static com.android.systemui.statusbar.phone.SystemUIDialog.DEFAULT_DISMISS_ON_DEVICE_LOCK; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Intent; +import android.media.AudioManager; +import android.os.Handler; +import android.provider.Settings; +import android.testing.AndroidTestingRunner; +import android.testing.TestableLooper; +import android.view.View; + +import androidx.test.filters.SmallTest; + +import com.android.settingslib.bluetooth.BluetoothEventManager; +import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; +import com.android.settingslib.bluetooth.LocalBluetoothAdapter; +import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.systemui.SysuiTestCase; +import com.android.systemui.animation.DialogTransitionAnimator; +import com.android.systemui.model.SysUiState; +import com.android.systemui.plugins.ActivityStarter; +import com.android.systemui.qs.tiles.dialog.bluetooth.DeviceItem; +import com.android.systemui.qs.tiles.dialog.bluetooth.DeviceItemType; +import com.android.systemui.res.R; +import com.android.systemui.statusbar.phone.SystemUIDialog; +import com.android.systemui.statusbar.phone.SystemUIDialogManager; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.util.ArrayList; +import java.util.List; + +/** Tests for {@link HearingDevicesDialogDelegate}. */ +@RunWith(AndroidTestingRunner.class) +@TestableLooper.RunWithLooper(setAsMainLooper = true) +@SmallTest +public class HearingDevicesDialogDelegateTest extends SysuiTestCase { + @Rule + public MockitoRule mockito = MockitoJUnit.rule(); + + private static final String DEVICE_ADDRESS = "AA:BB:CC:DD:EE:FF"; + + @Mock + private SystemUIDialog.Factory mSystemUIDialogFactory; + @Mock + private SystemUIDialogManager mSystemUIDialogManager; + @Mock + private SysUiState mSysUiState; + @Mock + private DialogTransitionAnimator mDialogTransitionAnimator; + @Mock + private ActivityStarter mActivityStarter; + @Mock + private LocalBluetoothManager mLocalBluetoothManager; + @Mock + private LocalBluetoothAdapter mLocalBluetoothAdapter; + @Mock + private CachedBluetoothDeviceManager mCachedDeviceManager; + @Mock + private BluetoothEventManager mBluetoothEventManager; + @Mock + private AudioManager mAudioManager; + @Mock + private CachedBluetoothDevice mCachedDevice; + @Mock + private DeviceItem mHearingDeviceItem; + private SystemUIDialog mDialog; + private HearingDevicesDialogDelegate mDialogDelegate; + private TestableLooper mTestableLooper; + private final List<CachedBluetoothDevice> mDevices = new ArrayList<>(); + + @Before + public void setUp() { + mTestableLooper = TestableLooper.get(this); + when(mLocalBluetoothManager.getBluetoothAdapter()).thenReturn(mLocalBluetoothAdapter); + when(mLocalBluetoothAdapter.isEnabled()).thenReturn(true); + when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager); + when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(mDevices); + when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); + when(mSysUiState.setFlag(anyInt(), anyBoolean())).thenReturn(mSysUiState); + when(mCachedDevice.getAddress()).thenReturn(DEVICE_ADDRESS); + when(mHearingDeviceItem.getCachedBluetoothDevice()).thenReturn(mCachedDevice); + + setUpPairNewDeviceDialog(); + + when(mSystemUIDialogFactory.create(any(SystemUIDialog.Delegate.class))) + .thenReturn(mDialog); + } + + @Test + public void createDialog_dialogShown() { + assertThat(mDialogDelegate.createDialog()).isEqualTo(mDialog); + } + + @Test + public void clickPairNewDeviceButton_intentActionMatch() { + mDialog.show(); + + getPairNewDeviceButton(mDialog).performClick(); + + ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class); + verify(mActivityStarter).postStartActivityDismissingKeyguard(intentCaptor.capture(), + anyInt(), any()); + assertThat(intentCaptor.getValue().getAction()).isEqualTo( + Settings.ACTION_HEARING_DEVICE_PAIRING_SETTINGS); + } + + @Test + public void onDeviceItemGearClicked_intentActionMatch() { + setUpDeviceListDialog(); + + mDialogDelegate.onDeviceItemGearClicked(mHearingDeviceItem, new View(mContext)); + + ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class); + verify(mActivityStarter).postStartActivityDismissingKeyguard(intentCaptor.capture(), + anyInt(), any()); + assertThat(intentCaptor.getValue().getAction()).isEqualTo( + HearingDevicesDialogDelegate.ACTION_BLUETOOTH_DEVICE_DETAILS); + + } + + @Test + public void onDeviceItemOnClicked_connectedDevice_disconnect() { + when(mHearingDeviceItem.getType()).thenReturn(DeviceItemType.CONNECTED_BLUETOOTH_DEVICE); + + mDialogDelegate.onDeviceItemOnClicked(mHearingDeviceItem, new View(mContext)); + + verify(mCachedDevice).disconnect(); + } + + private void setUpPairNewDeviceDialog() { + mDialogDelegate = new HearingDevicesDialogDelegate( + true, + mSystemUIDialogFactory, + mActivityStarter, + mDialogTransitionAnimator, + mLocalBluetoothManager, + new Handler(mTestableLooper.getLooper()), + mAudioManager + ); + mDialog = new SystemUIDialog( + mContext, + 0, + DEFAULT_DISMISS_ON_DEVICE_LOCK, + mSystemUIDialogManager, + mSysUiState, + getFakeBroadcastDispatcher(), + mDialogTransitionAnimator, + mDialogDelegate + ); + } + + private void setUpDeviceListDialog() { + mDialogDelegate = new HearingDevicesDialogDelegate( + false, + mSystemUIDialogFactory, + mActivityStarter, + mDialogTransitionAnimator, + mLocalBluetoothManager, + new Handler(mTestableLooper.getLooper()), + mAudioManager + ); + mDialog = new SystemUIDialog( + mContext, + 0, + DEFAULT_DISMISS_ON_DEVICE_LOCK, + mSystemUIDialogManager, + mSysUiState, + getFakeBroadcastDispatcher(), + mDialogTransitionAnimator, + mDialogDelegate + ); + } + + private View getPairNewDeviceButton(SystemUIDialog dialog) { + return dialog.requireViewById(R.id.pair_new_device_button); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManagerTest.java new file mode 100644 index 000000000000..abc12ede0a67 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManagerTest.java @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.accessibility.hearingaid; + +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.bluetooth.BluetoothDevice; +import android.testing.AndroidTestingRunner; +import android.testing.TestableLooper; +import android.view.View; + +import androidx.test.filters.SmallTest; + +import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; +import com.android.settingslib.bluetooth.LocalBluetoothAdapter; +import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.systemui.SysuiTestCase; +import com.android.systemui.animation.DialogTransitionAnimator; +import com.android.systemui.statusbar.phone.SystemUIDialog; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.util.ArrayList; +import java.util.List; + +/** Tests for {@link HearingDevicesDialogManager}. */ +@RunWith(AndroidTestingRunner.class) +@TestableLooper.RunWithLooper(setAsMainLooper = true) +@SmallTest +public class HearingDevicesDialogManagerTest extends SysuiTestCase { + + @Rule + public MockitoRule mockito = MockitoJUnit.rule(); + + private final View mView = new View(mContext); + private final List<CachedBluetoothDevice> mCachedDevices = new ArrayList<>(); + @Mock + private DialogTransitionAnimator mDialogTransitionAnimator; + @Mock + private HearingDevicesDialogDelegate.Factory mDialogFactory; + @Mock + private HearingDevicesDialogDelegate mDialogDelegate; + @Mock + private SystemUIDialog mDialog; + @Mock + private LocalBluetoothManager mLocalBluetoothManager; + @Mock + private LocalBluetoothAdapter mLocalBluetoothAdapter; + @Mock + private CachedBluetoothDeviceManager mCachedBluetoothDeviceManager; + @Mock + private CachedBluetoothDevice mCachedDevice; + + private HearingDevicesDialogManager mManager; + + @Before + public void setUp() { + when(mDialogFactory.create(anyBoolean())).thenReturn(mDialogDelegate); + when(mDialogDelegate.createDialog()).thenReturn(mDialog); + when(mLocalBluetoothManager.getBluetoothAdapter()).thenReturn(mLocalBluetoothAdapter); + when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn( + mCachedBluetoothDeviceManager); + when(mCachedBluetoothDeviceManager.getCachedDevicesCopy()).thenReturn(mCachedDevices); + + mManager = new HearingDevicesDialogManager( + mDialogTransitionAnimator, + mDialogFactory, + mLocalBluetoothManager + ); + } + + @Test + public void showDialog_bluetoothDisable_showPairNewDeviceTrue() { + when(mLocalBluetoothAdapter.isEnabled()).thenReturn(false); + + mManager.showDialog(mView); + + verify(mDialogFactory).create(eq(true)); + } + + @Test + public void showDialog_containsHearingAid_showPairNewDeviceFalse() { + when(mLocalBluetoothAdapter.isEnabled()).thenReturn(true); + when(mCachedDevice.isHearingAidDevice()).thenReturn(true); + when(mCachedDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED); + mCachedDevices.add(mCachedDevice); + + mManager.showDialog(mView); + + verify(mDialogFactory).create(eq(false)); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesListAdapterTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesListAdapterTest.java new file mode 100644 index 000000000000..95d5597ef645 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesListAdapterTest.java @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.accessibility.hearingaid; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.when; + +import android.testing.AndroidTestingRunner; +import android.testing.TestableLooper; + +import androidx.test.filters.SmallTest; + +import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.systemui.SysuiTestCase; +import com.android.systemui.qs.tiles.dialog.bluetooth.DeviceItem; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.util.ArrayList; +import java.util.List; + +/** Tests for {@link HearingDevicesListAdapter}. */ +@RunWith(AndroidTestingRunner.class) +@TestableLooper.RunWithLooper(setAsMainLooper = true) +@SmallTest +public class HearingDevicesListAdapterTest extends SysuiTestCase { + @Rule + public MockitoRule mockito = MockitoJUnit.rule(); + + private static final String DEVICE_ADDRESS = "AA:BB:CC:DD:EE:FF"; + + @Mock + private DeviceItem mHearingDeviceItem; + @Mock + private CachedBluetoothDevice mCachedDevice; + @Mock + private HearingDevicesListAdapter.HearingDeviceItemCallback mDeviceItemCallback; + private HearingDevicesListAdapter mAdapter; + + @Before + public void setUp() { + when(mCachedDevice.getAddress()).thenReturn(DEVICE_ADDRESS); + when(mHearingDeviceItem.getCachedBluetoothDevice()).thenReturn(mCachedDevice); + } + + @Test + public void constructor_oneItem_getOneCount() { + mAdapter = new HearingDevicesListAdapter(List.of(mHearingDeviceItem), mDeviceItemCallback); + + assertThat(mAdapter.getItemCount()).isEqualTo(1); + } + + @Test + public void refreshDeviceItemList_oneItem_getOneCount() { + mAdapter = new HearingDevicesListAdapter(new ArrayList<>(), mDeviceItemCallback); + + mAdapter.refreshDeviceItemList(List.of(mHearingDeviceItem)); + + assertThat(mAdapter.getItemCount()).isEqualTo(1); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepositoryTest.kt index 8700001fddd0..53560d740575 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepositoryTest.kt @@ -35,14 +35,16 @@ import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep import com.android.systemui.keyguard.util.KeyguardTransitionRunner +import com.android.systemui.kosmos.testScope +import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import java.math.BigDecimal import java.math.RoundingMode import java.util.UUID +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.dropWhile import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.After @@ -54,6 +56,9 @@ import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) @FlakyTest(bugId = 270760395) class KeyguardTransitionRepositoryTest : SysuiTestCase() { + val kosmos = testKosmos() + + private val testScope = kosmos.testScope private lateinit var underTest: KeyguardTransitionRepository private lateinit var oldWtfHandler: TerribleFailureHandler @@ -62,7 +67,7 @@ class KeyguardTransitionRepositoryTest : SysuiTestCase() { @Before fun setUp() { - underTest = KeyguardTransitionRepositoryImpl() + underTest = KeyguardTransitionRepositoryImpl(Dispatchers.Main) wtfHandler = WtfHandler() oldWtfHandler = Log.setWtfHandler(wtfHandler) runner = KeyguardTransitionRunner(underTest) @@ -75,7 +80,7 @@ class KeyguardTransitionRepositoryTest : SysuiTestCase() { @Test fun startTransitionRunsAnimatorToCompletion() = - TestScope().runTest { + testScope.runTest { val steps = mutableListOf<TransitionStep>() val job = underTest.transition(AOD, LOCKSCREEN).onEach { steps.add(it) }.launchIn(this) @@ -91,7 +96,7 @@ class KeyguardTransitionRepositoryTest : SysuiTestCase() { @Test fun startingSecondTransitionWillCancelTheFirstTransitionAndUseLastValue() = - TestScope().runTest { + testScope.runTest { val steps = mutableListOf<TransitionStep>() val job = underTest.transition(AOD, LOCKSCREEN).onEach { steps.add(it) }.launchIn(this) runner.startTransition( @@ -126,7 +131,7 @@ class KeyguardTransitionRepositoryTest : SysuiTestCase() { @Test fun startingSecondTransitionWillCancelTheFirstTransitionAndUseReset() = - TestScope().runTest { + testScope.runTest { val steps = mutableListOf<TransitionStep>() val job = underTest.transition(AOD, LOCKSCREEN).onEach { steps.add(it) }.launchIn(this) runner.startTransition( @@ -161,7 +166,7 @@ class KeyguardTransitionRepositoryTest : SysuiTestCase() { @Test fun startingSecondTransitionWillCancelTheFirstTransitionAndUseReverse() = - TestScope().runTest { + testScope.runTest { val steps = mutableListOf<TransitionStep>() val job = underTest.transition(AOD, LOCKSCREEN).onEach { steps.add(it) }.launchIn(this) runner.startTransition( @@ -196,7 +201,7 @@ class KeyguardTransitionRepositoryTest : SysuiTestCase() { @Test fun nullAnimatorEnablesManualControlWithUpdateTransition() = - TestScope().runTest { + testScope.runTest { val steps = mutableListOf<TransitionStep>() val job = underTest.transition(AOD, LOCKSCREEN).onEach { steps.add(it) }.launchIn(this) @@ -228,7 +233,7 @@ class KeyguardTransitionRepositoryTest : SysuiTestCase() { @Test fun startingSecondManualTransitionWillCancelPreviousManualTransition() = - TestScope().runTest { + testScope.runTest { // Drop initial steps from OFF which are sent in the constructor val steps = mutableListOf<TransitionStep>() val job = @@ -274,7 +279,7 @@ class KeyguardTransitionRepositoryTest : SysuiTestCase() { @Test fun startingSecondTransitionWillCancelPreviousManualTransition() = - TestScope().runTest { + testScope.runTest { // Drop initial steps from OFF which are sent in the constructor val steps = mutableListOf<TransitionStep>() val job = @@ -328,42 +333,44 @@ class KeyguardTransitionRepositoryTest : SysuiTestCase() { } @Test - fun attemptToManuallyUpdateTransitionAfterFINISHEDstateThrowsException() { - val uuid = - underTest.startTransition( - TransitionInfo( - ownerName = OWNER_NAME, - from = AOD, - to = LOCKSCREEN, - animator = null, + fun attemptToManuallyUpdateTransitionAfterFINISHEDstateThrowsException() = + testScope.runTest { + val uuid = + underTest.startTransition( + TransitionInfo( + ownerName = OWNER_NAME, + from = AOD, + to = LOCKSCREEN, + animator = null, + ) ) - ) - checkNotNull(uuid).let { - underTest.updateTransition(it, 1f, TransitionState.FINISHED) - underTest.updateTransition(it, 0.5f, TransitionState.RUNNING) + checkNotNull(uuid).let { + underTest.updateTransition(it, 1f, TransitionState.FINISHED) + underTest.updateTransition(it, 0.5f, TransitionState.RUNNING) + } + assertThat(wtfHandler.failed).isTrue() } - assertThat(wtfHandler.failed).isTrue() - } @Test - fun attemptToManuallyUpdateTransitionAfterCANCELEDstateThrowsException() { - val uuid = - underTest.startTransition( - TransitionInfo( - ownerName = OWNER_NAME, - from = AOD, - to = LOCKSCREEN, - animator = null, + fun attemptToManuallyUpdateTransitionAfterCANCELEDstateThrowsException() = + testScope.runTest { + val uuid = + underTest.startTransition( + TransitionInfo( + ownerName = OWNER_NAME, + from = AOD, + to = LOCKSCREEN, + animator = null, + ) ) - ) - checkNotNull(uuid).let { - underTest.updateTransition(it, 0.2f, TransitionState.CANCELED) - underTest.updateTransition(it, 0.5f, TransitionState.RUNNING) + checkNotNull(uuid).let { + underTest.updateTransition(it, 0.2f, TransitionState.CANCELED) + underTest.updateTransition(it, 0.5f, TransitionState.RUNNING) + } + assertThat(wtfHandler.failed).isTrue() } - assertThat(wtfHandler.failed).isTrue() - } private fun listWithStep( step: BigDecimal, diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractorTest.kt index c3e24d579491..1ec78742f0dd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractorTest.kt @@ -37,17 +37,14 @@ import com.android.systemui.kosmos.testScope import com.android.systemui.shade.data.repository.FlingInfo import com.android.systemui.shade.data.repository.fakeShadeRepository import com.android.systemui.testKosmos -import com.android.systemui.util.mockito.any import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Test import org.junit.runner.RunWith -import org.mockito.Mockito.never import org.mockito.Mockito.reset import org.mockito.Mockito.spy -import org.mockito.Mockito.verify @OptIn(ExperimentalCoroutinesApi::class) @SmallTest @@ -125,7 +122,7 @@ class FromLockscreenTransitionInteractorTest : SysuiTestCase() { fun testTransitionsToGone_whenDismissFlingWhileDismissable_flagEnabled() = testScope.runTest { underTest.start() - verify(transitionRepository, never()).startTransition(any()) + assertThatRepository(transitionRepository).noTransitionsStarted() keyguardRepository.setKeyguardDismissible(true) runCurrent() @@ -146,7 +143,7 @@ class FromLockscreenTransitionInteractorTest : SysuiTestCase() { fun testDoesNotTransitionToGone_whenDismissFlingWhileDismissable_flagDisabled() = testScope.runTest { underTest.start() - verify(transitionRepository, never()).startTransition(any()) + assertThatRepository(transitionRepository).noTransitionsStarted() keyguardRepository.setKeyguardDismissible(true) runCurrent() @@ -163,7 +160,7 @@ class FromLockscreenTransitionInteractorTest : SysuiTestCase() { fun testDoesNotTransitionToGone_whenDismissFling_emitsNull() = testScope.runTest { underTest.start() - verify(transitionRepository, never()).startTransition(any()) + assertThatRepository(transitionRepository).noTransitionsStarted() keyguardRepository.setKeyguardDismissible(true) runCurrent() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt index 95606ae81e5c..2c0a518350da 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt @@ -47,7 +47,6 @@ import com.android.systemui.power.domain.interactor.powerInteractor import com.android.systemui.shade.data.repository.fakeShadeRepository import com.android.systemui.statusbar.commandQueue import com.android.systemui.testKosmos -import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.whenever import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.cancelChildren @@ -64,10 +63,8 @@ import org.junit.runners.JUnit4 import org.mockito.ArgumentMatchers.anyInt import org.mockito.Mock import org.mockito.Mockito.clearInvocations -import org.mockito.Mockito.never import org.mockito.Mockito.reset import org.mockito.Mockito.spy -import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations /** @@ -521,7 +518,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { advanceTimeBy(100L) // THEN the transition is ignored - verify(transitionRepository, never()).startTransition(any()) + assertThat(transitionRepository).noTransitionsStarted() coroutineContext.cancelChildren() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultDeviceEntrySectionTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultDeviceEntrySectionTest.kt index 58273d6805b9..4f2b690f9fcd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultDeviceEntrySectionTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultDeviceEntrySectionTest.kt @@ -22,7 +22,7 @@ import android.view.WindowManager import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import androidx.test.filters.SmallTest -import com.android.keyguard.LockIconViewController +import com.android.keyguard.LegacyLockIconViewController import com.android.systemui.Flags as AConfigFlags import com.android.systemui.SysuiTestCase import com.android.systemui.biometrics.AuthController @@ -58,7 +58,7 @@ class DefaultDeviceEntrySectionTest : SysuiTestCase() { @Mock(answer = Answers.RETURNS_DEEP_STUBS) private lateinit var windowManager: WindowManager @Mock private lateinit var notificationPanelView: NotificationPanelView private lateinit var featureFlags: FakeFeatureFlags - @Mock private lateinit var lockIconViewController: LockIconViewController + @Mock private lateinit var lockIconViewController: LegacyLockIconViewController @Mock private lateinit var falsingManager: FalsingManager @Mock private lateinit var deviceEntryIconViewModel: DeviceEntryIconViewModel private lateinit var underTest: DefaultDeviceEntrySection diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/util/KeyguardTransitionRepositorySpySubject.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/util/KeyguardTransitionRepositorySpySubject.kt index 655a5510593a..a08e4913d553 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/util/KeyguardTransitionRepositorySpySubject.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/util/KeyguardTransitionRepositorySpySubject.kt @@ -21,8 +21,6 @@ import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepositor import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionInfo import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.withArgCaptor import com.google.common.truth.FailureMetadata import com.google.common.truth.Subject import com.google.common.truth.Truth @@ -30,8 +28,6 @@ import com.google.common.truth.Truth.assertAbout import junit.framework.Assert.assertEquals import kotlin.test.fail import org.mockito.Mockito -import org.mockito.Mockito.never -import org.mockito.Mockito.verify /** [Subject] used to make assertions about a [Mockito.spy] KeyguardTransitionRepository. */ class KeyguardTransitionRepositorySpySubject @@ -45,7 +41,7 @@ private constructor( * parameters. If an animator param or assertion is not provided, we will not assert anything * about the animator. */ - fun startedTransition( + suspend fun startedTransition( ownerName: String? = null, from: KeyguardState? = null, to: KeyguardState, @@ -58,7 +54,7 @@ private constructor( * Asserts that we started a transition to the given state, optionally verifying additional * params. */ - fun startedTransition( + suspend fun startedTransition( ownerName: String? = null, from: KeyguardState? = null, to: KeyguardState, @@ -72,26 +68,41 @@ private constructor( * Asserts that we started a transition to the given state, optionally verifying additional * params. */ - fun startedTransition( + suspend fun startedTransition( ownerName: String? = null, from: KeyguardState? = null, to: KeyguardState, animatorAssertion: (Subject) -> Unit, modeOnCanceled: TransitionModeOnCanceled? = null, ) { - withArgCaptor<TransitionInfo> { verify(repository).startTransition(capture()) } - .also { transitionInfo -> + // TODO(b/331799060): Remove this workaround once atest supports mocking suspend functions. + Mockito.mockingDetails(repository).invocations.forEach { invocation -> + if (invocation.method.equals(KeyguardTransitionRepository::startTransition.name)) { + val transitionInfo = invocation.arguments.firstOrNull() as TransitionInfo assertEquals(to, transitionInfo.to) animatorAssertion.invoke(Truth.assertThat(transitionInfo.animator)) from?.let { assertEquals(it, transitionInfo.from) } ownerName?.let { assertEquals(it, transitionInfo.ownerName) } modeOnCanceled?.let { assertEquals(it, transitionInfo.modeOnCanceled) } + invocation.markVerified() } + } } /** Verifies that [KeyguardTransitionRepository.startTransition] was never called. */ - fun noTransitionsStarted() { - verify(repository, never()).startTransition(any()) + suspend fun noTransitionsStarted() { + // TODO(b/331799060): Remove this workaround once atest supports mocking suspend functions. + Mockito.mockingDetails(repository).invocations.forEach { + if ( + it.method.equals(KeyguardTransitionRepository::startTransition.name) && + !it.isVerified + ) { + fail( + "Expected no transitions started, however this transition was started: " + + it.arguments.firstOrNull() + ) + } + } } companion object { diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/panels/domain/repository/IconTilesRepositoryImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/panels/domain/repository/IconTilesRepositoryImplTest.kt new file mode 100644 index 000000000000..8cc3a85ef6c8 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/panels/domain/repository/IconTilesRepositoryImplTest.kt @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.panels.domain.repository + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.qs.panels.data.repository.IconTilesRepositoryImpl +import com.android.systemui.qs.pipeline.shared.TileSpec +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class IconTilesRepositoryImplTest : SysuiTestCase() { + + private val underTest = IconTilesRepositoryImpl() + + @Test + fun iconTilesSpecsIsValid() = runTest { + val tilesSpecs by collectLastValue(underTest.iconTilesSpecs) + assertThat(tilesSpecs).isEqualTo(ICON_ONLY_TILES_SPECS) + } + + companion object { + private val ICON_ONLY_TILES_SPECS = + setOf( + TileSpec.create("airplane"), + TileSpec.create("battery"), + TileSpec.create("cameratoggle"), + TileSpec.create("cast"), + TileSpec.create("color_correction"), + TileSpec.create("inversion"), + TileSpec.create("saver"), + TileSpec.create("dnd"), + TileSpec.create("flashlight"), + TileSpec.create("location"), + TileSpec.create("mictoggle"), + TileSpec.create("nfc"), + TileSpec.create("night"), + TileSpec.create("rotation") + ) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/HearingDevicesTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/HearingDevicesTileTest.java index 326df5c07b85..73aa54cef66a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/HearingDevicesTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/HearingDevicesTileTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.content.Intent; import android.os.Handler; @@ -29,12 +30,14 @@ import android.platform.test.annotations.EnableFlags; import android.provider.Settings; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; +import android.view.View; import androidx.test.filters.SmallTest; import com.android.internal.logging.MetricsLogger; import com.android.systemui.Flags; import com.android.systemui.SysuiTestCase; +import com.android.systemui.accessibility.hearingaid.HearingDevicesDialogManager; import com.android.systemui.classifier.FalsingManagerFake; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.statusbar.StatusBarStateController; @@ -73,6 +76,8 @@ public class HearingDevicesTileTest extends SysuiTestCase { private ActivityStarter mActivityStarter; @Mock private QSLogger mQSLogger; + @Mock + HearingDevicesDialogManager mHearingDevicesDialogManager; private TestableLooper mTestableLooper; private HearingDevicesTile mTile; @@ -80,6 +85,7 @@ public class HearingDevicesTileTest extends SysuiTestCase { @Before public void setUp() throws Exception { mTestableLooper = TestableLooper.get(this); + when(mHost.getContext()).thenReturn(mContext); mTile = new HearingDevicesTile( mHost, @@ -90,7 +96,8 @@ public class HearingDevicesTileTest extends SysuiTestCase { mMetricsLogger, mStatusBarStateController, mActivityStarter, - mQSLogger); + mQSLogger, + mHearingDevicesDialogManager); mTile.initialize(); mTestableLooper.processAllMessages(); @@ -125,4 +132,13 @@ public class HearingDevicesTileTest extends SysuiTestCase { assertThat(IntentCaptor.getValue().getAction()).isEqualTo( Settings.ACTION_HEARING_DEVICES_SETTINGS); } + + @Test + public void handleClick_dialogShown() { + View view = new View(mContext); + mTile.handleClick(view); + mTestableLooper.processAllMessages(); + + verify(mHearingDevicesDialogManager).showDialog(view); + } } 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 2d18f9293ec8..122d9e414d13 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 @@ -58,7 +58,6 @@ import android.testing.TestableLooper; import androidx.test.filters.SmallTest; import com.android.internal.logging.MetricsLogger; -import com.android.systemui.res.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.classifier.FalsingManagerFake; import com.android.systemui.plugins.ActivityStarter; @@ -68,6 +67,7 @@ import com.android.systemui.qs.QSHost; import com.android.systemui.qs.QsEventLogger; import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.tileimpl.QSTileImpl; +import com.android.systemui.res.R; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.util.settings.SecureSettings; import com.android.systemui.wallet.controller.QuickAccessWalletController; @@ -198,7 +198,8 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { } @Test - public void testIsAvailable_qawFeatureAvailable() { + public void testIsAvailable_qawFeatureAvailableWalletUnavailable() { + when(mController.isWalletRoleAvailable()).thenReturn(false); when(mPackageManager.hasSystemFeature(FEATURE_NFC_HOST_CARD_EMULATION)).thenReturn(true); when(mPackageManager.hasSystemFeature("org.chromium.arc")).thenReturn(false); when(mSecureSettings.getStringForUser(NFC_PAYMENT_DEFAULT_COMPONENT, @@ -208,6 +209,16 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { } @Test + public void testIsAvailable_nfcUnavailableWalletAvailable() { + when(mController.isWalletRoleAvailable()).thenReturn(true); + when(mHost.getUserId()).thenReturn(PRIMARY_USER_ID); + when(mPackageManager.hasSystemFeature(FEATURE_NFC_HOST_CARD_EMULATION)).thenReturn(false); + when(mPackageManager.hasSystemFeature("org.chromium.arc")).thenReturn(false); + + assertTrue(mTile.isAvailable()); + } + + @Test public void testHandleClick_startQuickAccessUiIntent_noCard() { setUpWalletCard(/* hasCard= */ false); diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegateTest.kt index 6e480746a076..598a0f2d88d0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegateTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegateTest.kt @@ -39,7 +39,6 @@ import com.android.systemui.res.R import com.android.systemui.settings.UserContextProvider import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.statusbar.phone.SystemUIDialogManager -import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.mock import com.google.common.truth.Truth.assertThat @@ -50,6 +49,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.Mockito.eq +import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations @@ -59,7 +59,6 @@ import org.mockito.MockitoAnnotations @TestableLooper.RunWithLooper(setAsMainLooper = true) class ScreenRecordPermissionDialogDelegateTest : SysuiTestCase() { - //@Mock private lateinit var dialogFactory: SystemUIDialog.Factory @Mock private lateinit var starter: ActivityStarter @Mock private lateinit var controller: RecordingController @Mock private lateinit var userContextProvider: UserContextProvider @@ -76,13 +75,13 @@ class ScreenRecordPermissionDialogDelegateTest : SysuiTestCase() { whenever(flags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING)).thenReturn(true) val systemUIDialogFactory = - SystemUIDialog.Factory( - context, - Dependency.get(SystemUIDialogManager::class.java), - Dependency.get(SysUiState::class.java), - Dependency.get(BroadcastDispatcher::class.java), - Dependency.get(DialogTransitionAnimator::class.java), - ) + SystemUIDialog.Factory( + context, + Dependency.get(SystemUIDialogManager::class.java), + Dependency.get(SysUiState::class.java), + Dependency.get(BroadcastDispatcher::class.java), + Dependency.get(DialogTransitionAnimator::class.java), + ) val delegate = ScreenRecordPermissionDialogDelegate( @@ -189,6 +188,17 @@ class ScreenRecordPermissionDialogDelegateTest : SysuiTestCase() { verify(mediaProjectionMetricsLogger).notifyProjectionRequestCancelled(TEST_HOST_UID) } + @Test + fun showDialog_singleAppSelected_clickOnStart_projectionRequestCancelledIsNotLoggedOnce() { + showDialog() + onSpinnerItemSelected(SINGLE_APP) + + clickOnStart() + + verify(mediaProjectionMetricsLogger, never()) + .notifyProjectionRequestCancelled(TEST_HOST_UID) + } + private fun showDialog() { dialog.show() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java index e957ca2eca3a..dfe72cf11dcb 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java @@ -73,7 +73,7 @@ import com.android.keyguard.KeyguardSliceViewController; import com.android.keyguard.KeyguardStatusView; import com.android.keyguard.KeyguardStatusViewController; import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.keyguard.LockIconViewController; +import com.android.keyguard.LegacyLockIconViewController; import com.android.keyguard.dagger.KeyguardQsUserSwitchComponent; import com.android.keyguard.dagger.KeyguardStatusBarViewComponent; import com.android.keyguard.dagger.KeyguardStatusViewComponent; @@ -278,7 +278,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { @Mock protected AmbientState mAmbientState; @Mock protected UserManager mUserManager; @Mock protected UiEventLogger mUiEventLogger; - @Mock protected LockIconViewController mLockIconViewController; + @Mock protected LegacyLockIconViewController mLockIconViewController; @Mock protected KeyguardViewConfigurator mKeyguardViewConfigurator; @Mock protected KeyguardRootView mKeyguardRootView; @Mock protected View mKeyguardRootViewChild; @@ -604,6 +604,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { new NotificationsKeyguardInteractor(notifsKeyguardViewStateRepository); NotificationWakeUpCoordinator coordinator = new NotificationWakeUpCoordinator( + mKosmos.getTestScope().getBackgroundScope(), mDumpManager, mock(HeadsUpManager.class), new StatusBarStateControllerImpl( @@ -618,7 +619,8 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { mDozeParameters, mScreenOffAnimationController, new NotificationWakeUpCoordinatorLogger(logcatLogBuffer()), - notifsKeyguardInteractor); + notifsKeyguardInteractor, + mKosmos.getCommunalInteractor()); mConfigurationController = new ConfigurationControllerImpl(mContext); PulseExpansionHandler expansionHandler = new PulseExpansionHandler( mContext, diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java index 29a92d969ca4..650c45bf83ea 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java @@ -1061,7 +1061,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo @Test public void testPanelClosedWhenClosingQsInSplitShade() { mShadeExpansionStateManager.onPanelExpansionChanged(/* fraction= */ 1, - /* expanded= */ true, /* tracking= */ false, /* dragDownPxAmount= */ 0); + /* expanded= */ true, /* tracking= */ false); enableSplitShade(/* enabled= */ true); mNotificationPanelViewController.setExpandedFraction(1f); diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt index b6996131ea09..dfbb699ed915 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt @@ -25,7 +25,7 @@ import android.view.View import android.view.ViewGroup import androidx.test.filters.SmallTest import com.android.keyguard.KeyguardSecurityContainerController -import com.android.keyguard.LockIconViewController +import com.android.keyguard.LegacyLockIconViewController import com.android.keyguard.dagger.KeyguardBouncerComponent import com.android.systemui.Flags import com.android.systemui.SysuiTestCase @@ -46,6 +46,7 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInterac import com.android.systemui.keyguard.shared.model.TransitionStep import com.android.systemui.res.R import com.android.systemui.shade.NotificationShadeWindowView.InteractionEventHandler +import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor import com.android.systemui.statusbar.DragDownHelper import com.android.systemui.statusbar.LockscreenShadeTransitionController import com.android.systemui.statusbar.NotificationInsetsController @@ -68,6 +69,7 @@ import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat +import java.util.Optional import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.emptyFlow @@ -85,7 +87,6 @@ import org.mockito.Mockito.never import org.mockito.Mockito.times import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations -import java.util.Optional import org.mockito.Mockito.`when` as whenever @OptIn(ExperimentalCoroutinesApi::class) @@ -100,7 +101,8 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { @Mock private lateinit var dozeServiceHost: DozeServiceHost @Mock private lateinit var dozeScrimController: DozeScrimController @Mock private lateinit var dockManager: DockManager - @Mock private lateinit var notificationPanelViewController: NotificationPanelViewController + @Mock private lateinit var shadeViewController: ShadeViewController + @Mock private lateinit var panelExpansionInteractor: PanelExpansionInteractor @Mock private lateinit var notificationShadeDepthController: NotificationShadeDepthController @Mock private lateinit var notificationShadeWindowController: NotificationShadeWindowController @Mock private lateinit var keyguardUnlockAnimationController: KeyguardUnlockAnimationController @@ -113,7 +115,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { @Mock private lateinit var quickSettingsController: QuickSettingsControllerImpl @Mock private lateinit var lockscreenShadeTransitionController: LockscreenShadeTransitionController - @Mock private lateinit var lockIconViewController: LockIconViewController + @Mock private lateinit var lockIconViewController: LegacyLockIconViewController @Mock private lateinit var phoneStatusBarViewController: PhoneStatusBarViewController @Mock private lateinit var pulsingGestureListener: PulsingGestureListener @Mock @@ -177,7 +179,8 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { dockManager, notificationShadeDepthController, view, - notificationPanelViewController, + shadeViewController, + panelExpansionInteractor, ShadeExpansionStateManager(), stackScrollLayoutController, statusBarKeyguardViewManager, @@ -263,7 +266,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { testScope.runTest { underTest.setStatusBarViewController(phoneStatusBarViewController) whenever(statusBarWindowStateController.windowIsShowing()).thenReturn(true) - whenever(notificationPanelViewController.isFullyCollapsed).thenReturn(true) + whenever(panelExpansionInteractor.isFullyCollapsed).thenReturn(true) whenever(phoneStatusBarViewController.touchIsWithinView(anyFloat(), anyFloat())) .thenReturn(true) whenever(phoneStatusBarViewController.sendTouchToView(DOWN_EVENT)).thenReturn(true) @@ -282,7 +285,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { whenever(phoneStatusBarViewController.touchIsWithinView(anyFloat(), anyFloat())) .thenReturn(true) // Item we're testing - whenever(notificationPanelViewController.isFullyCollapsed).thenReturn(false) + whenever(panelExpansionInteractor.isFullyCollapsed).thenReturn(false) val returnVal = interactionEventHandler.handleDispatchTouchEvent(DOWN_EVENT) @@ -295,7 +298,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { testScope.runTest { underTest.setStatusBarViewController(phoneStatusBarViewController) whenever(statusBarWindowStateController.windowIsShowing()).thenReturn(true) - whenever(notificationPanelViewController.isFullyCollapsed).thenReturn(true) + whenever(panelExpansionInteractor.isFullyCollapsed).thenReturn(true) // Item we're testing whenever(phoneStatusBarViewController.touchIsWithinView(anyFloat(), anyFloat())) .thenReturn(false) @@ -310,7 +313,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { fun handleDispatchTouchEvent_sbWindowNotShowing_noSendTouchToSbAndReturnsTrue() = testScope.runTest { underTest.setStatusBarViewController(phoneStatusBarViewController) - whenever(notificationPanelViewController.isFullyCollapsed).thenReturn(true) + whenever(panelExpansionInteractor.isFullyCollapsed).thenReturn(true) whenever(phoneStatusBarViewController.touchIsWithinView(anyFloat(), anyFloat())) .thenReturn(true) // Item we're testing @@ -327,7 +330,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { testScope.runTest { underTest.setStatusBarViewController(phoneStatusBarViewController) whenever(statusBarWindowStateController.windowIsShowing()).thenReturn(true) - whenever(notificationPanelViewController.isFullyCollapsed).thenReturn(true) + whenever(panelExpansionInteractor.isFullyCollapsed).thenReturn(true) whenever(phoneStatusBarViewController.touchIsWithinView(anyFloat(), anyFloat())) .thenReturn(true) @@ -486,7 +489,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { // AND bouncer is not showing whenever(centralSurfaces.isBouncerShowing()).thenReturn(false) // AND panel view controller wants it - whenever(notificationPanelViewController.handleExternalInterceptTouch(DOWN_EVENT)) + whenever(shadeViewController.handleExternalInterceptTouch(DOWN_EVENT)) .thenReturn(true) mSetFlagsRule.enableFlags(Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT) diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt index 2ecca2e5c4ca..98a815cabe83 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt @@ -22,7 +22,7 @@ import android.view.MotionEvent import android.widget.FrameLayout import androidx.test.filters.SmallTest import com.android.keyguard.KeyguardSecurityContainerController -import com.android.keyguard.LockIconViewController +import com.android.keyguard.LegacyLockIconViewController import com.android.keyguard.dagger.KeyguardBouncerComponent import com.android.systemui.Flags as AConfigFlags import com.android.systemui.SysuiTestCase @@ -38,6 +38,7 @@ import com.android.systemui.keyguard.KeyguardUnlockAnimationController import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.res.R import com.android.systemui.shade.NotificationShadeWindowView.InteractionEventHandler +import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor import com.android.systemui.statusbar.DragDownHelper import com.android.systemui.statusbar.LockscreenShadeTransitionController import com.android.systemui.statusbar.NotificationInsetsController @@ -89,7 +90,8 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { @Mock private lateinit var dozeServiceHost: DozeServiceHost @Mock private lateinit var dozeScrimController: DozeScrimController @Mock private lateinit var dockManager: DockManager - @Mock private lateinit var notificationPanelViewController: NotificationPanelViewController + @Mock private lateinit var shadeViewController: ShadeViewController + @Mock private lateinit var panelExpansionInteractor: PanelExpansionInteractor @Mock private lateinit var notificationStackScrollLayout: NotificationStackScrollLayout @Mock private lateinit var notificationShadeDepthController: NotificationShadeDepthController @Mock private lateinit var notificationShadeWindowController: NotificationShadeWindowController @@ -101,7 +103,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { @Mock private lateinit var statusBarWindowStateController: StatusBarWindowStateController @Mock private lateinit var lockscreenShadeTransitionController: LockscreenShadeTransitionController - @Mock private lateinit var lockIconViewController: LockIconViewController + @Mock private lateinit var lockIconViewController: LegacyLockIconViewController @Mock private lateinit var keyguardUnlockAnimationController: KeyguardUnlockAnimationController @Mock private lateinit var ambientState: AmbientState @Mock private lateinit var shadeLogger: ShadeLogger @@ -166,7 +168,8 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { dockManager, notificationShadeDepthController, underTest, - notificationPanelViewController, + shadeViewController, + panelExpansionInteractor, ShadeExpansionStateManager(), notificationStackScrollLayoutController, statusBarKeyguardViewManager, diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeExpansionStateManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeExpansionStateManagerTest.kt index 15c04eb2e2bc..89ae42fd9f83 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeExpansionStateManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeExpansionStateManagerTest.kt @@ -42,17 +42,11 @@ class ShadeExpansionStateManagerTest : SysuiTestCase() { val tracking = true val dragDownAmount = 1234f - shadeExpansionStateManager.onPanelExpansionChanged( - fraction, - expanded, - tracking, - dragDownAmount - ) + shadeExpansionStateManager.onPanelExpansionChanged(fraction, expanded, tracking) assertThat(listener.fraction).isEqualTo(fraction) assertThat(listener.expanded).isEqualTo(expanded) assertThat(listener.tracking).isEqualTo(tracking) - assertThat(listener.dragDownAmountPx).isEqualTo(dragDownAmount) } @Test @@ -61,12 +55,7 @@ class ShadeExpansionStateManagerTest : SysuiTestCase() { val expanded = true val tracking = true val dragDownAmount = 1234f - shadeExpansionStateManager.onPanelExpansionChanged( - fraction, - expanded, - tracking, - dragDownAmount - ) + shadeExpansionStateManager.onPanelExpansionChanged(fraction, expanded, tracking) val listener = TestShadeExpansionListener() val currentState = shadeExpansionStateManager.addExpansionListener(listener) @@ -75,7 +64,6 @@ class ShadeExpansionStateManagerTest : SysuiTestCase() { assertThat(listener.fraction).isEqualTo(fraction) assertThat(listener.expanded).isEqualTo(expanded) assertThat(listener.tracking).isEqualTo(tracking) - assertThat(listener.dragDownAmountPx).isEqualTo(dragDownAmount) } @Test @@ -100,8 +88,7 @@ class ShadeExpansionStateManagerTest : SysuiTestCase() { shadeExpansionStateManager.onPanelExpansionChanged( fraction = 0.5f, expanded = true, - tracking = false, - dragDownPxAmount = 0f + tracking = false ) assertThat(listener.state).isEqualTo(STATE_OPENING) @@ -115,8 +102,7 @@ class ShadeExpansionStateManagerTest : SysuiTestCase() { shadeExpansionStateManager.onPanelExpansionChanged( fraction = 0.5f, expanded = true, - tracking = true, - dragDownPxAmount = 0f + tracking = true ) assertThat(listener.state).isEqualTo(STATE_OPENING) @@ -132,8 +118,7 @@ class ShadeExpansionStateManagerTest : SysuiTestCase() { shadeExpansionStateManager.onPanelExpansionChanged( fraction = 0.5f, expanded = false, - tracking = false, - dragDownPxAmount = 0f + tracking = false ) assertThat(listener.state).isEqualTo(STATE_CLOSED) @@ -149,8 +134,7 @@ class ShadeExpansionStateManagerTest : SysuiTestCase() { shadeExpansionStateManager.onPanelExpansionChanged( fraction = 0.5f, expanded = false, - tracking = true, - dragDownPxAmount = 0f + tracking = true ) assertThat(listener.state).isEqualTo(STATE_OPEN) @@ -166,8 +150,7 @@ class ShadeExpansionStateManagerTest : SysuiTestCase() { shadeExpansionStateManager.onPanelExpansionChanged( fraction = 1f, expanded = true, - tracking = false, - dragDownPxAmount = 0f + tracking = false ) assertThat(listener.previousState).isEqualTo(STATE_OPENING) @@ -182,8 +165,7 @@ class ShadeExpansionStateManagerTest : SysuiTestCase() { shadeExpansionStateManager.onPanelExpansionChanged( fraction = 1f, expanded = true, - tracking = true, - dragDownPxAmount = 0f + tracking = true ) assertThat(listener.state).isEqualTo(STATE_OPENING) @@ -199,8 +181,7 @@ class ShadeExpansionStateManagerTest : SysuiTestCase() { shadeExpansionStateManager.onPanelExpansionChanged( fraction = 1f, expanded = false, - tracking = false, - dragDownPxAmount = 0f + tracking = false ) assertThat(listener.state).isEqualTo(STATE_CLOSED) @@ -216,8 +197,7 @@ class ShadeExpansionStateManagerTest : SysuiTestCase() { shadeExpansionStateManager.onPanelExpansionChanged( fraction = 1f, expanded = false, - tracking = true, - dragDownPxAmount = 0f + tracking = true ) assertThat(listener.state).isEqualTo(STATE_OPEN) @@ -229,13 +209,11 @@ class ShadeExpansionStateManagerTest : SysuiTestCase() { var fraction: Float = 0f var expanded: Boolean = false var tracking: Boolean = false - var dragDownAmountPx: Float = 0f override fun onPanelExpansionChanged(event: ShadeExpansionChangeEvent) { this.fraction = event.fraction this.expanded = event.expanded this.tracking = event.tracking - this.dragDownAmountPx = event.dragDownPxAmount } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/transition/ScrimShadeTransitionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/transition/ScrimShadeTransitionControllerTest.kt index dea905aad132..f2abb909e004 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/transition/ScrimShadeTransitionControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/transition/ScrimShadeTransitionControllerTest.kt @@ -3,23 +3,18 @@ package com.android.systemui.shade.transition import android.platform.test.annotations.DisableFlags import android.testing.AndroidTestingRunner import androidx.test.filters.SmallTest -import com.android.compose.animation.scene.ObservableTransitionState -import com.android.compose.animation.scene.SceneKey import com.android.systemui.Flags import com.android.systemui.SysuiTestCase -import com.android.systemui.coroutines.collectLastValue import com.android.systemui.deviceentry.data.repository.FakeDeviceEntryRepository import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepository import com.android.systemui.deviceentry.domain.interactor.DeviceUnlockedInteractor import com.android.systemui.deviceentry.domain.interactor.deviceUnlockedInteractor import com.android.systemui.dump.DumpManager -import com.android.systemui.flags.EnableSceneContainer import com.android.systemui.kosmos.applicationCoroutineScope import com.android.systemui.kosmos.testScope import com.android.systemui.scene.domain.interactor.SceneInteractor import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.model.FakeSceneDataSource -import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.scene.shared.model.fakeSceneDataSource import com.android.systemui.shade.ShadeExpansionChangeEvent import com.android.systemui.shade.ShadeExpansionStateManager @@ -27,15 +22,8 @@ import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor import com.android.systemui.shade.domain.interactor.panelExpansionInteractor import com.android.systemui.statusbar.phone.ScrimController import com.android.systemui.testKosmos -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.whenever -import com.google.common.truth.Truth import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.test.TestScope -import kotlinx.coroutines.test.runCurrent -import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -74,9 +62,7 @@ class ScrimShadeTransitionControllerTest : SysuiTestCase() { sceneInteractor = kosmos.sceneInteractor fakeSceneDataSource = kosmos.fakeSceneDataSource underTest = ScrimShadeTransitionController( - applicationScope, shadeExpansionStateManager, - { panelExpansionInteractor }, dumpManager, scrimController, ) @@ -99,96 +85,20 @@ class ScrimShadeTransitionControllerTest : SysuiTestCase() { verify(scrimController).setRawPanelExpansionFraction(DEFAULT_EXPANSION_EVENT.fraction) } - @Test - @EnableSceneContainer - fun sceneChanges_forwardsToScrimTransitionController() = - testScope.runTest { - var rawExpansion: Float? = null - whenever(scrimController.setRawPanelExpansionFraction(any())).then { - (it.arguments[0] as Float?).also { rawExp -> rawExpansion = rawExp } - } - setUnlocked(true) - val transitionState = - MutableStateFlow<ObservableTransitionState>( - ObservableTransitionState.Idle(Scenes.Gone) - ) - sceneInteractor.setTransitionState(transitionState) - - changeScene(Scenes.Gone, transitionState) - val currentScene by collectLastValue(sceneInteractor.currentScene) - Truth.assertThat(currentScene).isEqualTo(Scenes.Gone) - - Truth.assertThat(rawExpansion) - .isEqualTo(0f) - - changeScene(Scenes.Shade, transitionState) { progress -> - Truth.assertThat(rawExpansion) - .isEqualTo(progress) - } - } - private fun startLegacyPanelExpansion() { shadeExpansionStateManager.onPanelExpansionChanged( DEFAULT_EXPANSION_EVENT.fraction, DEFAULT_EXPANSION_EVENT.expanded, DEFAULT_EXPANSION_EVENT.tracking, - DEFAULT_EXPANSION_EVENT.dragDownPxAmount, ) } - private fun TestScope.setUnlocked(isUnlocked: Boolean) { - val isDeviceUnlocked by collectLastValue(deviceUnlockedInteractor.isDeviceUnlocked) - deviceEntryRepository.setUnlocked(isUnlocked) - runCurrent() - - Truth.assertThat(isDeviceUnlocked).isEqualTo(isUnlocked) - } - - private fun TestScope.changeScene( - toScene: SceneKey, - transitionState: MutableStateFlow<ObservableTransitionState>, - assertDuringProgress: ((progress: Float) -> Unit) = {}, - ) { - val currentScene by collectLastValue(sceneInteractor.currentScene) - val progressFlow = MutableStateFlow(0f) - transitionState.value = - ObservableTransitionState.Transition( - fromScene = checkNotNull(currentScene), - toScene = toScene, - progress = progressFlow, - isInitiatedByUserInput = true, - isUserInputOngoing = flowOf(true), - ) - runCurrent() - assertDuringProgress(progressFlow.value) - - progressFlow.value = 0.2f - runCurrent() - assertDuringProgress(progressFlow.value) - - progressFlow.value = 0.6f - runCurrent() - assertDuringProgress(progressFlow.value) - - progressFlow.value = 1f - runCurrent() - assertDuringProgress(progressFlow.value) - - transitionState.value = ObservableTransitionState.Idle(toScene) - fakeSceneDataSource.changeScene(toScene) - runCurrent() - assertDuringProgress(progressFlow.value) - - Truth.assertThat(currentScene).isEqualTo(toScene) - } - companion object { val DEFAULT_EXPANSION_EVENT = ShadeExpansionChangeEvent( fraction = 0.5f, expanded = true, - tracking = true, - dragDownPxAmount = 10f + tracking = true ) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt index 68bc72b09f94..fc0c85e30d5a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt @@ -23,18 +23,18 @@ import android.view.Choreographer import android.view.View import android.view.ViewRootImpl import androidx.test.filters.SmallTest -import com.android.systemui.res.R import com.android.systemui.SysuiTestCase import com.android.systemui.animation.ShadeInterpolation import com.android.systemui.dump.DumpManager import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.res.R import com.android.systemui.shade.ShadeExpansionChangeEvent import com.android.systemui.statusbar.phone.BiometricUnlockController import com.android.systemui.statusbar.phone.DozeParameters import com.android.systemui.statusbar.phone.ScrimController import com.android.systemui.statusbar.policy.FakeConfigurationController -import com.android.systemui.statusbar.policy.ResourcesSplitShadeStateController import com.android.systemui.statusbar.policy.KeyguardStateController +import com.android.systemui.statusbar.policy.ResourcesSplitShadeStateController import com.android.systemui.util.WallpaperController import com.android.systemui.util.mockito.eq import com.google.common.truth.Truth.assertThat @@ -142,7 +142,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { fun onPanelExpansionChanged_apliesBlur_ifShade() { notificationShadeDepthController.onPanelExpansionChanged( ShadeExpansionChangeEvent( - fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) + fraction = 1f, expanded = true, tracking = false)) verify(shadeAnimation).animateTo(eq(maxBlur)) } @@ -150,7 +150,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { fun onPanelExpansionChanged_animatesBlurIn_ifShade() { notificationShadeDepthController.onPanelExpansionChanged( ShadeExpansionChangeEvent( - fraction = 0.01f, expanded = false, tracking = false, dragDownPxAmount = 0f)) + fraction = 0.01f, expanded = false, tracking = false)) verify(shadeAnimation).animateTo(eq(maxBlur)) } @@ -160,7 +160,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { clearInvocations(shadeAnimation) notificationShadeDepthController.onPanelExpansionChanged( ShadeExpansionChangeEvent( - fraction = 0f, expanded = false, tracking = false, dragDownPxAmount = 0f)) + fraction = 0f, expanded = false, tracking = false)) verify(shadeAnimation).animateTo(eq(0)) } @@ -168,7 +168,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { fun onPanelExpansionChanged_animatesBlurOut_ifFlick() { val event = ShadeExpansionChangeEvent( - fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f) + fraction = 1f, expanded = true, tracking = false) onPanelExpansionChanged_apliesBlur_ifShade() clearInvocations(shadeAnimation) notificationShadeDepthController.onPanelExpansionChanged(event) @@ -189,7 +189,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { clearInvocations(shadeAnimation) notificationShadeDepthController.onPanelExpansionChanged( ShadeExpansionChangeEvent( - fraction = 0.6f, expanded = true, tracking = true, dragDownPxAmount = 0f)) + fraction = 0.6f, expanded = true, tracking = true)) verify(shadeAnimation).animateTo(eq(maxBlur)) } @@ -197,7 +197,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { fun onPanelExpansionChanged_respectsMinPanelPullDownFraction() { val event = ShadeExpansionChangeEvent( - fraction = 0.5f, expanded = true, tracking = true, dragDownPxAmount = 0f) + fraction = 0.5f, expanded = true, tracking = true) notificationShadeDepthController.panelPullDownMinFraction = 0.5f notificationShadeDepthController.onPanelExpansionChanged(event) assertThat(notificationShadeDepthController.shadeExpansion).isEqualTo(0f) @@ -225,7 +225,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { notificationShadeDepthController.qsPanelExpansion = 1f notificationShadeDepthController.onPanelExpansionChanged( ShadeExpansionChangeEvent( - fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) + fraction = 1f, expanded = true, tracking = false)) notificationShadeDepthController.updateBlurCallback.doFrame(0) verify(blurUtils).applyBlur(any(), eq(maxBlur), eq(false)) } @@ -236,7 +236,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { notificationShadeDepthController.qsPanelExpansion = 0.25f notificationShadeDepthController.onPanelExpansionChanged( ShadeExpansionChangeEvent( - fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) + fraction = 1f, expanded = true, tracking = false)) notificationShadeDepthController.updateBlurCallback.doFrame(0) verify(wallpaperController) .setNotificationShadeZoom(eq(ShadeInterpolation.getNotificationScrimAlpha(0.25f))) @@ -248,7 +248,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { notificationShadeDepthController.onPanelExpansionChanged( ShadeExpansionChangeEvent( - fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) + fraction = 1f, expanded = true, tracking = false)) notificationShadeDepthController.updateBlurCallback.doFrame(0) verify(wallpaperController).setNotificationShadeZoom(0f) @@ -260,7 +260,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { notificationShadeDepthController.onPanelExpansionChanged( ShadeExpansionChangeEvent( - fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) + fraction = 1f, expanded = true, tracking = false)) notificationShadeDepthController.updateBlurCallback.doFrame(0) verify(wallpaperController).setNotificationShadeZoom(floatThat { it > 0 }) @@ -273,7 +273,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { val expanded = true val tracking = false val dragDownPxAmount = 0f - val event = ShadeExpansionChangeEvent(rawFraction, expanded, tracking, dragDownPxAmount) + val event = ShadeExpansionChangeEvent(rawFraction, expanded, tracking) val inOrder = Mockito.inOrder(wallpaperController) notificationShadeDepthController.onPanelExpansionChanged(event) @@ -338,7 +338,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { fun updateBlurCallback_setsBlur_whenExpanded() { notificationShadeDepthController.onPanelExpansionChanged( ShadeExpansionChangeEvent( - fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) + fraction = 1f, expanded = true, tracking = false)) `when`(shadeAnimation.radius).thenReturn(maxBlur.toFloat()) notificationShadeDepthController.updateBlurCallback.doFrame(0) verify(blurUtils).applyBlur(any(), eq(maxBlur), eq(false)) @@ -348,7 +348,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { fun updateBlurCallback_ignoreShadeBlurUntilHidden_overridesZoom() { notificationShadeDepthController.onPanelExpansionChanged( ShadeExpansionChangeEvent( - fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) + fraction = 1f, expanded = true, tracking = false)) `when`(shadeAnimation.radius).thenReturn(maxBlur.toFloat()) notificationShadeDepthController.blursDisabledForAppLaunch = true notificationShadeDepthController.updateBlurCallback.doFrame(0) @@ -367,7 +367,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { fun ignoreBlurForUnlock_ignores() { notificationShadeDepthController.onPanelExpansionChanged( ShadeExpansionChangeEvent( - fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) + fraction = 1f, expanded = true, tracking = false)) `when`(shadeAnimation.radius).thenReturn(maxBlur.toFloat()) notificationShadeDepthController.blursDisabledForAppLaunch = false @@ -384,7 +384,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { fun ignoreBlurForUnlock_doesNotIgnore() { notificationShadeDepthController.onPanelExpansionChanged( ShadeExpansionChangeEvent( - fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) + fraction = 1f, expanded = true, tracking = false)) `when`(shadeAnimation.radius).thenReturn(maxBlur.toFloat()) notificationShadeDepthController.blursDisabledForAppLaunch = false @@ -416,7 +416,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { // And shade is blurred notificationShadeDepthController.onPanelExpansionChanged( ShadeExpansionChangeEvent( - fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) + fraction = 1f, expanded = true, tracking = false)) `when`(shadeAnimation.radius).thenReturn(maxBlur.toFloat()) notificationShadeDepthController.updateBlurCallback.doFrame(0) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/OperatorNameViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/OperatorNameViewControllerTest.kt new file mode 100644 index 000000000000..9c59f9bf49d8 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/OperatorNameViewControllerTest.kt @@ -0,0 +1,202 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar + +import android.telephony.ServiceState +import android.telephony.SubscriptionInfo +import android.telephony.TelephonyManager +import android.telephony.telephonyManager +import androidx.test.filters.SmallTest +import com.android.keyguard.keyguardUpdateMonitor +import com.android.systemui.SysuiTestCase +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.plugins.DarkIconDispatcher +import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository +import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor +import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeMobileConnectionsRepository +import com.android.systemui.statusbar.pipeline.mobile.util.FakeSubscriptionManagerProxy +import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository +import com.android.systemui.tuner.TunerService +import com.android.systemui.util.CarrierConfigTracker +import com.android.systemui.util.kotlin.JavaAdapter +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.whenever +import com.google.common.truth.Truth.assertThat +import junit.framework.Assert.assertTrue +import kotlin.test.Test +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.mockito.Mock +import org.mockito.MockitoAnnotations + +@OptIn(ExperimentalCoroutinesApi::class) +@SmallTest +class OperatorNameViewControllerTest : SysuiTestCase() { + private lateinit var underTest: OperatorNameViewController + private lateinit var airplaneModeInteractor: AirplaneModeInteractor + + private val kosmos = Kosmos() + private val testScope = TestScope() + + private val view = OperatorNameView(mContext) + private val javaAdapter = JavaAdapter(testScope.backgroundScope) + + @Mock private lateinit var darkIconDispatcher: DarkIconDispatcher + @Mock private lateinit var tunerService: TunerService + private var telephonyManager = kosmos.telephonyManager + private val keyguardUpdateMonitor = kosmos.keyguardUpdateMonitor + @Mock private lateinit var carrierConfigTracker: CarrierConfigTracker + private val subscriptionManagerProxy = FakeSubscriptionManagerProxy() + + private val airplaneModeRepository = FakeAirplaneModeRepository() + private val connectivityRepository = FakeConnectivityRepository() + private val mobileConnectionsRepository = FakeMobileConnectionsRepository() + + @Before + fun setup() { + MockitoAnnotations.initMocks(this) + + airplaneModeInteractor = + AirplaneModeInteractor( + airplaneModeRepository, + connectivityRepository, + mobileConnectionsRepository, + ) + + underTest = + OperatorNameViewController.Factory( + darkIconDispatcher, + tunerService, + telephonyManager, + keyguardUpdateMonitor, + carrierConfigTracker, + airplaneModeInteractor, + subscriptionManagerProxy, + javaAdapter, + ) + .create(view) + } + + @Test + fun updateFromSubInfo_showsCarrieName() = + testScope.runTest { + whenever(telephonyManager.isDataCapable).thenReturn(true) + + val mockSubInfo = + mock<SubscriptionInfo>().also { + whenever(it.subscriptionId).thenReturn(1) + whenever(it.carrierName).thenReturn("test_carrier") + } + whenever(keyguardUpdateMonitor.getSubscriptionInfoForSubId(any())) + .thenReturn(mockSubInfo) + whenever(keyguardUpdateMonitor.getSimState(any())) + .thenReturn(TelephonyManager.SIM_STATE_READY) + whenever(keyguardUpdateMonitor.getServiceState(any())) + .thenReturn(ServiceState().also { it.state = ServiceState.STATE_IN_SERVICE }) + subscriptionManagerProxy.defaultDataSubId = 1 + airplaneModeRepository.setIsAirplaneMode(false) + + underTest.onViewAttached() + runCurrent() + + assertThat(view.text).isEqualTo("test_carrier") + } + + @Test + fun notDataCapable_doesNotShowOperatorName() = + testScope.runTest { + whenever(telephonyManager.isDataCapable).thenReturn(false) + + val mockSubInfo = + mock<SubscriptionInfo>().also { + whenever(it.subscriptionId).thenReturn(1) + whenever(it.carrierName).thenReturn("test_carrier") + } + whenever(keyguardUpdateMonitor.getSubscriptionInfoForSubId(any())) + .thenReturn(mockSubInfo) + whenever(keyguardUpdateMonitor.getSimState(any())) + .thenReturn(TelephonyManager.SIM_STATE_READY) + whenever(keyguardUpdateMonitor.getServiceState(any())) + .thenReturn(ServiceState().also { it.state = ServiceState.STATE_IN_SERVICE }) + subscriptionManagerProxy.defaultDataSubId = 1 + airplaneModeRepository.setIsAirplaneMode(false) + + underTest.onViewAttached() + runCurrent() + + assertTrue(view.text.isNullOrEmpty()) + } + + @Test + fun airplaneMode_doesNotShowOperatorName() = + testScope.runTest { + whenever(telephonyManager.isDataCapable).thenReturn(false) + val mockSubInfo = + mock<SubscriptionInfo>().also { + whenever(it.subscriptionId).thenReturn(1) + whenever(it.carrierName).thenReturn("test_carrier") + } + whenever(keyguardUpdateMonitor.getSubscriptionInfoForSubId(any())) + .thenReturn(mockSubInfo) + whenever(keyguardUpdateMonitor.getSimState(any())) + .thenReturn(TelephonyManager.SIM_STATE_READY) + whenever(keyguardUpdateMonitor.getServiceState(any())) + .thenReturn(ServiceState().also { it.state = ServiceState.STATE_IN_SERVICE }) + subscriptionManagerProxy.defaultDataSubId = 1 + airplaneModeRepository.setIsAirplaneMode(true) + + underTest.onViewAttached() + runCurrent() + + assertTrue(view.text.isNullOrEmpty()) + } + + @Test + fun notInService_doesNotShowOperatorName() = + testScope.runTest { + // Data capable + whenever(telephonyManager.isDataCapable).thenReturn(true) + + // Valid subscription + val mockSubInfo = + mock<SubscriptionInfo>().also { + whenever(it.subscriptionId).thenReturn(1) + whenever(it.carrierName).thenReturn("test_carrier") + } + whenever(keyguardUpdateMonitor.getSubscriptionInfoForSubId(any())) + .thenReturn(mockSubInfo) + whenever(keyguardUpdateMonitor.getSimState(any())) + .thenReturn(TelephonyManager.SIM_STATE_READY) + + // Not in service + whenever(keyguardUpdateMonitor.getServiceState(any())) + .thenReturn(ServiceState().also { it.state = ServiceState.STATE_OUT_OF_SERVICE }) + // Subscription is default for data + subscriptionManagerProxy.defaultDataSubId = 1 + // Not airplane mode + airplaneModeRepository.setIsAirplaneMode(false) + + underTest.onViewAttached() + runCurrent() + + assertTrue(view.text.isNullOrEmpty()) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorTest.kt index 82093adcb75c..67b540cd762e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorTest.kt @@ -19,10 +19,15 @@ package com.android.systemui.statusbar.notification import android.testing.AndroidTestingRunner import android.testing.TestableLooper import androidx.test.filters.SmallTest +import com.android.compose.animation.scene.ObservableTransitionState import com.android.systemui.SysuiTestCase import com.android.systemui.animation.AnimatorTestRule +import com.android.systemui.communal.data.repository.communalRepository +import com.android.systemui.communal.domain.interactor.communalInteractor +import com.android.systemui.communal.shared.model.CommunalScenes import com.android.systemui.dump.DumpManager -import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.kosmos.testScope import com.android.systemui.log.logcatLogBuffer import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.shade.ShadeViewController.Companion.WAKEUP_ANIMATION_DELAY_MS @@ -34,11 +39,16 @@ import com.android.systemui.statusbar.phone.DozeParameters import com.android.systemui.statusbar.phone.KeyguardBypassController import com.android.systemui.statusbar.phone.ScreenOffAnimationController import com.android.systemui.statusbar.policy.HeadsUpManager +import com.android.systemui.testKosmos import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever import com.android.systemui.util.mockito.withArgCaptor import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Rule import org.junit.Test @@ -49,6 +59,7 @@ import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.Mockito.verifyNoMoreInteractions +@OptIn(ExperimentalCoroutinesApi::class) @RunWith(AndroidTestingRunner::class) @SmallTest @TestableLooper.RunWithLooper(setAsMainLooper = true) @@ -56,7 +67,8 @@ class NotificationWakeUpCoordinatorTest : SysuiTestCase() { @get:Rule val animatorTestRule = AnimatorTestRule(this) - private val kosmos = Kosmos() + private val kosmos = testKosmos() + private val testScope = kosmos.testScope private val dumpManager: DumpManager = mock() private val headsUpManager: HeadsUpManager = mock() @@ -97,6 +109,7 @@ class NotificationWakeUpCoordinatorTest : SysuiTestCase() { whenever(statusBarStateController.state).then { statusBarState } notificationWakeUpCoordinator = NotificationWakeUpCoordinator( + kosmos.applicationCoroutineScope, dumpManager, headsUpManager, statusBarStateController, @@ -105,6 +118,7 @@ class NotificationWakeUpCoordinatorTest : SysuiTestCase() { screenOffAnimationController, logger, kosmos.notificationsKeyguardInteractor, + kosmos.communalInteractor, ) statusBarStateCallback = withArgCaptor { verify(statusBarStateController).addCallback(capture()) @@ -161,6 +175,39 @@ class NotificationWakeUpCoordinatorTest : SysuiTestCase() { } @Test + fun setDozeToZeroWhenCommunalShowingWillFullyHideNotifications() = + testScope.runTest { + val transitionState = + MutableStateFlow<ObservableTransitionState>( + ObservableTransitionState.Idle(CommunalScenes.Communal) + ) + kosmos.communalRepository.setTransitionState(transitionState) + runCurrent() + setDozeAmount(0f) + verifyStackScrollerDozeAndHideAmount(dozeAmount = 1f, hideAmount = 1f) + assertThat(notificationWakeUpCoordinator.notificationsFullyHidden).isTrue() + } + + @Test + fun closingCommunalWillShowNotifications() = + testScope.runTest { + val transitionState = + MutableStateFlow<ObservableTransitionState>( + ObservableTransitionState.Idle(CommunalScenes.Communal) + ) + kosmos.communalRepository.setTransitionState(transitionState) + runCurrent() + setDozeAmount(0f) + verifyStackScrollerDozeAndHideAmount(dozeAmount = 1f, hideAmount = 1f) + assertThat(notificationWakeUpCoordinator.notificationsFullyHidden).isTrue() + + transitionState.value = ObservableTransitionState.Idle(CommunalScenes.Blank) + runCurrent() + verifyStackScrollerDozeAndHideAmount(dozeAmount = 0f, hideAmount = 0f) + assertThat(notificationWakeUpCoordinator.notificationsFullyHidden).isFalse() + } + + @Test fun switchingToShadeWithBypassEnabledWillShowNotifications() { setDozeToZeroWithBypassWillFullyHideNotifications() clearInvocations(stackScrollerController) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/SectionStyleProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/SectionStyleProviderTest.kt new file mode 100644 index 000000000000..ab55a7d650c6 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/SectionStyleProviderTest.kt @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.statusbar.notification.collection + +import android.app.Flags +import android.os.UserHandle +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.service.notification.StatusBarNotification +import android.testing.AndroidTestingRunner +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.statusbar.notification.collection.listbuilder.NotifSection +import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner +import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider +import com.android.systemui.statusbar.notification.collection.provider.SectionStyleProvider +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow +import com.android.systemui.statusbar.notification.stack.BUCKET_ALERTING +import com.android.systemui.statusbar.notification.stack.BUCKET_FOREGROUND_SERVICE +import com.android.systemui.statusbar.notification.stack.BUCKET_PEOPLE +import com.android.systemui.statusbar.notification.stack.BUCKET_SILENT +import com.android.systemui.statusbar.notification.stack.BUCKET_UNKNOWN +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.mock +import com.google.common.collect.ImmutableList +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations +import org.mockito.Mockito.`when` as whenever + +@SmallTest +@RunWith(AndroidTestingRunner::class) +class SectionStyleProviderTest : SysuiTestCase() { + + @Rule @JvmField public val setFlagsRule = SetFlagsRule() + + @Mock private lateinit var highPriorityProvider: HighPriorityProvider + + @Mock private lateinit var peopleMixedSectioner : NotifSectioner + @Mock private lateinit var allSilentSectioner : NotifSectioner + @Mock private lateinit var allAlertingSectioner : NotifSectioner + + private lateinit var sectionStyleProvider: SectionStyleProvider + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + sectionStyleProvider = SectionStyleProvider(highPriorityProvider) + + whenever(peopleMixedSectioner.bucket).thenReturn(BUCKET_PEOPLE); + whenever(allSilentSectioner.bucket).thenReturn(BUCKET_SILENT); + whenever(allAlertingSectioner.bucket).thenReturn(BUCKET_ALERTING); + + sectionStyleProvider.setSilentSections(ImmutableList.of(allSilentSectioner)) + } + + @Test + fun testIsSilent_silentSection() { + assertThat(sectionStyleProvider.isSilent(fakeNotification(allSilentSectioner))).isTrue() + } + + @Test + fun testIsSilent_alertingSection() { + val listEntry = fakeNotification(allAlertingSectioner) + // this line should not matter for any non-people sections + whenever(highPriorityProvider.isHighPriorityConversation(listEntry)).thenReturn(true) + + assertThat(sectionStyleProvider.isSilent(fakeNotification(allAlertingSectioner))).isFalse() + } + + @Test + @EnableFlags(Flags.FLAG_SORT_SECTION_BY_TIME) + fun testIsSilent_silentPeople() { + val listEntry = fakeNotification(peopleMixedSectioner) + whenever(highPriorityProvider.isHighPriorityConversation(listEntry)).thenReturn(false) + assertThat(sectionStyleProvider.isSilent(listEntry)).isTrue() + } + + @Test + fun testIsSilent_alertingPeople() { + val listEntry = fakeNotification(peopleMixedSectioner) + whenever(highPriorityProvider.isHighPriorityConversation(listEntry)).thenReturn(true) + + assertThat(sectionStyleProvider.isSilent(listEntry)).isFalse() + } + + private fun fakeNotification(inputSectioner: NotifSectioner): ListEntry { + val mockUserHandle = + mock<UserHandle>().apply { whenever(identifier).thenReturn(0) } + val mockSbn: StatusBarNotification = + mock<StatusBarNotification>().apply { whenever(user).thenReturn(mockUserHandle) } + val mockRow: ExpandableNotificationRow = mock<ExpandableNotificationRow>() + val mockEntry = mock<NotificationEntry>().apply { + whenever(sbn).thenReturn(mockSbn) + whenever(row).thenReturn(mockRow) + } + whenever(mockEntry.rowExists()).thenReturn(true) + return object : ListEntry("key", 0) { + override fun getRepresentativeEntry(): NotificationEntry = mockEntry + override fun getSection(): NotifSection? = NotifSection(inputSectioner, 1) + } + } +}
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt index 36f643ab9cca..c5d7e1f490ee 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt @@ -16,10 +16,14 @@ package com.android.systemui.statusbar.notification.collection.coordinator +import android.app.Flags import android.app.NotificationChannel import android.app.NotificationManager.IMPORTANCE_DEFAULT import android.app.NotificationManager.IMPORTANCE_HIGH import android.app.NotificationManager.IMPORTANCE_LOW +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule import android.testing.AndroidTestingRunner import android.testing.TestableLooper import androidx.test.filters.SmallTest @@ -29,6 +33,7 @@ import com.android.systemui.statusbar.notification.collection.GroupEntryBuilder import com.android.systemui.statusbar.notification.collection.NotifPipeline import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder +import com.android.systemui.statusbar.notification.collection.SortBySectionTimeFlag import com.android.systemui.statusbar.notification.collection.listbuilder.NotifSection import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeRenderListListener import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifComparator @@ -48,12 +53,13 @@ import com.google.common.truth.Truth.assertThat import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Before +import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.Mockito.verify -import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations +import org.mockito.Mockito.`when` as whenever @SmallTest @RunWith(AndroidTestingRunner::class) @@ -77,6 +83,8 @@ class ConversationCoordinatorTest : SysuiTestCase() { private lateinit var coordinator: ConversationCoordinator + @Rule @JvmField public val setFlagsRule = SetFlagsRule() + @Before fun setUp() { MockitoAnnotations.initMocks(this) @@ -99,7 +107,8 @@ class ConversationCoordinatorTest : SysuiTestCase() { peopleAlertingSectioner = coordinator.peopleAlertingSectioner peopleSilentSectioner = coordinator.peopleSilentSectioner - peopleComparator = peopleAlertingSectioner.comparator!! + if (!SortBySectionTimeFlag.isEnabled) + peopleComparator = peopleAlertingSectioner.comparator!! entry = NotificationEntryBuilder().setChannel(channel).build() @@ -150,6 +159,20 @@ class ConversationCoordinatorTest : SysuiTestCase() { } @Test + @EnableFlags(Flags.FLAG_SORT_SECTION_BY_TIME) + fun testInAlertingPeopleSectionWhenTheImportanceIsLowerThanDefault() { + // GIVEN + val silentEntry = + NotificationEntryBuilder().setChannel(channel).setImportance(IMPORTANCE_LOW).build() + whenever(peopleNotificationIdentifier.getPeopleNotificationType(silentEntry)) + .thenReturn(TYPE_PERSON) + + // THEN put silent people notifications in alerting section + assertThat(peopleAlertingSectioner.isInSection(silentEntry)).isTrue() + } + + @Test + @DisableFlags(Flags.FLAG_SORT_SECTION_BY_TIME) fun testInSilentPeopleSectionWhenTheImportanceIsLowerThanDefault() { // GIVEN val silentEntry = @@ -178,7 +201,8 @@ class ConversationCoordinatorTest : SysuiTestCase() { .thenReturn(TYPE_NON_PERSON) // THEN - only put people notification either silent or alerting - assertThat(peopleSilentSectioner.isInSection(entry)).isFalse() + if (!SortBySectionTimeFlag.isEnabled) + assertThat(peopleSilentSectioner.isInSection(entry)).isFalse() assertThat(peopleAlertingSectioner.isInSection(importantEntry)).isFalse() } @@ -207,6 +231,7 @@ class ConversationCoordinatorTest : SysuiTestCase() { } @Test + @DisableFlags(Flags.FLAG_SORT_SECTION_BY_TIME) fun testComparatorPutsImportantPeopleFirst() { whenever(peopleNotificationIdentifier.getPeopleNotificationType(entryA)) .thenReturn(TYPE_IMPORTANT_PERSON) @@ -218,6 +243,7 @@ class ConversationCoordinatorTest : SysuiTestCase() { } @Test + @DisableFlags(Flags.FLAG_SORT_SECTION_BY_TIME) fun testComparatorEquatesPeopleWithSameType() { whenever(peopleNotificationIdentifier.getPeopleNotificationType(entryA)) .thenReturn(TYPE_PERSON) @@ -227,4 +253,10 @@ class ConversationCoordinatorTest : SysuiTestCase() { // only put people notifications in this section assertThat(peopleComparator.compare(entryA, entryB)).isEqualTo(0) } + + @Test + @EnableFlags(Flags.FLAG_SORT_SECTION_BY_TIME) + fun testNoSecondarySortForConversations() { + assertThat(peopleAlertingSectioner.comparator).isNull() + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorTest.java index 118d27a68c8c..cceaaea672c4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorTest.java @@ -64,6 +64,7 @@ import com.android.systemui.statusbar.notification.collection.listbuilder.OnBefo import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner; import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener; +import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider; import com.android.systemui.statusbar.notification.collection.provider.SectionStyleProvider; import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager; import com.android.systemui.statusbar.notification.collection.render.NotifViewBarn; @@ -112,7 +113,9 @@ public class PreparationCoordinatorTest extends SysuiTestCase { @Mock private Handler mHandler; @Mock private SecureSettings mSecureSettings; @Spy private FakeNotifInflater mNotifInflater = new FakeNotifInflater(); - private final SectionStyleProvider mSectionStyleProvider = new SectionStyleProvider(); + @Mock + HighPriorityProvider mHighPriorityProvider; + private SectionStyleProvider mSectionStyleProvider; @Mock private UserTracker mUserTracker; @Mock private GroupMembershipManager mGroupMembershipManager; @@ -126,6 +129,7 @@ public class PreparationCoordinatorTest extends SysuiTestCase { @Before public void setUp() { MockitoAnnotations.initMocks(this); + mSectionStyleProvider = new SectionStyleProvider(mHighPriorityProvider); mAdjustmentProvider = new NotifUiAdjustmentProvider( mHandler, mSecureSettings, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt index b4dadaf83e94..ea4f692ef4f1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt @@ -20,6 +20,8 @@ import android.platform.test.annotations.EnableFlags import android.testing.AndroidTestingRunner import android.testing.TestableLooper.RunWithLooper import androidx.test.filters.SmallTest +import com.android.server.notification.Flags.FLAG_SCREENSHARE_NOTIFICATION_HIDING +import com.android.systemui.Flags.FLAG_SCREENSHARE_NOTIFICATION_HIDING_BUG_FIX import com.android.systemui.SysuiTestCase import com.android.systemui.statusbar.notification.collection.NotifPipeline import com.android.systemui.statusbar.notification.collection.NotificationEntry @@ -36,6 +38,7 @@ import com.android.systemui.statusbar.notification.shared.NotificationIconContai import com.android.systemui.statusbar.notification.stack.BUCKET_ALERTING import com.android.systemui.statusbar.notification.stack.BUCKET_SILENT import com.android.systemui.statusbar.phone.NotificationIconAreaController +import com.android.systemui.statusbar.policy.SensitiveNotificationProtectionController import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.withArgCaptor import org.junit.Before @@ -43,6 +46,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.Mockito.verify +import org.mockito.Mockito.verifyZeroInteractions import org.mockito.MockitoAnnotations.initMocks import org.mockito.Mockito.`when` as whenever @@ -60,12 +64,18 @@ class StackCoordinatorTest : SysuiTestCase() { @Mock private lateinit var notificationIconAreaController: NotificationIconAreaController @Mock private lateinit var renderListInteractor: RenderNotificationListInteractor @Mock private lateinit var activeNotificationsInteractor: ActiveNotificationsInteractor + @Mock private lateinit var sensitiveNotificationProtectionController: + SensitiveNotificationProtectionController @Mock private lateinit var stackController: NotifStackController @Mock private lateinit var section: NotifSection @Before fun setUp() { initMocks(this) + + whenever(sensitiveNotificationProtectionController.isSensitiveStateActive) + .thenReturn(false) + entry = NotificationEntryBuilder().setSection(section).build() coordinator = StackCoordinator( @@ -73,6 +83,7 @@ class StackCoordinatorTest : SysuiTestCase() { notificationIconAreaController, renderListInteractor, activeNotificationsInteractor, + sensitiveNotificationProtectionController, ) coordinator.attach(pipeline) afterRenderListListener = withArgCaptor { @@ -107,6 +118,18 @@ class StackCoordinatorTest : SysuiTestCase() { whenever(section.bucket).thenReturn(BUCKET_ALERTING) afterRenderListListener.onAfterRenderList(listOf(entry), stackController) verify(stackController).setNotifStats(NotifStats(1, false, true, false, false)) + verifyZeroInteractions(activeNotificationsInteractor) + } + + @Test + @DisableFlags(FooterViewRefactor.FLAG_NAME) + @EnableFlags(FLAG_SCREENSHARE_NOTIFICATION_HIDING, FLAG_SCREENSHARE_NOTIFICATION_HIDING_BUG_FIX) + fun testSetNotificationStats_isSensitiveStateActive_nonClearableAlerting() { + whenever(sensitiveNotificationProtectionController.isSensitiveStateActive).thenReturn(true) + whenever(section.bucket).thenReturn(BUCKET_ALERTING) + afterRenderListListener.onAfterRenderList(listOf(entry), stackController) + verify(stackController).setNotifStats(NotifStats(1, true, false, false, false)) + verifyZeroInteractions(activeNotificationsInteractor) } @Test @@ -115,5 +138,67 @@ class StackCoordinatorTest : SysuiTestCase() { whenever(section.bucket).thenReturn(BUCKET_SILENT) afterRenderListListener.onAfterRenderList(listOf(entry), stackController) verify(stackController).setNotifStats(NotifStats(1, false, false, false, true)) + verifyZeroInteractions(activeNotificationsInteractor) + } + + @Test + @DisableFlags(FooterViewRefactor.FLAG_NAME) + @EnableFlags(FLAG_SCREENSHARE_NOTIFICATION_HIDING, FLAG_SCREENSHARE_NOTIFICATION_HIDING_BUG_FIX) + fun testSetNotificationStats_isSensitiveStateActive_nonClearableSilent() { + whenever(sensitiveNotificationProtectionController.isSensitiveStateActive).thenReturn(true) + whenever(section.bucket).thenReturn(BUCKET_SILENT) + afterRenderListListener.onAfterRenderList(listOf(entry), stackController) + verify(stackController).setNotifStats(NotifStats(1, false, false, true, false)) + verifyZeroInteractions(activeNotificationsInteractor) + } + + @Test + @EnableFlags(FooterViewRefactor.FLAG_NAME) + fun testSetNotificationStats_footerFlagOn_clearableAlerting() { + whenever(section.bucket).thenReturn(BUCKET_ALERTING) + afterRenderListListener.onAfterRenderList(listOf(entry), stackController) + verify(activeNotificationsInteractor) + .setNotifStats(NotifStats(1, false, true, false, false)) + verifyZeroInteractions(stackController) + } + + @Test + @EnableFlags( + FooterViewRefactor.FLAG_NAME, + FLAG_SCREENSHARE_NOTIFICATION_HIDING, + FLAG_SCREENSHARE_NOTIFICATION_HIDING_BUG_FIX + ) + fun testSetNotificationStats_footerFlagOn_isSensitiveStateActive_nonClearableAlerting() { + whenever(sensitiveNotificationProtectionController.isSensitiveStateActive).thenReturn(true) + whenever(section.bucket).thenReturn(BUCKET_ALERTING) + afterRenderListListener.onAfterRenderList(listOf(entry), stackController) + verify(activeNotificationsInteractor) + .setNotifStats(NotifStats(1, true, false, false, false)) + verifyZeroInteractions(stackController) + } + + @Test + @EnableFlags(FooterViewRefactor.FLAG_NAME) + fun testSetNotificationStats_footerFlagOn_clearableSilent() { + whenever(section.bucket).thenReturn(BUCKET_SILENT) + afterRenderListListener.onAfterRenderList(listOf(entry), stackController) + verify(activeNotificationsInteractor) + .setNotifStats(NotifStats(1, false, false, false, true)) + verifyZeroInteractions(stackController) + } + + @Test + @EnableFlags( + FooterViewRefactor.FLAG_NAME, + FLAG_SCREENSHARE_NOTIFICATION_HIDING, + FLAG_SCREENSHARE_NOTIFICATION_HIDING_BUG_FIX + ) + fun testSetNotificationStats_footerFlagOn_isSensitiveStateActive_nonClearableSilent() { + whenever(sensitiveNotificationProtectionController.isSensitiveStateActive).thenReturn(true) + whenever(section.bucket).thenReturn(BUCKET_SILENT) + afterRenderListListener.onAfterRenderList(listOf(entry), stackController) + verify(activeNotificationsInteractor) + .setNotifStats(NotifStats(1, false, false, true, false)) + verifyZeroInteractions(stackController) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.java index ea5a6e72557a..6f0a19da8629 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.java @@ -29,15 +29,19 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static kotlinx.coroutines.flow.StateFlowKt.MutableStateFlow; + import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import androidx.test.filters.SmallTest; -import com.android.keyguard.TestScopeProvider; +import com.android.compose.animation.scene.ObservableTransitionState; import com.android.systemui.SysuiTestCase; +import com.android.systemui.communal.shared.model.CommunalScenes; import com.android.systemui.dump.DumpManager; import com.android.systemui.keyguard.WakefulnessLifecycle; +import com.android.systemui.kosmos.KosmosJavaAdapter; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.shade.data.repository.FakeShadeRepository; import com.android.systemui.shade.data.repository.ShadeAnimationRepository; @@ -67,6 +71,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.verification.VerificationMode; +import kotlinx.coroutines.flow.MutableStateFlow; import kotlinx.coroutines.test.TestScope; @SmallTest @@ -89,9 +94,10 @@ public class VisualStabilityCoordinatorTest extends SysuiTestCase { @Captor private ArgumentCaptor<StatusBarStateController.StateListener> mSBStateListenerCaptor; @Captor private ArgumentCaptor<NotifStabilityManager> mNotifStabilityManagerCaptor; + private final KosmosJavaAdapter mKosmos = new KosmosJavaAdapter(this); private FakeSystemClock mFakeSystemClock = new FakeSystemClock(); private FakeExecutor mFakeExecutor = new FakeExecutor(mFakeSystemClock); - private final TestScope mTestScope = TestScopeProvider.getTestScope(); + private final TestScope mTestScope = mKosmos.getTestScope(); private final JavaAdapter mJavaAdapter = new JavaAdapter(mTestScope.getBackgroundScope()); private ShadeAnimationInteractor mShadeAnimationInteractor; @@ -118,8 +124,10 @@ public class VisualStabilityCoordinatorTest extends SysuiTestCase { mStatusBarStateController, mVisibilityLocationProvider, mVisualStabilityProvider, - mWakefulnessLifecycle); + mWakefulnessLifecycle, + mKosmos.getCommunalInteractor()); mCoordinator.attach(mNotifPipeline); + mTestScope.getTestScheduler().runCurrent(); // capture arguments: verify(mWakefulnessLifecycle).addObserver(mWakefulnessObserverCaptor.capture()); @@ -496,6 +504,7 @@ public class VisualStabilityCoordinatorTest extends SysuiTestCase { setFullyDozed(false); setSleepy(false); setPanelExpanded(true); + setCommunalShowing(false); assertFalse(mNotifStabilityManager.isEntryReorderingAllowed(mEntry)); // The pipeline still has to report back that entry reordering was suppressed @@ -509,6 +518,19 @@ public class VisualStabilityCoordinatorTest extends SysuiTestCase { } @Test + public void testCommunalShowingWillNotSuppressReordering() { + // GIVEN panel is expanded and communal is showing + setPulsing(false); + setFullyDozed(false); + setSleepy(false); + setPanelExpanded(true); + setCommunalShowing(true); + + // Reordering should be allowed + assertTrue(mNotifStabilityManager.isEntryReorderingAllowed(mEntry)); + } + + @Test public void testQueryingEntryReorderingButNotReportingReorderSuppressedDoesNotInvalidate() { // GIVEN visual stability is being maintained b/c panel is expanded setPulsing(false); @@ -561,6 +583,16 @@ public class VisualStabilityCoordinatorTest extends SysuiTestCase { mTestScope.getTestScheduler().runCurrent(); } + private void setCommunalShowing(boolean isShowing) { + final MutableStateFlow<ObservableTransitionState> showingFlow = + MutableStateFlow( + new ObservableTransitionState.Idle( + isShowing ? CommunalScenes.Communal : CommunalScenes.Blank) + ); + mKosmos.getCommunalRepository().setTransitionState(showingFlow); + mTestScope.getTestScheduler().runCurrent(); + } + private void setPulsing(boolean pulsing) { mStatusBarStateListener.onPulsingChanged(pulsing); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java index 10d2191c0e07..cd8be573a2ac 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java @@ -37,7 +37,6 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import static kotlinx.coroutines.flow.FlowKt.emptyFlow; -import static kotlinx.coroutines.test.TestCoroutineDispatchersKt.StandardTestDispatcher; import android.metrics.LogMaker; import android.platform.test.annotations.DisableFlags; @@ -69,7 +68,6 @@ import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin.OnMenuEventListener; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.power.domain.interactor.PowerInteractor; -import com.android.systemui.scene.shared.flag.SceneContainerFlags; import com.android.systemui.scene.ui.view.WindowRootView; import com.android.systemui.shade.ShadeController; import com.android.systemui.statusbar.LockscreenShadeTransitionController; @@ -89,7 +87,6 @@ import com.android.systemui.statusbar.notification.collection.render.NotifStats; import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider; import com.android.systemui.statusbar.notification.collection.render.SectionHeaderController; import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationListRepository; -import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor; import com.android.systemui.statusbar.notification.domain.interactor.SeenNotificationsInteractor; import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor; import com.android.systemui.statusbar.notification.init.NotificationsController; @@ -100,7 +97,6 @@ import com.android.systemui.statusbar.notification.stack.NotificationSwipeHelper import com.android.systemui.statusbar.notification.stack.domain.interactor.NotificationStackAppearanceInteractor; import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationListViewBinder; import com.android.systemui.statusbar.phone.KeyguardBypassController; -import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.HeadsUpManager; @@ -155,7 +151,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { @Mock(answer = Answers.RETURNS_SELF) private NotificationSwipeHelper.Builder mNotificationSwipeHelperBuilder; @Mock private NotificationSwipeHelper mNotificationSwipeHelper; - @Mock private ScrimController mScrimController; @Mock private GroupExpansionManager mGroupExpansionManager; @Mock private SectionHeaderController mSilentHeaderController; @Mock private NotifPipeline mNotifPipeline; @@ -165,7 +160,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { @Mock private NotificationRemoteInputManager mRemoteInputManager; @Mock private VisibilityLocationProviderDelegator mVisibilityLocationProviderDelegator; @Mock private ShadeController mShadeController; - @Mock private SceneContainerFlags mSceneContainerFlags; @Mock private Provider<WindowRootView> mWindowRootView; @Mock private NotificationStackAppearanceInteractor mNotificationStackAppearanceInteractor; private final StackStateLogger mStackLogger = new StackStateLogger(logcatLogBuffer(), @@ -191,10 +185,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { private final ActiveNotificationListRepository mActiveNotificationsRepository = new ActiveNotificationListRepository(); - private final ActiveNotificationsInteractor mActiveNotificationsInteractor = - new ActiveNotificationsInteractor(mActiveNotificationsRepository, - StandardTestDispatcher(/* scheduler = */ null, /* name = */ null)); - private final SeenNotificationsInteractor mSeenNotificationsInteractor = new SeenNotificationsInteractor(mActiveNotificationsRepository); @@ -1014,7 +1004,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { new FalsingCollectorFake(), new FalsingManagerFake(), mNotificationSwipeHelperBuilder, - mScrimController, mGroupExpansionManager, mSilentHeaderController, mNotifPipeline, @@ -1023,11 +1012,9 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { mUiEventLogger, mRemoteInputManager, mVisibilityLocationProviderDelegator, - mActiveNotificationsInteractor, mSeenNotificationsInteractor, mViewBinder, mShadeController, - mSceneContainerFlags, mWindowRootView, mNotificationStackAppearanceInteractor, mKosmos.getInteractionJankMonitor(), diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java index 054680df1582..34605fed7d28 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java @@ -597,8 +597,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { private static ShadeExpansionChangeEvent expansionEvent( float fraction, boolean expanded, boolean tracking) { - return new ShadeExpansionChangeEvent( - fraction, expanded, tracking, /* dragDownPxAmount= */ 0f); + return new ShadeExpansionChangeEvent(fraction, expanded, tracking); } @Test @@ -607,7 +606,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { /* verify that a predictive back callback is registered when the bouncer becomes visible */ mBouncerExpansionCallback.onVisibilityChanged(true); verify(mOnBackInvokedDispatcher).registerOnBackInvokedCallback( - eq(OnBackInvokedDispatcher.PRIORITY_OVERLAY), + eq(OnBackInvokedDispatcher.PRIORITY_DEFAULT), mBackCallbackCaptor.capture()); /* verify that the same callback is unregistered when the bouncer becomes invisible */ @@ -622,7 +621,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { mBouncerExpansionCallback.onVisibilityChanged(true); /* capture the predictive back callback during registration */ verify(mOnBackInvokedDispatcher).registerOnBackInvokedCallback( - eq(OnBackInvokedDispatcher.PRIORITY_OVERLAY), + eq(OnBackInvokedDispatcher.PRIORITY_DEFAULT), mBackCallbackCaptor.capture()); when(mPrimaryBouncerInteractor.isFullyShowing()).thenReturn(true); @@ -642,7 +641,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { mBouncerExpansionCallback.onVisibilityChanged(true); /* capture the predictive back callback during registration */ verify(mOnBackInvokedDispatcher).registerOnBackInvokedCallback( - eq(OnBackInvokedDispatcher.PRIORITY_OVERLAY), + eq(OnBackInvokedDispatcher.PRIORITY_DEFAULT), mBackCallbackCaptor.capture()); assertTrue(mBackCallbackCaptor.getValue() instanceof OnBackAnimationCallback); @@ -660,7 +659,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { mBouncerExpansionCallback.onVisibilityChanged(true); /* capture the predictive back callback during registration */ verify(mOnBackInvokedDispatcher).registerOnBackInvokedCallback( - eq(OnBackInvokedDispatcher.PRIORITY_OVERLAY), + eq(OnBackInvokedDispatcher.PRIORITY_DEFAULT), mBackCallbackCaptor.capture()); assertTrue(mBackCallbackCaptor.getValue() instanceof OnBackAnimationCallback); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java index 3da5ab9f9d3d..9c3d9c669adc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java @@ -52,7 +52,7 @@ import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.res.R; import com.android.systemui.shade.ShadeExpansionStateManager; -import com.android.systemui.shade.ShadeViewController; +import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.OperatorNameViewController; import com.android.systemui.statusbar.disableflags.DisableFlagsLogger; @@ -115,7 +115,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Mock private HeadsUpAppearanceController mHeadsUpAppearanceController; @Mock - private ShadeViewController mShadeViewController; + private PanelExpansionInteractor mPanelExpansionInteractor; @Mock private StatusBarIconController.DarkIconManager.Factory mIconManagerFactory; @Mock @@ -304,7 +304,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { // WHEN the shade is open and configured to hide the status bar icons mShadeExpansionStateManager.updateState(STATE_OPEN); - when(mShadeViewController.shouldHideStatusBarIconsWhenExpanded()).thenReturn(true); + when(mPanelExpansionInteractor.shouldHideStatusBarIconsWhenExpanded()).thenReturn(true); fragment.disable(DEFAULT_DISPLAY, 0, 0, false); @@ -320,7 +320,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { // WHEN the shade is open but *not* configured to hide the status bar icons mShadeExpansionStateManager.updateState(STATE_OPEN); - when(mShadeViewController.shouldHideStatusBarIconsWhenExpanded()).thenReturn(false); + when(mPanelExpansionInteractor.shouldHideStatusBarIconsWhenExpanded()).thenReturn(false); fragment.disable(DEFAULT_DISPLAY, 0, 0, false); @@ -337,7 +337,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { // WHEN the shade is open and configured to hide the status bar icons mShadeExpansionStateManager.updateState(STATE_OPEN); - when(mShadeViewController.shouldHideStatusBarIconsWhenExpanded()).thenReturn(true); + when(mPanelExpansionInteractor.shouldHideStatusBarIconsWhenExpanded()).thenReturn(true); fragment.disable(DEFAULT_DISPLAY, 0, 0, false); @@ -696,7 +696,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { mCollapsedStatusBarViewBinder, mStatusBarHideIconsForBouncerManager, mKeyguardStateController, - mShadeViewController, + mPanelExpansionInteractor, mStatusBarStateController, mock(NotificationIconContainerStatusBarViewBinder.class), mCommandQueue, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryTest.kt index c13e830afac7..3c13906dbd43 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryTest.kt @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.pipeline.mobile.data.repository.prod import android.net.ConnectivityManager +import android.os.PersistableBundle import android.telephony.ServiceState import android.telephony.SignalStrength import android.telephony.SubscriptionManager.PROFILE_CLASS_UNSET @@ -99,6 +100,9 @@ class FullMobileConnectionRepositoryTest : SysuiTestCase() { ) ) + // Use a real config, with no overrides + private val systemUiCarrierConfig = SystemUiCarrierConfig(SUB_ID, PersistableBundle()) + private lateinit var mobileRepo: FakeMobileConnectionRepository private lateinit var carrierMergedRepo: FakeMobileConnectionRepository @@ -680,10 +684,6 @@ class FullMobileConnectionRepositoryTest : SysuiTestCase() { telephonyManager: TelephonyManager, ): MobileConnectionRepositoryImpl { whenever(telephonyManager.subscriptionId).thenReturn(SUB_ID) - val systemUiCarrierConfigMock: SystemUiCarrierConfig = mock() - whenever(systemUiCarrierConfigMock.satelliteConnectionHysteresisSeconds) - .thenReturn(MutableStateFlow(0)) - val realRepo = MobileConnectionRepositoryImpl( SUB_ID, @@ -693,7 +693,7 @@ class FullMobileConnectionRepositoryTest : SysuiTestCase() { SEP, connectivityManager, telephonyManager, - systemUiCarrierConfig = systemUiCarrierConfigMock, + systemUiCarrierConfig = systemUiCarrierConfig, fakeBroadcastDispatcher, mobileMappingsProxy = mock(), testDispatcher, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryTest.kt index f761bcfe63d6..9d1411625a8f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryTest.kt @@ -1030,6 +1030,26 @@ class MobileConnectionRepositoryTest : SysuiTestCase() { } @Test + fun inflateSignalStrength_usesCarrierConfig() = + testScope.runTest { + val latest by collectLastValue(underTest.inflateSignalStrength) + + assertThat(latest).isEqualTo(false) + + systemUiCarrierConfig.processNewCarrierConfig( + configWithOverride(KEY_INFLATE_SIGNAL_STRENGTH_BOOL, true) + ) + + assertThat(latest).isEqualTo(true) + + systemUiCarrierConfig.processNewCarrierConfig( + configWithOverride(KEY_INFLATE_SIGNAL_STRENGTH_BOOL, false) + ) + + assertThat(latest).isEqualTo(false) + } + + @Test fun isAllowedDuringAirplaneMode_alwaysFalse() = testScope.runTest { val latest by collectLastValue(underTest.isAllowedDuringAirplaneMode) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorTest.kt index c49fcf88ecaa..f9ab25e9306a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorTest.kt @@ -181,6 +181,22 @@ class MobileIconInteractorTest : SysuiTestCase() { } @Test + fun inflateSignalStrength_arbitrarilyAddsOneToTheReportedLevel() = + testScope.runTest { + connectionRepository.inflateSignalStrength.value = false + val latest by collectLastValue(underTest.signalLevelIcon) + + connectionRepository.primaryLevel.value = 4 + assertThat(latest!!.level).isEqualTo(4) + + connectionRepository.inflateSignalStrength.value = true + connectionRepository.primaryLevel.value = 4 + + // when INFLATE_SIGNAL_STRENGTH is true, we add 1 to the reported signal level + assertThat(latest!!.level).isEqualTo(5) + } + + @Test fun iconGroup_three_g() = testScope.runTest { connectionRepository.resolvedNetworkType.value = diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt index 867476f9023c..581ca3b14822 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt @@ -28,6 +28,7 @@ import android.app.NotificationManager.VISIBILITY_NO_OVERRIDE import android.content.pm.PackageManager import android.media.projection.MediaProjectionInfo import android.media.projection.MediaProjectionManager +import android.os.UserHandle import android.permission.flags.Flags.FLAG_SENSITIVE_NOTIFICATION_APP_PROTECTION import android.platform.test.annotations.EnableFlags import android.platform.test.annotations.RequiresFlagsDisabled @@ -85,7 +86,6 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { @Mock private lateinit var activityManager: IActivityManager @Mock private lateinit var mediaProjectionManager: MediaProjectionManager @Mock private lateinit var packageManager: PackageManager - @Mock private lateinit var mediaProjectionInfo: MediaProjectionInfo @Mock private lateinit var listener1: Runnable @Mock private lateinit var listener2: Runnable @Mock private lateinit var listener3: Runnable @@ -95,6 +95,7 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { private lateinit var globalSettings: FakeGlobalSettings private lateinit var mediaProjectionCallback: MediaProjectionManager.Callback private lateinit var controller: SensitiveNotificationProtectionControllerImpl + private lateinit var mediaProjectionInfo: MediaProjectionInfo @Before fun setUp() { @@ -109,14 +110,29 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { setShareFullScreen() whenever(activityManager.bugreportWhitelistedPackages) .thenReturn(listOf(BUGREPORT_PACKAGE_NAME)) - whenever(packageManager.getPackageUid(TEST_PROJECTION_PACKAGE_NAME, 0)) + whenever( + packageManager.getPackageUidAsUser( + TEST_PROJECTION_PACKAGE_NAME, + UserHandle.CURRENT.identifier + ) + ) .thenReturn(TEST_PROJECTION_PACKAGE_UID) - whenever(packageManager.getPackageUid(BUGREPORT_PACKAGE_NAME, 0)) + whenever( + packageManager.getPackageUidAsUser( + BUGREPORT_PACKAGE_NAME, + UserHandle.CURRENT.identifier + ) + ) .thenReturn(BUGREPORT_PACKAGE_UID) // SystemUi context package name is exempt, but in test scenarios its // com.android.systemui.tests so use that instead of hardcoding. Setup packagemanager to // return the correct uid in this scenario - whenever(packageManager.getPackageUid(mContext.packageName, 0)) + whenever( + packageManager.getPackageUidAsUser( + mContext.packageName, + UserHandle.CURRENT.identifier + ) + ) .thenReturn(mContext.applicationInfo.uid) whenever(packageManager.checkPermission(anyString(), anyString())) @@ -271,7 +287,7 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { fun isSensitiveStateActive_projectionActive_sysuiExempt_false() { // SystemUi context package name is exempt, but in test scenarios its // com.android.systemui.tests so use that instead of hardcoding - whenever(mediaProjectionInfo.packageName).thenReturn(mContext.packageName) + setShareFullScreenViaSystemUi() mediaProjectionCallback.onStart(mediaProjectionInfo) assertFalse(controller.isSensitiveStateActive) @@ -309,7 +325,7 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { @Test fun isSensitiveStateActive_projectionActive_bugReportHandlerExempt_false() { - whenever(mediaProjectionInfo.packageName).thenReturn(BUGREPORT_PACKAGE_NAME) + setShareFullScreenViaBugReportHandler() mediaProjectionCallback.onStart(mediaProjectionInfo) assertFalse(controller.isSensitiveStateActive) @@ -371,7 +387,7 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { fun shouldProtectNotification_projectionActive_sysuiExempt_false() { // SystemUi context package name is exempt, but in test scenarios its // com.android.systemui.tests so use that instead of hardcoding - whenever(mediaProjectionInfo.packageName).thenReturn(mContext.packageName) + setShareFullScreenViaSystemUi() mediaProjectionCallback.onStart(mediaProjectionInfo) val notificationEntry = setupNotificationEntry(TEST_PACKAGE_NAME, false) @@ -415,7 +431,7 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { @Test fun shouldProtectNotification_projectionActive_bugReportHandlerExempt_false() { - whenever(mediaProjectionInfo.packageName).thenReturn(BUGREPORT_PACKAGE_NAME) + setShareFullScreenViaBugReportHandler() mediaProjectionCallback.onStart(mediaProjectionInfo) val notificationEntry = setupNotificationEntry(TEST_PACKAGE_NAME, false) @@ -548,9 +564,7 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { fun logSensitiveContentProtectionSession_exemptViaSystemUi() { // SystemUi context package name is exempt, but in test scenarios its // com.android.systemui.tests so use that instead of hardcoding - val testPackageName = mContext.packageName - val testUid = mContext.applicationInfo.uid - whenever(mediaProjectionInfo.packageName).thenReturn(testPackageName) + setShareFullScreenViaSystemUi() mediaProjectionCallback.onStart(mediaProjectionInfo) @@ -558,7 +572,7 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { FrameworkStatsLog.write( eq(FrameworkStatsLog.SENSITIVE_CONTENT_MEDIA_PROJECTION_SESSION), anyLong(), - eq(testUid), + eq(mContext.applicationInfo.uid), eq(true), eq(FrameworkStatsLog.SENSITIVE_CONTENT_MEDIA_PROJECTION_SESSION__STATE__START), eq(FrameworkStatsLog.SENSITIVE_CONTENT_MEDIA_PROJECTION_SESSION__SOURCE__SYS_UI) @@ -571,7 +585,7 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { FrameworkStatsLog.write( eq(FrameworkStatsLog.SENSITIVE_CONTENT_MEDIA_PROJECTION_SESSION), anyLong(), - eq(testUid), + eq(mContext.applicationInfo.uid), eq(true), eq(FrameworkStatsLog.SENSITIVE_CONTENT_MEDIA_PROJECTION_SESSION__STATE__STOP), eq(FrameworkStatsLog.SENSITIVE_CONTENT_MEDIA_PROJECTION_SESSION__SOURCE__SYS_UI) @@ -582,8 +596,7 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { @Test fun logSensitiveContentProtectionSession_exemptViaBugReportHandler() { // Setup exempt via bugreport handler - whenever(mediaProjectionInfo.packageName).thenReturn(BUGREPORT_PACKAGE_NAME) - + setShareFullScreenViaBugReportHandler() mediaProjectionCallback.onStart(mediaProjectionInfo) verify { @@ -619,13 +632,26 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { } private fun setShareFullScreen() { - whenever(mediaProjectionInfo.packageName).thenReturn(TEST_PROJECTION_PACKAGE_NAME) - whenever(mediaProjectionInfo.launchCookie).thenReturn(null) + setShareScreen(TEST_PROJECTION_PACKAGE_NAME, true) + } + + private fun setShareFullScreenViaBugReportHandler() { + setShareScreen(BUGREPORT_PACKAGE_NAME, true) + } + + private fun setShareFullScreenViaSystemUi() { + // SystemUi context package name is exempt, but in test scenarios its + // com.android.systemui.tests so use that instead of hardcoding + setShareScreen(mContext.packageName, true) } private fun setShareSingleApp() { - whenever(mediaProjectionInfo.packageName).thenReturn(TEST_PROJECTION_PACKAGE_NAME) - whenever(mediaProjectionInfo.launchCookie).thenReturn(ActivityOptions.LaunchCookie()) + setShareScreen(TEST_PROJECTION_PACKAGE_NAME, false) + } + + private fun setShareScreen(packageName: String, fullScreen: Boolean) { + val launchCookie = if (fullScreen) null else ActivityOptions.LaunchCookie() + mediaProjectionInfo = MediaProjectionInfo(packageName, UserHandle.CURRENT, launchCookie) } private fun setupNotificationEntry( diff --git a/packages/SystemUI/tests/src/com/android/systemui/unfold/FoldAodAnimationControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/unfold/FoldAodAnimationControllerTest.kt index cb7d2764bb49..e1797c445a70 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/unfold/FoldAodAnimationControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/unfold/FoldAodAnimationControllerTest.kt @@ -29,6 +29,7 @@ import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.keyguard.WakefulnessLifecycle import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory +import com.android.systemui.keyguard.domain.interactor.ToAodFoldTransitionInteractor import com.android.systemui.shade.ShadeFoldAnimator import com.android.systemui.shade.ShadeViewController import com.android.systemui.statusbar.LightRevealScrim @@ -79,6 +80,8 @@ class FoldAodAnimationControllerTest : SysuiTestCase() { @Mock lateinit var shadeFoldAnimator: ShadeFoldAnimator + @Mock lateinit var foldTransitionInteractor: ToAodFoldTransitionInteractor + @Captor private lateinit var foldStateListenerCaptor: ArgumentCaptor<FoldStateListener> private lateinit var deviceStates: FoldableDeviceStates @@ -96,6 +99,7 @@ class FoldAodAnimationControllerTest : SysuiTestCase() { // TODO(b/254878364): remove this call to NPVC.getView() whenever(shadeViewController.shadeFoldAnimator).thenReturn(shadeFoldAnimator) + whenever(foldTransitionInteractor.foldAnimator).thenReturn(shadeFoldAnimator) whenever(shadeFoldAnimator.view).thenReturn(viewGroup) whenever(viewGroup.viewTreeObserver).thenReturn(viewTreeObserver) whenever(wakefulnessLifecycle.lastSleepReason) @@ -120,6 +124,7 @@ class FoldAodAnimationControllerTest : SysuiTestCase() { globalSettings, latencyTracker, { keyguardInteractor }, + { foldTransitionInteractor }, ) .apply { initialize(centralSurfaces, shadeViewController, lightRevealScrim) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/wallet/controller/QuickAccessWalletControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/wallet/controller/QuickAccessWalletControllerTest.java index fccb936a3bc8..dc5597a1cce0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wallet/controller/QuickAccessWalletControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wallet/controller/QuickAccessWalletControllerTest.java @@ -29,6 +29,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.PendingIntent; +import android.app.role.RoleManager; import android.content.Intent; import android.service.quickaccesswallet.GetWalletCardsRequest; import android.service.quickaccesswallet.QuickAccessWalletClient; @@ -54,11 +55,14 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.List; + @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest public class QuickAccessWalletControllerTest extends SysuiTestCase { + private static final String WALLET_ROLE_HOLDER = "wallet.role.holder"; @Mock private QuickAccessWalletClient mQuickAccessWalletClient; @Mock @@ -69,6 +73,8 @@ public class QuickAccessWalletControllerTest extends SysuiTestCase { private ActivityStarter mActivityStarter; @Mock private ActivityTransitionAnimator.Controller mAnimationController; + @Mock + private RoleManager mRoleManager; @Captor private ArgumentCaptor<GetWalletCardsRequest> mRequestCaptor; @Captor @@ -102,7 +108,8 @@ public class QuickAccessWalletControllerTest extends SysuiTestCase { MoreExecutors.directExecutor(), mSecureSettings, mQuickAccessWalletClient, - mClock); + mClock, + mRoleManager); } @Test @@ -113,6 +120,24 @@ public class QuickAccessWalletControllerTest extends SysuiTestCase { } @Test + public void walletRoleAvailable_isAvailable() { + when(mRoleManager.isRoleAvailable(eq(RoleManager.ROLE_WALLET))).thenReturn(true); + when(mRoleManager.getRoleHolders(eq(RoleManager.ROLE_WALLET))) + .thenReturn(List.of(WALLET_ROLE_HOLDER)); + + assertTrue(mController.isWalletRoleAvailable()); + } + + @Test + public void walletRoleAvailable_isNotAvailable() { + when(mRoleManager.isRoleAvailable(eq(RoleManager.ROLE_WALLET))).thenReturn(false); + when(mRoleManager.getRoleHolders(eq(RoleManager.ROLE_WALLET))) + .thenReturn(List.of(WALLET_ROLE_HOLDER)); + + assertFalse(mController.isWalletRoleAvailable()); + } + + @Test public void walletServiceUnavailable_walletNotEnabled() { when(mQuickAccessWalletClient.isWalletServiceAvailable()).thenReturn(false); diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/flags/SceneContainerRule.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/flags/SceneContainerRule.kt index 4e05de27bb33..775ad14d4ad9 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/flags/SceneContainerRule.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/flags/SceneContainerRule.kt @@ -16,16 +16,14 @@ package com.android.systemui.flags -import android.util.Log import com.android.systemui.scene.shared.flag.SceneContainerFlag import org.junit.Assert -import org.junit.Assume import org.junit.rules.TestRule import org.junit.runner.Description import org.junit.runners.model.Statement /** - * Should always be used with [SetFlagsRule] and should be ordered after it. + * Should always be used with `SetFlagsRule` and should be ordered after it. * * Used to ensure tests annotated with [EnableSceneContainer] can actually get `true` from * [SceneContainerFlag.isEnabled]. @@ -35,15 +33,10 @@ class SceneContainerRule : TestRule { return object : Statement() { @Throws(Throwable::class) override fun evaluate() { - val initialEnabledValue = Flags.SCENE_CONTAINER_ENABLED val hasAnnotation = description?.testClass?.getAnnotation(EnableSceneContainer::class.java) != null || description?.getAnnotation(EnableSceneContainer::class.java) != null if (hasAnnotation) { - Assume.assumeTrue( - "Couldn't set Flags.SCENE_CONTAINER_ENABLED for @EnableSceneContainer test", - trySetSceneContainerEnabled(true) - ) Assert.assertTrue( "SceneContainerFlag.isEnabled is false:" + "\n * Did you forget to add a new aconfig flag dependency in" + @@ -52,32 +45,7 @@ class SceneContainerRule : TestRule { SceneContainerFlag.isEnabled ) } - try { - base?.evaluate() - } finally { - if (hasAnnotation) { - trySetSceneContainerEnabled(initialEnabledValue) - } - } - } - } - } - - companion object { - fun trySetSceneContainerEnabled(enabled: Boolean): Boolean { - if (Flags.SCENE_CONTAINER_ENABLED == enabled) { - return true - } - return try { - // TODO(b/283300105): remove this reflection setting once the hard-coded - // Flags.SCENE_CONTAINER_ENABLED is no longer needed. - val field = Flags::class.java.getField("SCENE_CONTAINER_ENABLED") - field.isAccessible = true - field.set(null, enabled) // note: this does not work with multivalent tests - true - } catch (t: Throwable) { - Log.e("SceneContainerRule", "Unable to set SCENE_CONTAINER_ENABLED=$enabled", t) - false + base?.evaluate() } } } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardTransitionRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardTransitionRepository.kt index de6bfb2f8756..a242368d1ee1 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardTransitionRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardTransitionRepository.kt @@ -32,7 +32,9 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.test.TestCoroutineScheduler import kotlinx.coroutines.test.TestScope @@ -41,11 +43,21 @@ import kotlinx.coroutines.test.runCurrent /** Fake implementation of [KeyguardTransitionRepository] */ @SysUISingleton class FakeKeyguardTransitionRepository @Inject constructor() : KeyguardTransitionRepository { - private val _transitions = MutableSharedFlow<TransitionStep>(replay = 3, onBufferOverflow = BufferOverflow.DROP_OLDEST) override val transitions: SharedFlow<TransitionStep> = _transitions + private val _currentTransitionInfo: MutableStateFlow<TransitionInfo> = + MutableStateFlow( + TransitionInfo( + ownerName = "", + from = KeyguardState.OFF, + to = KeyguardState.LOCKSCREEN, + animator = null + ) + ) + override var currentTransitionInfoInternal = _currentTransitionInfo.asStateFlow() + init { // Seed the fake repository with the same initial steps the actual repository uses. KeyguardTransitionRepositoryImpl.initialTransitionSteps.forEach { _transitions.tryEmit(it) } @@ -159,6 +171,11 @@ class FakeKeyguardTransitionRepository @Inject constructor() : KeyguardTransitio ), validateStep: Boolean = true ) { + if (step.transitionState == TransitionState.STARTED) { + _currentTransitionInfo.value = + TransitionInfo(from = step.from, to = step.to, animator = null, ownerName = "") + } + _transitions.replayCache.last().let { lastStep -> if ( validateStep && @@ -201,7 +218,8 @@ class FakeKeyguardTransitionRepository @Inject constructor() : KeyguardTransitio } } - override fun startTransition(info: TransitionInfo): UUID? { + override suspend fun startTransition(info: TransitionInfo): UUID? { + _currentTransitionInfo.value = info return if (info.animator == null) UUID.randomUUID() else null } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/ShadeControllerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/ShadeControllerKosmos.kt index 513c6ab3586d..4a2eaf0f7bf6 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/ShadeControllerKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/ShadeControllerKosmos.kt @@ -27,6 +27,7 @@ import com.android.systemui.kosmos.testDispatcher import com.android.systemui.log.LogBuffer import com.android.systemui.plugins.statusbar.statusBarStateController import com.android.systemui.scene.domain.interactor.sceneInteractor +import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.shade.domain.interactor.shadeInteractor import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.NotificationShadeWindowController @@ -78,4 +79,11 @@ val Kosmos.shadeControllerImpl by { mock<NotificationGutsManager>() }, ) } -var Kosmos.shadeController: ShadeController by Kosmos.Fixture { shadeControllerImpl } +var Kosmos.shadeController: ShadeController by + Kosmos.Fixture { + if (SceneContainerFlag.isEnabled) { + shadeControllerSceneImpl + } else { + shadeControllerImpl + } + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/domain/startable/ShadeStartableKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/domain/startable/ShadeStartableKosmos.kt index 7dfa68605ef3..b85858d915b5 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/domain/startable/ShadeStartableKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/domain/startable/ShadeStartableKosmos.kt @@ -22,11 +22,17 @@ import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.Kosmos.Fixture import com.android.systemui.kosmos.applicationCoroutineScope import com.android.systemui.log.LogBuffer +import com.android.systemui.scene.domain.interactor.sceneInteractor +import com.android.systemui.shade.ShadeExpansionStateManager import com.android.systemui.shade.data.repository.shadeRepository +import com.android.systemui.shade.domain.interactor.panelExpansionInteractor import com.android.systemui.shade.transition.ScrimShadeTransitionController import com.android.systemui.statusbar.policy.splitShadeStateController import com.android.systemui.util.mockito.mock +@Deprecated("ShadeExpansionStateManager is deprecated. Remove your dependency on it instead.") +val Kosmos.shadeExpansionStateManager by Fixture { ShadeExpansionStateManager() } + val Kosmos.shadeStartable by Fixture { ShadeStartable( applicationScope = applicationCoroutineScope, @@ -34,7 +40,10 @@ val Kosmos.shadeStartable by Fixture { touchLog = mock<LogBuffer>(), configurationRepository = configurationRepository, shadeRepository = shadeRepository, - controller = splitShadeStateController, + splitShadeStateController = splitShadeStateController, scrimShadeTransitionController = mock<ScrimShadeTransitionController>(), + sceneInteractorProvider = { sceneInteractor }, + panelExpansionInteractorProvider = { panelExpansionInteractor }, + shadeExpansionStateManager = shadeExpansionStateManager, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationStackAppearanceRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationPlaceholderRepositoryKosmos.kt index 407390296a6c..3e54e3d00d3a 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationStackAppearanceRepositoryKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationPlaceholderRepositoryKosmos.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 The Android Open Source Project + * Copyright (C) 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,4 @@ package com.android.systemui.statusbar.notification.stack.data.repository import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.Kosmos.Fixture -val Kosmos.notificationStackAppearanceRepository by Fixture { - NotificationStackAppearanceRepository() -} +val Kosmos.notificationPlaceholderRepository by Fixture { NotificationPlaceholderRepository() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationViewHeightRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationViewHeightRepositoryKosmos.kt new file mode 100644 index 000000000000..6c16c2ceee02 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationViewHeightRepositoryKosmos.kt @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.notification.stack.data.repository + +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.Kosmos.Fixture + +val Kosmos.notificationViewHeightRepository by Fixture { NotificationViewHeightRepository() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorKosmos.kt index 5605d1000f4e..dbfd9de2aa8c 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorKosmos.kt @@ -19,11 +19,13 @@ package com.android.systemui.statusbar.notification.stack.domain.interactor import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.Kosmos.Fixture import com.android.systemui.shade.domain.interactor.shadeInteractor -import com.android.systemui.statusbar.notification.stack.data.repository.notificationStackAppearanceRepository +import com.android.systemui.statusbar.notification.stack.data.repository.notificationPlaceholderRepository +import com.android.systemui.statusbar.notification.stack.data.repository.notificationViewHeightRepository val Kosmos.notificationStackAppearanceInteractor by Fixture { NotificationStackAppearanceInteractor( - repository = notificationStackAppearanceRepository, + viewHeightRepository = notificationViewHeightRepository, + placeholderRepository = notificationPlaceholderRepository, shadeInteractor = shadeInteractor, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationStackAppearanceViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationStackAppearanceViewModelKosmos.kt index 7e63eaaf9ec9..bada2a61995d 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationStackAppearanceViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationStackAppearanceViewModelKosmos.kt @@ -19,14 +19,12 @@ package com.android.systemui.statusbar.notification.stack.ui.viewmodel import com.android.systemui.dump.dumpManager import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.Kosmos.Fixture -import com.android.systemui.kosmos.applicationCoroutineScope import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.shade.domain.interactor.shadeInteractor import com.android.systemui.statusbar.notification.stack.domain.interactor.notificationStackAppearanceInteractor val Kosmos.notificationStackAppearanceViewModel by Fixture { NotificationStackAppearanceViewModel( - applicationScope = applicationCoroutineScope, dumpManager = dumpManager, stackAppearanceInteractor = notificationStackAppearanceInteractor, shadeInteractor = shadeInteractor, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/FakeMobileConnectionRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/FakeMobileConnectionRepository.kt index 2d5a3612ff6a..8109b60a9ef0 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/FakeMobileConnectionRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/FakeMobileConnectionRepository.kt @@ -31,6 +31,7 @@ class FakeMobileConnectionRepository( override val tableLogBuffer: TableLogBuffer, ) : MobileConnectionRepository { override val carrierId = MutableStateFlow(UNKNOWN_CARRIER_ID) + override val inflateSignalStrength: MutableStateFlow<Boolean> = MutableStateFlow(false) override val isEmergencyOnly = MutableStateFlow(false) override val isRoaming = MutableStateFlow(false) override val operatorAlphaShort: MutableStateFlow<String?> = MutableStateFlow(null) diff --git a/packages/VpnDialogs/res/values-af/strings.xml b/packages/VpnDialogs/res/values-af/strings.xml index db3c3558dc69..83c971766c25 100644 --- a/packages/VpnDialogs/res/values-af/strings.xml +++ b/packages/VpnDialogs/res/values-af/strings.xml @@ -32,7 +32,7 @@ <string name="always_on_disconnected_message_settings_link" msgid="6172280302829992412">"Verander VPN-instellings"</string> <string name="configure" msgid="4905518375574791375">"Stel op"</string> <string name="disconnect" msgid="971412338304200056">"Ontkoppel"</string> - <string name="open_app" msgid="3717639178595958667">"Maak program oop"</string> + <string name="open_app" msgid="3717639178595958667">"Maak app oop"</string> <string name="dismiss" msgid="6192859333764711227">"Maak toe"</string> <string name="sanitized_vpn_label_with_ellipsis" msgid="7014327474633422235">"<xliff:g id="SANITIZED_VPN_LABEL_WITH_ELLIPSIS_0">%1$s</xliff:g> … ( <xliff:g id="SANITIZED_VPN_LABEL_WITH_ELLIPSIS_1">%2$s</xliff:g>)"</string> <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string> diff --git a/ravenwood/Android.bp b/ravenwood/Android.bp index f4337d41aead..8905ad3273d8 100644 --- a/ravenwood/Android.bp +++ b/ravenwood/Android.bp @@ -151,7 +151,7 @@ java_device_for_host { filegroup { name: "ravenwood-services-jarjar-rules", - srcs: ["ravenwood-services-jarjar-rules.txt"], + srcs: ["texts/ravenwood-services-jarjar-rules.txt"], visibility: ["//frameworks/base"], } @@ -159,7 +159,7 @@ filegroup { // The "test" just shows the available stats filenames. sh_test_host { name: "ravenwood-stats-checker", - src: "ravenwood-stats-checker.sh", + src: "scripts/ravenwood-stats-checker.sh", test_suites: ["general-tests"], data: [ ":framework-minus-apex.ravenwood.stats", diff --git a/ravenwood/ravenwood-stats-checker.sh b/ravenwood/ravenwood-stats-checker.sh deleted file mode 100755 index fb58e7228461..000000000000 --- a/ravenwood/ravenwood-stats-checker.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -# Just print the available *.csv filenames. -echo '#Stats files:' -ls *.csv
\ No newline at end of file diff --git a/ravenwood/bulk_enable.py b/ravenwood/scripts/bulk_enable.py index aafaaff7561a..aafaaff7561a 100644 --- a/ravenwood/bulk_enable.py +++ b/ravenwood/scripts/bulk_enable.py diff --git a/ravenwood/fix_test_runner.py b/ravenwood/scripts/fix_test_runner.py index 99b7a1ff226b..99b7a1ff226b 100755 --- a/ravenwood/fix_test_runner.py +++ b/ravenwood/scripts/fix_test_runner.py diff --git a/ravenwood/list-ravenwood-tests.sh b/ravenwood/scripts/list-ravenwood-tests.sh index fb9b823ee93b..fb9b823ee93b 100755 --- a/ravenwood/list-ravenwood-tests.sh +++ b/ravenwood/scripts/list-ravenwood-tests.sh diff --git a/ravenwood/scripts/ravenwood-stats-checker.sh b/ravenwood/scripts/ravenwood-stats-checker.sh new file mode 100755 index 000000000000..93f4a3fe4333 --- /dev/null +++ b/ravenwood/scripts/ravenwood-stats-checker.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# Copyright (C) 2024 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Just print the available *.csv filenames. +echo '#Stats files:' +ls *.csv
\ No newline at end of file diff --git a/ravenwood/scripts/ravenwood-stats-collector.sh b/ravenwood/scripts/ravenwood-stats-collector.sh new file mode 100755 index 000000000000..4dcaa2be5af3 --- /dev/null +++ b/ravenwood/scripts/ravenwood-stats-collector.sh @@ -0,0 +1,52 @@ +#!/bin/bash +# Copyright (C) 2024 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Script to collect the ravenwood "stats" CVS files and create a single file. + +set -e + +# Output file +out=/tmp/ravenwood-stats-all.csv + +# Where the input files are. +path=$ANDROID_BUILD_TOP/out/host/linux-x86/testcases/ravenwood-stats-checker/x86_64/ + +m() { + ${ANDROID_BUILD_TOP}/build/soong/soong_ui.bash --make-mode "$@" +} + +# Building this will generate the files we need. +m ravenwood-stats-checker + +# Start... + +cd $path + +dump() { + local jar=$1 + local file=$2 + + sed -e '1d' -e "s/^/$jar,/" $file +} + +collect() { + echo 'Jar,PackageName,ClassName,SupportedMethods,TotalMethods' + dump "framework-minus-apex" hoststubgen_framework-minus-apex_stats.csv + dump "service.core" hoststubgen_services.core_stats.csv +} + +collect >$out + +echo "Full dump CVS created at $out" diff --git a/ravenwood/run-ravenwood-tests.sh b/ravenwood/scripts/run-ravenwood-tests.sh index a303626bb445..926c08f4e689 100755 --- a/ravenwood/run-ravenwood-tests.sh +++ b/ravenwood/scripts/run-ravenwood-tests.sh @@ -15,7 +15,7 @@ # Run all the ravenwood tests + hoststubgen unit tests. -all_tests="hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test" +all_tests="hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test ravenwood-stats-checker" # "echo" is to remove the newlines all_tests="$all_tests $(echo $(${0%/*}/list-ravenwood-tests.sh) )" diff --git a/ravenwood/framework-minus-apex-ravenwood-policies.txt b/ravenwood/texts/framework-minus-apex-ravenwood-policies.txt index 371c3acab144..371c3acab144 100644 --- a/ravenwood/framework-minus-apex-ravenwood-policies.txt +++ b/ravenwood/texts/framework-minus-apex-ravenwood-policies.txt diff --git a/ravenwood/ravenwood-annotation-allowed-classes.txt b/ravenwood/texts/ravenwood-annotation-allowed-classes.txt index 9b4d378cc7b7..9b4d378cc7b7 100644 --- a/ravenwood/ravenwood-annotation-allowed-classes.txt +++ b/ravenwood/texts/ravenwood-annotation-allowed-classes.txt diff --git a/ravenwood/ravenwood-services-jarjar-rules.txt b/ravenwood/texts/ravenwood-services-jarjar-rules.txt index 8fdd3408f74d..8fdd3408f74d 100644 --- a/ravenwood/ravenwood-services-jarjar-rules.txt +++ b/ravenwood/texts/ravenwood-services-jarjar-rules.txt diff --git a/ravenwood/ravenwood-standard-options.txt b/ravenwood/texts/ravenwood-standard-options.txt index f64f26d7962a..f64f26d7962a 100644 --- a/ravenwood/ravenwood-standard-options.txt +++ b/ravenwood/texts/ravenwood-standard-options.txt diff --git a/ravenwood/services.core-ravenwood-policies.txt b/ravenwood/texts/services.core-ravenwood-policies.txt index d8d563e05435..d8d563e05435 100644 --- a/ravenwood/services.core-ravenwood-policies.txt +++ b/ravenwood/texts/services.core-ravenwood-policies.txt diff --git a/services/Android.bp b/services/Android.bp index 7bbb42e9a88f..29d1acf5f350 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -254,6 +254,7 @@ java_library { required: [ "libukey2_jni_shared", "protolog.conf.json.gz", + "core.protolog.pb", ], lint: { baseline_filename: "lint-baseline.xml", diff --git a/services/accessibility/Android.bp b/services/accessibility/Android.bp index 69cc68a55108..467adc7a9628 100644 --- a/services/accessibility/Android.bp +++ b/services/accessibility/Android.bp @@ -34,6 +34,8 @@ java_library_static { ], static_libs: [ "com_android_server_accessibility_flags_lib", + "//frameworks/base/packages/SystemUI/aconfig:com_android_systemui_flags_lib", + ], } diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 940379699ee6..66ddff06d848 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -243,6 +243,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub private static final String SET_PIP_ACTION_REPLACEMENT = "setPictureInPictureActionReplacingConnection"; + /** + * An intent action to launch Hearing devices dialog. + */ + @VisibleForTesting + static final String ACTION_LAUNCH_HEARING_DEVICES_DIALOG = + "com.android.systemui.action.LAUNCH_HEARING_DEVICES_DIALOG"; + private static final char COMPONENT_NAME_SEPARATOR = ':'; private static final int OWN_PROCESS_ID = android.os.Process.myPid(); @@ -2311,6 +2318,14 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub } } + private void launchHearingDevicesDialog() { + final Intent intent = new Intent(ACTION_LAUNCH_HEARING_DEVICES_DIALOG); + intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND); + intent.setPackage( + mContext.getString(com.android.internal.R.string.config_systemUi)); + mContext.sendBroadcastAsUser(intent, UserHandle.SYSTEM); + } + private void notifyAccessibilityButtonVisibilityChangedLocked(boolean available) { final AccessibilityUserState state = getCurrentUserStateLocked(); mIsAccessibilityButtonShown = available; @@ -4120,7 +4135,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub private void launchAccessibilityFrameworkFeature(int displayId, ComponentName assignedTarget) { if (assignedTarget.equals(ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME)) { - launchAccessibilitySubSettings(displayId, ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME); + //import com.android.systemui.Flags; + if (com.android.systemui.Flags.hearingAidsQsTileDialog()) { + launchHearingDevicesDialog(); + } else { + launchAccessibilitySubSettings(displayId, + ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME); + } } } diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 90a9d1beadec..0a2aaeba57b4 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -1192,7 +1192,7 @@ public final class ActiveServices { // Use that as a shortcut if possible to avoid having to recheck all the conditions. final boolean whileInUseAllowsUiJobScheduling = ActivityManagerService.doesReasonCodeAllowSchedulingUserInitiatedJobs( - r.getFgsAllowWiu_forStart()); + r.getFgsAllowWiu_forStart(), callingUid); r.updateAllowUiJobScheduling(whileInUseAllowsUiJobScheduling || mAm.canScheduleUserInitiatedJobs(callingUid, callingPid, callingPackage)); } else { @@ -8157,7 +8157,7 @@ public final class ActiveServices { BackgroundStartPrivileges.NONE); @ReasonCode int allowStartFgs = shouldAllowFgsStartForegroundNoBindingCheckLocked( allowWhileInUse, callingPid, callingUid, callingPackage, null /* targetService */, - BackgroundStartPrivileges.NONE, null); + BackgroundStartPrivileges.NONE); if (allowStartFgs == REASON_DENIED) { if (canBindingClientStartFgsLocked(callingUid) != null) { @@ -8413,8 +8413,7 @@ public final class ActiveServices { allowWhileInUse2, clientPid, clientUid, clientPackageName, null /* targetService */, - BackgroundStartPrivileges.NONE, - pr); + BackgroundStartPrivileges.NONE); if (allowStartFgs != REASON_DENIED) { return new Pair<>(allowStartFgs, clientPackageName); } else { @@ -8451,7 +8450,7 @@ public final class ActiveServices { ActivityManagerService.FgsTempAllowListItem tempAllowListReason = r.mInfoTempFgsAllowListReason = mAm.isAllowlistedForFgsStartLOSP(callingUid); int ret = shouldAllowFgsStartForegroundNoBindingCheckLocked(allowWhileInUse, callingPid, - callingUid, callingPackage, r, backgroundStartPrivileges, null); + callingUid, callingPackage, r, backgroundStartPrivileges); // If an app (App 1) is bound by another app (App 2) that could start an FGS, then App 1 // is also allowed to start an FGS. We check all the binding @@ -8507,8 +8506,7 @@ public final class ActiveServices { private @ReasonCode int shouldAllowFgsStartForegroundNoBindingCheckLocked( @ReasonCode int allowWhileInUse, int callingPid, int callingUid, String callingPackage, @Nullable ServiceRecord targetService, - BackgroundStartPrivileges backgroundStartPrivileges, - @Nullable ProcessRecord targetRecord) { + BackgroundStartPrivileges backgroundStartPrivileges) { int ret = allowWhileInUse; if (ret == REASON_DENIED) { @@ -8565,31 +8563,24 @@ public final class ActiveServices { } } - // The flag being enabled isn't enough to deny background start: we need to also check - // if there is a system alert UI present. if (ret == REASON_DENIED) { - // Flag check: are we disabling SAW FGS background starts? - final boolean shouldDisableSaw = Flags.fgsDisableSaw() - && CompatChanges.isChangeEnabled(FGS_SAW_RESTRICTIONS, callingUid); - if (shouldDisableSaw) { - if (targetRecord == null) { - synchronized (mAm.mPidsSelfLocked) { - targetRecord = mAm.mPidsSelfLocked.get(callingPid); - } - } - if (targetRecord != null) { - if (targetRecord.mState.hasOverlayUi()) { - if (mAm.mAtmInternal.hasSystemAlertWindowPermission(callingUid, callingPid, - callingPackage)) { - ret = REASON_SYSTEM_ALERT_WINDOW_PERMISSION; + if (mAm.mAtmInternal.hasSystemAlertWindowPermission( + callingUid, callingPid, callingPackage)) { + // Starting from Android V, it is not enough to only have the SYSTEM_ALERT_WINDOW + // permission granted - apps must also be showing an overlay window. + if (Flags.fgsDisableSaw() + && CompatChanges.isChangeEnabled(FGS_SAW_RESTRICTIONS, callingUid)) { + final UidRecord uidRecord = mAm.mProcessList.getUidRecordLOSP(callingUid); + if (uidRecord != null) { + for (int i = uidRecord.getNumOfProcs() - 1; i >= 0; i--) { + final ProcessRecord pr = uidRecord.getProcessRecordByIndex(i); + if (pr != null && pr.mState.hasOverlayUi()) { + ret = REASON_SYSTEM_ALERT_WINDOW_PERMISSION; + break; + } } } - } else { - Slog.e(TAG, "Could not find process record for SAW check"); - } - } else { - if (mAm.mAtmInternal.hasSystemAlertWindowPermission(callingUid, callingPid, - callingPackage)) { + } else { // pre-V logic ret = REASON_SYSTEM_ALERT_WINDOW_PERMISSION; } } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 5941fd7013f4..0bc2a91e1935 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -136,6 +136,7 @@ import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_CONFIGURATION import static com.android.internal.util.FrameworkStatsLog.UNSAFE_INTENT_EVENT_REPORTED__EVENT_TYPE__INTERNAL_NON_EXPORTED_COMPONENT_MATCH; import static com.android.internal.util.FrameworkStatsLog.UNSAFE_INTENT_EVENT_REPORTED__EVENT_TYPE__NEW_MUTABLE_IMPLICIT_PENDING_INTENT_RETRIEVED; import static com.android.sdksandbox.flags.Flags.sdkSandboxInstrumentationInfo; +import static com.android.server.am.ActiveServices.FGS_SAW_RESTRICTIONS; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ALL; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ALLOWLISTS; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BACKGROUND_CHECK; @@ -414,6 +415,7 @@ import com.android.internal.os.BackgroundThread; import com.android.internal.os.BinderCallHeavyHitterWatcher.BinderCallHeavyHitterListener; import com.android.internal.os.BinderCallHeavyHitterWatcher.HeavyHitterContainer; import com.android.internal.os.BinderInternal; +import com.android.internal.os.BinderInternal.BinderProxyCountEventListener; import com.android.internal.os.BinderTransactionNameResolver; import com.android.internal.os.ByteTransferPipe; import com.android.internal.os.IResultReceiver; @@ -614,8 +616,8 @@ public class ActivityManagerService extends IActivityManager.Stub private static final int MINIMUM_MEMORY_GROWTH_THRESHOLD = 10 * 1000; // 10 MB /** - * The number of binder proxies we need to have before we start warning and - * dumping debug info. + * The number of binder proxies we need to have before we start dumping debug info + * and kill the offenders. */ private static final int BINDER_PROXY_HIGH_WATERMARK = 6000; @@ -625,6 +627,11 @@ public class ActivityManagerService extends IActivityManager.Stub */ private static final int BINDER_PROXY_LOW_WATERMARK = 5500; + /** + * The number of binder proxies we need to have before we start warning. + */ + private static final int BINDER_PROXY_WARNING_WATERMARK = 5750; + // Max character limit for a notification title. If the notification title is larger than this // the notification will not be legible to the user. private static final int MAX_BUGREPORT_TITLE_SIZE = 100; @@ -6461,7 +6468,7 @@ public class ActivityManagerService extends IActivityManager.Stub * This is a shortcut and <b>DOES NOT</b> include all reasons. * Use {@link #canScheduleUserInitiatedJobs(int, int, String)} to cover all cases. */ - static boolean doesReasonCodeAllowSchedulingUserInitiatedJobs(int reasonCode) { + static boolean doesReasonCodeAllowSchedulingUserInitiatedJobs(int reasonCode, int uid) { switch (reasonCode) { case REASON_PROC_STATE_PERSISTENT: case REASON_PROC_STATE_PERSISTENT_UI: @@ -6471,11 +6478,21 @@ public class ActivityManagerService extends IActivityManager.Stub case REASON_SYSTEM_UID: case REASON_START_ACTIVITY_FLAG: case REASON_ACTIVITY_VISIBILITY_GRACE_PERIOD: - case REASON_SYSTEM_ALERT_WINDOW_PERMISSION: case REASON_COMPANION_DEVICE_MANAGER: case REASON_BACKGROUND_ACTIVITY_PERMISSION: case REASON_INSTR_BACKGROUND_ACTIVITY_PERMISSION: return true; + case REASON_SYSTEM_ALERT_WINDOW_PERMISSION: + if (!Flags.fgsDisableSaw() + || !CompatChanges.isChangeEnabled(FGS_SAW_RESTRICTIONS, uid)) { + return true; + } else { + // With the new SAW restrictions starting Android V, only allow the app to + // schedule a user-initiated job if it's currently showing an overlay window + // in additional to holding the permission - this additional logic will be + // checked in #canScheduleUserInitiatedJobs(int, int, String) below since this + // method is simply a shortcut for checking based on the reason codes. + } } return false; } @@ -6488,7 +6505,7 @@ public class ActivityManagerService extends IActivityManager.Stub */ @GuardedBy(anyOf = {"this", "mProcLock"}) private boolean isProcessInStateToScheduleUserInitiatedJobsLocked( - @Nullable ProcessRecord pr, long nowElapsed) { + @Nullable ProcessRecord pr, long nowElapsed, int uid) { if (pr == null) { return false; } @@ -6505,7 +6522,7 @@ public class ActivityManagerService extends IActivityManager.Stub final int procstate = state.getCurProcState(); if (procstate <= PROCESS_STATE_BOUND_TOP) { if (doesReasonCodeAllowSchedulingUserInitiatedJobs( - getReasonCodeFromProcState(procstate))) { + getReasonCodeFromProcState(procstate), uid)) { return true; } } @@ -6547,7 +6564,8 @@ public class ActivityManagerService extends IActivityManager.Stub final long nowElapsed = SystemClock.elapsedRealtime(); final BackgroundStartPrivileges backgroundStartPrivileges; if (processRecord != null) { - if (isProcessInStateToScheduleUserInitiatedJobsLocked(processRecord, nowElapsed)) { + if (isProcessInStateToScheduleUserInitiatedJobsLocked( + processRecord, nowElapsed, uid)) { return true; } backgroundStartPrivileges = processRecord.getBackgroundStartPrivileges(); @@ -6573,17 +6591,30 @@ public class ActivityManagerService extends IActivityManager.Stub } final UidRecord uidRecord = mProcessList.getUidRecordLOSP(uid); + final boolean hasSawPermission = mAtmInternal.hasSystemAlertWindowPermission(uid, pid, + pkgName); + final boolean strictSawCheckEnabled = Flags.fgsDisableSaw() + && CompatChanges.isChangeEnabled(FGS_SAW_RESTRICTIONS, uid); if (uidRecord != null) { for (int i = uidRecord.getNumOfProcs() - 1; i >= 0; --i) { ProcessRecord pr = uidRecord.getProcessRecordByIndex(i); - if (isProcessInStateToScheduleUserInitiatedJobsLocked(pr, nowElapsed)) { + if (isProcessInStateToScheduleUserInitiatedJobsLocked(pr, nowElapsed, uid)) { return true; + } else if (hasSawPermission && strictSawCheckEnabled) { + // isProcessInStateToScheduleUserInitiatedJobsLocked() doesn't do a strict + // check for the SAW permission which is enabled from V onwards, so perform + // that here (pre-V versions will be checked in the conditional below) + // Starting Android V, only allow the app to schedule a user-initiated job + // if it's granted the permission and currently showing an overlay window + if (pr != null && pr.mState.hasOverlayUi()) { + return true; + } } } } - if (mAtmInternal.hasSystemAlertWindowPermission(uid, pid, pkgName)) { - // REASON_SYSTEM_ALERT_WINDOW_PERMISSION; + if (hasSawPermission && !strictSawCheckEnabled) { + // REASON_SYSTEM_ALERT_WINDOW_PERMISSION (pre-V) return true; } @@ -9063,34 +9094,10 @@ public class ActivityManagerService extends IActivityManager.Stub t.traceBegin("setBinderProxies"); BinderInternal.nSetBinderProxyCountWatermarks(BINDER_PROXY_HIGH_WATERMARK, - BINDER_PROXY_LOW_WATERMARK); + BINDER_PROXY_LOW_WATERMARK, BINDER_PROXY_WARNING_WATERMARK); BinderInternal.nSetBinderProxyCountEnabled(true); - BinderInternal.setBinderProxyCountCallback( - (uid) -> { - Slog.wtf(TAG, "Uid " + uid + " sent too many Binders to uid " - + Process.myUid()); - BinderProxy.dumpProxyDebugInfo(); - CriticalEventLog.getInstance().logExcessiveBinderCalls(uid); - if (uid == Process.SYSTEM_UID) { - Slog.i(TAG, "Skipping kill (uid is SYSTEM)"); - } else { - killUid(UserHandle.getAppId(uid), UserHandle.getUserId(uid), - ApplicationExitInfo.REASON_EXCESSIVE_RESOURCE_USAGE, - ApplicationExitInfo.SUBREASON_EXCESSIVE_BINDER_OBJECTS, - "Too many Binders sent to SYSTEM"); - // We need to run a GC here, because killing the processes involved - // actually isn't guaranteed to free up the proxies; in fact, if the - // GC doesn't run for a long time, we may even exceed the global - // proxy limit for a process (20000), resulting in system_server itself - // being killed. - // Note that the GC here might not actually clean up all the proxies, - // because the binder reference decrements will come in asynchronously; - // but if new processes belonging to the UID keep adding proxies, we - // will get another callback here, and run the GC again - this time - // cleaning up the old proxies. - VMRuntime.getRuntime().requestConcurrentGC(); - } - }, mHandler); + BinderInternal.setBinderProxyCountCallback(new MyBinderProxyCountEventListener(), + mHandler); t.traceEnd(); // setBinderProxies t.traceEnd(); // ActivityManagerStartApps @@ -9105,6 +9112,46 @@ public class ActivityManagerService extends IActivityManager.Stub } } + private class MyBinderProxyCountEventListener implements BinderProxyCountEventListener { + @Override + public void onLimitReached(int uid) { + Slog.wtf(TAG, "Uid " + uid + " sent too many Binders to uid " + + Process.myUid()); + BinderProxy.dumpProxyDebugInfo(); + CriticalEventLog.getInstance().logExcessiveBinderCalls(uid); + if (uid == Process.SYSTEM_UID) { + Slog.i(TAG, "Skipping kill (uid is SYSTEM)"); + } else { + killUid(UserHandle.getAppId(uid), UserHandle.getUserId(uid), + ApplicationExitInfo.REASON_EXCESSIVE_RESOURCE_USAGE, + ApplicationExitInfo.SUBREASON_EXCESSIVE_BINDER_OBJECTS, + "Too many Binders sent to SYSTEM"); + // We need to run a GC here, because killing the processes involved + // actually isn't guaranteed to free up the proxies; in fact, if the + // GC doesn't run for a long time, we may even exceed the global + // proxy limit for a process (20000), resulting in system_server itself + // being killed. + // Note that the GC here might not actually clean up all the proxies, + // because the binder reference decrements will come in asynchronously; + // but if new processes belonging to the UID keep adding proxies, we + // will get another callback here, and run the GC again - this time + // cleaning up the old proxies. + VMRuntime.getRuntime().requestConcurrentGC(); + } + } + + @Override + public void onWarningThresholdReached(int uid) { + if (Flags.logExcessiveBinderProxies()) { + Slog.w(TAG, "Uid " + uid + " sent too many (" + + BINDER_PROXY_WARNING_WATERMARK + ") Binders to uid " + Process.myUid()); + FrameworkStatsLog.write( + FrameworkStatsLog.EXCESSIVE_BINDER_PROXY_COUNT_REPORTED, + uid); + } + } + } + private void watchDeviceProvisioning(Context context) { // setting system property based on whether device is provisioned diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index 9c1ce666eddf..5a750c2ba6c8 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -71,7 +71,7 @@ import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL; -import static android.media.audio.Flags.foregroundAudioControl; +import static android.media.audio.Flags.roForegroundAudioControl; import static android.os.Process.SCHED_OTHER; import static android.os.Process.THREAD_GROUP_BACKGROUND; import static android.os.Process.THREAD_GROUP_DEFAULT; @@ -2212,7 +2212,7 @@ public class OomAdjuster { (fgsType & FOREGROUND_SERVICE_TYPE_LOCATION) != 0 ? PROCESS_CAPABILITY_FOREGROUND_LOCATION : 0; - if (foregroundAudioControl()) { // flag check + if (roForegroundAudioControl()) { // flag check final int fgsAudioType = FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK | FOREGROUND_SERVICE_TYPE_CAMERA | FOREGROUND_SERVICE_TYPE_MICROPHONE diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index be47f8581db3..ed58c4033c4c 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -34,7 +34,7 @@ import static android.media.audio.Flags.autoPublicVolumeApiHardening; import static android.media.audio.Flags.automaticBtDeviceType; import static android.media.audio.Flags.featureSpatialAudioHeadtrackingLowLatency; import static android.media.audio.Flags.focusFreezeTestApi; -import static android.media.audio.Flags.foregroundAudioControl; +import static android.media.audio.Flags.roForegroundAudioControl; import static android.media.audiopolicy.Flags.enableFadeManagerConfiguration; import static android.os.Process.FIRST_APPLICATION_UID; import static android.os.Process.INVALID_UID; @@ -4539,10 +4539,11 @@ public class AudioService extends IAudioService.Stub + focusFreezeTestApi()); pw.println("\tcom.android.media.audio.disablePrescaleAbsoluteVolume:" + disablePrescaleAbsoluteVolume()); + pw.println("\tcom.android.media.audio.setStreamVolumeOrder:" + setStreamVolumeOrder()); - pw.println("\tandroid.media.audio.foregroundAudioControl:" - + foregroundAudioControl()); + pw.println("\tandroid.media.audio.roForegroundAudioControl:" + + roForegroundAudioControl()); } private void dumpAudioMode(PrintWriter pw) { diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java index 14f3120b60b6..7df63b1dab66 100644 --- a/services/core/java/com/android/server/biometrics/AuthService.java +++ b/services/core/java/com/android/server/biometrics/AuthService.java @@ -869,9 +869,7 @@ public class AuthService extends SystemService { } if (faceAidlInstances != null && faceAidlInstances.length > 0) { - mFaceSensorConfigurations.addAidlConfigs(faceAidlInstances, - name -> IFace.Stub.asInterface(Binder.allowBlocking( - ServiceManager.waitForDeclaredService(name)))); + mFaceSensorConfigurations.addAidlConfigs(faceAidlInstances); } if (faceService != null) { @@ -909,9 +907,7 @@ public class AuthService extends SystemService { } if (fingerprintAidlInstances != null && fingerprintAidlInstances.length > 0) { - mFingerprintSensorConfigurations.addAidlSensors(fingerprintAidlInstances, - name -> IFingerprint.Stub.asInterface(Binder.allowBlocking( - ServiceManager.waitForDeclaredService(name)))); + mFingerprintSensorConfigurations.addAidlSensors(fingerprintAidlInstances); } if (fingerprintService != null) { diff --git a/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java b/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java index 7ee2a7ababb3..1037124d7048 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java @@ -729,8 +729,8 @@ public class FaceService extends SystemService { private List<ServiceProvider> getProviders( FaceSensorConfigurations faceSensorConfigurations) { final List<ServiceProvider> providers = new ArrayList<>(); - final Pair<String, SensorProps[]> filteredSensorProps = - filterAvailableHalInstances(faceSensorConfigurations); + final Pair<String, SensorProps[]> filteredSensorProps = filterAvailableHalInstances( + faceSensorConfigurations); providers.add(mFaceProviderFunction.getFaceProvider(filteredSensorProps, faceSensorConfigurations.getResetLockoutRequiresChallenge())); return providers; @@ -739,28 +739,36 @@ public class FaceService extends SystemService { @NonNull private Pair<String, SensorProps[]> filterAvailableHalInstances( FaceSensorConfigurations faceSensorConfigurations) { - Pair<String, SensorProps[]> finalSensorPair = faceSensorConfigurations.getSensorPair(); + String finalSensorInstance = faceSensorConfigurations.getSensorInstance(); if (faceSensorConfigurations.isSingleSensorConfigurationPresent()) { - return finalSensorPair; + return new Pair<>(finalSensorInstance, + faceSensorConfigurations.getSensorPropForInstance(finalSensorInstance)); } - - final Pair<String, SensorProps[]> virtualSensorProps = faceSensorConfigurations - .getSensorPairForInstance("virtual"); - - if (Utils.isVirtualEnabled(getContext())) { - if (virtualSensorProps != null) { - return virtualSensorProps; + final String virtualInstance = "virtual"; + final boolean isVirtualHalPresent = + faceSensorConfigurations.doesInstanceExist(virtualInstance); + if (Flags.faceVhalFeature() && Utils.isVirtualEnabled(getContext())) { + if (isVirtualHalPresent) { + return new Pair<>(virtualInstance, + faceSensorConfigurations.getSensorPropForInstance(virtualInstance)); } else { Slog.e(TAG, "Could not find virtual interface while it is enabled"); - return finalSensorPair; + return new Pair<>(finalSensorInstance, + faceSensorConfigurations.getSensorPropForInstance(finalSensorInstance)); } } else { - if (virtualSensorProps != null) { - return faceSensorConfigurations.getSensorPairNotForInstance("virtual"); + if (isVirtualHalPresent) { + final String notAVirtualInstance = + faceSensorConfigurations.getSensorNameNotForInstance(virtualInstance); + if (notAVirtualInstance != null) { + return new Pair<>(notAVirtualInstance, faceSensorConfigurations + .getSensorPropForInstance(notAVirtualInstance)); + } } } - return finalSensorPair; + return new Pair<>(finalSensorInstance, faceSensorConfigurations + .getSensorPropForInstance(finalSensorInstance)); } private Pair<List<FaceSensorPropertiesInternal>, List<String>> diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java index 1ba12134ab29..2dc03ed94b6c 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java @@ -1128,27 +1128,36 @@ public class FingerprintService extends SystemService { @NonNull private Pair<String, SensorProps[]> filterAvailableHalInstances( FingerprintSensorConfigurations fingerprintSensorConfigurations) { - Pair<String, SensorProps[]> finalSensorPair = - fingerprintSensorConfigurations.getSensorPair(); + final String finalSensorInstance = fingerprintSensorConfigurations.getSensorInstance(); if (fingerprintSensorConfigurations.isSingleSensorConfigurationPresent()) { - return finalSensorPair; + return new Pair<>(finalSensorInstance, + fingerprintSensorConfigurations.getSensorPropForInstance(finalSensorInstance)); } - - final Pair<String, SensorProps[]> virtualSensorPropsPair = fingerprintSensorConfigurations - .getSensorPairForInstance("virtual"); + final String virtualInstance = "virtual"; + final boolean isVirtualHalPresent = + fingerprintSensorConfigurations.doesInstanceExist(virtualInstance); if (Utils.isVirtualEnabled(getContext())) { - if (virtualSensorPropsPair != null) { - return virtualSensorPropsPair; + if (isVirtualHalPresent) { + return new Pair<>(virtualInstance, + fingerprintSensorConfigurations.getSensorPropForInstance(virtualInstance)); } else { Slog.e(TAG, "Could not find virtual interface while it is enabled"); - return finalSensorPair; + return new Pair<>(finalSensorInstance, + fingerprintSensorConfigurations.getSensorPropForInstance( + finalSensorInstance)); } } else { - if (virtualSensorPropsPair != null) { - return fingerprintSensorConfigurations.getSensorPairNotForInstance("virtual"); + if (isVirtualHalPresent) { + final String notAVirtualInstance = fingerprintSensorConfigurations + .getSensorNameNotForInstance(virtualInstance); + if (notAVirtualInstance != null) { + return new Pair<>(notAVirtualInstance, fingerprintSensorConfigurations + .getSensorPropForInstance(notAVirtualInstance)); + } } } - return finalSensorPair; + return new Pair<>(finalSensorInstance, fingerprintSensorConfigurations + .getSensorPropForInstance(finalSensorInstance)); } private Pair<List<FingerprintSensorPropertiesInternal>, List<String>> diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index 61ecb934dd38..70668cbea719 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -2139,7 +2139,7 @@ public class DisplayDeviceConfig { mAmbientLightSensor = SensorData.loadAmbientLightSensorConfig(config, mContext.getResources()); mScreenOffBrightnessSensor = SensorData.loadScreenOffBrightnessSensorConfig(config); - mProximitySensor = SensorData.loadProxSensorConfig(config); + mProximitySensor = SensorData.loadProxSensorConfig(mFlags, config); mTempSensor = SensorData.loadTempSensorConfig(mFlags, config); loadAmbientHorizonFromDdc(config); loadBrightnessChangeThresholds(config); diff --git a/services/core/java/com/android/server/display/config/SensorData.java b/services/core/java/com/android/server/display/config/SensorData.java index 8e716f8380b6..6ad13c3b8a40 100644 --- a/services/core/java/com/android/server/display/config/SensorData.java +++ b/services/core/java/com/android/server/display/config/SensorData.java @@ -129,21 +129,46 @@ public class SensorData { * Loads proximity sensor data from DisplayConfiguration */ @Nullable - public static SensorData loadProxSensorConfig(DisplayConfiguration config) { - SensorDetails sensorDetails = config.getProxSensor(); - if (sensorDetails != null) { - String name = sensorDetails.getName(); - String type = sensorDetails.getType(); - if ("".equals(name) && "".equals(type)) { + public static SensorData loadProxSensorConfig( + DisplayManagerFlags flags, DisplayConfiguration config) { + SensorData DEFAULT_SENSOR = new SensorData(); + List<SensorDetails> sensorDetailsList = config.getProxSensor(); + if (sensorDetailsList.isEmpty()) { + return DEFAULT_SENSOR; + } + + SensorData selectedSensor = DEFAULT_SENSOR; + // Prioritize flagged sensors. + for (SensorDetails sensorDetails : sensorDetailsList) { + String flagStr = sensorDetails.getFeatureFlag(); + if (flags.isUseFusionProxSensorEnabled() && + flags.getUseFusionProxSensorFlagName().equals(flagStr)) { + selectedSensor = loadSensorData(sensorDetails); + break; + } + } + + // Check for normal un-flagged sensor if a flagged one wasn't found. + if (DEFAULT_SENSOR == selectedSensor) { + for (SensorDetails sensorDetails : sensorDetailsList) { + if (sensorDetails.getFeatureFlag() != null) { + continue; + } + selectedSensor = loadSensorData(sensorDetails); + break; + } + } + + // Check if we shouldn't use a sensor at all. + if (DEFAULT_SENSOR != selectedSensor) { + if ("".equals(selectedSensor.name) && "".equals(selectedSensor.type)) { // <proxSensor> with empty values to the config means no sensor should be used. // See also {@link com.android.server.display.utils.SensorUtils} - return null; - } else { - return loadSensorData(sensorDetails); + selectedSensor = null; } - } else { - return new SensorData(); } + + return selectedSensor; } /** diff --git a/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java b/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java index 81f824e69cf3..50b1464c6123 100644 --- a/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java +++ b/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java @@ -144,12 +144,15 @@ public class DisplayManagerFlags { Flags::idleScreenRefreshRateTimeout ); - private final FlagState mRefactorDisplayPowerController = new FlagState( Flags.FLAG_REFACTOR_DISPLAY_POWER_CONTROLLER, Flags::refactorDisplayPowerController ); + private final FlagState mUseFusionProxSensor = new FlagState( + Flags.FLAG_USE_FUSION_PROX_SENSOR, + Flags::useFusionProxSensor + ); /** * @return {@code true} if 'port' is allowed in display layout configuration file. @@ -301,6 +304,14 @@ public class DisplayManagerFlags { return mRefactorDisplayPowerController.isEnabled(); } + public boolean isUseFusionProxSensorEnabled() { + return mUseFusionProxSensor.isEnabled(); + } + + public String getUseFusionProxSensorFlagName() { + return mUseFusionProxSensor.getName(); + } + /** * dumps all flagstates * @param pw printWriter @@ -331,6 +342,7 @@ public class DisplayManagerFlags { pw.println(" " + mIdleScreenRefreshRateTimeout); pw.println(" " + mRefactorDisplayPowerController); pw.println(" " + mResolutionBackupRestore); + pw.println(" " + mUseFusionProxSensor); } private static class FlagState { @@ -346,6 +358,10 @@ public class DisplayManagerFlags { mFlagFunction = flagFunction; } + private String getName() { + return mName; + } + private boolean isEnabled() { if (mEnabledSet) { if (DEBUG) { diff --git a/services/core/java/com/android/server/display/feature/display_flags.aconfig b/services/core/java/com/android/server/display/feature/display_flags.aconfig index 49a8553dd2cd..d4319cc2b633 100644 --- a/services/core/java/com/android/server/display/feature/display_flags.aconfig +++ b/services/core/java/com/android/server/display/feature/display_flags.aconfig @@ -235,3 +235,11 @@ flag { bug: "310026579" is_fixed_read_only: true } + +flag { + name: "use_fusion_prox_sensor" + namespace: "display_manager" + description: "Feature flag to control usage of a Fusion Proximity sensor if configued." + bug: "306203895" + is_fixed_read_only: true +} diff --git a/services/core/java/com/android/server/hdmi/HdmiCecController.java b/services/core/java/com/android/server/hdmi/HdmiCecController.java index a79fb88ea8b6..f6dfc9ea76d7 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecController.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecController.java @@ -528,15 +528,17 @@ final class HdmiCecController { */ @ServiceThreadOnly void pollDevices(DevicePollingCallback callback, int sourceAddress, int pickStrategy, - int retryCount) { + int retryCount, long pollingMessageInterval) { assertRunOnServiceThread(); // Extract polling candidates. No need to poll against local devices. List<Integer> pollingCandidates = pickPollCandidates(pickStrategy); ArrayList<Integer> allocated = new ArrayList<>(); + // pollStarted indication to avoid polling delay for the first message mControlHandler.postDelayed( - () -> runDevicePolling( - sourceAddress, pollingCandidates, retryCount, callback, allocated), + () + -> runDevicePolling(sourceAddress, pollingCandidates, retryCount, callback, + allocated, pollingMessageInterval, /**pollStarted**/ false), mPollDevicesDelay); } @@ -576,9 +578,10 @@ final class HdmiCecController { } @ServiceThreadOnly - private void runDevicePolling(final int sourceAddress, - final List<Integer> candidates, final int retryCount, - final DevicePollingCallback callback, final List<Integer> allocated) { + private void runDevicePolling(final int sourceAddress, final List<Integer> candidates, + final int retryCount, final DevicePollingCallback callback, + final List<Integer> allocated, final long pollingMessageInterval, + final boolean pollStarted) { assertRunOnServiceThread(); if (candidates.isEmpty()) { if (callback != null) { @@ -587,11 +590,10 @@ final class HdmiCecController { } return; } - final Integer candidate = candidates.remove(0); // Proceed polling action for the next address once polling action for the // previous address is done. - runOnIoThread(new Runnable() { + mIoHandler.postDelayed(new Runnable() { @Override public void run() { if (sendPollMessage(sourceAddress, candidate, retryCount)) { @@ -600,12 +602,12 @@ final class HdmiCecController { runOnServiceThread(new Runnable() { @Override public void run() { - runDevicePolling(sourceAddress, candidates, retryCount, callback, - allocated); + runDevicePolling(sourceAddress, candidates, retryCount, callback, allocated, + pollingMessageInterval, /**pollStarted**/ true); } }); } - }); + }, pollStarted ? pollingMessageInterval : 0); } @IoThreadOnly diff --git a/services/core/java/com/android/server/hdmi/HdmiCecFeatureAction.java b/services/core/java/com/android/server/hdmi/HdmiCecFeatureAction.java index 5db114b9c2eb..234d6d323838 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecFeatureAction.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecFeatureAction.java @@ -229,7 +229,13 @@ abstract class HdmiCecFeatureAction { protected final void pollDevices(DevicePollingCallback callback, int pickStrategy, int retryCount) { - mService.pollDevices(callback, getSourceAddress(), pickStrategy, retryCount); + pollDevices(callback, pickStrategy, retryCount, 0); + } + + protected final void pollDevices(DevicePollingCallback callback, int pickStrategy, + int retryCount, long pollingMessageInterval) { + mService.pollDevices( + callback, getSourceAddress(), pickStrategy, retryCount, pollingMessageInterval); } /** diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index d0532b995deb..91e35e9960e1 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -1823,10 +1823,10 @@ public class HdmiControlService extends SystemService { */ @ServiceThreadOnly void pollDevices(DevicePollingCallback callback, int sourceAddress, int pickStrategy, - int retryCount) { + int retryCount, long pollingMessageInterval) { assertRunOnServiceThread(); mCecController.pollDevices(callback, sourceAddress, checkPollStrategy(pickStrategy), - retryCount); + retryCount, pollingMessageInterval); } private int checkPollStrategy(int pickStrategy) { diff --git a/services/core/java/com/android/server/hdmi/HotplugDetectionAction.java b/services/core/java/com/android/server/hdmi/HotplugDetectionAction.java index da40ce5954e9..30842b24fc50 100644 --- a/services/core/java/com/android/server/hdmi/HotplugDetectionAction.java +++ b/services/core/java/com/android/server/hdmi/HotplugDetectionAction.java @@ -38,8 +38,10 @@ import java.util.List; final class HotplugDetectionAction extends HdmiCecFeatureAction { private static final String TAG = "HotPlugDetectionAction"; - public static final int POLLING_INTERVAL_MS_FOR_TV = 5000; - public static final int POLLING_INTERVAL_MS_FOR_PLAYBACK = 60000; + public static final long POLLING_MESSAGE_INTERVAL_MS_FOR_TV = 0; + public static final long POLLING_MESSAGE_INTERVAL_MS_FOR_PLAYBACK = 500; + public static final int POLLING_BATCH_INTERVAL_MS_FOR_TV = 5000; + public static final int POLLING_BATCH_INTERVAL_MS_FOR_PLAYBACK = 60000; public static final int TIMEOUT_COUNT = 3; private static final int AVR_COUNT_MAX = 3; @@ -69,8 +71,9 @@ final class HotplugDetectionAction extends HdmiCecFeatureAction { super(source); } - private int getPollingInterval() { - return mIsTvDevice ? POLLING_INTERVAL_MS_FOR_TV : POLLING_INTERVAL_MS_FOR_PLAYBACK; + private int getPollingBatchInterval() { + return mIsTvDevice ? POLLING_BATCH_INTERVAL_MS_FOR_TV + : POLLING_BATCH_INTERVAL_MS_FOR_PLAYBACK; } @Override @@ -83,7 +86,7 @@ final class HotplugDetectionAction extends HdmiCecFeatureAction { // Start timer without polling. // The first check for all devices will be initiated 15 seconds later for TV panels and 60 // seconds later for playback devices. - addTimer(mState, getPollingInterval()); + addTimer(mState, getPollingBatchInterval()); return true; } @@ -107,11 +110,11 @@ final class HotplugDetectionAction extends HdmiCecFeatureAction { } else if (tv().isSystemAudioActivated()) { pollAudioSystem(); } - addTimer(mState, POLLING_INTERVAL_MS_FOR_TV); + addTimer(mState, POLLING_BATCH_INTERVAL_MS_FOR_TV); return; } pollAllDevices(); - addTimer(mState, POLLING_INTERVAL_MS_FOR_PLAYBACK); + addTimer(mState, POLLING_BATCH_INTERVAL_MS_FOR_PLAYBACK); } } @@ -127,19 +130,24 @@ final class HotplugDetectionAction extends HdmiCecFeatureAction { mState = STATE_WAIT_FOR_NEXT_POLLING; pollAllDevices(); - addTimer(mState, getPollingInterval()); + addTimer(mState, getPollingBatchInterval()); } private void pollAllDevices() { Slog.v(TAG, "Poll all devices."); - pollDevices(new DevicePollingCallback() { - @Override - public void onPollingFinished(List<Integer> ackedAddress) { - checkHotplug(ackedAddress, false); - } - }, Constants.POLL_ITERATION_IN_ORDER - | Constants.POLL_STRATEGY_REMOTES_DEVICES, HdmiConfig.HOTPLUG_DETECTION_RETRY); + pollDevices( + new DevicePollingCallback() { + @Override + public void onPollingFinished(List<Integer> ackedAddress) { + checkHotplug(ackedAddress, false); + Slog.v(TAG, "Finish poll all devices."); + } + }, + Constants.POLL_ITERATION_IN_ORDER | Constants.POLL_STRATEGY_REMOTES_DEVICES, + HdmiConfig.HOTPLUG_DETECTION_RETRY, + mIsTvDevice ? POLLING_MESSAGE_INTERVAL_MS_FOR_TV + : POLLING_MESSAGE_INTERVAL_MS_FOR_PLAYBACK); } private void pollAudioSystem() { diff --git a/services/core/java/com/android/server/input/AmbientKeyboardBacklightController.java b/services/core/java/com/android/server/input/AmbientKeyboardBacklightController.java index ce868497b0e4..569322c8b501 100644 --- a/services/core/java/com/android/server/input/AmbientKeyboardBacklightController.java +++ b/services/core/java/com/android/server/input/AmbientKeyboardBacklightController.java @@ -234,6 +234,9 @@ final class AmbientKeyboardBacklightController implements DisplayManager.Display DisplayManagerInternal displayManagerInternal = LocalServices.getService( DisplayManagerInternal.class); DisplayInfo displayInfo = displayManagerInternal.getDisplayInfo(Display.DEFAULT_DISPLAY); + if (displayInfo == null) { + return; + } synchronized (sAmbientControllerLock) { if (Objects.equals(mCurrentDefaultDisplayUniqueId, displayInfo.uniqueId)) { return; diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 493c4a0e749b..5fb66d08d1ee 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -22,6 +22,9 @@ import static android.Manifest.permission.STATUS_BAR_SERVICE; import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND; import static android.app.ActivityManagerInternal.ServiceNotificationPolicy.NOT_FOREGROUND_SERVICE; import static android.app.AppOpsManager.MODE_ALLOWED; +import static android.app.Flags.FLAG_LIFETIME_EXTENSION_REFACTOR; +import static android.app.Flags.lifetimeExtensionRefactor; +import static android.app.Flags.updateRankingTime; import static android.app.Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION; import static android.app.Notification.EXTRA_BUILDER_APPLICATION_INFO; import static android.app.Notification.EXTRA_LARGE_ICON_BIG; @@ -34,7 +37,6 @@ import static android.app.Notification.FLAG_AUTO_CANCEL; import static android.app.Notification.FLAG_BUBBLE; import static android.app.Notification.FLAG_FOREGROUND_SERVICE; import static android.app.Notification.FLAG_FSI_REQUESTED_BUT_DENIED; -import static android.app.Notification.FLAG_INSISTENT; import static android.app.Notification.FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY; import static android.app.Notification.FLAG_NO_CLEAR; import static android.app.Notification.FLAG_NO_DISMISS; @@ -71,8 +73,6 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; -import static android.app.Flags.FLAG_LIFETIME_EXTENSION_REFACTOR; -import static android.app.Flags.lifetimeExtensionRefactor; import static android.app.NotificationManager.zenModeFromInterruptionFilter; import static android.app.StatusBarManager.ACTION_KEYGUARD_PRIVATE_NOTIFICATIONS_CHANGED; import static android.app.StatusBarManager.EXTRA_KM_PRIVATE_NOTIFS_ALLOWED; @@ -88,8 +88,6 @@ import static android.content.pm.PackageManager.MATCH_ANY_USER; import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE; import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE; import static android.content.pm.PackageManager.PERMISSION_GRANTED; -import static android.media.audio.Flags.focusExclusiveWithRecording; -import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE; import static android.os.Flags.allowPrivateProfile; import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL; import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL; @@ -98,8 +96,8 @@ import static android.os.PowerWhitelistManager.TEMPORARY_ALLOWLIST_TYPE_FOREGROU import static android.os.UserHandle.USER_ALL; import static android.os.UserHandle.USER_NULL; import static android.os.UserHandle.USER_SYSTEM; -import static android.service.notification.Flags.redactSensitiveNotificationsFromUntrustedListeners; import static android.service.notification.Flags.callstyleCallbackApi; +import static android.service.notification.Flags.redactSensitiveNotificationsFromUntrustedListeners; import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING; import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS; import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING; @@ -139,10 +137,9 @@ import static android.service.notification.NotificationListenerService.Ranking.R import static android.service.notification.NotificationListenerService.Ranking.RANKING_UNCHANGED; import static android.service.notification.NotificationListenerService.TRIM_FULL; import static android.service.notification.NotificationListenerService.TRIM_LIGHT; -import static android.view.contentprotection.flags.Flags.rapidClearNotificationsByListenerAppOpEnabled; import static android.view.WindowManager.LayoutParams.TYPE_TOAST; +import static android.view.contentprotection.flags.Flags.rapidClearNotificationsByListenerAppOpEnabled; -import static android.app.Flags.updateRankingTime; import static com.android.internal.util.FrameworkStatsLog.DND_MODE_RULE; import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_CHANNEL_GROUP_PREFERENCES; import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_CHANNEL_PREFERENCES; @@ -185,7 +182,6 @@ import android.app.INotificationManager; import android.app.ITransientNotification; import android.app.ITransientNotificationCallback; import android.app.IUriGrantsManager; -import android.app.KeyguardManager; import android.app.Notification; import android.app.Notification.MessagingStyle; import android.app.NotificationChannel; @@ -199,7 +195,6 @@ import android.app.Person; import android.app.RemoteServiceException.BadForegroundServiceNotificationException; import android.app.RemoteServiceException.BadUserInitiatedJobNotificationException; import android.app.StatsManager; -import android.app.StatusBarManager; import android.app.UriGrantsManager; import android.app.admin.DevicePolicyManagerInternal; import android.app.backup.BackupManager; @@ -238,7 +233,6 @@ import android.content.pm.VersionedPackage; import android.content.res.Resources; import android.database.ContentObserver; import android.graphics.drawable.Icon; -import android.media.AudioAttributes; import android.metrics.LogMaker; import android.net.Uri; import android.os.Binder; @@ -267,7 +261,6 @@ import android.os.SystemProperties; import android.os.Trace; import android.os.UserHandle; import android.os.UserManager; -import android.os.VibrationEffect; import android.os.WorkSource; import android.permission.PermissionManager; import android.provider.DeviceConfig; @@ -293,7 +286,6 @@ import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeProto; import android.service.notification.ZenPolicy; import android.telecom.TelecomManager; -import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.text.format.DateUtils; @@ -310,7 +302,6 @@ import android.util.StatsEvent; import android.util.Xml; import android.util.proto.ProtoOutputStream; import android.view.Display; -import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.widget.RemoteViews; import android.widget.Toast; @@ -350,7 +341,6 @@ import com.android.server.LocalServices; import com.android.server.SystemService; import com.android.server.job.JobSchedulerInternal; import com.android.server.lights.LightsManager; -import com.android.server.lights.LogicalLight; import com.android.server.notification.GroupHelper.NotificationAttributes; import com.android.server.notification.ManagedServices.ManagedServiceInfo; import com.android.server.notification.ManagedServices.UserProfiles; @@ -8499,7 +8489,7 @@ public class NotificationManagerService extends SystemService { r.isUpdate = true; final boolean isInterruptive = isVisuallyInterruptive(old, r); r.setTextChanged(isInterruptive); - if (updateRankingTime()) { + if (android.app.Flags.updateRankingTime()) { if (isInterruptive) { r.resetRankingTime(); } @@ -8644,14 +8634,26 @@ public class NotificationManagerService extends SystemService { return false; } - // Ignore visual interruptions from foreground services because users - // consider them one 'session'. Count them for everything else. - if ((r.getSbn().getNotification().flags & FLAG_FOREGROUND_SERVICE) != 0) { - if (DEBUG_INTERRUPTIVENESS) { - Slog.v(TAG, "INTERRUPTIVENESS: " - + r.getKey() + " is not interruptive: foreground service"); + if (android.app.Flags.updateRankingTime()) { + // Ignore visual interruptions from FGS/UIJs because users + // consider them one 'session'. Count them for everything else. + if (r.getSbn().getNotification().isFgsOrUij()) { + if (DEBUG_INTERRUPTIVENESS) { + Slog.v(TAG, "INTERRUPTIVENESS: " + + r.getKey() + " is not interruptive: FGS/UIJ"); + } + return false; + } + } else { + // Ignore visual interruptions from foreground services because users + // consider them one 'session'. Count them for everything else. + if ((r.getSbn().getNotification().flags & FLAG_FOREGROUND_SERVICE) != 0) { + if (DEBUG_INTERRUPTIVENESS) { + Slog.v(TAG, "INTERRUPTIVENESS: " + + r.getKey() + " is not interruptive: foreground service"); + } + return false; } - return false; } final String oldTitle = String.valueOf(oldN.extras.get(Notification.EXTRA_TITLE)); diff --git a/services/core/java/com/android/server/notification/NotificationRecord.java b/services/core/java/com/android/server/notification/NotificationRecord.java index 7e58d0af6195..a4464a1cbb14 100644 --- a/services/core/java/com/android/server/notification/NotificationRecord.java +++ b/services/core/java/com/android/server/notification/NotificationRecord.java @@ -1090,7 +1090,7 @@ public final class NotificationRecord { Notification n = getNotification(); // Take developer provided 'when', unless it's in the future. if (updateRankingTime()) { - if (n.when != n.creationTime && n.when <= getSbn().getPostTime()){ + if (n.hasAppProvidedWhen() && n.when <= getSbn().getPostTime()){ return n.when; } } else { diff --git a/services/core/java/com/android/server/notification/NotificationTimeComparator.java b/services/core/java/com/android/server/notification/NotificationTimeComparator.java new file mode 100644 index 000000000000..550c428a6e7c --- /dev/null +++ b/services/core/java/com/android/server/notification/NotificationTimeComparator.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.notification; + +import java.util.Comparator; + +/** + * Sorts notifications by stabilised recency. + */ +public class NotificationTimeComparator implements Comparator<NotificationRecord> { + /** + * Sorts by time, with some stability being applied to updates + * + * Time stability logic lives in NotificationRecord. + */ + @Override + public int compare(NotificationRecord left, NotificationRecord right) { + // earliest first + return -1 * Long.compare(left.getRankingTimeMs(), right.getRankingTimeMs()); + } +} diff --git a/services/core/java/com/android/server/notification/RankingHelper.java b/services/core/java/com/android/server/notification/RankingHelper.java index 773d10b1f076..7b12d8686f0e 100644 --- a/services/core/java/com/android/server/notification/RankingHelper.java +++ b/services/core/java/com/android/server/notification/RankingHelper.java @@ -15,6 +15,8 @@ */ package com.android.server.notification; +import static android.app.Flags.sortSectionByTime; +import static android.app.NotificationManager.IMPORTANCE_MIN; import static android.text.TextUtils.formatSimple; import android.annotation.NonNull; @@ -28,12 +30,13 @@ import android.util.proto.ProtoOutputStream; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; public class RankingHelper { private static final String TAG = "RankingHelper"; private final NotificationSignalExtractor[] mSignalExtractors; - private final NotificationComparator mPreliminaryComparator; + private final Comparator mPreliminaryComparator; private final GlobalSortKeyComparator mFinalComparator = new GlobalSortKeyComparator(); private final ArrayMap<String, NotificationRecord> mProxyByGroupTmp = new ArrayMap<>(); @@ -46,7 +49,11 @@ public class RankingHelper { ZenModeHelper zenHelper, NotificationUsageStats usageStats, String[] extractorNames) { mContext = context; mRankingHandler = rankingHandler; - mPreliminaryComparator = new NotificationComparator(mContext); + if (sortSectionByTime()) { + mPreliminaryComparator = new NotificationTimeComparator(); + } else { + mPreliminaryComparator = new NotificationComparator(mContext); + } final int N = extractorNames.length; mSignalExtractors = new NotificationSignalExtractor[N]; @@ -104,9 +111,13 @@ public class RankingHelper { } // Rank each record individually. - // Lock comparator state for consistent compare() results. - synchronized (mPreliminaryComparator.mStateLock) { + if (sortSectionByTime()) { notificationList.sort(mPreliminaryComparator); + } else { + // Lock comparator state for consistent compare() results. + synchronized (((NotificationComparator) mPreliminaryComparator).mStateLock) { + notificationList.sort(mPreliminaryComparator); + } } synchronized (mProxyByGroupTmp) { @@ -114,10 +125,22 @@ public class RankingHelper { for (int i = 0; i < N; i++) { final NotificationRecord record = notificationList.get(i); record.setAuthoritativeRank(i); - final String groupKey = record.getGroupKey(); - NotificationRecord existingProxy = mProxyByGroupTmp.get(groupKey); - if (existingProxy == null) { - mProxyByGroupTmp.put(groupKey, record); + if (sortSectionByTime()) { + final String groupKey = record.getGroupKey(); + NotificationRecord existingProxy = mProxyByGroupTmp.get(groupKey); + // summaries are mostly hidden in systemui - if there is a child notification + // with better information, use its rank + if (existingProxy == null + || (existingProxy.getNotification().isGroupSummary() + && !existingProxy.getNotification().hasAppProvidedWhen())) { + mProxyByGroupTmp.put(groupKey, record); + } + } else { + final String groupKey = record.getGroupKey(); + NotificationRecord existingProxy = mProxyByGroupTmp.get(groupKey); + if (existingProxy == null) { + mProxyByGroupTmp.put(groupKey, record); + } } } // assign global sort key: @@ -142,12 +165,14 @@ public class RankingHelper { } boolean isGroupSummary = record.getNotification().isGroupSummary(); + char intrusiveRank = sortSectionByTime() + ? '2' + : record.isRecentlyIntrusive() && record.getImportance() > IMPORTANCE_MIN + ? '0' : '1'; record.setGlobalSortKey( formatSimple("crtcl=0x%04x:intrsv=%c:grnk=0x%04x:gsmry=%c:%s:rnk=0x%04x", record.getCriticality(), - record.isRecentlyIntrusive() - && record.getImportance() > NotificationManager.IMPORTANCE_MIN - ? '0' : '1', + intrusiveRank, groupProxy.getAuthoritativeRank(), isGroupSummary ? '0' : '1', groupSortKeyPortion, diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 59faf24aa77a..1868b6325d6b 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -45,6 +45,7 @@ import android.content.IntentSender; import android.content.pm.ApplicationInfo; import android.content.pm.ArchivedPackageParcel; import android.content.pm.FeatureInfo; +import android.content.pm.Flags; import android.content.pm.IPackageDataObserver; import android.content.pm.IPackageInstaller; import android.content.pm.IPackageManager; @@ -4489,7 +4490,9 @@ class PackageManagerShellCommand extends ShellCommand { pw.println(" -d: filter to only show disabled packages"); pw.println(" -e: filter to only show enabled packages"); pw.println(" -s: filter to only show system packages"); - pw.println(" -q: filter to only show quarantined packages"); + if (Flags.quarantinedEnabled()) { + pw.println(" -q: filter to only show quarantined packages"); + } pw.println(" -3: filter to only show third party packages"); pw.println(" -i: see the installer for the packages"); pw.println(" -l: ignored (used for compatibility with older releases)"); diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index f5ed8d4af45b..9f2c36a1c34a 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -93,6 +93,7 @@ import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.BackgroundThread; +import com.android.internal.pm.parsing.pkg.AndroidPackageInternal; import com.android.internal.pm.pkg.component.ParsedComponent; import com.android.internal.pm.pkg.component.ParsedIntentInfo; import com.android.internal.pm.pkg.component.ParsedPermission; @@ -911,8 +912,10 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile sharedUserSetting.mDisabledPackages.remove(p); } p.getPkgState().setUpdatedSystemApp(false); + final AndroidPackageInternal pkg = p.getPkg(); PackageSetting ret = addPackageLPw(name, p.getRealName(), p.getPath(), p.getAppId(), - p.getFlags(), p.getPrivateFlags(), mDomainVerificationManager.generateNewId()); + p.getFlags(), p.getPrivateFlags(), mDomainVerificationManager.generateNewId(), + pkg == null ? false : pkg.isSdkLibrary()); if (ret != null) { ret.setLegacyNativeLibraryPath(p.getLegacyNativeLibraryPath()); ret.setPrimaryCpuAbi(p.getPrimaryCpuAbiLegacy()); @@ -951,8 +954,8 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile } } - PackageSetting addPackageLPw(String name, String realName, File codePath, int uid, int pkgFlags, - int pkgPrivateFlags, @NonNull UUID domainSetId) { + PackageSetting addPackageLPw(String name, String realName, File codePath, int uid, + int pkgFlags, int pkgPrivateFlags, @NonNull UUID domainSetId, boolean isSdkLibrary) { PackageSetting p = mPackages.get(name); if (p != null) { if (p.getAppId() == uid) { @@ -964,7 +967,8 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile } p = new PackageSetting(name, realName, codePath, pkgFlags, pkgPrivateFlags, domainSetId) .setAppId(uid); - if (mAppIds.registerExistingAppId(uid, p, name)) { + if ((uid == Process.INVALID_UID && isSdkLibrary && Flags.disallowSdkLibsToBeApps()) + || mAppIds.registerExistingAppId(uid, p, name)) { mPackages.put(name, p); return p; } @@ -4176,7 +4180,7 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile } else if (appId > 0 || (appId == Process.INVALID_UID && isSdkLibrary && Flags.disallowSdkLibsToBeApps())) { packageSetting = addPackageLPw(name.intern(), realName, new File(codePathStr), - appId, pkgFlags, pkgPrivateFlags, domainSetId); + appId, pkgFlags, pkgPrivateFlags, domainSetId, isSdkLibrary); if (PackageManagerService.DEBUG_SETTINGS) Log.i(PackageManagerService.TAG, "Reading package " + name + ": appId=" + appId + " pkg=" + packageSetting); diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index f5ac8306cfa9..63386a999d40 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -567,7 +567,7 @@ public class UserManagerService extends IUserManager.Stub { int autoLockPreference = Settings.Secure.getIntForUser(mContext.getContentResolver(), Settings.Secure.PRIVATE_SPACE_AUTO_LOCK, - Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER, + Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART, getMainUserIdUnchecked()); Slog.i(LOG_TAG, "Auto-lock settings changed to " + autoLockPreference); setOrUpdateAutoLockPreferenceForPrivateProfile(autoLockPreference); @@ -615,7 +615,7 @@ public class UserManagerService extends IUserManager.Stub { int privateSpaceAutoLockPreference = Settings.Secure.getIntForUser(mContext.getContentResolver(), Settings.Secure.PRIVATE_SPACE_AUTO_LOCK, - Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER, + Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART, getMainUserIdUnchecked()); if (privateSpaceAutoLockPreference != Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_INACTIVITY) { @@ -714,7 +714,7 @@ public class UserManagerService extends IUserManager.Stub { if (isAutoLockForPrivateSpaceEnabled()) { int autoLockPreference = Settings.Secure.getIntForUser(mContext.getContentResolver(), Settings.Secure.PRIVATE_SPACE_AUTO_LOCK, - Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER, + Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART, getMainUserIdUnchecked()); boolean isAutoLockOnDeviceLockSelected = autoLockPreference == Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_ON_DEVICE_LOCK; @@ -1052,7 +1052,8 @@ public class UserManagerService extends IUserManager.Stub { setOrUpdateAutoLockPreferenceForPrivateProfile( Settings.Secure.getIntForUser(mContext.getContentResolver(), Settings.Secure.PRIVATE_SPACE_AUTO_LOCK, - Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER, mainUserId)); + Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART, + mainUserId)); } } diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 3dec02ecc9a0..b5d49b36affe 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -179,6 +179,9 @@ public final class PowerManagerService extends SystemService // Message: Sent when an attentive timeout occurs to update the power state. private static final int MSG_ATTENTIVE_TIMEOUT = 5; + // Message: Sent when the policy want to release all timeout override wake locks. + private static final int MSG_RELEASE_ALL_OVERRIDE_WAKE_LOCKS = 6; + // Dirty bit: mWakeLocks changed private static final int DIRTY_WAKE_LOCKS = 1 << 0; // Dirty bit: mWakefulness changed @@ -219,6 +222,7 @@ public final class PowerManagerService extends SystemService static final int WAKE_LOCK_STAY_AWAKE = 1 << 5; // only set if already awake static final int WAKE_LOCK_DOZE = 1 << 6; static final int WAKE_LOCK_DRAW = 1 << 7; + static final int WAKE_LOCK_SCREEN_TIMEOUT_OVERRIDE = 1 << 8; // Summarizes the user activity state. static final int USER_ACTIVITY_SCREEN_BRIGHT = 1 << 0; @@ -616,7 +620,8 @@ public final class PowerManagerService extends SystemService public final float mScreenBrightnessDim; // Value we store for tracking face down behavior. - private boolean mIsFaceDown = false; + @VisibleForTesting + boolean mIsFaceDown = false; private long mLastFlipTime = 0L; // The screen brightness setting override from the window manager @@ -707,6 +712,9 @@ public final class PowerManagerService extends SystemService // Whether to keep dreaming when the device is unplugging. private boolean mKeepDreamingWhenUnplugging; + @GuardedBy("mLock") + private ScreenTimeoutOverridePolicy mScreenTimeoutOverridePolicy; + private final class DreamManagerStateListener implements DreamManagerInternal.DreamManagerStateListener { @Override @@ -734,6 +742,12 @@ public final class PowerManagerService extends SystemService userActivityNoUpdateLocked(mPowerGroups.get(groupId), eventTime, PowerManager.USER_ACTIVITY_EVENT_OTHER, flags, uid); } + + // Release wake lock when default display is not interactive. + if (mScreenTimeoutOverridePolicy != null && groupId == Display.DEFAULT_DISPLAY_GROUP) { + mScreenTimeoutOverridePolicy.onWakefulnessChange(mWakeLockSummary, wakefulness); + } + mDirty |= DIRTY_DISPLAY_GROUP_WAKEFULNESS; mNotifier.onGroupWakefulnessChangeStarted(groupId, wakefulness, reason, eventTime); updateGlobalWakefulnessLocked(eventTime, reason, uid, opUid, opPackageName, details); @@ -1401,6 +1415,13 @@ public final class PowerManagerService extends SystemService // Go. readConfigurationLocked(); updateSettingsLocked(); + if (mFeatureFlags.isEarlyScreenTimeoutDetectorEnabled()) { + mScreenTimeoutOverridePolicy = new ScreenTimeoutOverridePolicy(mContext, + mMinimumScreenOffTimeoutConfig, () -> { + Message msg = mHandler.obtainMessage(MSG_RELEASE_ALL_OVERRIDE_WAKE_LOCKS); + mHandler.sendMessageAtTime(msg, mClock.uptimeMillis()); + }); + } mDirty |= DIRTY_BATTERY_STATE; updatePowerStateLocked(); } @@ -1805,7 +1826,7 @@ public final class PowerManagerService extends SystemService } @GuardedBy("mLock") - private void removeWakeLockLocked(WakeLock wakeLock, int index) { + private void removeWakeLockNoUpdateLocked(WakeLock wakeLock, int index) { mWakeLocks.remove(index); UidState state = wakeLock.mUidState; state.mNumWakeLocks--; @@ -1813,10 +1834,15 @@ public final class PowerManagerService extends SystemService state.mProcState == ActivityManager.PROCESS_STATE_NONEXISTENT) { mUidState.remove(state.mUid); } - notifyWakeLockReleasedLocked(wakeLock); + notifyWakeLockReleasedLocked(wakeLock); applyWakeLockFlagsOnReleaseLocked(wakeLock); mDirty |= DIRTY_WAKE_LOCKS; + } + + @GuardedBy("mLock") + private void removeWakeLockLocked(WakeLock wakeLock, int index) { + removeWakeLockNoUpdateLocked(wakeLock, index); updatePowerStateLocked(); } @@ -1999,7 +2025,9 @@ public final class PowerManagerService extends SystemService case PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK: return mSystemReady && mDisplayManagerInternal.isProximitySensorAvailable(); - + case PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK: + return mSystemReady && mFeatureFlags.isEarlyScreenTimeoutDetectorEnabled() + && mScreenTimeoutOverridePolicy != null; default: return false; } @@ -2096,6 +2124,10 @@ public final class PowerManagerService extends SystemService mNotifier.onUserActivity(powerGroup.getGroupId(), event, uid); mAttentionDetector.onUserActivity(eventTime, event); + if (mScreenTimeoutOverridePolicy != null) { + mScreenTimeoutOverridePolicy.onUserActivity(mWakeLockSummary, event); + } + if (mUserInactiveOverrideFromWindowManager) { mUserInactiveOverrideFromWindowManager = false; mOverriddenTimeout = -1; @@ -2751,6 +2783,11 @@ public final class PowerManagerService extends SystemService } } + // Screen wake lock or non-interactive will release all override wake locks. + if (mScreenTimeoutOverridePolicy != null) { + mScreenTimeoutOverridePolicy.checkScreenWakeLock(mWakeLockSummary); + } + for (int idx = 0; idx < mPowerGroups.size(); idx++) { final PowerGroup powerGroup = mPowerGroups.valueAt(idx); final int wakeLockSummary = adjustWakeLockSummary(powerGroup.getWakefulnessLocked(), @@ -2826,6 +2863,8 @@ public final class PowerManagerService extends SystemService return WAKE_LOCK_DOZE; case PowerManager.DRAW_WAKE_LOCK: return WAKE_LOCK_DRAW; + case PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK: + return WAKE_LOCK_SCREEN_TIMEOUT_OVERRIDE; } return 0; } @@ -2906,11 +2945,10 @@ public final class PowerManagerService extends SystemService final long attentiveTimeout = getAttentiveTimeoutLocked(); final long sleepTimeout = getSleepTimeoutLocked(attentiveTimeout); - long screenOffTimeout = getScreenOffTimeoutLocked(sleepTimeout, + final long defaultScreenOffTimeout = getScreenOffTimeoutLocked(sleepTimeout, attentiveTimeout); - final long screenDimDuration = getScreenDimDurationLocked(screenOffTimeout); - screenOffTimeout = - getScreenOffTimeoutWithFaceDownLocked(screenOffTimeout, screenDimDuration); + final long defaultScreenDimDuration = getScreenDimDurationLocked(defaultScreenOffTimeout); + final boolean userInactiveOverride = mUserInactiveOverrideFromWindowManager; long nextTimeout = -1; boolean hasUserActivitySummary = false; @@ -2919,6 +2957,16 @@ public final class PowerManagerService extends SystemService long groupNextTimeout = 0; final PowerGroup powerGroup = mPowerGroups.valueAt(idx); final int wakefulness = powerGroup.getWakefulnessLocked(); + + // The default display screen timeout could be overridden by policy. + long screenOffTimeout = defaultScreenOffTimeout; + long screenDimDuration = defaultScreenDimDuration; + if (powerGroup.getGroupId() == Display.DEFAULT_DISPLAY_GROUP) { + screenOffTimeout = + getScreenOffTimeoutOverrideLocked(screenOffTimeout, screenDimDuration); + screenDimDuration = getScreenDimDurationLocked(screenOffTimeout); + } + if (wakefulness != WAKEFULNESS_ASLEEP) { final long lastUserActivityTime = powerGroup.getLastUserActivityTimeLocked(); final long lastUserActivityTimeNoChangeLights = @@ -3196,15 +3244,20 @@ public final class PowerManagerService extends SystemService (long)(screenOffTimeout * mMaximumScreenDimRatioConfig)); } + @VisibleForTesting @GuardedBy("mLock") - private long getScreenOffTimeoutWithFaceDownLocked( - long screenOffTimeout, long screenDimDuration) { - // If face down, we decrease the timeout to equal the dim duration so that the - // device will go into a dim state. + long getScreenOffTimeoutOverrideLocked(long screenOffTimeout, long screenDimDuration) { + long shortestScreenOffTimeout = screenOffTimeout; + if (mScreenTimeoutOverridePolicy != null) { + shortestScreenOffTimeout = + mScreenTimeoutOverridePolicy.getScreenTimeoutOverrideLocked( + mWakeLockSummary, screenOffTimeout); + } if (mIsFaceDown) { - return Math.min(screenDimDuration, screenOffTimeout); + shortestScreenOffTimeout = Math.min(screenDimDuration, shortestScreenOffTimeout); } - return screenOffTimeout; + + return shortestScreenOffTimeout; } /** @@ -4815,6 +4868,13 @@ public final class PowerManagerService extends SystemService mAmbientDisplaySuppressionController.dump(pw); mLowPowerStandbyController.dump(pw); + + synchronized (mLock) { + if (mScreenTimeoutOverridePolicy != null) { + mScreenTimeoutOverridePolicy.dump(pw); + } + } + mFeatureFlags.dump(pw); } @@ -5284,6 +5344,9 @@ public final class PowerManagerService extends SystemService case MSG_ATTENTIVE_TIMEOUT: handleAttentiveTimeout(); break; + case MSG_RELEASE_ALL_OVERRIDE_WAKE_LOCKS: + releaseAllOverrideWakeLocks(); + break; } return true; @@ -5475,21 +5538,23 @@ public final class PowerManagerService extends SystemService private String getLockLevelString() { switch (mFlags & PowerManager.WAKE_LOCK_LEVEL_MASK) { case PowerManager.FULL_WAKE_LOCK: - return "FULL_WAKE_LOCK "; + return "FULL_WAKE_LOCK "; case PowerManager.SCREEN_BRIGHT_WAKE_LOCK: - return "SCREEN_BRIGHT_WAKE_LOCK "; + return "SCREEN_BRIGHT_WAKE_LOCK "; case PowerManager.SCREEN_DIM_WAKE_LOCK: - return "SCREEN_DIM_WAKE_LOCK "; + return "SCREEN_DIM_WAKE_LOCK "; case PowerManager.PARTIAL_WAKE_LOCK: - return "PARTIAL_WAKE_LOCK "; + return "PARTIAL_WAKE_LOCK "; case PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK: - return "PROXIMITY_SCREEN_OFF_WAKE_LOCK"; + return "PROXIMITY_SCREEN_OFF_WAKE_LOCK "; case PowerManager.DOZE_WAKE_LOCK: - return "DOZE_WAKE_LOCK "; + return "DOZE_WAKE_LOCK "; case PowerManager.DRAW_WAKE_LOCK: - return "DRAW_WAKE_LOCK "; + return "DRAW_WAKE_LOCK "; + case PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK: + return "SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK"; default: - return "??? "; + return "??? "; } } @@ -5732,6 +5797,17 @@ public final class PowerManagerService extends SystemService mContext.enforceCallingOrSelfPermission( android.Manifest.permission.DEVICE_POWER, null); } + + if ((flags & PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK) != 0) { + if (!mFeatureFlags.isEarlyScreenTimeoutDetectorEnabled()) { + throw new IllegalArgumentException("Acquiring an unsupported wake lock:" + + " flags=" + flags + ", tag=" + tag); + } + + mContext.enforceCallingOrSelfPermission( + android.Manifest.permission.SCREEN_TIMEOUT_OVERRIDE, null); + } + if (ws != null && !ws.isEmpty()) { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.UPDATE_DEVICE_STATS, null); @@ -7182,4 +7258,23 @@ public final class PowerManagerService extends SystemService } return false; } + + private void releaseAllOverrideWakeLocks() { + synchronized (mLock) { + final int size = mWakeLocks.size(); + boolean change = false; + for (int i = size - 1; i >= 0; i--) { + final WakeLock wakeLock = mWakeLocks.get(i); + if ((wakeLock.mFlags & PowerManager.WAKE_LOCK_LEVEL_MASK) + == PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK) { + removeWakeLockNoUpdateLocked(wakeLock, i); + change = true; + } + } + + if (change) { + updatePowerStateLocked(); + } + } + } } diff --git a/services/core/java/com/android/server/power/ScreenTimeoutOverridePolicy.java b/services/core/java/com/android/server/power/ScreenTimeoutOverridePolicy.java new file mode 100644 index 000000000000..adde5189115c --- /dev/null +++ b/services/core/java/com/android/server/power/ScreenTimeoutOverridePolicy.java @@ -0,0 +1,173 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.power; + +import static android.os.PowerManagerInternal.WAKEFULNESS_AWAKE; + +import static com.android.server.power.PowerManagerService.WAKE_LOCK_BUTTON_BRIGHT; +import static com.android.server.power.PowerManagerService.WAKE_LOCK_SCREEN_BRIGHT; +import static com.android.server.power.PowerManagerService.WAKE_LOCK_SCREEN_DIM; +import static com.android.server.power.PowerManagerService.WAKE_LOCK_SCREEN_TIMEOUT_OVERRIDE; + +import android.content.Context; +import android.os.PowerManager; +import android.util.IndentingPrintWriter; +import android.util.Slog; + +import com.android.internal.annotations.VisibleForTesting; + +import java.io.PrintWriter; + +/** + * Policy that handle the screen timeout override wake lock behavior. + */ +@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) +final class ScreenTimeoutOverridePolicy { + private static final String TAG = "ScreenTimeoutOverridePolicy"; + + /** + * Release reason code: The wake lock is never acquired. + */ + public static final int RELEASE_REASON_UNKNOWN = -1; + + /** + * Release reason code: The wake lock can't be acquired because of screen off. + */ + public static final int RELEASE_REASON_NON_INTERACTIVE = 1; + + /** + * Release reason code: Release because user activity occurred. + */ + public static final int RELEASE_REASON_USER_ACTIVITY = 2; + /** + * Release reason code: Release because a screen lock is acquired. + */ + public static final int RELEASE_REASON_SCREEN_LOCK = 3; + + // The screen timeout override config in milliseconds. + private long mScreenTimeoutOverrideConfig; + + // The last reason that wake locks had been released by service. + private int mLastAutoReleaseReason = RELEASE_REASON_UNKNOWN; + + interface PolicyCallback { + /** + * Notify {@link PowerManagerService} to release all override wake locks. + */ + void releaseAllScreenTimeoutOverrideWakelocks(); + } + private PolicyCallback mPolicyCallback; + + ScreenTimeoutOverridePolicy(Context context, long minimumScreenOffTimeoutConfig, + PolicyCallback callback) { + mScreenTimeoutOverrideConfig = context.getResources().getInteger( + com.android.internal.R.integer.config_screenTimeoutOverride); + if (mScreenTimeoutOverrideConfig < minimumScreenOffTimeoutConfig) { + Slog.w(TAG, "Screen timeout override is smaller than the minimum timeout : " + + mScreenTimeoutOverrideConfig); + mScreenTimeoutOverrideConfig = -1; + } + mPolicyCallback = callback; + } + + /** + * Return the valid screen timeout override value. + */ + long getScreenTimeoutOverrideLocked(int wakeLockSummary, long screenOffTimeout) { + if (!isWakeLockAcquired(wakeLockSummary)) { + return screenOffTimeout; + } + + if (mScreenTimeoutOverrideConfig < 0) { + return screenOffTimeout; + } + + // If screen timeout overlay wake lock is acquired, return the policy timeout. + return Math.min(mScreenTimeoutOverrideConfig, screenOffTimeout); + } + + /** + * Called when the policy have to release all wake lock when user activity occurred. + */ + void onUserActivity(int wakeLockSummary, @PowerManager.UserActivityEvent int event) { + if (!isWakeLockAcquired(wakeLockSummary)) { + return; + } + + switch (event) { + case PowerManager.USER_ACTIVITY_EVENT_ATTENTION: + case PowerManager.USER_ACTIVITY_EVENT_OTHER: + case PowerManager.USER_ACTIVITY_EVENT_BUTTON: + case PowerManager.USER_ACTIVITY_EVENT_TOUCH: + case PowerManager.USER_ACTIVITY_EVENT_ACCESSIBILITY: + releaseAllWakeLocks(RELEASE_REASON_USER_ACTIVITY); + } + } + + /** + * Check the summary whether a screen wake lock acquired . + */ + void checkScreenWakeLock(int wakeLockSummary) { + if (!isWakeLockAcquired(wakeLockSummary)) { + return; + } + + if ((wakeLockSummary & (WAKE_LOCK_SCREEN_BRIGHT | WAKE_LOCK_SCREEN_DIM + | WAKE_LOCK_BUTTON_BRIGHT)) != 0) { + releaseAllWakeLocks(RELEASE_REASON_SCREEN_LOCK); + } + } + + /** + * Check the device is in non-interactive + */ + void onWakefulnessChange(int wakeLockSummary, int globalWakefulness) { + if (!isWakeLockAcquired(wakeLockSummary)) { + return; + } + + if (globalWakefulness != WAKEFULNESS_AWAKE) { + releaseAllWakeLocks(RELEASE_REASON_NON_INTERACTIVE); + } + } + + private boolean isWakeLockAcquired(int wakeLockSummary) { + return (wakeLockSummary & WAKE_LOCK_SCREEN_TIMEOUT_OVERRIDE) != 0; + } + + private void logReleaseReason() { + Slog.i(TAG, "Releasing all screen timeout override wake lock." + + " (reason=" + mLastAutoReleaseReason + ")"); + } + + private void releaseAllWakeLocks(int reason) { + mPolicyCallback.releaseAllScreenTimeoutOverrideWakelocks(); + mLastAutoReleaseReason = reason; + logReleaseReason(); + } + + void dump(PrintWriter pw) { + final IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " "); + + ipw.println(); + ipw.println("ScreenTimeoutOverridePolicy:"); + ipw.increaseIndent(); + + ipw.println("mScreenTimeoutOverrideConfig=" + mScreenTimeoutOverrideConfig); + ipw.println("mLastAutoReleaseReason=" + mLastAutoReleaseReason); + } +} diff --git a/services/core/java/com/android/server/power/WakeLockLog.java b/services/core/java/com/android/server/power/WakeLockLog.java index d3486a4a1cf8..b131311f76c7 100644 --- a/services/core/java/com/android/server/power/WakeLockLog.java +++ b/services/core/java/com/android/server/power/WakeLockLog.java @@ -86,7 +86,7 @@ final class WakeLockLog { private static final int TAG_DATABASE_SIZE = 128; private static final int TAG_DATABASE_SIZE_MAX = 128; - private static final int LEVEL_UNKNOWN = 0; + private static final int LEVEL_SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK = 0; private static final int LEVEL_PARTIAL_WAKE_LOCK = 1; private static final int LEVEL_FULL_WAKE_LOCK = 2; private static final int LEVEL_SCREEN_DIM_WAKE_LOCK = 3; @@ -96,7 +96,7 @@ final class WakeLockLog { private static final int LEVEL_DRAW_WAKE_LOCK = 7; private static final String[] LEVEL_TO_STRING = { - "unknown", + "override", "partial", "full", "screen-dim", @@ -311,6 +311,9 @@ final class WakeLockLog { case PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK: newFlags = LEVEL_PROXIMITY_SCREEN_OFF_WAKE_LOCK; break; + case PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK: + newFlags = LEVEL_SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK; + break; default: Slog.w(TAG, "Unsupported lock level for logging, flags: " + flags); break; diff --git a/services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java b/services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java index 881583ad8c91..2088e411f842 100644 --- a/services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java +++ b/services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java @@ -16,6 +16,7 @@ package com.android.server.stats.pull; +import android.annotation.NonNull; import android.app.ActivityManager; import android.app.StatsManager; import android.app.usage.NetworkStatsManager; @@ -125,6 +126,11 @@ class AggregatedMobileDataStatsPuller { @GuardedBy("mLock") private final Map<UidProcState, MobileDataStats> mUidStats; + // No reason to keep more dimensions than 3000. The 3000 is the hard top for the statsd metrics + // dimensions guardrail. It also will keep the result binder transaction size capped to + // approximately 220kB for 3000 atoms + private static final int UID_STATS_MAX_SIZE = 3000; + private final SparseIntArray mUidPreviousState; private NetworkStats mLastMobileUidStats = new NetworkStats(0, -1); @@ -135,7 +141,7 @@ class AggregatedMobileDataStatsPuller { private final RateLimiter mRateLimiter; - AggregatedMobileDataStatsPuller(NetworkStatsManager networkStatsManager) { + AggregatedMobileDataStatsPuller(@NonNull NetworkStatsManager networkStatsManager) { if (DEBUG) { if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) { Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, @@ -188,14 +194,18 @@ class AggregatedMobileDataStatsPuller { } final UidProcState statsKey = new UidProcState(uid, previousState); - MobileDataStats stats; if (mUidStats.containsKey(statsKey)) { - stats = mUidStats.get(statsKey); - } else { - stats = new MobileDataStats(); + return mUidStats.get(statsKey); + } + if (mUidStats.size() < UID_STATS_MAX_SIZE) { + MobileDataStats stats = new MobileDataStats(); mUidStats.put(statsKey, stats); + return stats; } - return stats; + if (DEBUG) { + Slog.w(TAG, "getUidStatsForPreviousStateLocked() UID_STATS_MAX_SIZE reached"); + } + return null; } private void noteUidProcessStateImpl(int uid, int state) { @@ -252,10 +262,12 @@ class AggregatedMobileDataStatsPuller { continue; } MobileDataStats stats = getUidStatsForPreviousStateLocked(entry.getUid()); - stats.addTxBytes(entry.getTxBytes()); - stats.addRxBytes(entry.getRxBytes()); - stats.addTxPackets(entry.getTxPackets()); - stats.addRxPackets(entry.getRxPackets()); + if (stats != null) { + stats.addTxBytes(entry.getTxBytes()); + stats.addRxBytes(entry.getRxBytes()); + stats.addTxPackets(entry.getTxPackets()); + stats.addRxPackets(entry.getRxPackets()); + } } } } diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index 0ffd002197c4..02f90f24714e 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -844,8 +844,6 @@ public class StatsPullAtomService extends SystemService { mStorageManager = (StorageManager) mContext.getSystemService(StorageManager.class); mNetworkStatsManager = mContext.getSystemService(NetworkStatsManager.class); - initMobileDataStatsPuller(); - // Initialize DiskIO mStoragedUidIoStatsReader = new StoragedUidIoStatsReader(); @@ -1015,7 +1013,8 @@ public class StatsPullAtomService extends SystemService { } if (ENABLE_MOBILE_DATA_STATS_AGGREGATED_PULLER) { mAggregatedMobileDataStatsPuller = - new AggregatedMobileDataStatsPuller(mNetworkStatsManager); + new AggregatedMobileDataStatsPuller( + mContext.getSystemService(NetworkStatsManager.class)); } } @@ -1061,6 +1060,7 @@ public class StatsPullAtomService extends SystemService { registerMobileBytesTransfer(); registerMobileBytesTransferBackground(); if (ENABLE_MOBILE_DATA_STATS_AGGREGATED_PULLER) { + initMobileDataStatsPuller(); registerMobileBytesTransferByProcState(); } registerBytesTransferByTagAndMetered(); diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index baf274d54e5d..4036d553c82f 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -819,12 +819,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A @Nullable private Rect mLetterboxBoundsForFixedOrientationAndAspectRatio; - // Bounds populated in resolveAspectRatioRestriction when this activity is letterboxed for - // aspect ratio. If not null, they are used as parent container in - // resolveSizeCompatModeConfiguration and in a constructor of CompatDisplayInsets. - @Nullable - private Rect mLetterboxBoundsForAspectRatio; - // Whether the activity is eligible to be letterboxed for fixed orientation with respect to its // requested orientation, even when it's letterbox for another reason (e.g., size compat mode) // and therefore #isLetterboxedForFixedOrientationAndAspectRatio returns false. @@ -3204,10 +3198,18 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (!Flags.activityWindowInfoFlag() || !isAttached()) { return mTmpActivityWindowInfo; } - mTmpActivityWindowInfo.set( - isEmbeddedInHostContainer(), - getTask().getBounds(), - getTaskFragment().getBounds()); + if (isFixedRotationTransforming()) { + // Fixed rotation only applied to fullscreen activity, thus using the activity bounds + // for Task/TaskFragment so that it is "pre-rotated" and in sync with the Configuration + // update. + final Rect bounds = getBounds(); + mTmpActivityWindowInfo.set(false /* isEmbedded */, bounds, bounds); + } else { + mTmpActivityWindowInfo.set( + isEmbeddedInHostContainer(), + getTask().getBounds(), + getTaskFragment().getBounds()); + } return mTmpActivityWindowInfo; } @@ -8427,14 +8429,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A fullConfig.windowConfiguration.getRotation()); } - final Rect letterboxedContainerBounds = - mLetterboxBoundsForFixedOrientationAndAspectRatio != null - ? mLetterboxBoundsForFixedOrientationAndAspectRatio - : mLetterboxBoundsForAspectRatio; - // The role of CompatDisplayInsets is like the override bounds. mCompatDisplayInsets = - new CompatDisplayInsets(mDisplayContent, this, letterboxedContainerBounds); + new CompatDisplayInsets( + mDisplayContent, this, mLetterboxBoundsForFixedOrientationAndAspectRatio); } private void clearSizeCompatModeAttributes() { @@ -8506,7 +8504,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mIsAspectRatioApplied = false; mIsEligibleForFixedOrientationLetterbox = false; mLetterboxBoundsForFixedOrientationAndAspectRatio = null; - mLetterboxBoundsForAspectRatio = null; // Can't use resolvedConfig.windowConfiguration.getWindowingMode() because it can be // different from windowing mode of the task (PiP) during transition from fullscreen to PiP @@ -8545,11 +8542,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A getTaskFragment().computeConfigResourceOverrides(resolvedConfig, newParentConfiguration); } - } // If activity in fullscreen mode is letterboxed because of fixed orientation then bounds - // are already calculated in resolveFixedOrientationConfiguration, or if in size compat - // mode, it should already be calculated in resolveSizeCompatModeConfiguration - if (!isLetterboxedForFixedOrientationAndAspectRatio() && !mInSizeCompatModeForBounds) { + // are already calculated in resolveFixedOrientationConfiguration. + } else if (!isLetterboxedForFixedOrientationAndAspectRatio()) { resolveAspectRatioRestriction(newParentConfiguration); } @@ -9043,8 +9038,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } final CompatDisplayInsets compatDisplayInsets = getCompatDisplayInsets(); - if (compatDisplayInsets != null - && !compatDisplayInsets.mIsInFixedOrientationOrAspectRatioLetterbox) { + if (compatDisplayInsets != null && !compatDisplayInsets.mIsInFixedOrientationLetterbox) { // App prefers to keep its original size. // If the size compat is from previous fixed orientation letterboxing, we may want to // have fixed orientation letterbox again, otherwise it will show the size compat @@ -9176,7 +9170,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // restrict, the bounds should be the requested override bounds. getTaskFragment().computeConfigResourceOverrides(resolvedConfig, newParentConfiguration, getFixedRotationTransformDisplayInfo()); - mLetterboxBoundsForAspectRatio = new Rect(resolvedBounds); } } @@ -10741,10 +10734,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A /** Whether the {@link Task} windowingMode represents a floating window*/ final boolean mIsFloating; /** - * Whether is letterboxed because of fixed orientation or aspect ratio when the - * unresizable activity is first shown. + * Whether is letterboxed because of fixed orientation when the unresizable activity is + * first shown. */ - final boolean mIsInFixedOrientationOrAspectRatioLetterbox; + final boolean mIsInFixedOrientationLetterbox; /** * The nonDecorInsets for each rotation. Includes the navigation bar and cutout insets. It * is used to compute the appBounds. @@ -10759,7 +10752,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A /** Constructs the environment to simulate the bounds behavior of the given container. */ CompatDisplayInsets(DisplayContent display, ActivityRecord container, - @Nullable Rect letterboxedContainerBounds) { + @Nullable Rect fixedOrientationBounds) { mOriginalRotation = display.getRotation(); mIsFloating = container.getWindowConfiguration().tasksAreFloating(); mOriginalRequestedOrientation = container.getRequestedConfigurationOrientation(); @@ -10774,21 +10767,22 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mNonDecorInsets[rotation] = emptyRect; mStableInsets[rotation] = emptyRect; } - mIsInFixedOrientationOrAspectRatioLetterbox = false; + mIsInFixedOrientationLetterbox = false; return; } final Task task = container.getTask(); - mIsInFixedOrientationOrAspectRatioLetterbox = letterboxedContainerBounds != null; + mIsInFixedOrientationLetterbox = fixedOrientationBounds != null; + // Store the bounds of the Task for the non-resizable activity to use in size compat // mode so that the activity will not be resized regardless the windowing mode it is // currently in. - // When an activity needs to be letterboxed because of fixed orientation or aspect - // ratio, use resolved bounds instead of task bounds since the activity will be - // displayed within these even if it is in size compat mode. - final Rect filledContainerBounds = mIsInFixedOrientationOrAspectRatioLetterbox - ? letterboxedContainerBounds + // When an activity needs to be letterboxed because of fixed orientation, use fixed + // orientation bounds instead of task bounds since the activity will be displayed + // within these even if it is in size compat mode. + final Rect filledContainerBounds = mIsInFixedOrientationLetterbox + ? fixedOrientationBounds : task != null ? task.getBounds() : display.getBounds(); final int filledContainerRotation = task != null ? task.getConfiguration().windowConfiguration.getRotation() diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 38f0587adb0a..354cab364ec1 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -2160,19 +2160,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { return rect; } - @Override - public ActivityManager.TaskDescription getTaskDescription(int id) { - synchronized (mGlobalLock) { - enforceTaskPermission("getTaskDescription()"); - final Task tr = mRootWindowContainer.anyTaskForId(id, - MATCH_ATTACHED_TASK_OR_RECENT_TASKS); - if (tr != null) { - return tr.getTaskDescription(); - } - } - return null; - } - /** * Sets the locusId for a particular activity. * @@ -3072,8 +3059,33 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public Bitmap getTaskDescriptionIcon(String filePath, int userId) { - userId = handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), - userId, "getTaskDescriptionIcon"); + final int callingUid = Binder.getCallingUid(); + // Verify that the caller can make the request for the given userId + userId = handleIncomingUser(Binder.getCallingPid(), callingUid, userId, + "getTaskDescriptionIcon"); + synchronized (mGlobalLock) { + // Verify that the caller can make the request for given icon file path + final ActivityRecord matchingActivity = mRootWindowContainer.getActivity( + r -> { + if (r.taskDescription == null + || r.taskDescription.getIconFilename() == null) { + return false; + } + return r.taskDescription.getIconFilename().equals(filePath); + }); + if (matchingActivity == null || (matchingActivity.getUid() != callingUid)) { + // Caller UID doesn't match the requested Activity's UID, check if caller is + // privileged + try { + enforceActivityTaskPermission("getTaskDescriptionIcon"); + } catch (SecurityException e) { + Slog.w(TAG, "getTaskDescriptionIcon(): request (callingUid=" + callingUid + + ", filePath=" + filePath + ", user=" + userId + ") doesn't match any " + + "activity"); + throw e; + } + } + } final File passedIconFile = new File(filePath); final File legitIconFile = new File(TaskPersister.getUserImagesDir(userId), @@ -3303,6 +3315,13 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { return false; } + /** + * An instance method that's easier for mocking in tests. + */ + void enforceActivityTaskPermission(String func) { + enforceTaskPermission(func); + } + static void enforceTaskPermission(String func) { if (checkCallingPermission(MANAGE_ACTIVITY_TASKS) == PackageManager.PERMISSION_GRANTED) { return; diff --git a/services/core/java/com/android/server/wm/InputConfigAdapter.java b/services/core/java/com/android/server/wm/InputConfigAdapter.java index 2dcde4ee2ba8..ef1b02d8accc 100644 --- a/services/core/java/com/android/server/wm/InputConfigAdapter.java +++ b/services/core/java/com/android/server/wm/InputConfigAdapter.java @@ -56,7 +56,10 @@ class InputConfigAdapter { InputConfig.DISABLE_USER_ACTIVITY, false /* inverted */), new FlagMapping( LayoutParams.INPUT_FEATURE_SPY, - InputConfig.SPY, false /* inverted */)); + InputConfig.SPY, false /* inverted */), + new FlagMapping( + LayoutParams.INPUT_FEATURE_SENSITIVE_FOR_TRACING, + InputConfig.SENSITIVE_FOR_TRACING, false /* inverted */)); @InputConfigFlags private static final int INPUT_FEATURE_TO_CONFIG_MASK = diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 6f1c834be039..1ce2cd898765 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -1277,8 +1277,9 @@ class Task extends TaskFragment { final ActivityRecord top = topRunningActivity(); final ActivityRecord resumedActivity = getResumedActivity(); if (resumedActivity != null - && (top.getTaskFragment() != this || !canBeResumed(resuming))) { - // Pausing the resumed activity because it is occluded by other task fragment. + && (top == null || top.getTaskFragment() != this || !canBeResumed(resuming))) { + // Pausing the resumed activity because it is occluded by other task fragment, or + // should not be remained in resumed state. if (startPausing(false /* uiSleeping*/, resuming, reason)) { someActivityPaused[0]++; } diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index e01842c61784..80889d1ac972 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -3286,10 +3286,6 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< if (isTaskTransitOld(transit) && getWindowingMode() == WINDOWING_MODE_FULLSCREEN) { animationRunnerBuilder.setTaskBackgroundColor(getTaskAnimationBackgroundColor()); - // TODO: Remove when we migrate to shell (b/202383002) - if (mWmService.mTaskTransitionSpec != null) { - animationRunnerBuilder.hideInsetSourceViewOverflows(); - } } // Check if the animation requests to show background color for Activity and embedded @@ -4255,27 +4251,6 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } } - private void hideInsetSourceViewOverflows() { - final SparseArray<InsetsSourceProvider> providers = - getDisplayContent().getInsetsStateController().getSourceProviders(); - for (int i = providers.size(); i >= 0; i--) { - final InsetsSourceProvider insetProvider = providers.valueAt(i); - if (!insetProvider.getSource().hasFlags(InsetsSource.FLAG_INSETS_ROUNDED_CORNER)) { - return; - } - - // Will apply it immediately to current leash and to all future inset animations - // until we disable it. - insetProvider.setCropToProvidingInsetsBounds(getPendingTransaction()); - - // Only clear the size restriction of the inset once the surface animation is over - // and not if it's canceled to be replace by another animation. - mOnAnimationFinished.add(() -> { - insetProvider.removeCropToProvidingInsetsBounds(getPendingTransaction()); - }); - } - } - private IAnimationStarter build() { return (Transaction t, AnimationAdapter adapter, boolean hidden, @AnimationType int type, @Nullable AnimationAdapter snapshotAnim) -> { diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index f09ef9643433..6762e7a29b0b 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -43,6 +43,7 @@ import static android.os.Process.SYSTEM_UID; import static android.os.Process.myPid; import static android.os.Process.myUid; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; +import static android.permission.flags.Flags.sensitiveContentImprovements; import static android.provider.Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT; import static android.provider.Settings.Global.DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW; import static android.provider.Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS; @@ -65,6 +66,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; import static android.view.WindowManager.LayoutParams.FLAG_SLIPPERY; import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL; +import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_SENSITIVE_FOR_TRACING; import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_SPY; import static android.view.WindowManager.LayoutParams.INVALID_WINDOW_TYPE; import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW; @@ -305,6 +307,7 @@ import android.view.WindowManagerPolicyConstants.PointerEventListener; import android.view.displayhash.DisplayHash; import android.view.displayhash.VerifiedDisplayHash; import android.view.inputmethod.ImeTracker; +import android.widget.Toast; import android.window.ActivityWindowInfo; import android.window.AddToSurfaceSyncGroupResult; import android.window.ClientWindowFrames; @@ -1718,8 +1721,8 @@ public class WindowManagerService extends IWindowManager.Stub final DisplayPolicy displayPolicy = displayContent.getDisplayPolicy(); displayPolicy.adjustWindowParamsLw(win, win.mAttrs); attrs.flags = sanitizeFlagSlippery(attrs.flags, win.getName(), callingUid, callingPid); - attrs.inputFeatures = sanitizeSpyWindow(attrs.inputFeatures, win.getName(), callingUid, - callingPid); + attrs.inputFeatures = sanitizeInputFeatures(attrs.inputFeatures, win.getName(), + callingUid, callingPid, win.isTrustedOverlay()); win.setRequestedVisibleTypes(requestedVisibleTypes); res = displayPolicy.validateAddingWindowLw(attrs, callingPid, callingUid); @@ -2289,8 +2292,8 @@ public class WindowManagerService extends IWindowManager.Stub if (attrs != null) { displayPolicy.adjustWindowParamsLw(win, attrs); attrs.flags = sanitizeFlagSlippery(attrs.flags, win.getName(), uid, pid); - attrs.inputFeatures = sanitizeSpyWindow(attrs.inputFeatures, win.getName(), uid, - pid); + attrs.inputFeatures = sanitizeInputFeatures(attrs.inputFeatures, win.getName(), uid, + pid, win.isTrustedOverlay()); int disableFlags = (attrs.systemUiVisibility | attrs.subtreeSystemUiVisibility) & DISABLE_MASK; if (disableFlags != 0 && !hasStatusBarPermission(pid, uid)) { @@ -2581,14 +2584,18 @@ public class WindowManagerService extends IWindowManager.Stub } if (outFrames != null && outMergedConfiguration != null) { + final boolean shouldReportActivityWindowInfo = outBundle != null + && win.mLastReportedActivityWindowInfo != null; + final ActivityWindowInfo outActivityWindowInfo = shouldReportActivityWindowInfo + ? new ActivityWindowInfo() + : null; + win.fillClientWindowFramesAndConfiguration(outFrames, outMergedConfiguration, - false /* useLatestConfig */, shouldRelayout); - if (Flags.activityWindowInfoFlag() && outBundle != null - && win.mActivityRecord != null) { - final ActivityWindowInfo activityWindowInfo = win.mActivityRecord - .getActivityWindowInfo(); + outActivityWindowInfo, false /* useLatestConfig */, shouldRelayout); + + if (shouldReportActivityWindowInfo) { outBundle.putParcelable(IWindowSession.KEY_RELAYOUT_BUNDLE_ACTIVITY_WINDOW_INFO, - activityWindowInfo); + outActivityWindowInfo); } // Set resize-handled here because the values are sent back to the client. @@ -8721,6 +8728,15 @@ public class WindowManagerService extends IWindowManager.Stub mSensitiveContentPackages.addBlockScreenCaptureForApps(packageInfos); if (modified) { WindowManagerService.this.refreshScreenCaptureDisabled(); + if (sensitiveContentImprovements()) { + // TODO(b/331842561): Combine this traversal with the one inside + // refreshScreenCaptureDisabled above. + mRoot.forAllWindows((w) -> { + if (w.isVisible()) { + WindowManagerService.this.showToastIfBlockingScreenCapture(w); + } + }, /* traverseTopToBottom= */ true); + } } } } @@ -9105,18 +9121,26 @@ public class WindowManagerService extends IWindowManager.Stub } /** - * You need MONITOR_INPUT permission to be able to set INPUT_FEATURE_SPY. + * Ensure the caller has the right permissions to be able to set the requested input features. */ - private int sanitizeSpyWindow(int inputFeatures, String windowName, int callingUid, - int callingPid) { - if ((inputFeatures & INPUT_FEATURE_SPY) == 0) { - return inputFeatures; + private int sanitizeInputFeatures(int inputFeatures, String windowName, int callingUid, + int callingPid, boolean isTrustedOverlay) { + // You need MONITOR_INPUT permission to be able to set INPUT_FEATURE_SPY. + if ((inputFeatures & INPUT_FEATURE_SPY) != 0) { + final int permissionResult = mContext.checkPermission( + permission.MONITOR_INPUT, callingPid, callingUid); + if (permissionResult != PackageManager.PERMISSION_GRANTED) { + throw new IllegalArgumentException( + "Cannot use INPUT_FEATURE_SPY from '" + windowName + + "' because it doesn't the have MONITOR_INPUT permission"); + } } - final int permissionResult = mContext.checkPermission( - permission.MONITOR_INPUT, callingPid, callingUid); - if (permissionResult != PackageManager.PERMISSION_GRANTED) { - throw new IllegalArgumentException("Cannot use INPUT_FEATURE_SPY from '" + windowName - + "' because it doesn't the have MONITOR_INPUT permission"); + + // You can only use INPUT_FEATURE_SENSITIVE_FOR_TRACING on a trusted overlay. + if ((inputFeatures & INPUT_FEATURE_SENSITIVE_FOR_TRACING) != 0 && !isTrustedOverlay) { + Slog.w(TAG, "Removing INPUT_FEATURE_SENSITIVE_FOR_TRACING from '" + windowName + + "' because it isn't a trusted overlay"); + return inputFeatures & ~INPUT_FEATURE_SENSITIVE_FOR_TRACING; } return inputFeatures; } @@ -9194,8 +9218,10 @@ public class WindowManagerService extends IWindowManager.Stub h.setWindowToken(clientToken); h.name = name; + final boolean isTrustedOverlay = (privateFlags & PRIVATE_FLAG_TRUSTED_OVERLAY) != 0; flags = sanitizeFlagSlippery(flags, name, callingUid, callingPid); - inputFeatures = sanitizeSpyWindow(inputFeatures, name, callingUid, callingPid); + inputFeatures = sanitizeInputFeatures(inputFeatures, name, callingUid, callingPid, + isTrustedOverlay); final int sanitizedLpFlags = (flags & (FLAG_NOT_TOUCHABLE | FLAG_SLIPPERY | LayoutParams.FLAG_NOT_FOCUSABLE)) @@ -9232,7 +9258,7 @@ public class WindowManagerService extends IWindowManager.Stub final SurfaceControl.Transaction t = mTransactionFactory.get(); // Check private trusted overlay flag to set trustedOverlay field of input window handle. - h.setTrustedOverlay(t, surface, (privateFlags & PRIVATE_FLAG_TRUSTED_OVERLAY) != 0); + h.setTrustedOverlay(t, surface, isTrustedOverlay); t.setInputWindowInfo(surface, h); t.apply(); t.close(); @@ -10119,4 +10145,28 @@ public class WindowManagerService extends IWindowManager.Stub boolean getDisableSecureWindows() { return mDisableSecureWindows; } + + /** + * Called to notify WMS that the specified window has become visible. This shows a Toast if the + * window is deemed to hold sensitive content. + */ + void onWindowVisible(@NonNull WindowState w) { + showToastIfBlockingScreenCapture(w); + } + + /** + * Shows a Toast if the specified window is + * {@link LocalService#addBlockScreenCaptureForApps(ArraySet) blocked} from screen capture based + * on sensitive content protections. + */ + private void showToastIfBlockingScreenCapture(@NonNull WindowState w) { + // TODO(b/323580163): Check if already shown and update shown state. + if (mSensitiveContentPackages.shouldBlockScreenCaptureForApp(w.getOwningPackage(), + w.getOwningUid(), w.getWindowToken())) { + Toast.makeText(mContext, Looper.getMainLooper(), + mContext.getString(R.string.screen_not_shared_sensitive_content), + Toast.LENGTH_SHORT) + .show(); + } + } } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 37b2d0e82366..aca3119c63bb 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -28,6 +28,7 @@ import static android.graphics.GraphicsProtos.dumpPointProto; import static android.os.InputConstants.DEFAULT_DISPATCHING_TIMEOUT_MILLIS; import static android.os.PowerManager.DRAW_WAKE_LOCK; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; +import static android.permission.flags.Flags.sensitiveContentImprovements; import static android.view.SurfaceControl.Transaction; import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_CONTENT; import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME; @@ -421,6 +422,13 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP */ private final MergedConfiguration mLastReportedConfiguration = new MergedConfiguration(); + /** + * Similar to {@link #mLastReportedConfiguration}, used to store last reported to client + * ActivityWindowInfo. {@code null} if this is not an Activity window. + */ + @Nullable + final ActivityWindowInfo mLastReportedActivityWindowInfo; + /** @see #isLastConfigReportedToClient() */ private boolean mLastConfigReportedToClient; @@ -1080,6 +1088,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mPolicy = mWmService.mPolicy; mContext = mWmService.mContext; mForceSeamlesslyRotate = token.mRoundedCornerOverlay; + mLastReportedActivityWindowInfo = Flags.activityWindowInfoFlag() && mActivityRecord != null + ? new ActivityWindowInfo() + : null; mInputWindowHandle = new InputWindowHandleWrapper(new InputWindowHandle( mActivityRecord != null ? mActivityRecord.getInputApplicationHandle(false /* update */) : null, @@ -2127,6 +2138,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP } } setDisplayLayoutNeeded(); + if (sensitiveContentImprovements() && visible) { + mWmService.onWindowVisible(this); + } } } @@ -3603,12 +3617,15 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP * * @param outFrames The frames that will be sent to the client. * @param outMergedConfiguration The configuration that will be sent to the client. + * @param outActivityWindowInfo The ActivityWindowInfo that will be sent to the client if set. + * {@code null} if this is not activity window. * @param useLatestConfig Whether to use the latest configuration. * @param relayoutVisible Whether to consider visibility to use the latest configuration. */ - void fillClientWindowFramesAndConfiguration(ClientWindowFrames outFrames, - MergedConfiguration outMergedConfiguration, boolean useLatestConfig, - boolean relayoutVisible) { + void fillClientWindowFramesAndConfiguration(@NonNull ClientWindowFrames outFrames, + @NonNull MergedConfiguration outMergedConfiguration, + @Nullable ActivityWindowInfo outActivityWindowInfo, + boolean useLatestConfig, boolean relayoutVisible) { outFrames.frame.set(mWindowFrames.mCompatFrame); outFrames.displayFrame.set(mWindowFrames.mDisplayFrame); if (mInvGlobalScale != 1f) { @@ -3638,8 +3655,15 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP if (outMergedConfiguration != mLastReportedConfiguration) { mLastReportedConfiguration.setTo(outMergedConfiguration); } + if (outActivityWindowInfo != null && mLastReportedActivityWindowInfo != null) { + outActivityWindowInfo.set(mActivityRecord.getActivityWindowInfo()); + mLastReportedActivityWindowInfo.set(outActivityWindowInfo); + } } else { outMergedConfiguration.setTo(mLastReportedConfiguration); + if (outActivityWindowInfo != null && mLastReportedActivityWindowInfo != null) { + outActivityWindowInfo.set(mLastReportedActivityWindowInfo); + } } mLastConfigReportedToClient = true; } @@ -3676,10 +3700,22 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mDragResizingChangeReported = true; mWindowFrames.clearReportResizeHints(); + // App window resize may trigger Activity#onConfigurationChanged, so we need to update + // ActivityWindowInfo as well. + final IBinder activityToken; + final ActivityWindowInfo activityWindowInfo; + if (mLastReportedActivityWindowInfo != null) { + activityToken = mActivityRecord.token; + activityWindowInfo = mLastReportedActivityWindowInfo; + } else { + activityToken = null; + activityWindowInfo = null; + } + final int prevRotation = mLastReportedConfiguration .getMergedConfiguration().windowConfiguration.getRotation(); fillClientWindowFramesAndConfiguration(mClientWindowFrames, mLastReportedConfiguration, - true /* useLatestConfig */, false /* relayoutVisible */); + activityWindowInfo, true /* useLatestConfig */, false /* relayoutVisible */); final boolean syncRedraw = shouldSendRedrawForSync(); final boolean syncWithBuffers = syncRedraw && shouldSyncWithBuffers(); final boolean reportDraw = syncRedraw || drawPending; @@ -3697,18 +3733,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP markRedrawForSyncReported(); - // App window resize may trigger Activity#onConfigurationChanged, so we need to update - // ActivityWindowInfo as well. - final IBinder activityToken; - final ActivityWindowInfo activityWindowInfo; - if (Flags.activityWindowInfoFlag() && mActivityRecord != null) { - activityToken = mActivityRecord.token; - activityWindowInfo = mActivityRecord.getActivityWindowInfo(); - } else { - activityToken = null; - activityWindowInfo = null; - } - if (Flags.bundleClientTransactionFlag()) { getProcess().scheduleClientTransactionItem( WindowStateResizeItem.obtain(mClient, mClientWindowFrames, reportDraw, @@ -4132,6 +4156,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP } pw.println(prefix + "mFullConfiguration=" + getConfiguration()); pw.println(prefix + "mLastReportedConfiguration=" + getLastReportedConfiguration()); + if (mLastReportedActivityWindowInfo != null) { + pw.println(prefix + "mLastReportedActivityWindowInfo=" + + mLastReportedActivityWindowInfo); + } } pw.println(prefix + "mHasSurface=" + mHasSurface + " isReadyForDisplay()=" + isReadyForDisplay() diff --git a/services/core/xsd/display-device-config/display-device-config.xsd b/services/core/xsd/display-device-config/display-device-config.xsd index 755a7f884a95..859802354e04 100644 --- a/services/core/xsd/display-device-config/display-device-config.xsd +++ b/services/core/xsd/display-device-config/display-device-config.xsd @@ -114,7 +114,7 @@ <xs:element type="sensorDetails" name="screenOffBrightnessSensor"> <xs:annotation name="final"/> </xs:element> - <xs:element type="sensorDetails" name="proxSensor"> + <xs:element type="sensorDetails" name="proxSensor" maxOccurs="2"> <xs:annotation name="final"/> </xs:element> <xs:element type="sensorDetails" name="tempSensor"> @@ -478,6 +478,7 @@ </xs:simpleType> <xs:complexType name="sensorDetails"> + <xs:attribute name="featureFlag" type="xs:string" use="optional"/> <xs:sequence> <xs:element type="xs:string" name="type" minOccurs="0" maxOccurs="1"> <xs:annotation name="nullable"/> diff --git a/services/core/xsd/display-device-config/schema/current.txt b/services/core/xsd/display-device-config/schema/current.txt index 4fa77d963733..4ce4cc3186e0 100644 --- a/services/core/xsd/display-device-config/schema/current.txt +++ b/services/core/xsd/display-device-config/schema/current.txt @@ -117,7 +117,7 @@ package com.android.server.display.config { method public com.android.server.display.config.LuxThrottling getLuxThrottling(); method @Nullable public final String getName(); method public com.android.server.display.config.PowerThrottlingConfig getPowerThrottlingConfig(); - method public final com.android.server.display.config.SensorDetails getProxSensor(); + method public final java.util.List<com.android.server.display.config.SensorDetails> getProxSensor(); method public com.android.server.display.config.DisplayQuirks getQuirks(); method public com.android.server.display.config.RefreshRateConfigs getRefreshRate(); method public final java.math.BigDecimal getScreenBrightnessCapForWearBedtimeMode(); @@ -154,7 +154,6 @@ package com.android.server.display.config { method public void setLuxThrottling(com.android.server.display.config.LuxThrottling); method public final void setName(@Nullable String); method public void setPowerThrottlingConfig(com.android.server.display.config.PowerThrottlingConfig); - method public final void setProxSensor(com.android.server.display.config.SensorDetails); method public void setQuirks(com.android.server.display.config.DisplayQuirks); method public void setRefreshRate(com.android.server.display.config.RefreshRateConfigs); method public final void setScreenBrightnessCapForWearBedtimeMode(java.math.BigDecimal); @@ -405,10 +404,12 @@ package com.android.server.display.config { public class SensorDetails { ctor public SensorDetails(); + method public String getFeatureFlag(); method @Nullable public final String getName(); method @Nullable public final com.android.server.display.config.RefreshRateRange getRefreshRate(); method @Nullable public final com.android.server.display.config.NonNegativeFloatToFloatMap getSupportedModes(); method @Nullable public final String getType(); + method public void setFeatureFlag(String); method public final void setName(@Nullable String); method public final void setRefreshRate(@Nullable com.android.server.display.config.RefreshRateRange); method public final void setSupportedModes(@Nullable com.android.server.display.config.NonNegativeFloatToFloatMap); diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt index 538c0ee52424..c9aab5318840 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt +++ b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt @@ -166,7 +166,7 @@ class MockSystem(withSession: (StaticMockitoSessionBuilder) -> Unit = {}) { null } whenever(mocks.settings.addPackageLPw(nullable(), nullable(), nullable(), nullable(), - nullable(), nullable(), nullable())) { + nullable(), nullable(), nullable(), nullable())) { val name: String = getArgument(0) val pendingAdd = mPendingPackageAdds.firstOrNull { it.first == name } ?: return@whenever null diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java index 6aa1825ba6b7..759a974bd41f 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java @@ -736,9 +736,10 @@ public final class UserManagerServiceTest { Mockito.clearInvocations(mKeyguardManager); Mockito.clearInvocations(mSpiedContext); - // Finally, set the preference to don't auto-lock + // Finally, set the preference to auto-lock only after device restart, which is the default + // behaviour mUms.setOrUpdateAutoLockPreferenceForPrivateProfile( - Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER); + Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART); // Verify that inactivity broadcasts are unregistered and keyguard listener was removed Mockito.verify(mSpiedContext).unregisterReceiver(any()); diff --git a/services/tests/powerservicetests/AndroidManifest.xml b/services/tests/powerservicetests/AndroidManifest.xml index 26d9eec21fb1..f7eb4ad7129a 100644 --- a/services/tests/powerservicetests/AndroidManifest.xml +++ b/services/tests/powerservicetests/AndroidManifest.xml @@ -24,6 +24,7 @@ <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/> <uses-permission android:name="android.permission.READ_DREAM_STATE"/> <uses-permission android:name="android.permission.READ_DREAM_SUPPRESSION"/> + <uses-permission android:name="android.permission.SCREEN_TIMEOUT_OVERRIDE"/> <uses-permission android:name="android.permission.STATUS_BAR_SERVICE"/> <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS"/> <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS"/> diff --git a/services/tests/powerservicetests/src/com/android/server/power/PowerManagerServiceTest.java b/services/tests/powerservicetests/src/com/android/server/power/PowerManagerServiceTest.java index 52f28e95e6b5..67409a424edb 100644 --- a/services/tests/powerservicetests/src/com/android/server/power/PowerManagerServiceTest.java +++ b/services/tests/powerservicetests/src/com/android/server/power/PowerManagerServiceTest.java @@ -32,6 +32,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; @@ -492,6 +493,12 @@ public class PowerManagerServiceTest { mIsBatterySaverSupported); } + private void setScreenTimeoutOverrideConfig(int screenTimeoutOverrideConfig) { + when(mResourcesSpy.getInteger( + com.android.internal.R.integer.config_screenTimeoutOverride)) + .thenReturn(screenTimeoutOverrideConfig); + } + @Test public void testCreateService_initializesNativeServiceAndSetsPowerModes() { PowerManagerService service = createService(); @@ -2941,6 +2948,299 @@ public class PowerManagerServiceTest { assertThat(wakeLock.mDisabled).isFalse(); } + @Test + public void testScreenTimeoutOverrideWakeLock() { + mSetFlagsRule.enableFlags(com.android.server.power.feature.flags + .Flags.FLAG_ENABLE_EARLY_SCREEN_TIMEOUT_DETECTOR); + + setAttentiveTimeout(30000); + setScreenTimeoutOverrideConfig(10000); + + createService(); + startSystem(); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + + // Grab a wakelock + final String tag = "wakelock1"; + final String packageName = "pkg.name"; + final IBinder token = new Binder(); + final int flags = PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK; + mService.getBinderServiceInstance().acquireWakeLock(token, flags, tag, packageName, + null /* workSource */, null /* historyTag */, Display.INVALID_DISPLAY, + null /* callback */); + + // Early screen off while acquired the wake lock. + advanceTime(10000); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP); + + // Should not affect anything after release the wake lock. + mService.getBinderServiceInstance().releaseWakeLock(token, 0 /* flags */); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP); + } + + @Test + public void testScreenTimeoutOverrideWakeLockOnFeatureDisable() { + // Feature flag is not enabled + mSetFlagsRule.disableFlags(com.android.server.power.feature.flags + .Flags.FLAG_ENABLE_EARLY_SCREEN_TIMEOUT_DETECTOR); + + setAttentiveTimeout(30000); + setScreenTimeoutOverrideConfig(10000); + + createService(); + startSystem(); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + + // Grab a wakelock + final String tag = "wakelock1"; + final String packageName = "pkg.name"; + final IBinder token = new Binder(); + final int flags = PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK; + try { + mService.getBinderServiceInstance().acquireWakeLock(token, flags, tag, packageName, + null /* workSource */, null /* historyTag */, Display.INVALID_DISPLAY, + null /* callback */); + } catch (IllegalArgumentException e) { + return; + } + + fail("Have to throw a IllegalArgumentException when feature is not enabled."); + } + + @Test + public void testScreenTimeoutOverrideWakeLockAcquiredAfterTimeout() { + mSetFlagsRule.enableFlags(com.android.server.power.feature.flags + .Flags.FLAG_ENABLE_EARLY_SCREEN_TIMEOUT_DETECTOR); + + setAttentiveTimeout(30000); + setScreenTimeoutOverrideConfig(10000); + + createService(); + startSystem(); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + + advanceTime(10000); + + // Grab a wakelock + final String tag = "wakelock1"; + final String packageName = "pkg.name"; + final IBinder token = new Binder(); + final int flags = PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK; + mService.getBinderServiceInstance().acquireWakeLock(token, flags, tag, packageName, + null /* workSource */, null /* historyTag */, Display.INVALID_DISPLAY, + null /* callback */); + + // Early screen off while acquired the wake lock. + advanceTime(0); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP); + + // Should not affect anything after release the wake lock. + mService.getBinderServiceInstance().releaseWakeLock(token, 0 /* flags */); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP); + } + + @Test + public void testScreenTimeoutOverrideWakeLockAcquiredAfterSleep() { + mSetFlagsRule.enableFlags(com.android.server.power.feature.flags + .Flags.FLAG_ENABLE_EARLY_SCREEN_TIMEOUT_DETECTOR); + + setAttentiveTimeout(30000); + setScreenTimeoutOverrideConfig(10000); + + createService(); + startSystem(); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + advanceTime(30000); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP); + + // Grab a wakelock + final String tag = "wakelock1"; + final String packageName = "pkg.name"; + final IBinder token = new Binder(); + final int flags = PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK; + mService.getBinderServiceInstance().acquireWakeLock(token, flags, tag, packageName, + null /* workSource */, null /* historyTag */, Display.INVALID_DISPLAY, + null /* callback */); + + // Keep screen off and the wake lock won't be acquired when screen off. + advanceTime(0); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP); + + // Verify if the wake lock is still valid. + forceAwake(); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + advanceTime(10000); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + + // Should not affect anything after release the wake lock. + mService.getBinderServiceInstance().releaseWakeLock(token, 0 /* flags */); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + } + + @Test + public void testScreenTimeoutOverrideWakeLockUserActivity() { + mSetFlagsRule.enableFlags(com.android.server.power.feature.flags + .Flags.FLAG_ENABLE_EARLY_SCREEN_TIMEOUT_DETECTOR); + + final DisplayInfo info = new DisplayInfo(); + info.displayGroupId = Display.DEFAULT_DISPLAY_GROUP; + when(mDisplayManagerInternalMock.getDisplayInfo(Display.DEFAULT_DISPLAY)).thenReturn(info); + + setAttentiveTimeout(30000); + setScreenTimeoutOverrideConfig(10000); + + createService(); + startSystem(); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + + // Grab a wakelock + final String tag = "wakelock1"; + final String packageName = "pkg.name"; + final IBinder token = new Binder(); + final int flags = PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK; + mService.getBinderServiceInstance().acquireWakeLock(token, flags, tag, packageName, + null /* workSource */, null /* historyTag */, Display.INVALID_DISPLAY, + null /* callback */); + + // Still keep awake when not timeout. + advanceTime(500); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + mService.getBinderServiceInstance().userActivity(Display.DEFAULT_DISPLAY, mClock.now(), + PowerManager.USER_ACTIVITY_EVENT_TOUCH, 0); + + // screen timeout override wake lock should be released after user activity. + advanceTime(10000); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + assertThat(mService.findWakeLockLocked(token)).isEqualTo(null); + + // Should not affect anything after release the wake lock. + mService.getBinderServiceInstance().releaseWakeLock(token, 0 /* flags */); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + } + + @Test + public void testScreenTimeoutOverrideWakeLockFullWakeLock() { + mSetFlagsRule.enableFlags(com.android.server.power.feature.flags + .Flags.FLAG_ENABLE_EARLY_SCREEN_TIMEOUT_DETECTOR); + + setAttentiveTimeout(30000); + setScreenTimeoutOverrideConfig(10000); + + createService(); + startSystem(); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + + // Grab a wakelock + final String tag1 = "wakelock1"; + final String packageName1 = "pkg.name"; + final IBinder token1 = new Binder(); + final int flags = PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK; + mService.getBinderServiceInstance().acquireWakeLock(token1, flags, tag1, packageName1, + null /* workSource */, null /* historyTag */, Display.INVALID_DISPLAY, + null /* callback */); + + advanceTime(500); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + + // Grab a full wake lock + final String tag2 = "wakelock2"; + final String packageName2 = "pkg2.name"; + final IBinder token2 = new Binder(); + final int flags2 = PowerManager.FULL_WAKE_LOCK; + mService.getBinderServiceInstance().acquireWakeLock(token2, flags2, tag2, packageName2, + null /* workSource */, null /* historyTag */, Display.INVALID_DISPLAY, + null /* callback */); + + // wake lock should be released when another full wake lock acquired. + advanceTime(10000); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + assertThat(mService.findWakeLockLocked(token1)).isEqualTo(null); + + // Should not affect anything after release the wake locks. + mService.getBinderServiceInstance().releaseWakeLock(token1, 0 /* flags */); + mService.getBinderServiceInstance().releaseWakeLock(token2, 0 /* flags */); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + } + + @Test + public void testScreenTimeoutOverrideWakeLockMultiClients() { + mSetFlagsRule.enableFlags(com.android.server.power.feature.flags + .Flags.FLAG_ENABLE_EARLY_SCREEN_TIMEOUT_DETECTOR); + + setAttentiveTimeout(30000); + setScreenTimeoutOverrideConfig(10000); + + createService(); + startSystem(); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); + + // Grab a wakelock + final String tag1 = "wakelock1"; + final String packageName1 = "pkg.name"; + final IBinder token1 = new Binder(); + final int flags = PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK; + mService.getBinderServiceInstance().acquireWakeLock(token1, flags, tag1, packageName1, + null /* workSource */, null /* historyTag */, Display.INVALID_DISPLAY, + null /* callback */); + + // Grab a full wake lock + final String tag2 = "wakelock2"; + final String packageName2 = "pkg2.name"; + final IBinder token2 = new Binder(); + final int flags2 = PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK; + mService.getBinderServiceInstance().acquireWakeLock(token2, flags2, tag2, packageName2, + null /* workSource */, null /* historyTag */, Display.INVALID_DISPLAY, + null /* callback */); + + advanceTime(500); + // Release the first lock to ensure the second lock is still valid. + mService.getBinderServiceInstance().releaseWakeLock(token1, 0 /* flags */); + advanceTime(10000); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP); + + // Should not affect anything after release the wake locks. + mService.getBinderServiceInstance().releaseWakeLock(token2, 0 /* flags */); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP); + } + + @Test + public void testGetScreenOffTimeoutOverrideApi() { + mSetFlagsRule.enableFlags(com.android.server.power.feature.flags + .Flags.FLAG_ENABLE_EARLY_SCREEN_TIMEOUT_DETECTOR); + + final int screenTimeout = 30000; + final int screenDimTimeout = 7000; + final int screenTimeoutOverride = 10000; + setScreenTimeoutOverrideConfig(screenTimeoutOverride); + + createService(); + startSystem(); + + final String tag = "wakelock"; + final String packageName = "pkg.name"; + final IBinder token = new Binder(); + final int flags = PowerManager.SCREEN_TIMEOUT_OVERRIDE_WAKE_LOCK; + + // define cases as {isFaceDown, isTimeoutOverride, expectedTimeout} + final int[][] testCases = {{0, 0, screenTimeout}, {0, 1, screenTimeoutOverride}, + {1, 0, screenDimTimeout}, {1, 1, screenDimTimeout}}; + + for (int[] expect : testCases) { + mService.mIsFaceDown = expect[0] == 1; + final boolean acquireWakeLock = expect[1] == 1; + if (acquireWakeLock) { + mService.getBinderServiceInstance().acquireWakeLock(token, flags, tag, packageName, + null /* workSource */, null /* historyTag */, Display.INVALID_DISPLAY, + null /* callback */); + } + assertThat(mService.getScreenOffTimeoutOverrideLocked(screenTimeout, screenDimTimeout)) + .isEqualTo(expect[2]); + if (acquireWakeLock) { + mService.getBinderServiceInstance().releaseWakeLock(token, 0); + } + } + } + private void setCachedUidProcState(int uid) { mService.updateUidProcStateInternal(uid, PROCESS_STATE_TOP_SLEEPING); } diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java index 9d32ed847645..1bf9a9d02431 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java @@ -25,6 +25,7 @@ import static android.view.accessibility.Flags.FLAG_SKIP_ACCESSIBILITY_WARNING_D import static com.android.internal.accessibility.AccessibilityShortcutController.ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME; import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME; +import static com.android.server.accessibility.AccessibilityManagerService.ACTION_LAUNCH_HEARING_DEVICES_DIALOG; import static com.google.common.truth.Truth.assertThat; @@ -771,6 +772,7 @@ public class AccessibilityManagerServiceTest { @SmallTest @Test + @RequiresFlagsDisabled(com.android.systemui.Flags.FLAG_HEARING_AIDS_QS_TILE_DIALOG) public void testPerformAccessibilityShortcut_hearingAids_startActivityWithExpectedComponent() { final AccessibilityUserState userState = mA11yms.mUserStates.get( mA11yms.getCurrentUserIdLocked()); @@ -786,6 +788,27 @@ public class AccessibilityManagerServiceTest { ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME.flattenToString()); } + @SmallTest + @Test + @RequiresFlagsEnabled(com.android.systemui.Flags.FLAG_HEARING_AIDS_QS_TILE_DIALOG) + public void testPerformAccessibilityShortcut_hearingAids_sendExpectedBroadcast() { + final AccessibilityUserState userState = mA11yms.mUserStates.get( + mA11yms.getCurrentUserIdLocked()); + mockManageAccessibilityGranted(mTestableContext); + userState.mAccessibilityShortcutKeyTargets.add( + ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME.flattenToString()); + + mA11yms.performAccessibilityShortcut( + ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME.flattenToString()); + mTestableLooper.processAllMessages(); + + ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class); + verify(mTestableContext.getMockContext()).sendBroadcastAsUser(intentCaptor.capture(), + eq(UserHandle.SYSTEM)); + assertThat(intentCaptor.getValue().getAction()).isEqualTo( + ACTION_LAUNCH_HEARING_DEVICES_DIALOG); + } + @Test public void testPackagesForceStopped_disablesRelevantService() { final AccessibilityServiceInfo info_a = new AccessibilityServiceInfo(); @@ -1618,6 +1641,11 @@ public class AccessibilityManagerServiceTest { } @Override + public void sendBroadcastAsUser(Intent intent, UserHandle user) { + mMockContext.sendBroadcastAsUser(intent, user); + } + + @Override public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user, IntentFilter filter, String broadcastPermission, Handler scheduler) { Iterator<String> actions = filter.actionsIterator(); diff --git a/services/tests/servicestests/src/com/android/server/audio/VolumeHelperTest.java b/services/tests/servicestests/src/com/android/server/audio/VolumeHelperTest.java index 83bbd0e3f014..23728db34c34 100644 --- a/services/tests/servicestests/src/com/android/server/audio/VolumeHelperTest.java +++ b/services/tests/servicestests/src/com/android/server/audio/VolumeHelperTest.java @@ -35,6 +35,7 @@ import static android.media.AudioManager.STREAM_NOTIFICATION; import static android.media.AudioManager.STREAM_RING; import static android.media.AudioManager.STREAM_SYSTEM; import static android.media.AudioManager.STREAM_VOICE_CALL; +import static android.media.audio.Flags.autoPublicVolumeApiHardening; import static android.view.KeyEvent.ACTION_DOWN; import static android.view.KeyEvent.KEYCODE_VOLUME_UP; @@ -47,6 +48,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeNotNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -66,6 +68,8 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.AppOpsManager; import android.content.Context; +import android.content.pm.PackageManager; +import android.content.res.Resources; import android.media.AudioDeviceAttributes; import android.media.AudioDeviceInfo; import android.media.AudioManager; @@ -214,6 +218,19 @@ public class VolumeHelperTest { reset(mSpyAudioSystem); + final boolean useFixedVolume = mContext.getResources().getBoolean( + Resources.getSystem().getIdentifier("config_useFixedVolume", "bool", "android")); + final PackageManager packageManager = mContext.getPackageManager(); + final boolean isTelevision = packageManager != null + && (packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK) + || packageManager.hasSystemFeature(PackageManager.FEATURE_TELEVISION)); + final boolean isSingleVolume = mContext.getResources().getBoolean( + Resources.getSystem().getIdentifier("config_single_volume", "bool", "android")); + final boolean automotiveHardened = mContext.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_AUTOMOTIVE) && autoPublicVolumeApiHardening(); + assumeFalse("Skipping test for fixed, TV, single volume and auto devices", + useFixedVolume || isTelevision || isSingleVolume || automotiveHardened); + InstrumentationRegistry.getInstrumentation().getUiAutomation() .adoptShellPermissionIdentity(Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED, Manifest.permission.MODIFY_AUDIO_ROUTING, diff --git a/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java b/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java index f0dc5f0606f3..7e04277fddc0 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java @@ -269,7 +269,7 @@ public class AuthServiceTest { mFingerprintSensorConfigurationsCaptor.capture()); final SensorProps[] fingerprintProp = mFingerprintSensorConfigurationsCaptor.getValue() - .getSensorPairForInstance("defaultHIDL").second; + .getSensorPropForInstance("defaultHIDL"); assertEquals(fingerprintProp[0].commonProps.sensorId, fingerprintId); assertEquals(fingerprintProp[0].commonProps.sensorStrength, @@ -280,7 +280,7 @@ public class AuthServiceTest { final android.hardware.biometrics.face.SensorProps[] faceProp = mFaceSensorConfigurationsCaptor.getValue() - .getSensorPairForInstance("defaultHIDL").second; + .getSensorPropForInstance("defaultHIDL"); assertEquals(faceProp[0].commonProps.sensorId, faceId); assertEquals(faceProp[0].commonProps.sensorStrength, diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/FaceServiceTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/FaceServiceTest.java index 3aaac2e9cf1b..e015e97debb0 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/FaceServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/FaceServiceTest.java @@ -32,8 +32,6 @@ import android.content.ComponentName; import android.content.pm.PackageManager; import android.hardware.biometrics.BiometricAuthenticator; import android.hardware.biometrics.IBiometricService; -import android.hardware.biometrics.face.IFace; -import android.hardware.biometrics.face.SensorProps; import android.hardware.face.FaceAuthenticateOptions; import android.hardware.face.FaceSensorConfigurations; import android.hardware.face.FaceSensorPropertiesInternal; @@ -93,18 +91,12 @@ public class FaceServiceTest { @Mock private FaceProvider mFaceProviderVirtual; @Mock - private IFace mDefaultFaceDaemon; - @Mock - private IFace mVirtualFaceDaemon; - @Mock private IBiometricService mIBiometricService; @Mock private IBinder mToken; @Mock private IFaceServiceReceiver mFaceServiceReceiver; - private final SensorProps mDefaultSensorProps = new SensorProps(); - private final SensorProps mVirtualSensorProps = new SensorProps(); private FaceService mFaceService; private final FaceSensorPropertiesInternal mSensorPropsDefault = new FaceSensorPropertiesInternal(ID_DEFAULT, STRENGTH_STRONG, @@ -126,10 +118,6 @@ public class FaceServiceTest { @Before public void setUp() throws RemoteException { - when(mDefaultFaceDaemon.getSensorProps()).thenReturn( - new SensorProps[]{mDefaultSensorProps}); - when(mVirtualFaceDaemon.getSensorProps()).thenReturn( - new SensorProps[]{mVirtualSensorProps}); when(mFaceProviderDefault.getSensorProperties()).thenReturn(List.of(mSensorPropsDefault)); when(mFaceProviderVirtual.getSensorProperties()).thenReturn(List.of(mSensorPropsVirtual)); when(mFaceProviderDefault.containsSensor(anyInt())) @@ -140,15 +128,7 @@ public class FaceServiceTest { mContext.getTestablePermissions().setPermission( USE_BIOMETRIC_INTERNAL, PackageManager.PERMISSION_GRANTED); mFaceSensorConfigurations = new FaceSensorConfigurations(false); - mFaceSensorConfigurations.addAidlConfigs(new String[]{NAME_DEFAULT, NAME_VIRTUAL}, - (name) -> { - if (name.equals(IFace.DESCRIPTOR + "/" + NAME_DEFAULT)) { - return mDefaultFaceDaemon; - } else if (name.equals(IFace.DESCRIPTOR + "/" + NAME_VIRTUAL)) { - return mVirtualFaceDaemon; - } - return null; - }); + mFaceSensorConfigurations.addAidlConfigs(new String[]{NAME_DEFAULT, NAME_VIRTUAL}); } private void initService() { @@ -199,15 +179,7 @@ public class FaceServiceTest { @RequiresFlagsEnabled(Flags.FLAG_DE_HIDL) public void registerAuthenticatorsLegacy_virtualAlwaysWhenNoOther() throws Exception { mFaceSensorConfigurations = new FaceSensorConfigurations(false); - mFaceSensorConfigurations.addAidlConfigs(new String[]{NAME_VIRTUAL}, - (name) -> { - if (name.equals(IFace.DESCRIPTOR + "/" + NAME_DEFAULT)) { - return mDefaultFaceDaemon; - } else if (name.equals(IFace.DESCRIPTOR + "/" + NAME_VIRTUAL)) { - return mVirtualFaceDaemon; - } - return null; - }); + mFaceSensorConfigurations.addAidlConfigs(new String[]{NAME_VIRTUAL}); initService(); mFaceService.mServiceWrapper.registerAuthenticatorsLegacy(mFaceSensorConfigurations); diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceTest.java index 88956b614eae..20961a9ddddd 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/FingerprintServiceTest.java @@ -43,8 +43,6 @@ import android.app.AppOpsManager; import android.content.ComponentName; import android.content.pm.PackageManager; import android.hardware.biometrics.IBiometricService; -import android.hardware.biometrics.fingerprint.IFingerprint; -import android.hardware.biometrics.fingerprint.SensorProps; import android.hardware.fingerprint.FingerprintAuthenticateOptions; import android.hardware.fingerprint.FingerprintSensorConfigurations; import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; @@ -123,10 +121,6 @@ public class FingerprintServiceTest { private IBinder mToken; @Mock private VirtualDeviceManagerInternal mVdmInternal; - @Mock - private IFingerprint mDefaultFingerprintDaemon; - @Mock - private IFingerprint mVirtualFingerprintDaemon; @Captor private ArgumentCaptor<FingerprintAuthenticateOptions> mAuthenticateOptionsCaptor; @@ -145,8 +139,6 @@ public class FingerprintServiceTest { false /* resetLockoutRequiresHardwareAuthToken */); private FingerprintSensorConfigurations mFingerprintSensorConfigurations; private FingerprintService mService; - private final SensorProps mDefaultSensorProps = new SensorProps(); - private final SensorProps mVirtualSensorProps = new SensorProps(); @Before public void setup() throws Exception { @@ -159,10 +151,6 @@ public class FingerprintServiceTest { .thenAnswer(i -> i.getArguments()[0].equals(ID_DEFAULT)); when(mFingerprintVirtual.containsSensor(anyInt())) .thenAnswer(i -> i.getArguments()[0].equals(ID_VIRTUAL)); - when(mDefaultFingerprintDaemon.getSensorProps()).thenReturn( - new SensorProps[]{mDefaultSensorProps}); - when(mVirtualFingerprintDaemon.getSensorProps()).thenReturn( - new SensorProps[]{mVirtualSensorProps}); mContext.addMockSystemService(AppOpsManager.class, mAppOpsManager); for (int permission : List.of(OP_USE_BIOMETRIC, OP_USE_FINGERPRINT)) { @@ -177,15 +165,7 @@ public class FingerprintServiceTest { mFingerprintSensorConfigurations = new FingerprintSensorConfigurations( true /* resetLockoutRequiresHardwareAuthToken */); - mFingerprintSensorConfigurations.addAidlSensors(new String[]{NAME_DEFAULT, NAME_VIRTUAL}, - (name) -> { - if (name.equals(IFingerprint.DESCRIPTOR + "/" + NAME_DEFAULT)) { - return mDefaultFingerprintDaemon; - } else if (name.equals(IFingerprint.DESCRIPTOR + "/" + NAME_VIRTUAL)) { - return mVirtualFingerprintDaemon; - } - return null; - }); + mFingerprintSensorConfigurations.addAidlSensors(new String[]{NAME_DEFAULT, NAME_VIRTUAL}); } private void initServiceWith(String... aidlInstances) { @@ -270,15 +250,7 @@ public class FingerprintServiceTest { public void registerAuthenticatorsLegacy_virtualAlwaysWhenNoOther() throws Exception { mFingerprintSensorConfigurations = new FingerprintSensorConfigurations(true); - mFingerprintSensorConfigurations.addAidlSensors(new String[]{NAME_VIRTUAL}, - (name) -> { - if (name.equals(IFingerprint.DESCRIPTOR + "/" + NAME_DEFAULT)) { - return mDefaultFingerprintDaemon; - } else if (name.equals(IFingerprint.DESCRIPTOR + "/" + NAME_VIRTUAL)) { - return mVirtualFingerprintDaemon; - } - return null; - }); + mFingerprintSensorConfigurations.addAidlSensors(new String[]{NAME_VIRTUAL}); initServiceWith(NAME_VIRTUAL); mService.mServiceWrapper.registerAuthenticatorsLegacy(mFingerprintSensorConfigurations); diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java index 1bd6e29a7f21..b7175bc8c9ff 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java @@ -58,7 +58,9 @@ import java.util.concurrent.TimeUnit; public class HdmiCecLocalDevicePlaybackTest { private static final int TIMEOUT_MS = HdmiConfig.TIMEOUT_MS + 1; private static final int HOTPLUG_INTERVAL = - HotplugDetectionAction.POLLING_INTERVAL_MS_FOR_PLAYBACK; + HotplugDetectionAction.POLLING_BATCH_INTERVAL_MS_FOR_PLAYBACK; + private static final long POLLING_DELAY = + HotplugDetectionAction.POLLING_MESSAGE_INTERVAL_MS_FOR_PLAYBACK; private static final int PORT_1 = 1; private static final HdmiDeviceInfo INFO_TV = HdmiDeviceInfo.cecDeviceBuilder() @@ -1867,9 +1869,14 @@ public class HdmiCecLocalDevicePlaybackTest { mNativeWrapper.setPollAddressResponse(otherPlaybackLogicalAddress, SendMessageResult.SUCCESS); + // Moving forward to skip hotplug interval for polling to start mTestLooper.moveTimeForward(HOTPLUG_INTERVAL); mTestLooper.dispatchAll(); - + // Skipping each polling delay and dispatch each polling message + for (int i = 0; i < 14; i++) { + mTestLooper.moveTimeForward(POLLING_DELAY); + mTestLooper.dispatchAll(); + } // Check for <Give Physical Address> being sent to the newly discovered device. // This message is sent as part of the HotplugDetectionAction to available devices. HdmiCecMessage givePhysicalAddress = HdmiCecMessageBuilder.buildGivePhysicalAddress( 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 67ae9984266f..902ffed50d94 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java @@ -829,8 +829,8 @@ public class HdmiCecLocalDeviceTvTest { // Playback 1 begins ACKing polls, allowing detection by HotplugDetectionAction mNativeWrapper.setPollAddressResponse(ADDR_PLAYBACK_1, SendMessageResult.SUCCESS); for (int pollCount = 0; pollCount < HotplugDetectionAction.TIMEOUT_COUNT; pollCount++) { - mTestLooper.moveTimeForward( - TimeUnit.SECONDS.toMillis(HotplugDetectionAction.POLLING_INTERVAL_MS_FOR_TV)); + mTestLooper.moveTimeForward(TimeUnit.SECONDS.toMillis( + HotplugDetectionAction.POLLING_BATCH_INTERVAL_MS_FOR_TV)); mTestLooper.dispatchAll(); } @@ -872,7 +872,7 @@ public class HdmiCecLocalDeviceTvTest { // Assert that this device is removed from the list of devices. mNativeWrapper.setPollAddressResponse(Constants.ADDR_PLAYBACK_2, SendMessageResult.NACK); for (int pollCount = 0; pollCount < HotplugDetectionAction.TIMEOUT_COUNT; pollCount++) { - mTestLooper.moveTimeForward(HotplugDetectionAction.POLLING_INTERVAL_MS_FOR_TV); + mTestLooper.moveTimeForward(HotplugDetectionAction.POLLING_BATCH_INTERVAL_MS_FOR_TV); mTestLooper.dispatchAll(); } @@ -920,7 +920,7 @@ public class HdmiCecLocalDeviceTvTest { // Assert that this device is removed from the list of devices. mNativeWrapper.setPollAddressResponse(ADDR_AUDIO_SYSTEM, SendMessageResult.NACK); for (int pollCount = 0; pollCount < HotplugDetectionAction.TIMEOUT_COUNT; pollCount++) { - mTestLooper.moveTimeForward(HotplugDetectionAction.POLLING_INTERVAL_MS_FOR_TV); + mTestLooper.moveTimeForward(HotplugDetectionAction.POLLING_BATCH_INTERVAL_MS_FOR_TV); mTestLooper.dispatchAll(); } diff --git a/services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java b/services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java index 06fc01738967..b3ec2153542a 100644 --- a/services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java +++ b/services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java @@ -19,10 +19,13 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import android.annotation.UserIdInt; import android.content.Intent; import android.content.pm.PackageManagerInternal; import android.net.Uri; +import android.os.Binder; import android.os.Build; +import android.os.UserHandle; import android.testing.TestableContext; import androidx.test.InstrumentationRegistry; @@ -45,10 +48,20 @@ public class UiServiceTestCase { protected static final String PKG_P = "com.example.p"; protected static final String PKG_R = "com.example.r"; + protected static final int UID_N_MR1 = 10001; + protected static final int UID_O = 10002; + protected static final int UID_P = 10003; + protected static final int UID_R = 10004; + @Rule public TestableContext mContext = spy(new TestableContext(InstrumentationRegistry.getContext(), null)); + protected final int mUid = Binder.getCallingUid(); + protected final @UserIdInt int mUserId = UserHandle.getUserId(mUid); + protected final UserHandle mUser = UserHandle.of(mUserId); + protected final String mPkg = mContext.getPackageName(); + protected TestableContext getContext() { return mContext; } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java index 39a962d1bba0..20d1e988556b 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -103,6 +103,7 @@ import static android.service.notification.NotificationListenerService.Ranking.U import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.INVALID_DISPLAY; import static android.view.WindowManager.LayoutParams.TYPE_TOAST; + import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN; import static com.android.server.am.PendingIntentRecord.FLAG_ACTIVITY_SENDER; import static com.android.server.am.PendingIntentRecord.FLAG_BROADCAST_SENDER; @@ -112,11 +113,11 @@ import static com.android.server.notification.NotificationManagerService.DEFAULT import static com.android.server.notification.NotificationRecordLogger.NotificationReportedEvent.NOTIFICATION_ADJUSTED; import static com.android.server.notification.NotificationRecordLogger.NotificationReportedEvent.NOTIFICATION_POSTED; import static com.android.server.notification.NotificationRecordLogger.NotificationReportedEvent.NOTIFICATION_UPDATED; + import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static java.util.Collections.emptyList; -import static java.util.Collections.singletonList; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; @@ -125,6 +126,7 @@ import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertSame; import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; + import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.isNull; @@ -134,6 +136,9 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.*; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; + import android.Manifest; import android.annotation.Nullable; import android.annotation.SuppressLint; @@ -238,8 +243,10 @@ import android.util.AtomicFile; import android.util.Pair; import android.util.Xml; import android.widget.RemoteViews; + import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; + import com.android.internal.R; import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; import com.android.internal.config.sysui.TestableFlagResolver; @@ -270,10 +277,13 @@ import com.android.server.uri.UriGrantsManagerInternal; import com.android.server.utils.quota.MultiRateLimiter; import com.android.server.wm.ActivityTaskManagerInternal; import com.android.server.wm.WindowManagerInternal; + import com.google.android.collect.Lists; import com.google.common.collect.ImmutableList; + import libcore.junit.util.compat.CoreCompatChangeRule.DisableCompatChanges; import libcore.junit.util.compat.CoreCompatChangeRule.EnableCompatChanges; + import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -331,9 +341,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setOwner(new ComponentName("pkg", "cls")) .build(); - private final int mUid = Binder.getCallingUid(); - private final @UserIdInt int mUserId = UserHandle.getUserId(mUid); - @ClassRule public static final LimitDevicesRule sLimitDevicesRule = new LimitDevicesRule(); @@ -357,7 +364,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Mock private PermissionHelper mPermissionHelper; private NotificationChannelLoggerFake mLogger = new NotificationChannelLoggerFake(); - private final String PKG = mContext.getPackageName(); private TestableLooper mTestableLooper; @Mock private RankingHelper mRankingHelper; @@ -566,8 +572,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_NORMAL); when(mPackageManagerClient.hasSystemFeature(FEATURE_WATCH)).thenReturn(false); when(mUgmInternal.newUriPermissionOwner(anyString())).thenReturn(mPermOwner); - when(mPackageManager.getPackagesForUid(mUid)).thenReturn(new String[]{PKG}); - when(mPackageManagerClient.getPackagesForUid(anyInt())).thenReturn(new String[]{PKG}); + when(mPackageManager.getPackagesForUid(mUid)).thenReturn(new String[]{mPkg}); + when(mPackageManagerClient.getPackagesForUid(anyInt())).thenReturn(new String[]{mPkg}); when(mAtm.getTaskToShowPermissionDialogOn(anyString(), anyInt())) .thenReturn(INVALID_TASK_ID); mContext.addMockSystemService(AppOpsManager.class, mock(AppOpsManager.class)); @@ -599,7 +605,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { when(mNlf.isPackageAllowed(null)).thenReturn(true); when(mListeners.getNotificationListenerFilter(any())).thenReturn(mNlf); mListener = mListeners.new ManagedServiceInfo( - null, new ComponentName(PKG, "test_class"), + null, new ComponentName(mPkg, "test_class"), mUserId, true, null, 0, 123); ComponentName defaultComponent = ComponentName.unflattenFromString("config/device"); ArraySet<ComponentName> components = new ArraySet<>(); @@ -743,7 +749,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // Pretend the shortcut exists List<ShortcutInfo> shortcutInfos = new ArrayList<>(); ShortcutInfo info = mock(ShortcutInfo.class); - when(info.getPackage()).thenReturn(PKG); + when(info.getPackage()).thenReturn(mPkg); when(info.getId()).thenReturn(VALID_CONVO_SHORTCUT_ID); when(info.getUserId()).thenReturn(USER_SYSTEM); when(info.isLongLived()).thenReturn(true); @@ -765,16 +771,16 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mBinderService = mService.getBinderService(); mInternalService = mService.getInternalService(); - mBinderService.createNotificationChannels(PKG, new ParceledListSlice( + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice( Arrays.asList(mTestNotificationChannel, mSilentChannel))); mBinderService.createNotificationChannels(PKG_P, new ParceledListSlice( Arrays.asList(mTestNotificationChannel, mSilentChannel))); mBinderService.createNotificationChannels(PKG_O, new ParceledListSlice( Arrays.asList(mTestNotificationChannel, mSilentChannel))); assertNotNull(mBinderService.getNotificationChannel( - PKG, mContext.getUserId(), PKG, TEST_CHANNEL_ID)); + mPkg, mContext.getUserId(), mPkg, TEST_CHANNEL_ID)); assertNotNull(mBinderService.getNotificationChannel( - PKG, mContext.getUserId(), PKG, mSilentChannel.getId())); + mPkg, mContext.getUserId(), mPkg, mSilentChannel.getId())); clearInvocations(mRankingHandler); when(mPermissionHelper.hasPermission(mUid)).thenReturn(true); @@ -976,7 +982,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setSmallIcon(android.R.drawable.sym_def_app_icon) .setGroup(groupKey) .setGroupSummary(isSummary); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, id, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, id, tag, mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); return new NotificationRecord(mContext, sbn, channel); @@ -998,14 +1004,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { if (extender != null) { nb.extend(extender); } - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); return new NotificationRecord(mContext, sbn, channel); } private NotificationRecord generateNotificationRecord(NotificationChannel channel, long postTime) { - final StatusBarNotification sbn = generateSbn(PKG, mUid, postTime, mUserId); + final StatusBarNotification sbn = generateSbn(mPkg, mUid, postTime, mUserId); return new NotificationRecord(mContext, sbn, channel); } @@ -1026,7 +1032,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification.Builder nb = new Notification.Builder(mContext, channel.getId()) .setContentTitle(title) .setSmallIcon(android.R.drawable.sym_def_app_icon); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, id, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, id, "tag", mUid, 0, nb.build(), new UserHandle(userId), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, channel); return r; @@ -1046,7 +1052,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { tag = "tag"; } Notification.Builder nb = getMessageStyleNotifBuilder(addMetadata, groupKey, isSummary); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, id, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, id, tag, mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); return new NotificationRecord(mContext, sbn, channel); @@ -1058,7 +1064,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setContentTitle("foo") .setSmallIcon(android.R.drawable.sym_def_app_icon) .setContentText(REDACTED_TEXT); - return new StatusBarNotification(PKG, PKG, id, "tag", mUid, 0, + return new StatusBarNotification(mPkg, mPkg, id, "tag", mUid, 0, nb.build(), new UserHandle(userId), null, 0); } @@ -1180,13 +1186,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord nrBubble = generateMessageBubbleNotifRecord(true /* addMetadata */, mTestNotificationChannel, 1 /* id */, "tag", groupKey, false /* isSummary */); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nrBubble.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nrBubble.getSbn().getTag(), nrBubble.getSbn().getId(), nrBubble.getSbn().getNotification(), nrBubble.getSbn().getUserId()); waitForIdle(); // Make sure we are a bubble - StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsAfter.length); assertTrue((notifsAfter[0].getNotification().flags & FLAG_BUBBLE) != 0); @@ -1194,12 +1200,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord nrPlain = generateMessageBubbleNotifRecord(false /* addMetadata */, mTestNotificationChannel, 2 /* id */, "tag", groupKey, false /* isSummary */); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nrPlain.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nrPlain.getSbn().getTag(), nrPlain.getSbn().getId(), nrPlain.getSbn().getNotification(), nrPlain.getSbn().getUserId()); waitForIdle(); - notifsAfter = mBinderService.getActiveNotifications(PKG); + notifsAfter = mBinderService.getActiveNotifications(mPkg); assertEquals(2, notifsAfter.length); // Summary notification for both of those @@ -1209,12 +1215,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { if (summaryAutoCancel) { nrSummary.getNotification().flags |= FLAG_AUTO_CANCEL; } - mBinderService.enqueueNotificationWithTag(PKG, PKG, nrSummary.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nrSummary.getSbn().getTag(), nrSummary.getSbn().getId(), nrSummary.getSbn().getNotification(), nrSummary.getSbn().getUserId()); waitForIdle(); - notifsAfter = mBinderService.getActiveNotifications(PKG); + notifsAfter = mBinderService.getActiveNotifications(mPkg); assertEquals(3, notifsAfter.length); return nrSummary; @@ -1229,7 +1235,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setSmallIcon(android.R.drawable.sym_def_app_icon) .setTimeoutAfter(1); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, channel); @@ -1269,17 +1275,17 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testCreateNotificationChannels_SingleChannel() throws Exception { final NotificationChannel channel = new NotificationChannel("id", "name", IMPORTANCE_DEFAULT); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(channel))); final NotificationChannel createdChannel = - mBinderService.getNotificationChannel(PKG, mContext.getUserId(), PKG, "id"); + mBinderService.getNotificationChannel(mPkg, mContext.getUserId(), mPkg, "id"); assertTrue(createdChannel != null); } @Test public void testCreateNotificationChannels_NullChannelThrowsException() throws Exception { try { - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList((Object[])null))); fail("Exception should be thrown immediately."); } catch (NullPointerException e) { @@ -1304,11 +1310,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testCreateNotificationChannels_SecondChannelWithFgndTaskDoesntStartPermDialog() throws Exception { when(mAtm.getTaskToShowPermissionDialogOn(anyString(), anyInt())).thenReturn(TEST_TASK_ID); - assertTrue(mBinderService.getNumNotificationChannelsForPackage(PKG, mUid, true) > 0); + assertTrue(mBinderService.getNumNotificationChannelsForPackage(mPkg, mUid, true) > 0); final NotificationChannel channel = new NotificationChannel("id", "name", IMPORTANCE_DEFAULT); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(channel))); verify(mWorkerHandler, never()).post(any( NotificationManagerService.ShowNotificationPermissionPromptRunnable.class)); @@ -1322,7 +1328,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final NotificationChannel channel = new NotificationChannel("id", "name", IMPORTANCE_DEFAULT); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(channel))); verify(mWorkerHandler, never()).post(any( @@ -1335,12 +1341,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { new NotificationChannel("id1", "name", IMPORTANCE_DEFAULT); final NotificationChannel channel2 = new NotificationChannel("id2", "name", IMPORTANCE_DEFAULT); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(channel1, channel2))); assertTrue(mBinderService.getNotificationChannel( - PKG, mContext.getUserId(), PKG, "id1") != null); + mPkg, mContext.getUserId(), mPkg, "id1") != null); assertTrue(mBinderService.getNotificationChannel( - PKG, mContext.getUserId(), PKG, "id2") != null); + mPkg, mContext.getUserId(), mPkg, "id2") != null); } @Test @@ -1348,16 +1354,16 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { throws Exception { final NotificationChannel channel = new NotificationChannel("id", "name", IMPORTANCE_DEFAULT); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(channel))); // Recreating the channel doesn't throw, but ignores importance. final NotificationChannel dupeChannel = new NotificationChannel("id", "name", IMPORTANCE_HIGH); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(dupeChannel))); final NotificationChannel createdChannel = - mBinderService.getNotificationChannel(PKG, mContext.getUserId(), PKG, "id"); + mBinderService.getNotificationChannel(mPkg, mContext.getUserId(), mPkg, "id"); assertEquals(IMPORTANCE_DEFAULT, createdChannel.getImportance()); } @@ -1366,16 +1372,16 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { throws Exception { final NotificationChannel channel = new NotificationChannel("id", "name", IMPORTANCE_DEFAULT); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(channel))); // Recreating with a lower importance is allowed to modify the channel. final NotificationChannel dupeChannel = new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_LOW); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(dupeChannel))); final NotificationChannel createdChannel = - mBinderService.getNotificationChannel(PKG, mContext.getUserId(), PKG, "id"); + mBinderService.getNotificationChannel(mPkg, mContext.getUserId(), mPkg, "id"); assertEquals(NotificationManager.IMPORTANCE_LOW, createdChannel.getImportance()); } @@ -1384,21 +1390,21 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { throws Exception { final NotificationChannel channel = new NotificationChannel("id", "name", IMPORTANCE_DEFAULT); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(channel))); // The user modifies importance directly, can no longer be changed by the app. final NotificationChannel updatedChannel = new NotificationChannel("id", "name", IMPORTANCE_HIGH); - mBinderService.updateNotificationChannelForPackage(PKG, mUid, updatedChannel); + mBinderService.updateNotificationChannelForPackage(mPkg, mUid, updatedChannel); // Recreating with a lower importance leaves channel unchanged. final NotificationChannel dupeChannel = new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_LOW); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(dupeChannel))); final NotificationChannel createdChannel = - mBinderService.getNotificationChannel(PKG, mContext.getUserId(), PKG, "id"); + mBinderService.getNotificationChannel(mPkg, mContext.getUserId(), mPkg, "id"); assertEquals(IMPORTANCE_HIGH, createdChannel.getImportance()); } @@ -1409,10 +1415,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { new NotificationChannel("id", "name", IMPORTANCE_DEFAULT); final NotificationChannel channel2 = new NotificationChannel("id", "name", IMPORTANCE_HIGH); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(channel1, channel2))); final NotificationChannel createdChannel = - mBinderService.getNotificationChannel(PKG, mContext.getUserId(), PKG, "id"); + mBinderService.getNotificationChannel(mPkg, mContext.getUserId(), mPkg, "id"); assertEquals(IMPORTANCE_DEFAULT, createdChannel.getImportance()); } @@ -1438,9 +1444,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertTrue(mService.isRecordBlockedLocked(r)); mBinderService.createNotificationChannels( - PKG, new ParceledListSlice(Arrays.asList(channel))); + mPkg, new ParceledListSlice(Arrays.asList(channel))); final StatusBarNotification sbn = generateNotificationRecord(channel).getSbn(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testBlockedNotifications_blockedChannel", sbn.getId(), sbn.getNotification(), sbn.getUserId()); waitForIdle(); @@ -1457,18 +1463,18 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationChannel channel = new NotificationChannel("blocked", "name", NotificationManager.IMPORTANCE_NONE); mBinderService.createNotificationChannels( - PKG, new ParceledListSlice(Arrays.asList(channel))); + mPkg, new ParceledListSlice(Arrays.asList(channel))); final StatusBarNotification sbn = generateNotificationRecord(channel).getSbn(); sbn.getNotification().flags |= FLAG_FOREGROUND_SERVICE; - mBinderService.enqueueNotificationWithTag(PKG, PKG, sbn.getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, sbn.getTag(), sbn.getId(), sbn.getNotification(), sbn.getUserId()); waitForIdle(); assertEquals(1, mBinderService.getActiveNotifications(sbn.getPackageName()).length); assertEquals(IMPORTANCE_LOW, mService.getNotificationRecord(sbn.getKey()).getImportance()); assertEquals(IMPORTANCE_LOW, mBinderService.getNotificationChannel( - PKG, mContext.getUserId(), PKG, channel.getId()).getImportance()); + mPkg, mContext.getUserId(), mPkg, channel.getId()).getImportance()); } @Test @@ -1481,18 +1487,18 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationChannel channel = new NotificationChannel("blockedbyuser", "name", IMPORTANCE_HIGH); mBinderService.createNotificationChannels( - PKG, new ParceledListSlice(Arrays.asList(channel))); + mPkg, new ParceledListSlice(Arrays.asList(channel))); NotificationChannel update = new NotificationChannel("blockedbyuser", "name", IMPORTANCE_NONE); - mBinderService.updateNotificationChannelForPackage(PKG, mUid, update); + mBinderService.updateNotificationChannelForPackage(mPkg, mUid, update); waitForIdle(); assertEquals(IMPORTANCE_NONE, mBinderService.getNotificationChannel( - PKG, mContext.getUserId(), PKG, channel.getId()).getImportance()); + mPkg, mContext.getUserId(), mPkg, channel.getId()).getImportance()); StatusBarNotification sbn = generateNotificationRecord(channel).getSbn(); sbn.getNotification().flags |= FLAG_FOREGROUND_SERVICE; - mBinderService.enqueueNotificationWithTag(PKG, PKG, sbn.getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, sbn.getTag(), sbn.getId(), sbn.getNotification(), sbn.getUserId()); waitForIdle(); // The first time a foreground service notification is shown, we allow the channel @@ -1501,20 +1507,20 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertEquals(IMPORTANCE_LOW, mService.getNotificationRecord(sbn.getKey()).getImportance()); assertEquals(IMPORTANCE_LOW, mBinderService.getNotificationChannel( - PKG, mContext.getUserId(), PKG, channel.getId()).getImportance()); - mBinderService.cancelNotificationWithTag(PKG, PKG, "tag", sbn.getId(), sbn.getUserId()); + mPkg, mContext.getUserId(), mPkg, channel.getId()).getImportance()); + mBinderService.cancelNotificationWithTag(mPkg, mPkg, "tag", sbn.getId(), sbn.getUserId()); waitForIdle(); update = new NotificationChannel("blockedbyuser", "name", IMPORTANCE_NONE); update.setUserVisibleTaskShown(true); - mBinderService.updateNotificationChannelForPackage(PKG, mUid, update); + mBinderService.updateNotificationChannelForPackage(mPkg, mUid, update); waitForIdle(); assertEquals(IMPORTANCE_NONE, mBinderService.getNotificationChannel( - PKG, mContext.getUserId(), PKG, channel.getId()).getImportance()); + mPkg, mContext.getUserId(), mPkg, channel.getId()).getImportance()); sbn = generateNotificationRecord(channel).getSbn(); sbn.getNotification().flags |= FLAG_FOREGROUND_SERVICE; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testEnqueuedBlockedNotifications_userBlockedChannelForegroundService", sbn.getId(), sbn.getNotification(), sbn.getUserId()); waitForIdle(); @@ -1522,7 +1528,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertEquals(0, mBinderService.getActiveNotifications(sbn.getPackageName()).length); assertNull(mService.getNotificationRecord(sbn.getKey())); assertEquals(IMPORTANCE_NONE, mBinderService.getNotificationChannel( - PKG, mContext.getUserId(), PKG, channel.getId()).getImportance()); + mPkg, mContext.getUserId(), mPkg, channel.getId()).getImportance()); } @Test @@ -1545,7 +1551,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { when(mPermissionHelper.hasPermission(mUid)).thenReturn(false); final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testEnqueuedBlockedNotifications_blockedApp", sbn.getId(), sbn.getNotification(), sbn.getUserId()); waitForIdle(); @@ -1561,7 +1567,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().flags |= FLAG_FOREGROUND_SERVICE; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testEnqueuedBlockedNotifications_blockedAppForegroundService", sbn.getId(), sbn.getNotification(), sbn.getUserId()); waitForIdle(); @@ -1590,12 +1596,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel, ++id, "", false).getSbn(); sbn.getNotification().category = category; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testEnqueuedRestrictedNotifications_asSystem", sbn.getId(), sbn.getNotification(), sbn.getUserId()); } waitForIdle(); - assertEquals(categories.size(), mBinderService.getActiveNotifications(PKG).length); + assertEquals(categories.size(), mBinderService.getActiveNotifications(mPkg).length); } @@ -1614,12 +1620,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel, ++id, "", false).getSbn(); sbn.getNotification().category = category; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testEnqueuedRestrictedNotifications_notAutomotive", sbn.getId(), sbn.getNotification(), sbn.getUserId()); } waitForIdle(); - assertEquals(categories.size(), mBinderService.getActiveNotifications(PKG).length); + assertEquals(categories.size(), mBinderService.getActiveNotifications(mPkg).length); } /** @@ -1637,7 +1643,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().category = category; try { - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testEnqueuedRestrictedNotifications_badUser", sbn.getId(), sbn.getNotification(), sbn.getUserId()); fail("Calls from non system apps should not allow use of restricted categories"); @@ -1646,7 +1652,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { } } waitForIdle(); - assertEquals(0, mBinderService.getActiveNotifications(PKG).length); + assertEquals(0, mBinderService.getActiveNotifications(mPkg).length); } @Test @@ -1726,7 +1732,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord nr = generateNotificationRecord( new NotificationChannel("did not create", "", IMPORTANCE_DEFAULT)); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -1736,7 +1742,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { reset(mPermissionHelper); when(mPermissionHelper.hasPermission(mUid)).thenReturn(true); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -1748,7 +1754,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testEnqueueNotification_appBlocked() throws Exception { when(mPermissionHelper.hasPermission(mUid)).thenReturn(false); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testEnqueueNotification_appBlocked", 0, generateNotificationRecord(null).getNotification(), mUserId); waitForIdle(); @@ -1758,11 +1764,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testEnqueueNotificationWithTag_PopulatesGetActiveNotifications() throws Exception { - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testEnqueueNotificationWithTag_PopulatesGetActiveNotifications", 0, generateNotificationRecord(null).getNotification(), mUserId); waitForIdle(); - StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifs = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifs.length); assertEquals(1, mService.getNotificationRecordCount()); } @@ -1770,7 +1776,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testEnqueueNotificationWithTag_WritesExpectedLogs() throws Exception { final String tag = "testEnqueueNotificationWithTag_WritesExpectedLog"; - mBinderService.enqueueNotificationWithTag(PKG, PKG, tag, 0, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, tag, 0, generateNotificationRecord(null).getNotification(), mUserId); waitForIdle(); assertEquals(1, mNotificationRecordLogger.numCalls()); @@ -1782,7 +1788,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertNull(call.old); assertEquals(0, call.position); assertEquals(0, call.buzzBeepBlink); - assertEquals(PKG, call.r.getSbn().getPackageName()); + assertEquals(mPkg, call.r.getSbn().getPackageName()); assertEquals(0, call.r.getSbn().getId()); assertEquals(tag, call.r.getSbn().getTag()); assertEquals(1, call.getInstanceId()); // Fake instance IDs are assigned in order @@ -1795,12 +1801,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification original = new Notification.Builder(mContext, mTestNotificationChannel.getId()) .setSmallIcon(android.R.drawable.sym_def_app_icon).build(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, tag, 0, original, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, tag, 0, original, mUserId); Notification update = new Notification.Builder(mContext, mTestNotificationChannel.getId()) .setSmallIcon(android.R.drawable.sym_def_app_icon) .setCategory(Notification.CATEGORY_ALARM).build(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, tag, 0, update, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, tag, 0, update, mUserId); waitForIdle(); assertEquals(2, mNotificationRecordLogger.numCalls()); @@ -1819,9 +1825,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testEnqueueNotificationWithTag_DoesNotLogOnMinorUpdate() throws Exception { final String tag = "testEnqueueNotificationWithTag_DoesNotLogOnMinorUpdate"; - mBinderService.enqueueNotificationWithTag(PKG, PKG, tag, 0, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, tag, 0, generateNotificationRecord(null).getNotification(), mUserId); - mBinderService.enqueueNotificationWithTag(PKG, PKG, tag, 0, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, tag, 0, generateNotificationRecord(null).getNotification(), mUserId); waitForIdle(); assertEquals(2, mNotificationRecordLogger.numCalls()); @@ -1834,12 +1840,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testEnqueueNotificationWithTag_DoesNotLogOnTitleUpdate() throws Exception { final String tag = "testEnqueueNotificationWithTag_DoesNotLogOnTitleUpdate"; - mBinderService.enqueueNotificationWithTag(PKG, PKG, tag, 0, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, tag, 0, generateNotificationRecord(null).getNotification(), mUserId); final Notification notif = generateNotificationRecord(null).getNotification(); notif.extras.putString(Notification.EXTRA_TITLE, "Changed title"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, tag, 0, notif, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, tag, 0, notif, mUserId); waitForIdle(); assertEquals(2, mNotificationRecordLogger.numCalls()); assertEquals(NOTIFICATION_POSTED, mNotificationRecordLogger.event(0)); @@ -1852,11 +1858,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification notification = new Notification.Builder(mContext, mTestNotificationChannel.getId()) .setSmallIcon(android.R.drawable.sym_def_app_icon).build(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, tag, 0, notification, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, tag, 0, notification, mUserId); waitForIdle(); - mBinderService.cancelNotificationWithTag(PKG, PKG, tag, 0, mUserId); + mBinderService.cancelNotificationWithTag(mPkg, mPkg, tag, 0, mUserId); waitForIdle(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, tag, 0, notification, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, tag, 0, notification, mUserId); waitForIdle(); assertEquals(3, mNotificationRecordLogger.numCalls()); @@ -1893,14 +1899,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setSmallIcon(android.R.drawable.sym_def_app_icon) .setFlag(FLAG_FOREGROUND_SERVICE, true) .build(); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, tag, mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, tag, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); - mBinderService.enqueueNotificationWithTag(PKG, PKG, tag, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, tag, sbn.getId(), sbn.getNotification(), sbn.getUserId()); waitForIdle(); StatusBarNotification[] notifs = - mBinderService.getActiveNotifications(PKG); + mBinderService.getActiveNotifications(mPkg); assertThat(notifs[0].getNotification().flags).isEqualTo( FLAG_FOREGROUND_SERVICE | FLAG_CAN_COLORIZE | FLAG_NO_CLEAR); } @@ -1916,10 +1922,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); n.actions[1] = null; - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, n, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", 0, n, mUserId); waitForIdle(); - StatusBarNotification[] posted = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] posted = mBinderService.getActiveNotifications(mPkg); assertThat(posted).hasLength(1); assertThat(posted[0].getNotification().actions).hasLength(2); assertThat(posted[0].getNotification().actions[0].title.toString()).isEqualTo("one"); @@ -1937,17 +1943,17 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { n.actions[0] = null; n.actions[1] = null; - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, n, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", 0, n, mUserId); waitForIdle(); - StatusBarNotification[] posted = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] posted = mBinderService.getActiveNotifications(mPkg); assertThat(posted).hasLength(1); assertThat(posted[0].getNotification().actions).isNull(); } @Test public void enqueueNotificationWithTag_usesAndFinishesTracker() throws Exception { - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testEnqueueNotificationWithTag_PopulatesGetActiveNotifications", 0, generateNotificationRecord(null).getNotification(), mUserId); @@ -1956,7 +1962,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); - assertThat(mBinderService.getActiveNotifications(PKG)).hasLength(1); + assertThat(mBinderService.getActiveNotifications(mPkg)).hasLength(1); assertThat(mPostNotificationTrackerFactory.mCreatedTrackers).hasSize(1); assertThat(mPostNotificationTrackerFactory.mCreatedTrackers.get(0).isOngoing()).isFalse(); } @@ -1965,13 +1971,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void enqueueNotificationWithTag_throws_usesAndCancelsTracker() throws Exception { // Simulate not enqueued due to rejected inputs. assertThrows(Exception.class, - () -> mBinderService.enqueueNotificationWithTag(PKG, PKG, + () -> mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testEnqueueNotificationWithTag_PopulatesGetActiveNotifications", 0, /* notification= */ null, mUserId)); waitForIdle(); - assertThat(mBinderService.getActiveNotifications(PKG)).hasLength(0); + assertThat(mBinderService.getActiveNotifications(mPkg)).hasLength(0); assertThat(mPostNotificationTrackerFactory.mCreatedTrackers).hasSize(1); assertThat(mPostNotificationTrackerFactory.mCreatedTrackers.get(0).isOngoing()).isFalse(); } @@ -1982,12 +1988,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { when(mSnoozeHelper.getSnoozeContextForUnpostedNotification(anyInt(), any(), any())) .thenReturn("zzzzzzz"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testEnqueueNotificationWithTag_PopulatesGetActiveNotifications", 0, generateNotificationRecord(null).getNotification(), mUserId); waitForIdle(); - assertThat(mBinderService.getActiveNotifications(PKG)).hasLength(0); + assertThat(mBinderService.getActiveNotifications(mPkg)).hasLength(0); assertThat(mPostNotificationTrackerFactory.mCreatedTrackers).hasSize(1); assertThat(mPostNotificationTrackerFactory.mCreatedTrackers.get(0).isOngoing()).isFalse(); } @@ -1997,19 +2003,19 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // Simulate not posted due to blocked app. when(mPermissionHelper.hasPermission(anyInt())).thenReturn(false); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testEnqueueNotificationWithTag_PopulatesGetActiveNotifications", 0, generateNotificationRecord(null).getNotification(), mUserId); waitForIdle(); - assertThat(mBinderService.getActiveNotifications(PKG)).hasLength(0); + assertThat(mBinderService.getActiveNotifications(mPkg)).hasLength(0); assertThat(mPostNotificationTrackerFactory.mCreatedTrackers).hasSize(1); assertThat(mPostNotificationTrackerFactory.mCreatedTrackers.get(0).isOngoing()).isFalse(); } @Test public void enqueueNotification_acquiresAndReleasesWakeLock() throws Exception { - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "enqueueNotification_acquiresAndReleasesWakeLock", 0, generateNotificationRecord(null).getNotification(), mUserId); @@ -2027,7 +2033,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void enqueueNotification_throws_acquiresAndReleasesWakeLock() throws Exception { // Simulate not enqueued due to rejected inputs. assertThrows(Exception.class, - () -> mBinderService.enqueueNotificationWithTag(PKG, PKG, + () -> mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "enqueueNotification_throws_acquiresAndReleasesWakeLock", 0, /* notification= */ null, mUserId)); @@ -2042,7 +2048,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { when(mSnoozeHelper.getSnoozeContextForUnpostedNotification(anyInt(), any(), any())) .thenReturn("zzzzzzz"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "enqueueNotification_notEnqueued_acquiresAndReleasesWakeLock", 0, generateNotificationRecord(null).getNotification(), mUserId); @@ -2063,7 +2069,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setContentTitle("foo") .build(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "enqueueNotification_notPosted_acquiresAndReleasesWakeLock", 0, notif, mUserId); @@ -2088,14 +2094,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { WakeLock wakeLock = mock(WakeLock.class); when(mPowerManager.newWakeLock(anyInt(), anyString())).thenReturn(wakeLock); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "enqueueNotification_setsWakeLockWorkSource", 0, generateNotificationRecord(null).getNotification(), mUserId); waitForIdle(); InOrder inOrder = inOrder(mPowerManager, wakeLock); inOrder.verify(mPowerManager).newWakeLock(eq(PARTIAL_WAKE_LOCK), anyString()); - inOrder.verify(wakeLock).setWorkSource(eq(new WorkSource(mUid, PKG))); + inOrder.verify(wakeLock).setWorkSource(eq(new WorkSource(mUid, mPkg))); inOrder.verify(wakeLock).acquire(anyLong()); inOrder.verify(wakeLock).release(); inOrder.verifyNoMoreInteractions(); @@ -2103,7 +2109,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testCancelNonexistentNotification() throws Exception { - mBinderService.cancelNotificationWithTag(PKG, PKG, + mBinderService.cancelNotificationWithTag(mPkg, mPkg, "testCancelNonexistentNotification", 0, mUserId); waitForIdle(); // The notification record logger doesn't even get called when a nonexistent notification @@ -2113,14 +2119,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testCancelNotificationImmediatelyAfterEnqueue() throws Exception { - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelNotificationImmediatelyAfterEnqueue", 0, generateNotificationRecord(null).getNotification(), mUserId); - mBinderService.cancelNotificationWithTag(PKG, PKG, + mBinderService.cancelNotificationWithTag(mPkg, mPkg, "testCancelNotificationImmediatelyAfterEnqueue", 0, mUserId); waitForIdle(); StatusBarNotification[] notifs = - mBinderService.getActiveNotifications(PKG); + mBinderService.getActiveNotifications(mPkg); assertEquals(0, notifs.length); assertEquals(0, mService.getNotificationRecordCount()); } @@ -2129,39 +2135,39 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testPostCancelPostNotifiesListeners() throws Exception { // WHEN a notification is posted final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", sbn.getId(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", sbn.getId(), sbn.getNotification(), sbn.getUserId()); mTestableLooper.moveTimeForward(1); // THEN it is canceled - mBinderService.cancelNotificationWithTag(PKG, PKG, "tag", sbn.getId(), sbn.getUserId()); + mBinderService.cancelNotificationWithTag(mPkg, mPkg, "tag", sbn.getId(), sbn.getUserId()); mTestableLooper.moveTimeForward(1); // THEN it is posted again (before the cancel has a chance to finish) - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", sbn.getId(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", sbn.getId(), sbn.getNotification(), sbn.getUserId()); // THEN the later enqueue isn't swallowed by the cancel. I.e., ordering is respected waitForIdle(); // The final enqueue made it to the listener instead of being canceled StatusBarNotification[] notifs = - mBinderService.getActiveNotifications(PKG); + mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifs.length); assertEquals(1, mService.getNotificationRecordCount()); } @Test public void testCancelNotificationWhilePostedAndEnqueued() throws Exception { - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelNotificationWhilePostedAndEnqueued", 0, generateNotificationRecord(null).getNotification(), mUserId); waitForIdle(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelNotificationWhilePostedAndEnqueued", 0, generateNotificationRecord(null).getNotification(), mUserId); - mBinderService.cancelNotificationWithTag(PKG, PKG, + mBinderService.cancelNotificationWithTag(mPkg, mPkg, "testCancelNotificationWhilePostedAndEnqueued", 0, mUserId); waitForIdle(); StatusBarNotification[] notifs = - mBinderService.getActiveNotifications(PKG); + mBinderService.getActiveNotifications(mPkg); assertEquals(0, notifs.length); assertEquals(0, mService.getNotificationRecordCount()); ArgumentCaptor<NotificationStats> captor = ArgumentCaptor.forClass(NotificationStats.class); @@ -2173,7 +2179,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testCancelNotificationsFromListenerImmediatelyAfterEnqueue() throws Exception { NotificationRecord r = generateNotificationRecord(null); final StatusBarNotification sbn = r.getSbn(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelNotificationsFromListenerImmediatelyAfterEnqueue", sbn.getId(), sbn.getNotification(), sbn.getUserId()); mBinderService.cancelNotificationsFromListener(null, null); @@ -2187,10 +2193,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testCancelAllNotificationsImmediatelyAfterEnqueue() throws Exception { final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelAllNotificationsImmediatelyAfterEnqueue", sbn.getId(), sbn.getNotification(), sbn.getUserId()); - mBinderService.cancelAllNotifications(PKG, sbn.getUserId()); + mBinderService.cancelAllNotifications(mPkg, sbn.getUserId()); waitForIdle(); StatusBarNotification[] notifs = mBinderService.getActiveNotifications(sbn.getPackageName()); @@ -2203,7 +2209,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final NotificationRecord n = generateNotificationRecord( mTestNotificationChannel, 1, "group", true); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testUserInitiatedClearAll_noLeak", n.getSbn().getId(), n.getSbn().getNotification(), n.getSbn().getUserId()); waitForIdle(); @@ -2227,17 +2233,17 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final NotificationRecord child = generateNotificationRecord( mTestNotificationChannel, 2, "group1", false); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelAllNotificationsCancelsChildren", parent.getSbn().getId(), parent.getSbn().getNotification(), parent.getSbn().getUserId()); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelAllNotificationsCancelsChildren", child.getSbn().getId(), child.getSbn().getNotification(), child.getSbn().getUserId()); waitForIdle(); - mBinderService.cancelAllNotifications(PKG, parent.getSbn().getUserId()); + mBinderService.cancelAllNotifications(mPkg, parent.getSbn().getUserId()); waitForIdle(); assertEquals(0, mService.getNotificationRecordCount()); } @@ -2246,11 +2252,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testCancelAllNotificationsMultipleEnqueuedDoesNotCrash() throws Exception { final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); for (int i = 0; i < 10; i++) { - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelAllNotificationsMultipleEnqueuedDoesNotCrash", sbn.getId(), sbn.getNotification(), sbn.getUserId()); } - mBinderService.cancelAllNotifications(PKG, sbn.getUserId()); + mBinderService.cancelAllNotifications(mPkg, sbn.getUserId()); waitForIdle(); assertEquals(0, mService.getNotificationRecordCount()); @@ -2266,7 +2272,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mTestNotificationChannel, 2, "group1", false); // fully post parent notification - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelGroupSummaryMultipleEnqueuedChildrenDoesNotCrash", parent.getSbn().getId(), parent.getSbn().getNotification(), parent.getSbn().getUserId()); @@ -2274,13 +2280,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // enqueue the child several times for (int i = 0; i < 10; i++) { - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelGroupSummaryMultipleEnqueuedChildrenDoesNotCrash", child.getSbn().getId(), child.getSbn().getNotification(), child.getSbn().getUserId()); } // make the parent a child, which will cancel the child notification - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelGroupSummaryMultipleEnqueuedChildrenDoesNotCrash", parentAsChild.getSbn().getId(), parentAsChild.getSbn().getNotification(), parentAsChild.getSbn().getUserId()); @@ -2332,10 +2338,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { any(), anyString(), anyInt(), anyString(), anyInt())).thenReturn(SHOW_IMMEDIATELY); final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().flags |= FLAG_FOREGROUND_SERVICE; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelAllNotifications_IgnoreForegroundService", sbn.getId(), sbn.getNotification(), sbn.getUserId()); - mBinderService.cancelAllNotifications(PKG, sbn.getUserId()); + mBinderService.cancelAllNotifications(mPkg, sbn.getUserId()); waitForIdle(); StatusBarNotification[] notifs = mBinderService.getActiveNotifications(sbn.getPackageName()); @@ -2350,10 +2356,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .thenReturn(NOT_FOREGROUND_SERVICE); final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().flags |= FLAG_FOREGROUND_SERVICE; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelAllNotifications_IgnoreForegroundService", sbn.getId(), sbn.getNotification(), sbn.getUserId()); - mBinderService.cancelAllNotifications(PKG, sbn.getUserId()); + mBinderService.cancelAllNotifications(mPkg, sbn.getUserId()); waitForIdle(); StatusBarNotification[] notifs = mBinderService.getActiveNotifications(sbn.getPackageName()); @@ -2367,7 +2373,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .thenReturn(SHOW_IMMEDIATELY); final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().flags |= FLAG_FOREGROUND_SERVICE; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelAllNotifications_IgnoreOtherPackages", sbn.getId(), sbn.getNotification(), sbn.getUserId()); mBinderService.cancelAllNotifications("other_pkg_name", sbn.getUserId()); @@ -2381,7 +2387,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testCancelAllNotifications_NullPkgRemovesAll() throws Exception { final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelAllNotifications_NullPkgRemovesAll", sbn.getId(), sbn.getNotification(), sbn.getUserId()); mBinderService.cancelAllNotifications(null, sbn.getUserId()); @@ -2395,7 +2401,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testCancelAllNotifications_NullPkgIgnoresUserAllNotifications() throws Exception { final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelAllNotifications_NullPkgIgnoresUserAllNotifications", sbn.getId(), sbn.getNotification(), UserHandle.USER_ALL); // Null pkg is how we signal a user switch. @@ -2411,10 +2417,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testAppInitiatedCancelAllNotifications_CancelsNoClearFlag() throws Exception { final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().flags |= Notification.FLAG_NO_CLEAR; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testAppInitiatedCancelAllNotifications_CancelsNoClearFlag", sbn.getId(), sbn.getNotification(), sbn.getUserId()); - mBinderService.cancelAllNotifications(PKG, sbn.getUserId()); + mBinderService.cancelAllNotifications(mPkg, sbn.getUserId()); waitForIdle(); StatusBarNotification[] notifs = mBinderService.getActiveNotifications(sbn.getPackageName()); @@ -2427,7 +2433,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mTestNotificationChannel, 1, "group", true); notif.getNotification().flags |= Notification.FLAG_NO_CLEAR; mService.addNotification(notif); - mService.cancelAllNotificationsInt(mUid, 0, PKG, null, 0, 0, + mService.cancelAllNotificationsInt(mUid, 0, mPkg, null, 0, 0, notif.getUserId(), REASON_CANCEL); waitForIdle(); StatusBarNotification[] notifs = @@ -2462,9 +2468,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { StatusBarNotification sbn = new StatusBarNotification("a", "a", 0, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); sbn.getNotification().flags |= FLAG_FOREGROUND_SERVICE; - mBinderService.enqueueNotificationWithTag(PKG, PKG, null, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, null, sbn.getId(), sbn.getNotification(), sbn.getUserId()); - mInternalService.removeForegroundServiceFlagFromNotification(PKG, sbn.getId(), + mInternalService.removeForegroundServiceFlagFromNotification(mPkg, sbn.getId(), sbn.getUserId()); waitForIdle(); StatusBarNotification[] notifs = @@ -2477,12 +2483,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().flags = Notification.FLAG_ONGOING_EVENT | FLAG_FOREGROUND_SERVICE; - mBinderService.enqueueNotificationWithTag(PKG, PKG, sbn.getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, sbn.getTag(), sbn.getId(), sbn.getNotification(), sbn.getUserId()); sbn.getNotification().flags = Notification.FLAG_ONGOING_EVENT; - mBinderService.enqueueNotificationWithTag(PKG, PKG, sbn.getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, sbn.getTag(), sbn.getId(), sbn.getNotification(), sbn.getUserId()); - mBinderService.cancelNotificationWithTag(PKG, PKG, sbn.getTag(), sbn.getId(), + mBinderService.cancelNotificationWithTag(mPkg, mPkg, sbn.getTag(), sbn.getId(), sbn.getUserId()); waitForIdle(); assertEquals(0, mBinderService.getActiveNotifications(sbn.getPackageName()).length); @@ -2501,7 +2507,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertThat(mBinderService.getActiveNotifications(sbn.getPackageName()).length).isEqualTo(1); assertThat(mService.getNotificationRecordCount()).isEqualTo(1); - mBinderService.cancelNotificationWithTag(PKG, PKG, sbn.getTag(), sbn.getId(), + mBinderService.cancelNotificationWithTag(mPkg, mPkg, sbn.getTag(), sbn.getId(), sbn.getUserId()); waitForIdle(); @@ -2520,7 +2526,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY); mSetFlagsRule.disableFlags(android.app.Flags.FLAG_LIFETIME_EXTENSION_REFACTOR); - mBinderService.cancelNotificationWithTag(PKG, PKG, sbn.getTag(), sbn.getId(), + mBinderService.cancelNotificationWithTag(mPkg, mPkg, sbn.getTag(), sbn.getId(), sbn.getUserId()); waitForIdle(); @@ -2542,13 +2548,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mTestNotificationChannel, 2, null, false); mService.addNotification(notifCancelable); // Verify that both notifications have been posted and are active. - assertThat(mBinderService.getActiveNotifications(PKG).length).isEqualTo(2); + assertThat(mBinderService.getActiveNotifications(mPkg).length).isEqualTo(2); - mBinderService.cancelAllNotifications(PKG, notif.getSbn().getUserId()); + mBinderService.cancelAllNotifications(mPkg, notif.getSbn().getUserId()); waitForIdle(); // The non-lifetime extended notification, with id = 2, has been cancelled. - StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifs = mBinderService.getActiveNotifications(mPkg); assertThat(notifs.length).isEqualTo(1); assertThat(notifs[0].getId()).isEqualTo(1); @@ -3230,7 +3236,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testGroupInstanceIds() throws Exception { final NotificationRecord group1 = generateNotificationRecord( mTestNotificationChannel, 1, "group1", true); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "testGroupInstanceIds", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testGroupInstanceIds", group1.getSbn().getId(), group1.getSbn().getNotification(), group1.getSbn().getUserId()); waitForIdle(); @@ -3238,7 +3244,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // same group, child, should be returned final NotificationRecord group1Child = generateNotificationRecord( mTestNotificationChannel, 2, "group1", false); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "testGroupInstanceIds", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testGroupInstanceIds", group1Child.getSbn().getId(), group1Child.getSbn().getNotification(), group1Child.getSbn().getUserId()); waitForIdle(); @@ -3259,7 +3265,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // should not be returned final NotificationRecord group2 = generateNotificationRecord( mTestNotificationChannel, 2, "group2", true); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "testFindGroupNotificationsLocked", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testFindGroupNotificationsLocked", group2.getSbn().getId(), group2.getSbn().getNotification(), group2.getSbn().getUserId()); waitForIdle(); @@ -3267,7 +3273,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // should not be returned final NotificationRecord nonGroup = generateNotificationRecord( mTestNotificationChannel, 3, null, false); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "testFindGroupNotificationsLocked", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testFindGroupNotificationsLocked", nonGroup.getSbn().getId(), nonGroup.getSbn().getNotification(), nonGroup.getSbn().getUserId()); waitForIdle(); @@ -3275,13 +3281,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // same group, child, should be returned final NotificationRecord group1Child = generateNotificationRecord( mTestNotificationChannel, 4, "group1", false); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "testFindGroupNotificationsLocked", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testFindGroupNotificationsLocked", group1Child.getSbn().getId(), group1Child.getSbn().getNotification(), group1Child.getSbn().getUserId()); waitForIdle(); List<NotificationRecord> inGroup1 = - mService.findGroupNotificationsLocked(PKG, group1.getGroupKey(), + mService.findGroupNotificationsLocked(mPkg, group1.getGroupKey(), group1.getSbn().getUserId()); assertEquals(3, inGroup1.size()); for (NotificationRecord record : inGroup1) { @@ -3296,7 +3302,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mTestNotificationChannel, 1, "group", true); notif.getNotification().flags |= Notification.FLAG_NO_CLEAR; mService.addNotification(notif); - mService.cancelAllNotificationsInt(mUid, 0, PKG, null, 0, + mService.cancelAllNotificationsInt(mUid, 0, mPkg, null, 0, Notification.FLAG_ONGOING_EVENT, notif.getUserId(), REASON_CANCEL); waitForIdle(); StatusBarNotification[] notifs = @@ -3308,10 +3314,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testAppInitiatedCancelAllNotifications_CancelsOngoingFlag() throws Exception { final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().flags |= Notification.FLAG_ONGOING_EVENT; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testAppInitiatedCancelAllNotifications_CancelsOnGoingFlag", sbn.getId(), sbn.getNotification(), sbn.getUserId()); - mBinderService.cancelAllNotifications(PKG, sbn.getUserId()); + mBinderService.cancelAllNotifications(mPkg, sbn.getUserId()); waitForIdle(); StatusBarNotification[] notifs = mBinderService.getActiveNotifications(sbn.getPackageName()); @@ -3324,7 +3330,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mTestNotificationChannel, 1, "group", true); notif.getNotification().flags |= Notification.FLAG_ONGOING_EVENT; mService.addNotification(notif); - mService.cancelAllNotificationsInt(mUid, 0, PKG, null, 0, 0, + mService.cancelAllNotificationsInt(mUid, 0, mPkg, null, 0, 0, notif.getUserId(), REASON_CANCEL); waitForIdle(); StatusBarNotification[] notifs = @@ -3420,16 +3426,16 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testPostNotification_appPermissionFixed() throws Exception { when(mPermissionHelper.hasPermission(mUid)).thenReturn(true); - when(mPermissionHelper.isPermissionFixed(PKG, mUserId)).thenReturn(true); + when(mPermissionHelper.isPermissionFixed(mPkg, mUserId)).thenReturn(true); NotificationRecord temp = generateNotificationRecord(mTestNotificationChannel); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testPostNotification_appPermissionFixed", 0, temp.getNotification(), mUserId); waitForIdle(); assertThat(mService.getNotificationRecordCount()).isEqualTo(1); StatusBarNotification[] notifs = - mBinderService.getActiveNotifications(PKG); + mBinderService.getActiveNotifications(mPkg); assertThat(mService.getNotificationRecord(notifs[0].getKey()).isImportanceFixed()).isTrue(); } @@ -3439,7 +3445,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addNotification(temp); when(mPermissionHelper.hasPermission(mUid)).thenReturn(true); - when(mPermissionHelper.isPermissionFixed(PKG, temp.getUserId())).thenReturn(true); + when(mPermissionHelper.isPermissionFixed(mPkg, temp.getUserId())).thenReturn(true); NotificationRecord r = mService.createAutoGroupSummary(temp.getUserId(), temp.getSbn().getPackageName(), temp.getKey(), 0, mock(Icon.class), 0, @@ -3457,7 +3463,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { new NotificationChannel("foo", "foo", IMPORTANCE_HIGH)); Notification.TvExtender tv = new Notification.TvExtender().setChannelId("foo"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "testTvExtenderChannelOverride_onTv", 0, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testTvExtenderChannelOverride_onTv", 0, generateNotificationRecord(null, tv).getNotification(), mUserId); verify(mPreferencesHelper, times(1)).getConversationNotificationChannel( anyString(), anyInt(), eq("foo"), eq(null), anyBoolean(), anyBoolean()); @@ -3472,7 +3478,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mTestNotificationChannel); Notification.TvExtender tv = new Notification.TvExtender().setChannelId("foo"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "testTvExtenderChannelOverride_notOnTv", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testTvExtenderChannelOverride_notOnTv", 0, generateNotificationRecord(null, tv).getNotification(), mUserId); verify(mPreferencesHelper, times(1)).getConversationNotificationChannel( anyString(), anyInt(), eq(mTestNotificationChannel.getId()), eq(null), @@ -3585,7 +3591,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testUpdateAppNotifyCreatorBlock() throws Exception { when(mPermissionHelper.hasPermission(mUid)).thenReturn(true); - mBinderService.setNotificationsEnabledForPackage(PKG, mUid, false); + mBinderService.setNotificationsEnabledForPackage(mPkg, mUid, false); Thread.sleep(500); waitForIdle(); @@ -3594,7 +3600,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertEquals(NotificationManager.ACTION_APP_BLOCK_STATE_CHANGED, captor.getValue().getAction()); - assertEquals(PKG, captor.getValue().getPackage()); + assertEquals(mPkg, captor.getValue().getPackage()); assertTrue(captor.getValue().getBooleanExtra(EXTRA_BLOCKED_STATE, true)); } @@ -3602,7 +3608,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testUpdateAppNotifyCreatorBlock_notIfMatchesExistingSetting() throws Exception { when(mPermissionHelper.hasPermission(mUid)).thenReturn(false); - mBinderService.setNotificationsEnabledForPackage(PKG, 0, false); + mBinderService.setNotificationsEnabledForPackage(mPkg, 0, false); verify(mContext, never()).sendBroadcastAsUser(any(), any(), eq(null)); } @@ -3610,7 +3616,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testUpdateAppNotifyCreatorUnblock() throws Exception { when(mPermissionHelper.hasPermission(mUid)).thenReturn(false); - mBinderService.setNotificationsEnabledForPackage(PKG, mUid, true); + mBinderService.setNotificationsEnabledForPackage(mPkg, mUid, true); Thread.sleep(500); waitForIdle(); @@ -3619,14 +3625,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertEquals(NotificationManager.ACTION_APP_BLOCK_STATE_CHANGED, captor.getValue().getAction()); - assertEquals(PKG, captor.getValue().getPackage()); + assertEquals(mPkg, captor.getValue().getPackage()); assertFalse(captor.getValue().getBooleanExtra(EXTRA_BLOCKED_STATE, true)); } @Test public void testUpdateChannelNotifyCreatorBlock() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mPreferencesHelper.getNotificationChannel(eq(PKG), anyInt(), + when(mPreferencesHelper.getNotificationChannel(eq(mPkg), anyInt(), eq(mTestNotificationChannel.getId()), anyBoolean())) .thenReturn(mTestNotificationChannel); @@ -3634,13 +3640,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { new NotificationChannel(mTestNotificationChannel.getId(), mTestNotificationChannel.getName(), IMPORTANCE_NONE); - mBinderService.updateNotificationChannelForPackage(PKG, 0, updatedChannel); + mBinderService.updateNotificationChannelForPackage(mPkg, 0, updatedChannel); ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class); verify(mContext, times(1)).sendBroadcastAsUser(captor.capture(), any(), eq(null)); assertEquals(NotificationManager.ACTION_NOTIFICATION_CHANNEL_BLOCK_STATE_CHANGED, captor.getValue().getAction()); - assertEquals(PKG, captor.getValue().getPackage()); + assertEquals(mPkg, captor.getValue().getPackage()); assertEquals(mTestNotificationChannel.getId(), captor.getValue().getStringExtra( NotificationManager.EXTRA_NOTIFICATION_CHANNEL_ID)); assertTrue(captor.getValue().getBooleanExtra(EXTRA_BLOCKED_STATE, false)); @@ -3652,17 +3658,17 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { new NotificationChannel(mTestNotificationChannel.getId(), mTestNotificationChannel.getName(), IMPORTANCE_NONE); mService.setPreferencesHelper(mPreferencesHelper); - when(mPreferencesHelper.getNotificationChannel(eq(PKG), anyInt(), + when(mPreferencesHelper.getNotificationChannel(eq(mPkg), anyInt(), eq(mTestNotificationChannel.getId()), anyBoolean())) .thenReturn(existingChannel); - mBinderService.updateNotificationChannelForPackage(PKG, 0, mTestNotificationChannel); + mBinderService.updateNotificationChannelForPackage(mPkg, 0, mTestNotificationChannel); ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class); verify(mContext, times(1)).sendBroadcastAsUser(captor.capture(), any(), eq(null)); assertEquals(NotificationManager.ACTION_NOTIFICATION_CHANNEL_BLOCK_STATE_CHANGED, captor.getValue().getAction()); - assertEquals(PKG, captor.getValue().getPackage()); + assertEquals(mPkg, captor.getValue().getPackage()); assertEquals(mTestNotificationChannel.getId(), captor.getValue().getStringExtra( NotificationManager.EXTRA_NOTIFICATION_CHANNEL_ID)); assertFalse(captor.getValue().getBooleanExtra(EXTRA_BLOCKED_STATE, false)); @@ -3674,11 +3680,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { new NotificationChannel(mTestNotificationChannel.getId(), mTestNotificationChannel.getName(), IMPORTANCE_MAX); mService.setPreferencesHelper(mPreferencesHelper); - when(mPreferencesHelper.getNotificationChannel(eq(PKG), anyInt(), + when(mPreferencesHelper.getNotificationChannel(eq(mPkg), anyInt(), eq(mTestNotificationChannel.getId()), anyBoolean())) .thenReturn(existingChannel); - mBinderService.updateNotificationChannelForPackage(PKG, 0, mTestNotificationChannel); + mBinderService.updateNotificationChannelForPackage(mPkg, 0, mTestNotificationChannel); verify(mContext, never()).sendBroadcastAsUser(any(), any(), eq(null)); } @@ -3687,19 +3693,19 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationChannelGroup existing = new NotificationChannelGroup("id", "name"); mService.setPreferencesHelper(mPreferencesHelper); when(mPreferencesHelper.getNotificationChannelGroup(eq(existing.getId()), - eq(PKG), anyInt())) + eq(mPkg), anyInt())) .thenReturn(existing); NotificationChannelGroup updated = new NotificationChannelGroup("id", "name"); updated.setBlocked(true); - mBinderService.updateNotificationChannelGroupForPackage(PKG, 0, updated); + mBinderService.updateNotificationChannelGroupForPackage(mPkg, 0, updated); ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class); verify(mContext, times(1)).sendBroadcastAsUser(captor.capture(), any(), eq(null)); assertEquals(NotificationManager.ACTION_NOTIFICATION_CHANNEL_GROUP_BLOCK_STATE_CHANGED, captor.getValue().getAction()); - assertEquals(PKG, captor.getValue().getPackage()); + assertEquals(mPkg, captor.getValue().getPackage()); assertEquals(existing.getId(), captor.getValue().getStringExtra( NotificationManager.EXTRA_NOTIFICATION_CHANNEL_GROUP_ID)); assertTrue(captor.getValue().getBooleanExtra(EXTRA_BLOCKED_STATE, false)); @@ -3711,17 +3717,17 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { existing.setBlocked(true); mService.setPreferencesHelper(mPreferencesHelper); when(mPreferencesHelper.getNotificationChannelGroup(eq(existing.getId()), - eq(PKG), anyInt())) + eq(mPkg), anyInt())) .thenReturn(existing); mBinderService.updateNotificationChannelGroupForPackage( - PKG, 0, new NotificationChannelGroup("id", "name")); + mPkg, 0, new NotificationChannelGroup("id", "name")); ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class); verify(mContext, times(1)).sendBroadcastAsUser(captor.capture(), any(), eq(null)); assertEquals(NotificationManager.ACTION_NOTIFICATION_CHANNEL_GROUP_BLOCK_STATE_CHANGED, captor.getValue().getAction()); - assertEquals(PKG, captor.getValue().getPackage()); + assertEquals(mPkg, captor.getValue().getPackage()); assertEquals(existing.getId(), captor.getValue().getStringExtra( NotificationManager.EXTRA_NOTIFICATION_CHANNEL_GROUP_ID)); assertFalse(captor.getValue().getBooleanExtra(EXTRA_BLOCKED_STATE, false)); @@ -3732,131 +3738,131 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationChannelGroup existing = new NotificationChannelGroup("id", "name"); mService.setPreferencesHelper(mPreferencesHelper); when(mPreferencesHelper.getNotificationChannelGroup( - eq(existing.getId()), eq(PKG), anyInt())) + eq(existing.getId()), eq(mPkg), anyInt())) .thenReturn(existing); mBinderService.updateNotificationChannelGroupForPackage( - PKG, 0, new NotificationChannelGroup("id", "new name")); + mPkg, 0, new NotificationChannelGroup("id", "new name")); verify(mContext, never()).sendBroadcastAsUser(any(), any(), eq(null)); } @Test public void testCreateChannelNotifyListener() throws Exception { - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); mService.setPreferencesHelper(mPreferencesHelper); - when(mPreferencesHelper.getNotificationChannel(eq(PKG), anyInt(), + when(mPreferencesHelper.getNotificationChannel(eq(mPkg), anyInt(), eq(mTestNotificationChannel.getId()), anyBoolean())) .thenReturn(mTestNotificationChannel); NotificationChannel channel2 = new NotificationChannel("a", "b", IMPORTANCE_LOW); - when(mPreferencesHelper.getNotificationChannel(eq(PKG), anyInt(), + when(mPreferencesHelper.getNotificationChannel(eq(mPkg), anyInt(), eq(channel2.getId()), anyBoolean())) .thenReturn(channel2); - when(mPreferencesHelper.createNotificationChannel(eq(PKG), anyInt(), + when(mPreferencesHelper.createNotificationChannel(eq(mPkg), anyInt(), eq(channel2), anyBoolean(), anyBoolean(), anyInt(), anyBoolean())) .thenReturn(true); reset(mListeners); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(mTestNotificationChannel, channel2))); - verify(mListeners, never()).notifyNotificationChannelChanged(eq(PKG), + verify(mListeners, never()).notifyNotificationChannelChanged(eq(mPkg), eq(Process.myUserHandle()), eq(mTestNotificationChannel), eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_ADDED)); - verify(mListeners, times(1)).notifyNotificationChannelChanged(eq(PKG), + verify(mListeners, times(1)).notifyNotificationChannelChanged(eq(mPkg), eq(Process.myUserHandle()), eq(channel2), eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_ADDED)); } @Test public void testCreateChannelGroupNotifyListener() throws Exception { - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); mService.setPreferencesHelper(mPreferencesHelper); NotificationChannelGroup group1 = new NotificationChannelGroup("a", "b"); NotificationChannelGroup group2 = new NotificationChannelGroup("n", "m"); reset(mListeners); - mBinderService.createNotificationChannelGroups(PKG, + mBinderService.createNotificationChannelGroups(mPkg, new ParceledListSlice(Arrays.asList(group1, group2))); - verify(mListeners, times(1)).notifyNotificationChannelGroupChanged(eq(PKG), + verify(mListeners, times(1)).notifyNotificationChannelGroupChanged(eq(mPkg), eq(Process.myUserHandle()), eq(group1), eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_ADDED)); - verify(mListeners, times(1)).notifyNotificationChannelGroupChanged(eq(PKG), + verify(mListeners, times(1)).notifyNotificationChannelGroupChanged(eq(mPkg), eq(Process.myUserHandle()), eq(group2), eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_ADDED)); } @Test public void testUpdateChannelNotifyListener() throws Exception { - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); mService.setPreferencesHelper(mPreferencesHelper); mTestNotificationChannel.setLightColor(Color.CYAN); - when(mPreferencesHelper.getNotificationChannel(eq(PKG), anyInt(), + when(mPreferencesHelper.getNotificationChannel(eq(mPkg), anyInt(), eq(mTestNotificationChannel.getId()), anyBoolean())) .thenReturn(mTestNotificationChannel); reset(mListeners); - mBinderService.updateNotificationChannelForPackage(PKG, mUid, mTestNotificationChannel); - verify(mListeners, times(1)).notifyNotificationChannelChanged(eq(PKG), + mBinderService.updateNotificationChannelForPackage(mPkg, mUid, mTestNotificationChannel); + verify(mListeners, times(1)).notifyNotificationChannelChanged(eq(mPkg), eq(Process.myUserHandle()), eq(mTestNotificationChannel), eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED)); } @Test public void testDeleteChannelNotifyListener() throws Exception { - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); mService.setPreferencesHelper(mPreferencesHelper); - when(mPreferencesHelper.getNotificationChannel(eq(PKG), anyInt(), + when(mPreferencesHelper.getNotificationChannel(eq(mPkg), anyInt(), eq(mTestNotificationChannel.getId()), anyBoolean())) .thenReturn(mTestNotificationChannel); - when(mPreferencesHelper.deleteNotificationChannel(eq(PKG), anyInt(), + when(mPreferencesHelper.deleteNotificationChannel(eq(mPkg), anyInt(), eq(mTestNotificationChannel.getId()), anyInt(), anyBoolean())).thenReturn(true); reset(mListeners); - mBinderService.deleteNotificationChannel(PKG, mTestNotificationChannel.getId()); - verify(mListeners, times(1)).notifyNotificationChannelChanged(eq(PKG), + mBinderService.deleteNotificationChannel(mPkg, mTestNotificationChannel.getId()); + verify(mListeners, times(1)).notifyNotificationChannelChanged(eq(mPkg), eq(Process.myUserHandle()), eq(mTestNotificationChannel), eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_DELETED)); } @Test public void testDeleteChannelOnlyDoExtraWorkIfExisted() throws Exception { - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); mService.setPreferencesHelper(mPreferencesHelper); - when(mPreferencesHelper.getNotificationChannel(eq(PKG), anyInt(), + when(mPreferencesHelper.getNotificationChannel(eq(mPkg), anyInt(), eq(mTestNotificationChannel.getId()), anyBoolean())) .thenReturn(null); reset(mListeners); - mBinderService.deleteNotificationChannel(PKG, mTestNotificationChannel.getId()); + mBinderService.deleteNotificationChannel(mPkg, mTestNotificationChannel.getId()); verifyNoMoreInteractions(mListeners); verifyNoMoreInteractions(mHistoryManager); } @Test public void testDeleteChannelGroupNotifyListener() throws Exception { - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); NotificationChannelGroup ncg = new NotificationChannelGroup("a", "b/c"); mService.setPreferencesHelper(mPreferencesHelper); when(mPreferencesHelper.getNotificationChannelGroupWithChannels( - eq(PKG), anyInt(), eq(ncg.getId()), anyBoolean())) + eq(mPkg), anyInt(), eq(ncg.getId()), anyBoolean())) .thenReturn(ncg); reset(mListeners); - mBinderService.deleteNotificationChannelGroup(PKG, ncg.getId()); - verify(mListeners, times(1)).notifyNotificationChannelGroupChanged(eq(PKG), + mBinderService.deleteNotificationChannelGroup(mPkg, ncg.getId()); + verify(mListeners, times(1)).notifyNotificationChannelGroupChanged(eq(mPkg), eq(Process.myUserHandle()), eq(ncg), eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_DELETED)); } @Test public void testDeleteChannelGroupChecksForFgses() throws Exception { - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); CountDownLatch latch = new CountDownLatch(2); mService.createNotificationChannelGroup( - PKG, mUid, new NotificationChannelGroup("group", "group"), true, false); + mPkg, mUid, new NotificationChannelGroup("group", "group"), true, false); new Thread(() -> { NotificationChannel notificationChannel = new NotificationChannel("id", "id", NotificationManager.IMPORTANCE_HIGH); @@ -3864,7 +3870,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { ParceledListSlice<NotificationChannel> pls = new ParceledListSlice(ImmutableList.of(notificationChannel)); try { - mBinderService.createNotificationChannelsForPackage(PKG, mUid, pls); + mBinderService.createNotificationChannelsForPackage(mPkg, mUid, pls); } catch (RemoteException e) { throw new RuntimeException(e); } @@ -3875,7 +3881,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { synchronized (this) { wait(5000); } - mService.createNotificationChannelGroup(PKG, mUid, + mService.createNotificationChannelGroup(mPkg, mUid, new NotificationChannelGroup("new", "new group"), true, false); NotificationChannel notificationChannel = new NotificationChannel("id", "id", NotificationManager.IMPORTANCE_HIGH); @@ -3883,8 +3889,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { ParceledListSlice<NotificationChannel> pls = new ParceledListSlice(ImmutableList.of(notificationChannel)); try { - mBinderService.createNotificationChannelsForPackage(PKG, mUid, pls); - mBinderService.deleteNotificationChannelGroup(PKG, "group"); + mBinderService.createNotificationChannelsForPackage(mPkg, mUid, pls); + mBinderService.deleteNotificationChannelGroup(mPkg, "group"); } catch (RemoteException e) { throw new RuntimeException(e); } @@ -3901,19 +3907,19 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testUpdateNotificationChannelFromPrivilegedListener_success() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); - when(mPreferencesHelper.getNotificationChannel(eq(PKG), anyInt(), + when(mPreferencesHelper.getNotificationChannel(eq(mPkg), anyInt(), eq(mTestNotificationChannel.getId()), anyBoolean())) .thenReturn(mTestNotificationChannel); mBinderService.updateNotificationChannelFromPrivilegedListener( - null, PKG, Process.myUserHandle(), mTestNotificationChannel); + null, mPkg, Process.myUserHandle(), mTestNotificationChannel); verify(mPreferencesHelper, times(1)).updateNotificationChannel( anyString(), anyInt(), any(), anyBoolean(), anyInt(), anyBoolean()); - verify(mListeners, never()).notifyNotificationChannelChanged(eq(PKG), + verify(mListeners, never()).notifyNotificationChannelChanged(eq(mPkg), eq(Process.myUserHandle()), eq(mTestNotificationChannel), eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED)); } @@ -3921,12 +3927,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testUpdateNotificationChannelFromPrivilegedListener_noAccess() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(emptyList()); try { mBinderService.updateNotificationChannelFromPrivilegedListener( - null, PKG, Process.myUserHandle(), mTestNotificationChannel); + null, mPkg, Process.myUserHandle(), mTestNotificationChannel); fail("listeners that don't have a companion device shouldn't be able to call this"); } catch (SecurityException e) { // pass @@ -3935,7 +3941,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { verify(mPreferencesHelper, never()).updateNotificationChannel( anyString(), anyInt(), any(), anyBoolean(), anyInt(), anyBoolean()); - verify(mListeners, never()).notifyNotificationChannelChanged(eq(PKG), + verify(mListeners, never()).notifyNotificationChannelChanged(eq(mPkg), eq(Process.myUserHandle()), eq(mTestNotificationChannel), eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED)); } @@ -3943,16 +3949,16 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testUpdateNotificationChannelFromPrivilegedListener_badUser() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); mListener = mock(ManagedServices.ManagedServiceInfo.class); - mListener.component = new ComponentName(PKG, PKG); + mListener.component = new ComponentName(mPkg, mPkg); when(mListener.enabledAndUserMatches(anyInt())).thenReturn(false); when(mListeners.checkServiceTokenLocked(any())).thenReturn(mListener); try { mBinderService.updateNotificationChannelFromPrivilegedListener( - null, PKG, UserHandle.ALL, mTestNotificationChannel); + null, mPkg, UserHandle.ALL, mTestNotificationChannel); fail("incorrectly allowed a change to a user listener cannot see"); } catch (SecurityException e) { // pass @@ -3961,7 +3967,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { verify(mPreferencesHelper, never()).updateNotificationChannel( anyString(), anyInt(), any(), anyBoolean(), anyInt(), anyBoolean()); - verify(mListeners, never()).notifyNotificationChannelChanged(eq(PKG), + verify(mListeners, never()).notifyNotificationChannelChanged(eq(mPkg), eq(Process.myUserHandle()), eq(mTestNotificationChannel), eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED)); } @@ -3970,9 +3976,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testUpdateNotificationChannelFromPrivilegedListener_noSoundUriPermission() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); - when(mPreferencesHelper.getNotificationChannel(eq(PKG), anyInt(), + when(mPreferencesHelper.getNotificationChannel(eq(mPkg), anyInt(), eq(mTestNotificationChannel.getId()), anyBoolean())) .thenReturn(mTestNotificationChannel); @@ -3987,13 +3993,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { anyInt(), eq(Process.myUserHandle().getIdentifier())); assertThrows(SecurityException.class, - () -> mBinderService.updateNotificationChannelFromPrivilegedListener(null, PKG, + () -> mBinderService.updateNotificationChannelFromPrivilegedListener(null, mPkg, Process.myUserHandle(), updatedNotificationChannel)); verify(mPreferencesHelper, never()).updateNotificationChannel( anyString(), anyInt(), any(), anyBoolean(), anyInt(), anyBoolean()); - verify(mListeners, never()).notifyNotificationChannelChanged(eq(PKG), + verify(mListeners, never()).notifyNotificationChannelChanged(eq(mPkg), eq(Process.myUserHandle()), eq(mTestNotificationChannel), eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED)); } @@ -4002,9 +4008,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testUpdateNotificationChannelFromPrivilegedListener_noSoundUriPermission_sameSound() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); - when(mPreferencesHelper.getNotificationChannel(eq(PKG), anyInt(), + when(mPreferencesHelper.getNotificationChannel(eq(mPkg), anyInt(), eq(mTestNotificationChannel.getId()), anyBoolean())) .thenReturn(mTestNotificationChannel); @@ -4019,12 +4025,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { anyInt(), eq(Process.myUserHandle().getIdentifier())); mBinderService.updateNotificationChannelFromPrivilegedListener( - null, PKG, Process.myUserHandle(), updatedNotificationChannel); + null, mPkg, Process.myUserHandle(), updatedNotificationChannel); verify(mPreferencesHelper, times(1)).updateNotificationChannel( anyString(), anyInt(), any(), anyBoolean(), anyInt(), anyBoolean()); - verify(mListeners, never()).notifyNotificationChannelChanged(eq(PKG), + verify(mListeners, never()).notifyNotificationChannelChanged(eq(mPkg), eq(Process.myUserHandle()), eq(mTestNotificationChannel), eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED)); } @@ -4032,11 +4038,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testGetNotificationChannelFromPrivilegedListener_cdm_success() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); mBinderService.getNotificationChannelsFromPrivilegedListener( - null, PKG, Process.myUserHandle()); + null, mPkg, Process.myUserHandle()); verify(mPreferencesHelper, times(1)).getNotificationChannels( anyString(), anyInt(), anyBoolean()); @@ -4045,12 +4051,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testGetNotificationChannelFromPrivilegedListener_cdm_noAccess() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(emptyList()); try { mBinderService.getNotificationChannelsFromPrivilegedListener( - null, PKG, Process.myUserHandle()); + null, mPkg, Process.myUserHandle()); fail("listeners that don't have a companion device shouldn't be able to call this"); } catch (SecurityException e) { // pass @@ -4064,12 +4070,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testGetNotificationChannelFromPrivilegedListener_assistant_success() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(emptyList()); when(mAssistants.isServiceTokenValidLocked(any())).thenReturn(true); mBinderService.getNotificationChannelsFromPrivilegedListener( - null, PKG, Process.myUserHandle()); + null, mPkg, Process.myUserHandle()); verify(mPreferencesHelper, times(1)).getNotificationChannels( anyString(), anyInt(), anyBoolean()); @@ -4079,13 +4085,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testGetNotificationChannelFromPrivilegedListener_assistant_noAccess() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(emptyList()); when(mAssistants.isServiceTokenValidLocked(any())).thenReturn(false); try { mBinderService.getNotificationChannelsFromPrivilegedListener( - null, PKG, Process.myUserHandle()); + null, mPkg, Process.myUserHandle()); fail("listeners that don't have a companion device shouldn't be able to call this"); } catch (SecurityException e) { // pass @@ -4098,16 +4104,16 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testGetNotificationChannelFromPrivilegedListener_badUser() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); mListener = mock(ManagedServices.ManagedServiceInfo.class); - mListener.component = new ComponentName(PKG, PKG); + mListener.component = new ComponentName(mPkg, mPkg); when(mListener.enabledAndUserMatches(anyInt())).thenReturn(false); when(mListeners.checkServiceTokenLocked(any())).thenReturn(mListener); try { mBinderService.getNotificationChannelsFromPrivilegedListener( - null, PKG, Process.myUserHandle()); + null, mPkg, Process.myUserHandle()); fail("listener getting channels from a user they cannot see"); } catch (SecurityException e) { // pass @@ -4120,11 +4126,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testGetNotificationChannelGroupsFromPrivilegedListener_success() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(singletonList(mock(AssociationInfo.class))); mBinderService.getNotificationChannelGroupsFromPrivilegedListener( - null, PKG, Process.myUserHandle()); + null, mPkg, Process.myUserHandle()); verify(mPreferencesHelper, times(1)).getNotificationChannelGroups(anyString(), anyInt()); } @@ -4132,12 +4138,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testGetNotificationChannelGroupsFromPrivilegedListener_noAccess() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(emptyList()); try { mBinderService.getNotificationChannelGroupsFromPrivilegedListener( - null, PKG, Process.myUserHandle()); + null, mPkg, Process.myUserHandle()); fail("listeners that don't have a companion device shouldn't be able to call this"); } catch (SecurityException e) { // pass @@ -4149,15 +4155,15 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testGetNotificationChannelGroupsFromPrivilegedListener_badUser() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); - when(mCompanionMgr.getAssociations(PKG, mUserId)) + when(mCompanionMgr.getAssociations(mPkg, mUserId)) .thenReturn(emptyList()); mListener = mock(ManagedServices.ManagedServiceInfo.class); - mListener.component = new ComponentName(PKG, PKG); + mListener.component = new ComponentName(mPkg, mPkg); when(mListener.enabledAndUserMatches(anyInt())).thenReturn(false); when(mListeners.checkServiceTokenLocked(any())).thenReturn(mListener); try { mBinderService.getNotificationChannelGroupsFromPrivilegedListener( - null, PKG, Process.myUserHandle()); + null, mPkg, Process.myUserHandle()); fail("listeners that don't have a companion device shouldn't be able to call this"); } catch (SecurityException e) { // pass @@ -4190,7 +4196,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addNotification(r2); mListener = mock(ManagedServices.ManagedServiceInfo.class); - mListener.component = new ComponentName(PKG, PKG); + mListener.component = new ComponentName(mPkg, mPkg); when(mListener.enabledAndUserMatches(anyInt())).thenReturn(false); when(mListeners.checkServiceTokenLocked(any())).thenReturn(mListener); @@ -4209,7 +4215,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addNotification(r2); mListener = mock(ManagedServices.ManagedServiceInfo.class); - mListener.component = new ComponentName(PKG, PKG); + mListener.component = new ComponentName(mPkg, mPkg); when(mListener.enabledAndUserMatches(anyInt())).thenReturn(true); when(mListeners.checkServiceTokenLocked(any())).thenReturn(mListener); @@ -4231,7 +4237,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addNotification(nr1); mListener = mock(ManagedServices.ManagedServiceInfo.class); - mListener.component = new ComponentName(PKG, PKG); + mListener.component = new ComponentName(mPkg, mPkg); when(mListener.enabledAndUserMatches(anyInt())).thenReturn(true); when(mListeners.checkServiceTokenLocked(any())).thenReturn(mListener); @@ -4242,7 +4248,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { any(NotificationManagerService.SnoozeNotificationRunnable.class)); // Ensure cancel event is logged. verify(mAppOpsManager).noteOpNoThrow( - AppOpsManager.OP_RAPID_CLEAR_NOTIFICATIONS_BY_LISTENER, mUid, PKG, null, + AppOpsManager.OP_RAPID_CLEAR_NOTIFICATIONS_BY_LISTENER, mUid, mPkg, null, null); } @@ -4257,7 +4263,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addNotification(nr1); mListener = mock(ManagedServices.ManagedServiceInfo.class); - mListener.component = new ComponentName(PKG, PKG); + mListener.component = new ComponentName(mPkg, mPkg); when(mListener.enabledAndUserMatches(anyInt())).thenReturn(true); when(mListeners.checkServiceTokenLocked(any())).thenReturn(mListener); @@ -4283,7 +4289,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addNotification(nr1); mListener = mock(ManagedServices.ManagedServiceInfo.class); - mListener.component = new ComponentName(PKG, PKG); + mListener.component = new ComponentName(mPkg, mPkg); when(mListener.enabledAndUserMatches(anyInt())).thenReturn(true); when(mListeners.checkServiceTokenLocked(any())).thenReturn(mListener); @@ -4309,7 +4315,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addNotification(nr1); mListener = mock(ManagedServices.ManagedServiceInfo.class); - mListener.component = new ComponentName(PKG, PKG); + mListener.component = new ComponentName(mPkg, mPkg); when(mListener.enabledAndUserMatches(anyInt())).thenReturn(true); when(mListeners.checkServiceTokenLocked(any())).thenReturn(mListener); @@ -4619,7 +4625,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final NotificationRecord child = generateNotificationRecord( mTestNotificationChannel, 2, "group", false); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "testPostNonGroup_noUnsnoozing", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testPostNonGroup_noUnsnoozing", child.getSbn().getId(), child.getSbn().getNotification(), child.getSbn().getUserId()); waitForIdle(); @@ -4633,7 +4639,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final NotificationRecord record = generateNotificationRecord( mTestNotificationChannel, 2, null, false); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "testPostNonGroup_noUnsnoozing", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testPostNonGroup_noUnsnoozing", record.getSbn().getId(), record.getSbn().getNotification(), record.getSbn().getUserId()); waitForIdle(); @@ -4646,7 +4652,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final NotificationRecord parent = generateNotificationRecord( mTestNotificationChannel, 2, "group", true); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "testPostGroupSummary_noUnsnoozing", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testPostGroupSummary_noUnsnoozing", parent.getSbn().getId(), parent.getSbn().getNotification(), parent.getSbn().getUserId()); waitForIdle(); @@ -4659,7 +4665,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final NotificationRecord nr = generateNotificationRecord( mTestNotificationChannel, 2, "group", false); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testSystemNotificationListenerCanUnsnooze", nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); @@ -4670,13 +4676,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { snoozeNotificationRunnable.run(); ManagedServices.ManagedServiceInfo listener = mListeners.new ManagedServiceInfo( - null, new ComponentName(PKG, "test_class"), mUid, true, null, 0, 234); + null, new ComponentName(mPkg, "test_class"), mUid, true, null, 0, 234); listener.isSystem = true; when(mListeners.checkServiceTokenLocked(any())).thenReturn(listener); mBinderService.unsnoozeNotificationFromSystemListener(null, nr.getKey()); waitForIdle(); - StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifs = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifs.length); assertNotNull(notifs[0].getKey());//mService.getNotificationRecord(nr.getSbn().getKey())); } @@ -5197,17 +5203,17 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setContentTitle("foo") .addExtras(extras) .setSmallIcon(android.R.drawable.sym_def_app_icon); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, "testNoNotificationDuringSetupPermission", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord nr = new NotificationRecord(mContext, sbn, mTestNotificationChannel); - mBinderService.enqueueNotificationWithTag(PKG, PKG, sbn.getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, sbn.getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); NotificationRecord posted = mService.findNotificationLocked( - PKG, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getUserId()); + mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getUserId()); assertTrue(posted.getNotification().extras.containsKey(EXTRA_ALLOW_DURING_SETUP)); } @@ -5222,17 +5228,17 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setColorized(true).setColor(Color.WHITE) .setFlag(FLAG_CAN_COLORIZE, true) .setSmallIcon(android.R.drawable.sym_def_app_icon); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, "testNoFakeColorizedPermission", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord nr = new NotificationRecord(mContext, sbn, mTestNotificationChannel); - mBinderService.enqueueNotificationWithTag(PKG, PKG, sbn.getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, sbn.getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); NotificationRecord posted = mService.findNotificationLocked( - PKG, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getUserId()); + mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getUserId()); assertFalse(posted.getNotification().isColorized()); } @@ -5430,9 +5436,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // anything that's currently enqueued or posted int userId = mUserId; assertEquals(40, - mService.getNotificationCount(PKG, userId, 0, null)); + mService.getNotificationCount(mPkg, userId, 0, null)); assertEquals(40, - mService.getNotificationCount(PKG, userId, 0, "tag2")); + mService.getNotificationCount(mPkg, userId, 0, "tag2")); // return all for package "a" - "banana" tag isn't used assertEquals(2, @@ -5440,7 +5446,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // exclude a known notification - it's excluded from only the posted list, not enqueued assertEquals(39, mService.getNotificationCount( - PKG, userId, sampleIdToExclude, sampleTagToExclude)); + mPkg, userId, sampleIdToExclude, sampleTagToExclude)); } @Test @@ -5702,7 +5708,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Check that the notification was cancelled. - StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(mPkg); assertThat(notifsAfter.length).isEqualTo(0); assertThat(mService.getNotificationRecord(notif.getKey())).isNull(); } @@ -5718,7 +5724,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Check that the notification was not cancelled. - StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(mPkg); assertThat(notifsAfter.length).isEqualTo(1); assertThat(mService.getNotificationRecord(notif.getKey())).isEqualTo(notif); } @@ -5734,7 +5740,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Check that the notification was not cancelled. - StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(mPkg); assertThat(notifsAfter.length).isEqualTo(1); assertThat(mService.getNotificationRecord(notif.getKey())).isEqualTo(notif); } @@ -5752,7 +5758,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Check that the notification was not cancelled. - StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(mPkg); assertThat(notifsAfter.length).isEqualTo(1); assertThat(mService.getNotificationRecord(notif.getKey())).isEqualTo(notif); @@ -5926,7 +5932,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addNotification(r); final NotificationVisibility nv = NotificationVisibility.obtain(r.getKey(), 0, 1, true); - mService.mNotificationDelegate.onNotificationClear(mUid, 0, PKG, r.getUserId(), + mService.mNotificationDelegate.onNotificationClear(mUid, 0, mPkg, r.getUserId(), r.getKey(), NotificationStats.DISMISSAL_AOD, NotificationStats.DISMISS_SENTIMENT_POSITIVE, nv); waitForIdle(); @@ -5949,7 +5955,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addNotification(r); final NotificationVisibility nv = NotificationVisibility.obtain(r.getKey(), 0, 1, true); - mService.mNotificationDelegate.onNotificationClear(mUid, 0, PKG, r.getUserId(), + mService.mNotificationDelegate.onNotificationClear(mUid, 0, mPkg, r.getUserId(), r.getKey(), NotificationStats.DISMISSAL_AOD, NotificationStats.DISMISS_SENTIMENT_NEGATIVE, nv); waitForIdle(); @@ -5979,7 +5985,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord original = generateNotificationRecord(mTestNotificationChannel); mService.addNotification(original); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, original.getSbn().getId(), + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, original.getSbn().getId(), original.getSbn().getTag(), mUid, 0, new Notification.Builder(mContext, mTestNotificationChannel.getId()) .setContentTitle("new title").build(), @@ -6411,7 +6417,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .addMessage(message1) .addMessage(message2)); NotificationRecord recordA = new NotificationRecord(mContext, new StatusBarNotification( - PKG, PKG, 0, "tag", mUid, 0, nbA.build(), UserHandle.getUserHandleForUid(mUid), + mPkg, mPkg, 0, "tag", mUid, 0, nbA.build(), UserHandle.getUserHandleForUid(mUid), null, 0), c); // First post means we grant access to both @@ -6429,8 +6435,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setContentTitle("foo") .setSmallIcon(android.R.drawable.sym_def_app_icon) .setStyle(new Notification.MessagingStyle("").addMessage(message2)); - NotificationRecord recordB = new NotificationRecord(mContext, new StatusBarNotification(PKG, - PKG, 0, "tag", mUid, 0, nbB.build(), UserHandle.getUserHandleForUid(mUid), null, 0), + NotificationRecord recordB = new NotificationRecord(mContext, new StatusBarNotification(mPkg, + mPkg, 0, "tag", mUid, 0, nbB.build(), UserHandle.getUserHandleForUid(mUid), null, 0), c); // Update means we drop access to first @@ -6470,7 +6476,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setStyle(new Notification.MessagingStyle("") .addMessage(message1)); NotificationRecord recordA = new NotificationRecord(mContext, new StatusBarNotification( - PKG, PKG, 0, "tag", mUid, 0, nbA.build(), UserHandle.getUserHandleForUid(mUid), + mPkg, mPkg, 0, "tag", mUid, 0, nbA.build(), UserHandle.getUserHandleForUid(mUid), null, 0), c); doThrow(new SecurityException("no access")).when(mUgm) @@ -6929,7 +6935,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testVisualDifference_foreground() { Notification.Builder nb1 = new Notification.Builder(mContext, "") .setContentTitle("foo"); - StatusBarNotification sbn1 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn1 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb1.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r1 = new NotificationRecord(mContext, sbn1, mock(NotificationChannel.class)); @@ -6937,7 +6943,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification.Builder nb2 = new Notification.Builder(mContext, "") .setFlag(FLAG_FOREGROUND_SERVICE, true) .setContentTitle("bar"); - StatusBarNotification sbn2 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn2 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb2.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r2 = new NotificationRecord(mContext, sbn2, mock(NotificationChannel.class)); @@ -6949,14 +6955,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testVisualDifference_diffTitle() { Notification.Builder nb1 = new Notification.Builder(mContext, "") .setContentTitle("foo"); - StatusBarNotification sbn1 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn1 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb1.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r1 = new NotificationRecord(mContext, sbn1, mock(NotificationChannel.class)); Notification.Builder nb2 = new Notification.Builder(mContext, "") .setContentTitle("bar"); - StatusBarNotification sbn2 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn2 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb2.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r2 = new NotificationRecord(mContext, sbn2, mock(NotificationChannel.class)); @@ -6969,7 +6975,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification.Builder nb1 = new Notification.Builder(mContext, "") .setStyle(new Notification.InboxStyle() .addLine("line1").addLine("line2")); - StatusBarNotification sbn1 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn1 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb1.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r1 = new NotificationRecord(mContext, sbn1, mock(NotificationChannel.class)); @@ -6977,7 +6983,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification.Builder nb2 = new Notification.Builder(mContext, "") .setStyle(new Notification.InboxStyle() .addLine("line1").addLine("line2_changed")); - StatusBarNotification sbn2 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn2 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb2.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r2 = new NotificationRecord(mContext, sbn2, mock(NotificationChannel.class)); @@ -6987,7 +6993,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification.Builder nb3 = new Notification.Builder(mContext, "") .setStyle(new Notification.InboxStyle() .addLine("line1")); - StatusBarNotification sbn3 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn3 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb3.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r3 = new NotificationRecord(mContext, sbn3, mock(NotificationChannel.class)); @@ -6997,7 +7003,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification.Builder nb4 = new Notification.Builder(mContext, "") .setStyle(new Notification.InboxStyle() .addLine("line1").addLine("line2").addLine("line3")); - StatusBarNotification sbn4 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn4 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb4.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r4 = new NotificationRecord(mContext, sbn4, mock(NotificationChannel.class)); @@ -7006,7 +7012,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification.Builder nb5 = new Notification.Builder(mContext, "") .setContentText("not an inbox"); - StatusBarNotification sbn5 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn5 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb5.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r5 = new NotificationRecord(mContext, sbn5, mock(NotificationChannel.class)); @@ -7018,14 +7024,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testVisualDifference_diffText() { Notification.Builder nb1 = new Notification.Builder(mContext, "") .setContentText("foo"); - StatusBarNotification sbn1 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn1 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb1.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r1 = new NotificationRecord(mContext, sbn1, mock(NotificationChannel.class)); Notification.Builder nb2 = new Notification.Builder(mContext, "") .setContentText("bar"); - StatusBarNotification sbn2 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn2 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb2.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r2 = new NotificationRecord(mContext, sbn2, mock(NotificationChannel.class)); @@ -7037,14 +7043,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testVisualDifference_sameText() { Notification.Builder nb1 = new Notification.Builder(mContext, "") .setContentText("foo"); - StatusBarNotification sbn1 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn1 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb1.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r1 = new NotificationRecord(mContext, sbn1, mock(NotificationChannel.class)); Notification.Builder nb2 = new Notification.Builder(mContext, "") .setContentText("foo"); - StatusBarNotification sbn2 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn2 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb2.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r2 = new NotificationRecord(mContext, sbn2, mock(NotificationChannel.class)); @@ -7056,14 +7062,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testVisualDifference_sameTextButStyled() { Notification.Builder nb1 = new Notification.Builder(mContext, "") .setContentText(Html.fromHtml("<b>foo</b>")); - StatusBarNotification sbn1 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn1 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb1.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r1 = new NotificationRecord(mContext, sbn1, mock(NotificationChannel.class)); Notification.Builder nb2 = new Notification.Builder(mContext, "") .setContentText(Html.fromHtml("<b>foo</b>")); - StatusBarNotification sbn2 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn2 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb2.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r2 = new NotificationRecord(mContext, sbn2, mock(NotificationChannel.class)); @@ -7075,14 +7081,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testVisualDifference_diffTextButStyled() { Notification.Builder nb1 = new Notification.Builder(mContext, "") .setContentText(Html.fromHtml("<b>foo</b>")); - StatusBarNotification sbn1 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn1 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb1.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r1 = new NotificationRecord(mContext, sbn1, mock(NotificationChannel.class)); Notification.Builder nb2 = new Notification.Builder(mContext, "") .setContentText(Html.fromHtml("<b>bar</b>")); - StatusBarNotification sbn2 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn2 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb2.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r2 = new NotificationRecord(mContext, sbn2, mock(NotificationChannel.class)); @@ -7094,14 +7100,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testVisualDifference_diffProgress() { Notification.Builder nb1 = new Notification.Builder(mContext, "") .setProgress(100, 90, false); - StatusBarNotification sbn1 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn1 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb1.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r1 = new NotificationRecord(mContext, sbn1, mock(NotificationChannel.class)); Notification.Builder nb2 = new Notification.Builder(mContext, "") .setProgress(100, 100, false); - StatusBarNotification sbn2 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn2 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb2.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r2 = new NotificationRecord(mContext, sbn2, mock(NotificationChannel.class)); @@ -7113,14 +7119,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testVisualDifference_diffProgressNotDone() { Notification.Builder nb1 = new Notification.Builder(mContext, "") .setProgress(100, 90, false); - StatusBarNotification sbn1 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn1 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb1.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r1 = new NotificationRecord(mContext, sbn1, mock(NotificationChannel.class)); Notification.Builder nb2 = new Notification.Builder(mContext, "") .setProgress(100, 91, false); - StatusBarNotification sbn2 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn2 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb2.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r2 = new NotificationRecord(mContext, sbn2, mock(NotificationChannel.class)); @@ -7132,14 +7138,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testVisualDifference_sameProgressStillDone() { Notification.Builder nb1 = new Notification.Builder(mContext, "") .setProgress(100, 100, false); - StatusBarNotification sbn1 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn1 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb1.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r1 = new NotificationRecord(mContext, sbn1, mock(NotificationChannel.class)); Notification.Builder nb2 = new Notification.Builder(mContext, "") .setProgress(100, 100, false); - StatusBarNotification sbn2 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn2 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb2.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r2 = new NotificationRecord(mContext, sbn2, mock(NotificationChannel.class)); @@ -7153,7 +7159,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setGroup("bananas") .setFlag(Notification.FLAG_GROUP_SUMMARY, true) .setContentText("foo"); - StatusBarNotification sbn1 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn1 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb1.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r1 = new NotificationRecord(mContext, sbn1, mock(NotificationChannel.class)); @@ -7162,7 +7168,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setGroup("bananas") .setFlag(Notification.FLAG_GROUP_SUMMARY, true) .setContentText("bar"); - StatusBarNotification sbn2 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn2 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb2.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r2 = new NotificationRecord(mContext, sbn2, mock(NotificationChannel.class)); @@ -7176,7 +7182,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setGroup("bananas") .setFlag(Notification.FLAG_GROUP_SUMMARY, true) .setContentText("bar"); - StatusBarNotification sbn2 = new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, + StatusBarNotification sbn2 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, nb2.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r2 = new NotificationRecord(mContext, sbn2, mock(NotificationChannel.class)); @@ -7227,10 +7233,31 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertThat(mService.isVisuallyInterruptive(r1, r2)).isTrue(); } + @Test + @EnableFlags({android.app.Flags.FLAG_UPDATE_RANKING_TIME}) + public void testVisualDifference_userInitiatedJob() { + Notification.Builder nb1 = new Notification.Builder(mContext, "") + .setContentTitle("foo"); + StatusBarNotification sbn1 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, + nb1.build(), UserHandle.getUserHandleForUid(mUid), null, 0); + NotificationRecord r1 = + new NotificationRecord(mContext, sbn1, mock(NotificationChannel.class)); + + Notification.Builder nb2 = new Notification.Builder(mContext, "") + .setFlag(FLAG_USER_INITIATED_JOB, true) + .setContentTitle("bar"); + StatusBarNotification sbn2 = new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, + nb2.build(), UserHandle.getUserHandleForUid(mUid), null, 0); + NotificationRecord r2 = + new NotificationRecord(mContext, sbn2, mock(NotificationChannel.class)); + + assertFalse(mService.isVisuallyInterruptive(r1, r2)); + } + private NotificationRecord notificationToRecord(Notification n) { return new NotificationRecord( mContext, - new StatusBarNotification(PKG, PKG, 0, "tag", mUid, 0, n, + new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0), mock(NotificationChannel.class)); } @@ -7246,13 +7273,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addNotification(notif2); // on broadcast, hide the 2 notifications - simulatePackageSuspendBroadcast(true, PKG, notif1.getUid()); + simulatePackageSuspendBroadcast(true, mPkg, notif1.getUid()); ArgumentCaptor<List> captorHide = ArgumentCaptor.forClass(List.class); verify(mListeners, times(1)).notifyHiddenLocked(captorHide.capture()); assertEquals(2, captorHide.getValue().size()); // on broadcast, unhide the 2 notifications - simulatePackageSuspendBroadcast(false, PKG, notif1.getUid()); + simulatePackageSuspendBroadcast(false, mPkg, notif1.getUid()); ArgumentCaptor<List> captorUnhide = ArgumentCaptor.forClass(List.class); verify(mListeners, times(1)).notifyUnhiddenLocked(captorUnhide.capture()); assertEquals(2, captorUnhide.getValue().size()); @@ -7286,7 +7313,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addNotification(notif2); // on broadcast, nothing is hidden since no notifications are of user 10 with package PKG - simulatePackageSuspendBroadcast(true, PKG, 10); + simulatePackageSuspendBroadcast(true, mPkg, 10); ArgumentCaptor<List> captor = ArgumentCaptor.forClass(List.class); verify(mListeners, times(1)).notifyHiddenLocked(captor.capture()); assertEquals(0, captor.getValue().size()); @@ -7467,7 +7494,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mContext, mTestNotificationChannel.getId()) .setContentTitle("foo") .setSmallIcon(android.R.drawable.sym_def_app_icon); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, "tag" + System.currentTimeMillis(), UserHandle.PER_USER_RANGE, 0, nb.build(), UserHandle.getUserHandleForUid(mUid + UserHandle.PER_USER_RANGE), null, 0); @@ -7490,7 +7517,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mContext, mTestNotificationChannel.getId()) .setContentTitle("foo") .setSmallIcon(android.R.drawable.sym_def_app_icon); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, "tag" + System.currentTimeMillis(), UserHandle.PER_USER_RANGE, 0, nb.build(), UserHandle.getUserHandleForUid(mUid + UserHandle.PER_USER_RANGE), null, 0); @@ -7540,31 +7567,31 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testBubble() throws Exception { - mBinderService.setBubblesAllowed(PKG, mUid, BUBBLE_PREFERENCE_NONE); - assertFalse(mBinderService.areBubblesAllowed(PKG)); - assertEquals(mBinderService.getBubblePreferenceForPackage(PKG, mUid), + mBinderService.setBubblesAllowed(mPkg, mUid, BUBBLE_PREFERENCE_NONE); + assertFalse(mBinderService.areBubblesAllowed(mPkg)); + assertEquals(mBinderService.getBubblePreferenceForPackage(mPkg, mUid), BUBBLE_PREFERENCE_NONE); } @Test public void testUserApprovedBubblesForPackageSelected() throws Exception { - mBinderService.setBubblesAllowed(PKG, mUid, BUBBLE_PREFERENCE_SELECTED); - assertEquals(mBinderService.getBubblePreferenceForPackage(PKG, mUid), + mBinderService.setBubblesAllowed(mPkg, mUid, BUBBLE_PREFERENCE_SELECTED); + assertEquals(mBinderService.getBubblePreferenceForPackage(mPkg, mUid), BUBBLE_PREFERENCE_SELECTED); } @Test public void testUserApprovedBubblesForPackageAll() throws Exception { - mBinderService.setBubblesAllowed(PKG, mUid, BUBBLE_PREFERENCE_ALL); - assertTrue(mBinderService.areBubblesAllowed(PKG)); - assertEquals(mBinderService.getBubblePreferenceForPackage(PKG, mUid), + mBinderService.setBubblesAllowed(mPkg, mUid, BUBBLE_PREFERENCE_ALL); + assertTrue(mBinderService.areBubblesAllowed(mPkg)); + assertEquals(mBinderService.getBubblePreferenceForPackage(mPkg, mUid), BUBBLE_PREFERENCE_ALL); } @Test public void testUserRejectsBubblesForPackage() throws Exception { - mBinderService.setBubblesAllowed(PKG, mUid, BUBBLE_PREFERENCE_NONE); - assertFalse(mBinderService.areBubblesAllowed(PKG)); + mBinderService.setBubblesAllowed(mPkg, mUid, BUBBLE_PREFERENCE_NONE); + assertFalse(mBinderService.areBubblesAllowed(mPkg)); } @Test @@ -7763,14 +7790,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification n = new Notification.Builder(mContext, "").build(); n.flags |= FLAG_FOREGROUND_SERVICE; - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 9, null, mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 9, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); mService.addEnqueuedNotification(r); mInternalService.removeForegroundServiceFlagFromNotification( - PKG, r.getSbn().getId(), r.getSbn().getUserId()); + mPkg, r.getSbn().getId(), r.getSbn().getUserId()); waitForIdle(); @@ -7785,14 +7812,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification n = new Notification.Builder(mContext, "").build(); n.flags |= FLAG_FOREGROUND_SERVICE; - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 9, null, mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 9, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); mService.addNotification(r); mInternalService.removeForegroundServiceFlagFromNotification( - PKG, r.getSbn().getId(), r.getSbn().getUserId()); + mPkg, r.getSbn().getId(), r.getSbn().getUserId()); waitForIdle(); @@ -7810,7 +7837,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .thenReturn(SHOW_IMMEDIATELY); for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) { Notification n = new Notification.Builder(mContext, "").build(); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, i, null, mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, i, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); mService.addEnqueuedNotification(r); @@ -7818,7 +7845,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification n = new Notification.Builder(mContext, "").build(); n.flags |= FLAG_FOREGROUND_SERVICE; - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -7826,7 +7853,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addEnqueuedNotification(r); mInternalService.removeForegroundServiceFlagFromNotification( - PKG, r.getSbn().getId(), r.getSbn().getUserId()); + mPkg, r.getSbn().getId(), r.getSbn().getUserId()); waitForIdle(); @@ -7841,7 +7868,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .thenReturn(SHOW_IMMEDIATELY); for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) { Notification n = new Notification.Builder(mContext, "").build(); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, i, null, mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, i, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); mService.addNotification(r); @@ -7849,7 +7876,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification n = new Notification.Builder(mContext, "").build(); n.flags |= FLAG_FOREGROUND_SERVICE; - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -7857,7 +7884,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addNotification(r); mInternalService.removeForegroundServiceFlagFromNotification( - PKG, r.getSbn().getId(), r.getSbn().getUserId()); + mPkg, r.getSbn().getId(), r.getSbn().getUserId()); waitForIdle(); @@ -8723,7 +8750,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setContentTitle("foo") .setSmallIcon(android.R.drawable.sym_def_app_icon); - StatusBarNotification sbn = new StatusBarNotification(PKG, "opPkg", 0, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, "opPkg", 0, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -8745,7 +8772,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord r = generateNotificationRecord(mTestNotificationChannel); mService.addNotification(r); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, r.getSbn().getId(), + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, r.getSbn().getId(), r.getSbn().getTag(), mUid, 0, new Notification.Builder(mContext, mTestNotificationChannel.getId()).build(), UserHandle.getUserHandleForUid(mUid), null, 0); @@ -9073,7 +9100,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testFlagBubble() throws RemoteException { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -9081,11 +9108,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord nr = generateMessageBubbleNotifRecord(mTestNotificationChannel, "testFlagBubble"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); - StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifs = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifs.length); assertTrue((notifs[0].getNotification().flags & FLAG_BUBBLE) != 0); assertTrue(mService.getNotificationRecord( @@ -9094,7 +9121,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testFlagBubble_noFlag_appNotAllowed() throws RemoteException { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_NONE /* app */, true /* channel */); @@ -9102,11 +9129,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord nr = generateMessageBubbleNotifRecord(mTestNotificationChannel, "testFlagBubble_noFlag_appNotAllowed"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); - StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifs = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifs.length); assertEquals((notifs[0].getNotification().flags & FLAG_BUBBLE), 0); assertFalse(mService.getNotificationRecord( @@ -9115,7 +9142,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testFlagBubbleNotifs_noFlag_whenAppForeground() throws RemoteException { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -9126,14 +9153,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setContentTitle("foo") .setSmallIcon(android.R.drawable.sym_def_app_icon) .setBubbleMetadata(getBubbleMetadata()); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord nr = new NotificationRecord(mContext, sbn, mTestNotificationChannel); // Say we're foreground when(mActivityManager.getPackageImportance(nr.getSbn().getPackageName())).thenReturn( IMPORTANCE_FOREGROUND); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -9145,7 +9172,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testFlagBubbleNotifs_flag_messaging() throws RemoteException { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -9153,7 +9180,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord nr = generateMessageBubbleNotifRecord(mTestNotificationChannel, "testFlagBubbleNotifs_flag_messaging"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -9164,18 +9191,18 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testFlagBubbleNotifs_noFlag_noShortcut() throws RemoteException { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); Notification.Builder nb = getMessageStyleNotifBuilder(true, null, false); nb.setShortcutId(null); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, null, mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); - mBinderService.enqueueNotificationWithTag(PKG, PKG, sbn.getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, sbn.getTag(), sbn.getId(), sbn.getNotification(), sbn.getUserId()); waitForIdle(); @@ -9186,7 +9213,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testFlagBubbleNotifs_noFlag_messaging_appNotAllowed() throws RemoteException { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_NONE /* app */, true /* channel */); @@ -9195,7 +9222,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { "testFlagBubbleNotifs_noFlag_messaging_appNotAllowed"); // Post the notification - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -9206,7 +9233,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testFlagBubbleNotifs_noFlag_notBubble() throws RemoteException { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -9215,13 +9242,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification.Builder nb = getMessageStyleNotifBuilder(false /* addBubbleMetadata */, null /* groupKey */, false /* isSummary */); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, "testFlagBubbleNotifs_noFlag_notBubble", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord nr = new NotificationRecord(mContext, sbn, mTestNotificationChannel); // Post the notification - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -9232,7 +9259,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testFlagBubbleNotifs_noFlag_messaging_channelNotAllowed() throws RemoteException { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, false /* channel */); @@ -9242,7 +9269,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { nr.getChannel().lockFields(USER_LOCKED_ALLOW_BUBBLE); // Post the notification - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -9257,22 +9284,22 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { nrBubble.getSbn().getNotification().flags |= FLAG_BUBBLE; // Post the notification - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testAppCancelNotifications_cancelsBubbles", nrBubble.getSbn().getId(), nrBubble.getSbn().getNotification(), nrBubble.getSbn().getUserId()); waitForIdle(); - StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifs = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifs.length); assertEquals(1, mService.getNotificationRecordCount()); - mBinderService.cancelNotificationWithTag(PKG, PKG, + mBinderService.cancelNotificationWithTag(mPkg, mPkg, "testAppCancelNotifications_cancelsBubbles", nrBubble.getSbn().getId(), nrBubble.getSbn().getUserId()); waitForIdle(); - StatusBarNotification[] notifs2 = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifs2 = mBinderService.getActiveNotifications(mPkg); assertEquals(0, notifs2.length); assertEquals(0, mService.getNotificationRecordCount()); } @@ -9283,10 +9310,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { nr.getSbn().getNotification().flags |= FLAG_BUBBLE; mService.addNotification(nr); - mBinderService.cancelAllNotifications(PKG, nr.getSbn().getUserId()); + mBinderService.cancelAllNotifications(mPkg, nr.getSbn().getUserId()); waitForIdle(); - StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifs = mBinderService.getActiveNotifications(mPkg); assertEquals(0, notifs.length); assertEquals(0, mService.getNotificationRecordCount()); } @@ -9303,7 +9330,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.getBinderService().cancelNotificationsFromListener(null, null); waitForIdle(); - StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifs = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifs.length); assertEquals(1, mService.getNotificationRecordCount()); } @@ -9320,7 +9347,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Notif not active anymore - StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifs = mBinderService.getActiveNotifications(mPkg); assertEquals(0, notifs.length); assertEquals(0, mService.getNotificationRecordCount()); // Cancel event is logged @@ -9332,13 +9359,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testCancelNotificationsFromListener_suppressesBubble() throws Exception { // Add bubble notif - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); NotificationRecord nr = generateMessageBubbleNotifRecord(mTestNotificationChannel, "tag"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -9348,7 +9375,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Bubble notif active and suppressed - StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifs = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifs.length); assertEquals(1, mService.getNotificationRecordCount()); assertTrue(notifs[0].getNotification().getBubbleMetadata().isNotificationSuppressed()); @@ -9367,7 +9394,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // THEN the bubble notification does not get removed - StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifs = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifs.length); assertEquals(1, mService.getNotificationRecordCount()); } @@ -9498,13 +9525,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { AutomaticZenRule rule = new AutomaticZenRule.Builder("rule", Uri.parse("uri")) .setType(AutomaticZenRule.TYPE_MANAGED) - .setOwner(new ComponentName(PKG, "cls")) + .setOwner(new ComponentName(mPkg, "cls")) .build(); when(mDevicePolicyManager.isActiveDeviceOwner(anyInt())).thenReturn(true); - mBinderService.addAutomaticZenRule(rule, PKG, /* fromUser= */ false); + mBinderService.addAutomaticZenRule(rule, mPkg, /* fromUser= */ false); - verify(zenModeHelper).addAutomaticZenRule(eq(PKG), eq(rule), anyInt(), any(), anyInt()); + verify(zenModeHelper).addAutomaticZenRule(eq(mPkg), eq(rule), anyInt(), any(), anyInt()); } @Test @@ -9526,27 +9553,27 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { ZenModeHelper zenModeHelper = setUpMockZenTest(); mService.setCallerIsNormalPackage(); reset(mPackageManagerInternal); - when(mPackageManagerInternal.isSameApp(eq(PKG), eq(mUid), anyInt())).thenReturn(true); + when(mPackageManagerInternal.isSameApp(eq(mPkg), eq(mUid), anyInt())).thenReturn(true); when(mResources .getString(com.android.internal.R.string.config_systemWellbeing)) - .thenReturn(PKG); + .thenReturn(mPkg); when(mContext.getResources()).thenReturn(mResources); AutomaticZenRule rule = new AutomaticZenRule.Builder("rule", Uri.parse("uri")) .setType(AutomaticZenRule.TYPE_BEDTIME) - .setOwner(new ComponentName(PKG, "cls")) + .setOwner(new ComponentName(mPkg, "cls")) .build(); - mBinderService.addAutomaticZenRule(rule, PKG, /* fromUser= */ false); + mBinderService.addAutomaticZenRule(rule, mPkg, /* fromUser= */ false); - verify(zenModeHelper).addAutomaticZenRule(eq(PKG), eq(rule), anyInt(), any(), anyInt()); + verify(zenModeHelper).addAutomaticZenRule(eq(mPkg), eq(rule), anyInt(), any(), anyInt()); } @Test @EnableFlags(android.app.Flags.FLAG_MODES_API) public void testAddAutomaticZenRule_typeBedtimeCanBeUsedBySystem() throws Exception { reset(mPackageManagerInternal); - when(mPackageManagerInternal.isSameApp(eq(PKG), eq(mUid), anyInt())).thenReturn(true); + when(mPackageManagerInternal.isSameApp(eq(mPkg), eq(mUid), anyInt())).thenReturn(true); addAutomaticZenRule_restrictedRuleTypeCanBeUsedBySystem(AutomaticZenRule.TYPE_BEDTIME); } @@ -9554,7 +9581,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @EnableFlags(android.app.Flags.FLAG_MODES_API) public void testAddAutomaticZenRule_typeBedtimeCannotBeUsedByRegularApps() throws Exception { reset(mPackageManagerInternal); - when(mPackageManagerInternal.isSameApp(eq(PKG), eq(mUid), anyInt())).thenReturn(true); + when(mPackageManagerInternal.isSameApp(eq(mPkg), eq(mUid), anyInt())).thenReturn(true); addAutomaticZenRule_restrictedRuleTypeCannotBeUsedByRegularApps( AutomaticZenRule.TYPE_BEDTIME); } @@ -9566,13 +9593,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { AutomaticZenRule rule = new AutomaticZenRule.Builder("rule", Uri.parse("uri")) .setType(ruleType) - .setOwner(new ComponentName(PKG, "cls")) + .setOwner(new ComponentName(mPkg, "cls")) .build(); when(mDevicePolicyManager.isActiveDeviceOwner(anyInt())).thenReturn(true); - mBinderService.addAutomaticZenRule(rule, PKG, /* fromUser= */ false); + mBinderService.addAutomaticZenRule(rule, mPkg, /* fromUser= */ false); - verify(zenModeHelper).addAutomaticZenRule(eq(PKG), eq(rule), anyInt(), any(), anyInt()); + verify(zenModeHelper).addAutomaticZenRule(eq(mPkg), eq(rule), anyInt(), any(), anyInt()); } private void addAutomaticZenRule_restrictedRuleTypeCannotBeUsedByRegularApps( @@ -9584,12 +9611,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { AutomaticZenRule rule = new AutomaticZenRule.Builder("rule", Uri.parse("uri")) .setType(ruleType) - .setOwner(new ComponentName(PKG, "cls")) + .setOwner(new ComponentName(mPkg, "cls")) .build(); when(mDevicePolicyManager.isActiveDeviceOwner(anyInt())).thenReturn(false); assertThrows(IllegalArgumentException.class, - () -> mBinderService.addAutomaticZenRule(rule, PKG, /* fromUser= */ false)); + () -> mBinderService.addAutomaticZenRule(rule, mPkg, /* fromUser= */ false)); } @Test @@ -9871,7 +9898,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testNotificationBubbleChanged_false() throws Exception { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -9880,7 +9907,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord nr = generateMessageBubbleNotifRecord(mTestNotificationChannel, "testNotificationBubbleChanged_false"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -9888,7 +9915,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { reset(mListeners); // First we were a bubble - StatusBarNotification[] notifsBefore = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsBefore = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsBefore.length); assertTrue((notifsBefore[0].getNotification().flags & FLAG_BUBBLE) != 0); @@ -9897,14 +9924,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Make sure we are not a bubble - StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsAfter.length); assertEquals((notifsAfter[0].getNotification().flags & FLAG_BUBBLE), 0); } @Test public void testNotificationBubbleChanged_true() throws Exception { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -9912,19 +9939,19 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // Notif that is not a bubble NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, 1, null, false); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); // Would be a normal notification because wouldn't have met requirements to bubble - StatusBarNotification[] notifsBefore = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsBefore = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsBefore.length); assertEquals((notifsBefore[0].getNotification().flags & FLAG_BUBBLE), 0); // Update the notification to be message style / meet bubble requirements NotificationRecord nr2 = generateMessageBubbleNotifRecord(mTestNotificationChannel, nr.getSbn().getTag()); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr2.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr2.getSbn().getTag(), nr2.getSbn().getId(), nr2.getSbn().getNotification(), nr2.getSbn().getUserId()); waitForIdle(); @@ -9936,21 +9963,21 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Make sure we are a bubble - StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsAfter.length); assertTrue((notifsAfter[0].getNotification().flags & FLAG_BUBBLE) != 0); } @Test public void testNotificationBubbleChanged_true_notAllowed() throws Exception { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); // Notif that is not a bubble NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -9958,7 +9985,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { reset(mListeners); // Would be a normal notification because wouldn't have met requirements to bubble - StatusBarNotification[] notifsBefore = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsBefore = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsBefore.length); assertEquals((notifsBefore[0].getNotification().flags & FLAG_BUBBLE), 0); @@ -9967,14 +9994,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // We still wouldn't be a bubble because the notification didn't meet requirements - StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsAfter.length); assertEquals((notifsAfter[0].getNotification().flags & FLAG_BUBBLE), 0); } @Test public void testNotificationBubbleIsFlagRemoved_resetOnUpdate() throws Exception { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -9983,7 +10010,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord nr = generateMessageBubbleNotifRecord(mTestNotificationChannel, "testNotificationBubbleIsFlagRemoved_resetOnUpdate"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); // Flag shouldn't be modified @@ -9999,7 +10026,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // Update the notif - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); // And the flag is reset @@ -10009,7 +10036,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testNotificationBubbleIsFlagRemoved_resetOnBubbleChangedTrue() throws Exception { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -10018,7 +10045,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord nr = generateMessageBubbleNotifRecord(mTestNotificationChannel, "testNotificationBubbleIsFlagRemoved_trueOnBubbleChangedTrue"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); // Flag shouldn't be modified @@ -10041,7 +10068,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testOnBubbleMetadataFlagChanged() throws Exception { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -10051,12 +10078,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // Set this so that the bubble can be suppressed nr.getNotification().getBubbleMetadata().setFlags( Notification.BubbleMetadata.FLAG_SUPPRESSABLE_BUBBLE); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); // Check the flags - Notification n = mBinderService.getActiveNotifications(PKG)[0].getNotification(); + Notification n = mBinderService.getActiveNotifications(mPkg)[0].getNotification(); assertFalse(n.getBubbleMetadata().isNotificationSuppressed()); assertFalse(n.getBubbleMetadata().getAutoExpandBubble()); assertFalse(n.getBubbleMetadata().isBubbleSuppressed()); @@ -10074,7 +10101,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Check - n = mBinderService.getActiveNotifications(PKG)[0].getNotification(); + n = mBinderService.getActiveNotifications(mPkg)[0].getNotification(); assertEquals(flags, n.getBubbleMetadata().getFlags()); // Reset to check again @@ -10085,7 +10112,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Check - n = mBinderService.getActiveNotifications(PKG)[0].getNotification(); + n = mBinderService.getActiveNotifications(mPkg)[0].getNotification(); assertEquals(0, n.getBubbleMetadata().getFlags()); } @@ -10093,14 +10120,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testOnBubbleMetadataChangedToSuppressNotification_soundStopped() throws RemoteException { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); // Post a bubble notification NotificationRecord nr = generateMessageBubbleNotifRecord(mTestNotificationChannel, "tag"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -10120,12 +10147,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { : USER_SYSTEM; NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, userId); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); // A notification exists for the given record - StatusBarNotification[] notifsBefore = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsBefore = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsBefore.length); reset(mPackageManager); @@ -10152,7 +10179,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // No notifications exist for the given record - StatusBarNotification[] notifsBefore = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsBefore = mBinderService.getActiveNotifications(mPkg); assertEquals(0, notifsBefore.length); Uri uri = ContentUris.withAppendedId(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, 1); @@ -10172,12 +10199,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // generate a NotificationRecord for USER_ALL to make sure it's converted into USER_SYSTEM NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, UserHandle.USER_ALL); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); // A notification exists for the given record - StatusBarNotification[] notifsBefore = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsBefore = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsBefore.length); reset(mPackageManager); @@ -10202,13 +10229,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { int otherUserId = 11; NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, otherUserId); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); // A notification exists for the given record List<StatusBarNotification> notifsBefore = - mBinderService.getAppActiveNotifications(PKG, nr.getSbn().getUserId()).getList(); + mBinderService.getAppActiveNotifications(mPkg, nr.getSbn().getUserId()).getList(); assertEquals(1, notifsBefore.size()); reset(mPackageManager); @@ -10310,7 +10337,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testNotificationBubbles_disabled_lowRamDevice() throws Exception { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -10321,12 +10348,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // Notification that would typically bubble NotificationRecord nr = generateMessageBubbleNotifRecord(mTestNotificationChannel, "testNotificationBubbles_disabled_lowRamDevice"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); // But we wouldn't be a bubble because the device is low ram & all bubbles are disabled. - StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsAfter.length); assertEquals((notifsAfter[0].getNotification().flags & FLAG_BUBBLE), 0); } @@ -10381,7 +10408,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertNotNull(n.publicVersion.bigContentView); assertNotNull(n.publicVersion.headsUpContentView); - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); assertNull(n.contentView); assertNull(n.bigContentView); @@ -10390,13 +10417,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertNull(n.publicVersion.bigContentView); assertNull(n.publicVersion.headsUpContentView); - verify(mUsageStats, times(5)).registerImageRemoved(PKG); + verify(mUsageStats, times(5)).registerImageRemoved(mPkg); } @Test public void testNotificationBubbles_flagAutoExpandForeground_fails_notForeground() throws Exception { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -10412,7 +10439,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { when(mActivityManager.getPackageImportance(nr.getSbn().getPackageName())).thenReturn( IMPORTANCE_VISIBLE); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -10427,7 +10454,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testNotificationBubbles_flagAutoExpandForeground_succeeds_foreground() throws RemoteException { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -10443,7 +10470,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { when(mActivityManager.getPackageImportance(nr.getSbn().getPackageName())).thenReturn( IMPORTANCE_FOREGROUND); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -10459,7 +10486,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testNotificationBubbles_flagRemoved_whenShortcutRemoved() throws RemoteException { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -10474,12 +10501,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { null /* groupKey */, false /* isSummary */); nb.setShortcutId(VALID_CONVO_SHORTCUT_ID); nb.setBubbleMetadata(metadata); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord nr = new NotificationRecord(mContext, sbn, mTestNotificationChannel); // Test: Send the bubble notification - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -10494,12 +10521,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // Make sure the shortcut is cached. verify(mShortcutServiceInternal).cacheShortcuts( - anyInt(), any(), eq(PKG), eq(singletonList(VALID_CONVO_SHORTCUT_ID)), + anyInt(), any(), eq(mPkg), eq(singletonList(VALID_CONVO_SHORTCUT_ID)), eq(USER_SYSTEM), eq(ShortcutInfo.FLAG_CACHED_NOTIFICATIONS)); // Test: Remove the shortcut when(mLauncherApps.getShortcuts(any(), any())).thenReturn(null); - launcherAppsCallback.getValue().onShortcutsChanged(PKG, emptyList(), + launcherAppsCallback.getValue().onShortcutsChanged(mPkg, emptyList(), UserHandle.getUserHandleForUid(mUid)); waitForIdle(); @@ -10519,7 +10546,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testNotificationBubbles_shortcut_stopListeningWhenNotifRemoved() throws RemoteException { final String shortcutId = "someshortcutId"; - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -10534,14 +10561,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { null /* groupKey */, false /* isSummary */); nb.setShortcutId(shortcutId); nb.setBubbleMetadata(metadata); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord nr = new NotificationRecord(mContext, sbn, mTestNotificationChannel); // Pretend the shortcut exists List<ShortcutInfo> shortcutInfos = new ArrayList<>(); ShortcutInfo info = mock(ShortcutInfo.class); - when(info.getPackage()).thenReturn(PKG); + when(info.getPackage()).thenReturn(mPkg); when(info.getId()).thenReturn(shortcutId); when(info.getUserId()).thenReturn(USER_SYSTEM); when(info.isLongLived()).thenReturn(true); @@ -10552,7 +10579,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { anyString(), anyInt(), any())).thenReturn(true); // Test: Send the bubble notification - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -10567,11 +10594,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // Make sure the shortcut is cached. verify(mShortcutServiceInternal).cacheShortcuts( - anyInt(), any(), eq(PKG), eq(singletonList(shortcutId)), + anyInt(), any(), eq(mPkg), eq(singletonList(shortcutId)), eq(USER_SYSTEM), eq(ShortcutInfo.FLAG_CACHED_NOTIFICATIONS)); // Test: Remove the notification - mBinderService.cancelNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.cancelNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getUserId()); waitForIdle(); @@ -10584,7 +10611,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testNotificationBubbles_bubbleChildrenStay_whenGroupSummaryDismissed() throws Exception { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -10595,21 +10622,21 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // Dismiss summary final NotificationVisibility nv = NotificationVisibility.obtain(nrSummary.getKey(), 1, 2, true); - mService.mNotificationDelegate.onNotificationClear(mUid, 0, PKG, + mService.mNotificationDelegate.onNotificationClear(mUid, 0, mPkg, nrSummary.getUserId(), nrSummary.getKey(), NotificationStats.DISMISSAL_SHADE, NotificationStats.DISMISS_SENTIMENT_NEUTRAL, nv); waitForIdle(); // The bubble should still exist - StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsAfter.length); } @Test public void testNotificationBubbles_bubbleChildrenStay_whenGroupSummaryClicked() throws Exception { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -10625,7 +10652,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // The bubble should still exist - StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsAfter.length); // Check we got the click log and associated dismissal logs @@ -10643,7 +10670,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testNotificationBubbles_bubbleStays_whenClicked() throws Exception { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -10660,7 +10687,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // THEN the bubble should still exist - StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsAfter.length); // Check we got the click log @@ -10677,7 +10704,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testNotificationBubbles_bubbleStays_whenClicked_afterBubbleDismissed() throws Exception { - setUpPrefsForBubbles(PKG, mUid, + setUpPrefsForBubbles(mPkg, mUid, true /* global */, BUBBLE_PREFERENCE_ALL /* app */, true /* channel */); @@ -10701,7 +10728,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // THEN the bubble should still exist - StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(mPkg); assertEquals(1, notifsAfter.length); // Check we got the click log @@ -10761,7 +10788,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testHandleOnPackageChanged() { - String[] pkgs = new String[] {PKG, PKG_N_MR1}; + String[] pkgs = new String[] {mPkg, PKG_N_MR1}; int[] uids = new int[] {mUid, UserHandle.PER_USER_RANGE + 1}; mService.handleOnPackageChanged(false, USER_SYSTEM, pkgs, uids); @@ -10788,25 +10815,25 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertEquals(1, notifs.length); // Cancels all notifications. - mService.cancelAllNotificationsInt(mUid, 0, PKG, null, 0, 0, + mService.cancelAllNotificationsInt(mUid, 0, mPkg, null, 0, 0, notif.getUserId(), REASON_CANCEL); waitForIdle(); notifs = mBinderService.getActiveNotifications(notif.getSbn().getPackageName()); assertEquals(0, notifs.length); // Checks that notification history's recently canceled archive contains the notification. - notifs = mBinderService.getHistoricalNotificationsWithAttribution(PKG, + notifs = mBinderService.getHistoricalNotificationsWithAttribution(mPkg, mContext.getAttributionTag(), 5 /* count */, false /* includeSnoozed */); waitForIdle(); assertEquals(1, notifs.length); // Remove sthe package that contained the channel - simulatePackageRemovedBroadcast(PKG, mUid); + simulatePackageRemovedBroadcast(mPkg, mUid); waitForIdle(); // Checks that notification history no longer contains the notification. notifs = mBinderService.getHistoricalNotificationsWithAttribution( - PKG, mContext.getAttributionTag(), 5 /* count */, false /* includeSnoozed */); + mPkg, mContext.getAttributionTag(), 5 /* count */, false /* includeSnoozed */); waitForIdle(); assertEquals(0, notifs.length); } @@ -10815,7 +10842,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testNotificationHistory_addNoisyNotification() throws Exception { NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, null /* tvExtender */); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -10839,14 +10866,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertEquals(original, orig); assertFalse(TextUtils.isEmpty(orig.getName())); - mBinderService.createNotificationChannels(PKG, new ParceledListSlice(Arrays.asList( + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList( orig))); mBinderService.createConversationNotificationChannelForPackage( - PKG, mUid, orig, "friend"); + mPkg, mUid, orig, "friend"); NotificationChannel friendChannel = mBinderService.getConversationNotificationChannel( - PKG, userId, PKG, original.getId(), false, "friend"); + mPkg, userId, mPkg, original.getId(), false, "friend"); assertEquals(original.getName(), friendChannel.getName()); assertEquals(original.getId(), friendChannel.getParentChannelId()); @@ -10911,15 +10938,15 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationChannel parentChannel = parcelAndUnparcel(originalChannel, NotificationChannel.CREATOR); assertEquals(originalChannel, parentChannel); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(parentChannel))); //Create deleted conversation channel mBinderService.createConversationNotificationChannelForPackage( - PKG, mUid, parentChannel, VALID_CONVO_SHORTCUT_ID); + mPkg, mUid, parentChannel, VALID_CONVO_SHORTCUT_ID); final NotificationChannel conversationChannel = mBinderService.getConversationNotificationChannel( - PKG, mUserId, PKG, originalChannel.getId(), false, VALID_CONVO_SHORTCUT_ID); + mPkg, mUserId, mPkg, originalChannel.getId(), false, VALID_CONVO_SHORTCUT_ID); conversationChannel.setDeleted(true); //Create notification record @@ -10927,12 +10954,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { null /* groupKey */, false /* isSummary */); nb.setShortcutId(VALID_CONVO_SHORTCUT_ID); nb.setChannelId(originalChannel.getId()); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord nr = new NotificationRecord(mContext, sbn, originalChannel); assertThat(nr.getChannel()).isEqualTo(originalChannel); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -10954,7 +10981,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationChannel parentChannel = parcelAndUnparcel(originalChannel, NotificationChannel.CREATOR); assertEquals(originalChannel, parentChannel); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(parentChannel))); parentChannel.setDeleted(true); @@ -10963,14 +10990,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { null /* groupKey */, false /* isSummary */); nb.setShortcutId(VALID_CONVO_SHORTCUT_ID); nb.setChannelId(originalChannel.getId()); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord nr = new NotificationRecord(mContext, sbn, originalChannel); assertThat(nr.getChannel()).isEqualTo(originalChannel); when(mPermissionHelper.hasPermission(mUid)).thenReturn(true); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -10992,27 +11019,27 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationChannel parentChannel = parcelAndUnparcel(originalChannel, NotificationChannel.CREATOR); assertEquals(originalChannel, parentChannel); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(parentChannel))); //Create conversation channel mBinderService.createConversationNotificationChannelForPackage( - PKG, mUid, parentChannel, VALID_CONVO_SHORTCUT_ID); + mPkg, mUid, parentChannel, VALID_CONVO_SHORTCUT_ID); final NotificationChannel conversationChannel = mBinderService.getConversationNotificationChannel( - PKG, mUserId, PKG, originalChannel.getId(), false, VALID_CONVO_SHORTCUT_ID); + mPkg, mUserId, mPkg, originalChannel.getId(), false, VALID_CONVO_SHORTCUT_ID); //Create notification record Notification.Builder nb = getMessageStyleNotifBuilder(false /* addDefaultMetadata */, null /* groupKey */, false /* isSummary */); nb.setShortcutId(VALID_CONVO_SHORTCUT_ID); nb.setChannelId(originalChannel.getId()); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord nr = new NotificationRecord(mContext, sbn, originalChannel); assertThat(nr.getChannel()).isEqualTo(originalChannel); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -11037,27 +11064,27 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationChannel parentChannel = parcelAndUnparcel(originalChannel, NotificationChannel.CREATOR); assertEquals(originalChannel, parentChannel); - mBinderService.createNotificationChannels(PKG, + mBinderService.createNotificationChannels(mPkg, new ParceledListSlice(Arrays.asList(parentChannel))); //Create deleted conversation channel mBinderService.createConversationNotificationChannelForPackage( - PKG, mUid, parentChannel, VALID_CONVO_SHORTCUT_ID); + mPkg, mUid, parentChannel, VALID_CONVO_SHORTCUT_ID); final NotificationChannel conversationChannel = mBinderService.getConversationNotificationChannel( - PKG, mUserId, PKG, originalChannel.getId(), false, VALID_CONVO_SHORTCUT_ID); + mPkg, mUserId, mPkg, originalChannel.getId(), false, VALID_CONVO_SHORTCUT_ID); //Create notification record without a shortcutId Notification.Builder nb = getMessageStyleNotifBuilder(false /* addDefaultMetadata */, null /* groupKey */, false /* isSummary */); nb.setShortcutId(null); nb.setChannelId(originalChannel.getId()); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord nr = new NotificationRecord(mContext, sbn, originalChannel); assertThat(nr.getChannel()).isEqualTo(originalChannel); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -11173,7 +11200,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { generateMessageBubbleNotifRecord(mTestNotificationChannel, "testShortcutHelperNull_doesntCrashEnqueue"); try { - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); } catch (Exception e) { @@ -11252,23 +11279,23 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testRecordMessages_invalidMsg_afterValidMsg() throws RemoteException { NotificationRecord nr = generateMessageBubbleNotifRecord(mTestNotificationChannel, "testRecordMessages_invalidMsg_afterValidMsg_1"); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); assertTrue(mService.getNotificationRecord(nr.getKey()).isConversation()); - mBinderService.cancelAllNotifications(PKG, mUid); + mBinderService.cancelAllNotifications(mPkg, mUid); waitForIdle(); Notification.Builder nb = getMessageStyleNotifBuilder(false /* addDefaultMetadata */, null /* groupKey */, false /* isSummary */); nb.setShortcutId(null); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, "testRecordMessages_invalidMsg_afterValidMsg_2", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); nr = new NotificationRecord(mContext, sbn, mTestNotificationChannel); - mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -11283,14 +11310,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) { StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel, i, null, false).getSbn(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCanPostFgsWhenOverLimit", sbn.getId(), sbn.getNotification(), sbn.getUserId()); } final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().flags |= FLAG_FOREGROUND_SERVICE; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCanPostFgsWhenOverLimit - fgs over limit!", sbn.getId(), sbn.getNotification(), sbn.getUserId()); @@ -11311,7 +11338,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) { StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel, i, null, false).getSbn(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCanPostFgsWhenOverLimit", sbn.getId(), sbn.getNotification(), sbn.getUserId()); waitForIdle(); @@ -11320,13 +11347,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel, 100, null, false).getSbn(); sbn.getNotification().flags |= FLAG_FOREGROUND_SERVICE; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCanPostFgsWhenOverLimit - fgs over limit!", sbn.getId(), sbn.getNotification(), sbn.getUserId()); final StatusBarNotification sbn2 = generateNotificationRecord(mTestNotificationChannel, 101, null, false).getSbn(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCanPostFgsWhenOverLimit - non fgs over limit!", sbn2.getId(), sbn2.getNotification(), sbn2.getUserId()); @@ -11337,7 +11364,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final StatusBarNotification sbn3 = generateNotificationRecord(mTestNotificationChannel, 101, null, false).getSbn(); sbn3.getNotification().flags |= FLAG_FOREGROUND_SERVICE; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCanPostFgsWhenOverLimit - fake fgs over limit!", sbn3.getId(), sbn3.getNotification(), sbn3.getUserId()); @@ -11486,7 +11513,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord r = generateMessageBubbleNotifRecord(true, mTestNotificationChannel, 7, "testImmutableBubbleIntent", null, false); try { - mBinderService.enqueueNotificationWithTag(PKG, PKG, r.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, r.getSbn().getTag(), r.getSbn().getId(), r.getNotification(), r.getSbn().getUserId()); waitForIdle(); @@ -11503,7 +11530,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord r = generateMessageBubbleNotifRecord(true, mTestNotificationChannel, 7, "testMutableBubbleIntent", null, false); - mBinderService.enqueueNotificationWithTag(PKG, PKG, r.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, r.getSbn().getTag(), r.getSbn().getId(), r.getNotification(), r.getSbn().getUserId()); waitForIdle(); @@ -11519,7 +11546,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord r = generateMessageBubbleNotifRecord(false, mTestNotificationChannel, 7, "testImmutableDirectReplyActionIntent", null, false); try { - mBinderService.enqueueNotificationWithTag(PKG, PKG, r.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, r.getSbn().getTag(), r.getSbn().getId(), r.getNotification(), r.getSbn().getUserId()); waitForIdle(); @@ -11535,7 +11562,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .thenReturn(FLAG_MUTABLE | FLAG_ONE_SHOT); NotificationRecord r = generateMessageBubbleNotifRecord(false, mTestNotificationChannel, 7, "testMutableDirectReplyActionIntent", null, false); - mBinderService.enqueueNotificationWithTag(PKG, PKG, r.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, r.getSbn().getTag(), r.getSbn().getId(), r.getNotification(), r.getSbn().getUserId()); waitForIdle(); @@ -11609,7 +11636,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .thenReturn(FLAG_IMMUTABLE | FLAG_ONE_SHOT); NotificationRecord r = generateNotificationRecord(mTestNotificationChannel); - mBinderService.enqueueNotificationWithTag(PKG, PKG, r.getSbn().getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, r.getSbn().getTag(), r.getSbn().getId(), r.getNotification(), r.getSbn().getUserId()); waitForIdle(); @@ -11779,9 +11806,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { when(mPermissionHelper.hasPermission(mUid)).thenReturn(false); - assertThat(mBinderService.getNotificationChannelsBypassingDnd(PKG, mUid).getList()) + assertThat(mBinderService.getNotificationChannelsBypassingDnd(mPkg, mUid).getList()) .isEmpty(); - verify(mPreferencesHelper, never()).getNotificationChannelsBypassingDnd(PKG, mUid); + verify(mPreferencesHelper, never()).getNotificationChannelsBypassingDnd(mPkg, mUid); } @Test @@ -11873,7 +11900,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setContentTitle("foo") .setSmallIcon(android.R.drawable.sym_def_app_icon) .addAction(new Notification.Action.Builder(null, "test", null).build()); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -11885,7 +11912,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // just using the style - blocked nb.setStyle(new Notification.MediaStyle()); - sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -11897,7 +11924,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Bundle extras = new Bundle(); extras.putParcelable(Notification.EXTRA_MEDIA_SESSION, new Intent()); nb.addExtras(extras); - sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -11906,7 +11933,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // style + media session - bypasses block nb.setStyle(new Notification.MediaStyle().setMediaSession(mock(MediaSession.Token.class))); - sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -11924,7 +11951,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setContentTitle("foo") .setSmallIcon(android.R.drawable.sym_def_app_icon) .addAction(new Notification.Action.Builder(null, "test", null).build()); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -11944,7 +11971,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.clearNotifications(); reset(mUsageStats); nb.setStyle(new Notification.MediaStyle()); - sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -11961,7 +11988,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.clearNotifications(); reset(mUsageStats); nb.setStyle(new Notification.MediaStyle().setMediaSession(mock(MediaSession.Token.class))); - sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -11986,7 +12013,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setContentTitle("foo") .setSmallIcon(android.R.drawable.sym_def_app_icon) .addAction(new Notification.Action.Builder(null, "test", null).build()); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -12003,7 +12030,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { nb.setStyle(Notification.CallStyle.forOngoingCall( person, mock(PendingIntent.class))); nb.setFullScreenIntent(mock(PendingIntent.class), true); - sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -12051,7 +12078,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setContentTitle("foo") .setSmallIcon(android.R.drawable.sym_def_app_icon) .addAction(new Notification.Action.Builder(null, "test", null).build()); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -12072,7 +12099,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Person person = new Person.Builder().setName("caller").build(); nb.setStyle(Notification.CallStyle.forOngoingCall(person, mock(PendingIntent.class))); nb.setFullScreenIntent(mock(PendingIntent.class), true); - sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, nb.build(), + sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -12194,21 +12221,21 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord nr0 = generateNotificationRecord(mTestNotificationChannel, mUserId); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag0", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag0", nr0.getSbn().getId(), nr0.getSbn().getNotification(), nr0.getSbn().getUserId()); NotificationRecord nr10 = generateNotificationRecord(mTestNotificationChannel, 10); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag10", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag10", nr10.getSbn().getId(), nr10.getSbn().getNotification(), nr10.getSbn().getUserId()); NotificationRecord nr11 = generateNotificationRecord(mTestNotificationChannel, 11); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag11", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag11", nr11.getSbn().getId(), nr11.getSbn().getNotification(), nr11.getSbn().getUserId()); waitForIdle(); - StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifs = mBinderService.getActiveNotifications(mPkg); assertEquals(2, notifs.length); for (StatusBarNotification sbn : notifs) { if (sbn.getUserId() == 11) { @@ -12297,9 +12324,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { VISIBILITY_PRIVATE)); // cancel both children - mBinderService.cancelNotificationWithTag(PKG, PKG, nr0.getSbn().getTag(), + mBinderService.cancelNotificationWithTag(mPkg, mPkg, nr0.getSbn().getTag(), nr0.getSbn().getId(), nr0.getSbn().getUserId()); - mBinderService.cancelNotificationWithTag(PKG, PKG, nr1.getSbn().getTag(), + mBinderService.cancelNotificationWithTag(mPkg, mPkg, nr1.getSbn().getTag(), nr1.getSbn().getId(), nr1.getSbn().getUserId()); waitForIdle(); @@ -12339,9 +12366,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { nr0_all.getKey(), GroupHelper.BASE_FLAGS, mock(Icon.class), 0, VISIBILITY_PRIVATE)); // cancel both children for USER_ALL - mBinderService.cancelNotificationWithTag(PKG, PKG, nr0_all.getSbn().getTag(), + mBinderService.cancelNotificationWithTag(mPkg, mPkg, nr0_all.getSbn().getTag(), nr0_all.getSbn().getId(), UserHandle.USER_ALL); - mBinderService.cancelNotificationWithTag(PKG, PKG, nr1_all.getSbn().getTag(), + mBinderService.cancelNotificationWithTag(mPkg, mPkg, nr1_all.getSbn().getTag(), nr1_all.getSbn().getId(), UserHandle.USER_ALL); waitForIdle(); @@ -12641,7 +12668,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { boolean isSticky) throws Exception { when(mPermissionHelper.hasRequestedPermission(Manifest.permission.USE_FULL_SCREEN_INTENT, - PKG, mUserId)).thenReturn(appRequested); + mPkg, mUserId)).thenReturn(appRequested); when(mPermissionManager.checkPermissionForDataDelivery( eq(Manifest.permission.USE_FULL_SCREEN_INTENT), any(), any())) @@ -12651,7 +12678,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setFullScreenIntent(mock(PendingIntent.class), true) .build(); - mService.fixNotification(n, PKG, "tag", 9, mUserId, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, mUserId, mUid, NOT_FOREGROUND_SERVICE, true); final int stickyFlag = n.flags & Notification.FLAG_FSI_REQUESTED_BUT_DENIED; @@ -12705,7 +12732,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setFlag(FLAG_CAN_COLORIZE, true) .build(); - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); assertFalse(n.isForegroundService()); assertFalse(n.hasColorizedPermission()); @@ -12718,7 +12745,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setStyle(Notification.CallStyle.forOngoingCall( person, mock(PendingIntent.class))) .build(); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -12739,7 +12766,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setStyle(Notification.CallStyle.forOngoingCall( person, mock(PendingIntent.class))) .build(); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -12769,7 +12796,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { if (isExpired) { timePostedMs -= BITMAP_DURATION.toMillis(); } - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, notification, UserHandle.getUserHandleForUid(mUid), null, timePostedMs); return new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -12899,7 +12926,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setStyle(Notification.CallStyle.forOngoingCall( person, mock(PendingIntent.class))) .build(); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -12916,7 +12943,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setStyle(Notification.CallStyle.forOngoingCall( person, mock(PendingIntent.class))) .build(); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -12932,7 +12959,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setStyle(Notification.CallStyle.forOngoingCall( person, mock(PendingIntent.class))) .build(); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -12948,7 +12975,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setStyle(Notification.CallStyle.forOngoingCall( person, mock(PendingIntent.class))) .build(); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 8, "tag", mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 8, "tag", mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -12976,7 +13003,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should not be set assertSame(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -12993,7 +13020,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should be set assertNotSame(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -13019,7 +13046,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should be set assertNotSame(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -13039,7 +13066,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should be set assertNotSame(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -13054,7 +13081,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should not be set assertEquals(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -13070,7 +13097,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { n.flags |= Notification.FLAG_NO_DISMISS; // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should be cleared assertEquals(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -13086,7 +13113,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should not be set assertEquals(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -13105,7 +13132,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { n.flags |= Notification.FLAG_NO_DISMISS; // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should be cleared assertEquals(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -13120,7 +13147,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should not be set assertEquals(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -13137,7 +13164,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should be set assertNotSame(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -13147,7 +13174,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void fixExemptAppOpNotification_withFlag_shouldBeNonDismissible() throws Exception { final ApplicationInfo ai = new ApplicationInfo(); - ai.packageName = PKG; + ai.packageName = mPkg; ai.uid = mUid; ai.flags |= ApplicationInfo.FLAG_SYSTEM; @@ -13155,7 +13182,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .thenReturn(ai); when(mAppOpsManager.checkOpNoThrow( AppOpsManager.OP_SYSTEM_EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS, mUid, - PKG)).thenReturn(AppOpsManager.MODE_ALLOWED); + mPkg)).thenReturn(AppOpsManager.MODE_ALLOWED); // Given: a notification has the flag FLAG_ONGOING_EVENT set setDpmAppOppsExemptFromDismissal(true); Notification n = new Notification.Builder(mContext, "test") @@ -13163,7 +13190,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should be cleared assertEquals(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -13174,7 +13201,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { throws Exception { when(mAppOpsManager.checkOpNoThrow( AppOpsManager.OP_SYSTEM_EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS, mUid, - PKG)).thenReturn(AppOpsManager.MODE_ALLOWED); + mPkg)).thenReturn(AppOpsManager.MODE_ALLOWED); // Given: a notification has the flag FLAG_ONGOING_EVENT set setDpmAppOppsExemptFromDismissal(false); Notification n = new Notification.Builder(mContext, "test") @@ -13182,7 +13209,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build(); // When: fix the notification with NotificationManagerService - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); // Then: the notification's flag FLAG_NO_DISMISS should not be set assertSame(0, n.flags & Notification.FLAG_NO_DISMISS); @@ -13194,10 +13221,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .thenReturn(true); final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().flags |= FLAG_USER_INITIATED_JOB; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelAllNotifications_IgnoreUserInitiatedJob", sbn.getId(), sbn.getNotification(), sbn.getUserId()); - mBinderService.cancelAllNotifications(PKG, sbn.getUserId()); + mBinderService.cancelAllNotifications(mPkg, sbn.getUserId()); waitForIdle(); StatusBarNotification[] notifs = mBinderService.getActiveNotifications(sbn.getPackageName()); @@ -13211,10 +13238,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .thenReturn(false); final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().flags |= FLAG_USER_INITIATED_JOB; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelAllNotifications_UijFlag_NoUij_Allowed", sbn.getId(), sbn.getNotification(), sbn.getUserId()); - mBinderService.cancelAllNotifications(PKG, sbn.getUserId()); + mBinderService.cancelAllNotifications(mPkg, sbn.getUserId()); waitForIdle(); StatusBarNotification[] notifs = mBinderService.getActiveNotifications(sbn.getPackageName()); @@ -13227,7 +13254,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .thenReturn(true); final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().flags |= FLAG_USER_INITIATED_JOB; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCancelAllNotifications_IgnoreOtherPackages", sbn.getId(), sbn.getNotification(), sbn.getUserId()); mBinderService.cancelAllNotifications("other_pkg_name", sbn.getUserId()); @@ -13248,9 +13275,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { StatusBarNotification sbn = new StatusBarNotification("a", "a", 0, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); sbn.getNotification().flags |= FLAG_USER_INITIATED_JOB; - mBinderService.enqueueNotificationWithTag(PKG, PKG, null, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, null, sbn.getId(), sbn.getNotification(), sbn.getUserId()); - mInternalService.removeUserInitiatedJobFlagFromNotification(PKG, sbn.getId(), + mInternalService.removeUserInitiatedJobFlagFromNotification(mPkg, sbn.getId(), sbn.getUserId()); waitForIdle(); StatusBarNotification[] notifs = @@ -13262,12 +13289,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testCancelAfterSecondEnqueueDoesNotSpecifyUserInitiatedJobFlag() throws Exception { final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().flags = Notification.FLAG_ONGOING_EVENT | FLAG_USER_INITIATED_JOB; - mBinderService.enqueueNotificationWithTag(PKG, PKG, sbn.getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, sbn.getTag(), sbn.getId(), sbn.getNotification(), sbn.getUserId()); sbn.getNotification().flags = Notification.FLAG_ONGOING_EVENT; - mBinderService.enqueueNotificationWithTag(PKG, PKG, sbn.getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, sbn.getTag(), sbn.getId(), sbn.getNotification(), sbn.getUserId()); - mBinderService.cancelNotificationWithTag(PKG, PKG, sbn.getTag(), sbn.getId(), + mBinderService.cancelNotificationWithTag(mPkg, mPkg, sbn.getTag(), sbn.getId(), sbn.getUserId()); waitForIdle(); assertEquals(0, mBinderService.getActiveNotifications(sbn.getPackageName()).length); @@ -13535,10 +13562,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testDeleteChannelGroupChecksForUijs() throws Exception { - when(mCompanionMgr.getAssociations(PKG, UserHandle.getUserId(mUid))) + when(mCompanionMgr.getAssociations(mPkg, UserHandle.getUserId(mUid))) .thenReturn(singletonList(mock(AssociationInfo.class))); CountDownLatch latch = new CountDownLatch(2); - mService.createNotificationChannelGroup(PKG, mUid, + mService.createNotificationChannelGroup(mPkg, mUid, new NotificationChannelGroup("group", "group"), true, false); new Thread(() -> { NotificationChannel notificationChannel = new NotificationChannel("id", "id", @@ -13547,7 +13574,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { ParceledListSlice<NotificationChannel> pls = new ParceledListSlice(ImmutableList.of(notificationChannel)); try { - mBinderService.createNotificationChannelsForPackage(PKG, mUid, pls); + mBinderService.createNotificationChannelsForPackage(mPkg, mUid, pls); } catch (RemoteException e) { throw new RuntimeException(e); } @@ -13558,7 +13585,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { synchronized (this) { wait(5000); } - mService.createNotificationChannelGroup(PKG, mUid, + mService.createNotificationChannelGroup(mPkg, mUid, new NotificationChannelGroup("new", "new group"), true, false); NotificationChannel notificationChannel = new NotificationChannel("id", "id", NotificationManager.IMPORTANCE_HIGH); @@ -13566,8 +13593,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { ParceledListSlice<NotificationChannel> pls = new ParceledListSlice(ImmutableList.of(notificationChannel)); try { - mBinderService.createNotificationChannelsForPackage(PKG, mUid, pls); - mBinderService.deleteNotificationChannelGroup(PKG, "group"); + mBinderService.createNotificationChannelsForPackage(mPkg, mUid, pls); + mBinderService.deleteNotificationChannelGroup(mPkg, "group"); } catch (RemoteException e) { throw new RuntimeException(e); } @@ -13589,14 +13616,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification n = new Notification.Builder(mContext, "").build(); n.flags |= FLAG_USER_INITIATED_JOB; - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 9, null, mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 9, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); mService.addEnqueuedNotification(r); mInternalService.removeUserInitiatedJobFlagFromNotification( - PKG, r.getSbn().getId(), r.getSbn().getUserId()); + mPkg, r.getSbn().getId(), r.getSbn().getUserId()); waitForIdle(); @@ -13610,14 +13637,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification n = new Notification.Builder(mContext, "").build(); n.flags |= FLAG_USER_INITIATED_JOB; - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 9, null, mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 9, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); mService.addNotification(r); mInternalService.removeUserInitiatedJobFlagFromNotification( - PKG, r.getSbn().getId(), r.getSbn().getUserId()); + mPkg, r.getSbn().getId(), r.getSbn().getUserId()); waitForIdle(); @@ -13632,7 +13659,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testCannotRemoveUserInitiatedJobFlagWhenOverLimit_enqueued() { for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) { Notification n = new Notification.Builder(mContext, "").build(); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, i, null, mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, i, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); mService.addEnqueuedNotification(r); @@ -13640,7 +13667,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification n = new Notification.Builder(mContext, "").build(); n.flags |= FLAG_USER_INITIATED_JOB; - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -13648,7 +13675,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addEnqueuedNotification(r); mInternalService.removeUserInitiatedJobFlagFromNotification( - PKG, r.getSbn().getId(), r.getSbn().getUserId()); + mPkg, r.getSbn().getId(), r.getSbn().getUserId()); waitForIdle(); @@ -13662,7 +13689,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .thenReturn(true); for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) { Notification n = new Notification.Builder(mContext, "").build(); - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, i, null, mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, i, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); mService.addNotification(r); @@ -13670,7 +13697,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification n = new Notification.Builder(mContext, "").build(); n.flags |= FLAG_USER_INITIATED_JOB; - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS, null, mUid, 0, n, UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); @@ -13678,7 +13705,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.addNotification(r); mInternalService.removeUserInitiatedJobFlagFromNotification( - PKG, r.getSbn().getId(), r.getSbn().getUserId()); + mPkg, r.getSbn().getId(), r.getSbn().getUserId()); waitForIdle(); @@ -13693,13 +13720,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) { StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel, i, null, false).getSbn(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "testCanPostUijWhenOverLimit", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCanPostUijWhenOverLimit", sbn.getId(), sbn.getNotification(), sbn.getUserId()); } final StatusBarNotification sbn = generateNotificationRecord(null).getSbn(); sbn.getNotification().flags |= FLAG_USER_INITIATED_JOB; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCanPostUijWhenOverLimit - uij over limit!", sbn.getId(), sbn.getNotification(), sbn.getUserId()); @@ -13719,7 +13746,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) { StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel, i, null, false).getSbn(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "testCannotPostNonUijWhenOverLimit", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCannotPostNonUijWhenOverLimit", sbn.getId(), sbn.getNotification(), sbn.getUserId()); waitForIdle(); } @@ -13727,13 +13754,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel, 100, null, false).getSbn(); sbn.getNotification().flags |= FLAG_USER_INITIATED_JOB; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCannotPostNonUijWhenOverLimit - uij over limit!", sbn.getId(), sbn.getNotification(), sbn.getUserId()); final StatusBarNotification sbn2 = generateNotificationRecord(mTestNotificationChannel, 101, null, false).getSbn(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCannotPostNonUijWhenOverLimit - non uij over limit!", sbn2.getId(), sbn2.getNotification(), sbn2.getUserId()); @@ -13742,7 +13769,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { final StatusBarNotification sbn3 = generateNotificationRecord(mTestNotificationChannel, 101, null, false).getSbn(); sbn3.getNotification().flags |= FLAG_USER_INITIATED_JOB; - mBinderService.enqueueNotificationWithTag(PKG, PKG, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "testCannotPostNonUijWhenOverLimit - fake uij over limit!", sbn3.getId(), sbn3.getNotification(), sbn3.getUserId()); @@ -13765,7 +13792,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .setFlag(FLAG_USER_INITIATED_JOB, true) .build(); - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); assertFalse(n.isUserInitiatedJob()); } @@ -13773,11 +13800,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void enqueue_updatesEnqueueRate() throws Exception { Notification n = generateNotificationRecord(null).getNotification(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, n, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", 0, n, mUserId); // Don't waitForIdle() here. We want to verify the "intermediate" state. - verify(mUsageStats).registerEnqueuedByApp(eq(PKG)); - verify(mUsageStats).registerEnqueuedByAppAndAccepted(eq(PKG)); + verify(mUsageStats).registerEnqueuedByApp(eq(mPkg)); + verify(mUsageStats).registerEnqueuedByAppAndAccepted(eq(mPkg)); verify(mUsageStats, never()).registerPostedByApp(any()); waitForIdle(); @@ -13787,26 +13814,26 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void enqueue_withPost_updatesEnqueueRateAndPost() throws Exception { Notification n = generateNotificationRecord(null).getNotification(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, n, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", 0, n, mUserId); waitForIdle(); - verify(mUsageStats).registerEnqueuedByApp(eq(PKG)); - verify(mUsageStats).registerEnqueuedByAppAndAccepted(eq(PKG)); + verify(mUsageStats).registerEnqueuedByApp(eq(mPkg)); + verify(mUsageStats).registerEnqueuedByAppAndAccepted(eq(mPkg)); verify(mUsageStats).registerPostedByApp(any()); } @Test public void enqueueNew_whenOverEnqueueRate_accepts() throws Exception { Notification n = generateNotificationRecord(null).getNotification(); - when(mUsageStats.getAppEnqueueRate(eq(PKG))) + when(mUsageStats.getAppEnqueueRate(eq(mPkg))) .thenReturn(DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE + 1f); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, n, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", 0, n, mUserId); waitForIdle(); assertThat(mService.mNotificationsByKey).hasSize(1); - verify(mUsageStats).registerEnqueuedByApp(eq(PKG)); - verify(mUsageStats).registerEnqueuedByAppAndAccepted(eq(PKG)); + verify(mUsageStats).registerEnqueuedByApp(eq(mPkg)); + verify(mUsageStats).registerEnqueuedByAppAndAccepted(eq(mPkg)); verify(mUsageStats).registerPostedByApp(any()); } @@ -13815,23 +13842,23 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // Post the first version. Notification original = generateNotificationRecord(null).getNotification(); original.when = 111; - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, original, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", 0, original, mUserId); waitForIdle(); assertThat(mService.mNotificationList).hasSize(1); assertThat(mService.mNotificationList.get(0).getNotification().when).isEqualTo(111); reset(mUsageStats); - when(mUsageStats.getAppEnqueueRate(eq(PKG))) + when(mUsageStats.getAppEnqueueRate(eq(mPkg))) .thenReturn(DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE - 1f); // Post the update. Notification update = generateNotificationRecord(null).getNotification(); update.when = 222; - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, update, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", 0, update, mUserId); waitForIdle(); - verify(mUsageStats).registerEnqueuedByApp(eq(PKG)); - verify(mUsageStats).registerEnqueuedByAppAndAccepted(eq(PKG)); + verify(mUsageStats).registerEnqueuedByApp(eq(mPkg)); + verify(mUsageStats).registerEnqueuedByAppAndAccepted(eq(mPkg)); verify(mUsageStats, never()).registerPostedByApp(any()); verify(mUsageStats).registerUpdatedByApp(any(), any()); assertThat(mService.mNotificationList).hasSize(1); @@ -13843,22 +13870,22 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // Post the first version. Notification original = generateNotificationRecord(null).getNotification(); original.when = 111; - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, original, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", 0, original, mUserId); waitForIdle(); assertThat(mService.mNotificationList).hasSize(1); assertThat(mService.mNotificationList.get(0).getNotification().when).isEqualTo(111); reset(mUsageStats); - when(mUsageStats.getAppEnqueueRate(eq(PKG))) + when(mUsageStats.getAppEnqueueRate(eq(mPkg))) .thenReturn(DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE + 1f); // Post the update. Notification update = generateNotificationRecord(null).getNotification(); update.when = 222; - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, update, mUserId); + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", 0, update, mUserId); waitForIdle(); - verify(mUsageStats).registerEnqueuedByApp(eq(PKG)); + verify(mUsageStats).registerEnqueuedByApp(eq(mPkg)); verify(mUsageStats, never()).registerEnqueuedByAppAndAccepted(any()); verify(mUsageStats, never()).registerPostedByApp(any()); verify(mUsageStats, never()).registerUpdatedByApp(any(), any()); @@ -13877,7 +13904,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .addAction(new Notification.Action.Builder(null, "action2", actionIntent2).build()) .build(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 1, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", 1, parcelAndUnparcel(n, Notification.CREATOR), mUserId); verify(mAmi, times(3)).setPendingIntentAllowlistDuration( @@ -13905,7 +13932,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { .build()) .build(); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 1, + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag", 1, parcelAndUnparcel(source, Notification.CREATOR), mUserId); verify(mAmi, times(4)).setPendingIntentAllowlistDuration( @@ -14377,7 +14404,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertThat(mBinderService.getAutomaticZenRules()).isEmpty(); // Create an implicit zen rule by calling setNotificationPolicy from an app. - mBinderService.setNotificationPolicy(PKG, new NotificationManager.Policy(0, 0, 0), false); + mBinderService.setNotificationPolicy(mPkg, new NotificationManager.Policy(0, 0, 0), false); assertThat(mBinderService.getAutomaticZenRules()).hasSize(1); Map.Entry<String, AutomaticZenRule> rule = getOnlyElement( mBinderService.getAutomaticZenRules().entrySet()); @@ -14403,7 +14430,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertThat(mBinderService.getAutomaticZenRules()).isEmpty(); // Create an implicit zen rule by calling setNotificationPolicy from an app. - mBinderService.setNotificationPolicy(PKG, new NotificationManager.Policy(0, 0, 0), false); + mBinderService.setNotificationPolicy(mPkg, new NotificationManager.Policy(0, 0, 0), false); assertThat(mBinderService.getAutomaticZenRules()).hasSize(1); Map.Entry<String, AutomaticZenRule> rule = getOnlyElement( mBinderService.getAutomaticZenRules().entrySet()); @@ -14447,7 +14474,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertThat(n.flags & FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY).isGreaterThan(0); - mService.fixNotification(n, PKG, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); + mService.fixNotification(n, mPkg, "tag", 9, 0, mUid, NOT_FOREGROUND_SERVICE, true); assertThat(n.flags & FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY).isEqualTo(0); } @@ -14474,12 +14501,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Notifications should not be active anymore. - StatusBarNotification[] notifications = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifications = mBinderService.getActiveNotifications(mPkg); assertThat(notifications).isEmpty(); assertEquals(0, mService.getNotificationRecordCount()); // Ensure cancel event is logged. verify(mAppOpsManager).noteOpNoThrow( - AppOpsManager.OP_RAPID_CLEAR_NOTIFICATIONS_BY_LISTENER, mUid, PKG, null, null); + AppOpsManager.OP_RAPID_CLEAR_NOTIFICATIONS_BY_LISTENER, mUid, mPkg, null, null); } @Test @@ -14502,7 +14529,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Notifications should not be active anymore. - StatusBarNotification[] notifications = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifications = mBinderService.getActiveNotifications(mPkg); assertThat(notifications).isEmpty(); assertEquals(0, mService.getNotificationRecordCount()); // Ensure cancel event is not logged. @@ -14533,7 +14560,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Notifications should not be active anymore. - StatusBarNotification[] notifications = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifications = mBinderService.getActiveNotifications(mPkg); assertThat(notifications).isEmpty(); assertEquals(0, mService.getNotificationRecordCount()); // Ensure cancel event is not logged due to flag being disabled. @@ -14563,12 +14590,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Notifications should not be active anymore. - StatusBarNotification[] notifications = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifications = mBinderService.getActiveNotifications(mPkg); assertThat(notifications).isEmpty(); assertEquals(0, mService.getNotificationRecordCount()); // Ensure cancel event is logged. verify(mAppOpsManager).noteOpNoThrow( - AppOpsManager.OP_RAPID_CLEAR_NOTIFICATIONS_BY_LISTENER, mUid, PKG, null, null); + AppOpsManager.OP_RAPID_CLEAR_NOTIFICATIONS_BY_LISTENER, mUid, mPkg, null, null); } @Test @@ -14590,7 +14617,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Notifications should not be active anymore. - StatusBarNotification[] notifications = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifications = mBinderService.getActiveNotifications(mPkg); assertThat(notifications).isEmpty(); assertEquals(0, mService.getNotificationRecordCount()); // Ensure cancel event is not logged. @@ -14620,7 +14647,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { waitForIdle(); // Notifications should not be active anymore. - StatusBarNotification[] notifications = mBinderService.getActiveNotifications(PKG); + StatusBarNotification[] notifications = mBinderService.getActiveNotifications(mPkg); assertThat(notifications).isEmpty(); assertEquals(0, mService.getNotificationRecordCount()); // Ensure cancel event is not logged due to flag being disabled. @@ -14651,20 +14678,20 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { ICallNotificationEventCallback listener = mock( ICallNotificationEventCallback.class); when(listener.asBinder()).thenReturn(mock(IBinder.class)); - mBinderService.registerCallNotificationEventListener(PKG, UserHandle.CURRENT, listener); + mBinderService.registerCallNotificationEventListener(mPkg, UserHandle.CURRENT, listener); waitForIdle(); final UserHandle userHandle = UserHandle.getUserHandleForUid(mUid); - final NotificationRecord r = createAndPostCallStyleNotification(PKG, userHandle, + final NotificationRecord r = createAndPostCallStyleNotification(mPkg, userHandle, "testCallNotificationListener_NotifiedOnPostCallStyle"); - verify(listener, times(1)).onCallNotificationPosted(PKG, userHandle); + verify(listener, times(1)).onCallNotificationPosted(mPkg, userHandle); - mBinderService.cancelNotificationWithTag(PKG, PKG, r.getSbn().getTag(), r.getSbn().getId(), + mBinderService.cancelNotificationWithTag(mPkg, mPkg, r.getSbn().getTag(), r.getSbn().getId(), r.getSbn().getUserId()); waitForIdle(); - verify(listener, times(1)).onCallNotificationRemoved(PKG, userHandle); + verify(listener, times(1)).onCallNotificationRemoved(mPkg, userHandle); } @Test @@ -14673,7 +14700,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { ICallNotificationEventCallback listener = mock( ICallNotificationEventCallback.class); when(listener.asBinder()).thenReturn(mock(IBinder.class)); - mBinderService.registerCallNotificationEventListener(PKG, + mBinderService.registerCallNotificationEventListener(mPkg, UserHandle.getUserHandleForUid(mUid), listener); waitForIdle(); @@ -14684,7 +14711,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { verify(listener, never()).onCallNotificationPosted(anyString(), any()); - mBinderService.cancelNotificationWithTag(PKG, PKG, r.getSbn().getTag(), r.getSbn().getId(), + mBinderService.cancelNotificationWithTag(mPkg, mPkg, r.getSbn().getTag(), r.getSbn().getId(), r.getSbn().getUserId()); waitForIdle(); @@ -14698,20 +14725,20 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { ICallNotificationEventCallback listener = mock( ICallNotificationEventCallback.class); when(listener.asBinder()).thenReturn(mock(IBinder.class)); - mBinderService.registerCallNotificationEventListener(PKG, UserHandle.ALL, listener); + mBinderService.registerCallNotificationEventListener(mPkg, UserHandle.ALL, listener); waitForIdle(); final UserHandle otherUser = UserHandle.of(2); - final NotificationRecord r = createAndPostCallStyleNotification(PKG, + final NotificationRecord r = createAndPostCallStyleNotification(mPkg, otherUser, "testCallNotificationListener_registerForUserAll_notifiedOnAnyUserId"); - verify(listener, times(1)).onCallNotificationPosted(PKG, otherUser); + verify(listener, times(1)).onCallNotificationPosted(mPkg, otherUser); - mBinderService.cancelNotificationWithTag(PKG, PKG, r.getSbn().getTag(), r.getSbn().getId(), + mBinderService.cancelNotificationWithTag(mPkg, mPkg, r.getSbn().getTag(), r.getSbn().getId(), r.getSbn().getUserId()); waitForIdle(); - verify(listener, times(1)).onCallNotificationRemoved(PKG, otherUser); + verify(listener, times(1)).onCallNotificationRemoved(mPkg, otherUser); } @Test @@ -14724,13 +14751,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mBinderService.registerCallNotificationEventListener(packageName, UserHandle.ALL, listener); waitForIdle(); - final NotificationRecord r = createAndPostCallStyleNotification(PKG, + final NotificationRecord r = createAndPostCallStyleNotification(mPkg, UserHandle.of(mUserId), "testCallNotificationListener_differentPackage_notNotified"); verify(listener, never()).onCallNotificationPosted(anyString(), any()); - mBinderService.cancelNotificationWithTag(PKG, PKG, r.getSbn().getTag(), r.getSbn().getId(), + mBinderService.cancelNotificationWithTag(mPkg, mPkg, r.getSbn().getTag(), r.getSbn().getId(), r.getSbn().getUserId()); waitForIdle(); @@ -14742,7 +14769,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void rankingTime_newNotification_noisy_matchesSbn() throws Exception { NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, mUserId); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag0", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag0", nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -14757,7 +14784,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationChannel low = new NotificationChannel("low", "low", IMPORTANCE_LOW); NotificationRecord nr = generateNotificationRecord(low, mUserId); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag0", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag0", nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); @@ -14772,14 +14799,14 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationChannel low = new NotificationChannel("low", "low", IMPORTANCE_LOW); NotificationRecord nr = generateNotificationRecord(low, mUserId); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag0", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag0", nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); NotificationRecord posted = mService.mNotificationList.get(0); long originalPostTime = posted.getSbn().getPostTime(); assertThat(posted.getRankingTimeMs()).isEqualTo(originalPostTime); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag0", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag0", nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); assertThat(mService.mNotificationList.get(0).getRankingTimeMs()) @@ -14792,7 +14819,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationChannel low = new NotificationChannel("low", "low", IMPORTANCE_LOW); NotificationRecord nr = generateNotificationRecord(low, 0, mUserId); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag0", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag0", nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); NotificationRecord posted = mService.mNotificationList.get(0); @@ -14801,7 +14828,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecord nrUpdate = generateNotificationRecord(low, 0, mUserId, "bar"); // no attention helper mocked behavior needed because this does not make noise - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag0", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag0", nrUpdate.getSbn().getId(), nrUpdate.getSbn().getNotification(), nrUpdate.getSbn().getUserId()); waitForIdle(); @@ -14817,7 +14844,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationChannel low = new NotificationChannel("low", "low", IMPORTANCE_LOW); NotificationRecord nr = generateNotificationRecord(low, mUserId); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag0", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag0", nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); NotificationRecord posted = mService.mNotificationList.get(0); @@ -14832,7 +14859,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { return 2; // beep } }); - mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag0", + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, "tag0", nrUpdate.getSbn().getId(), nrUpdate.getSbn().getNotification(), nrUpdate.getSbn().getUserId()); waitForIdle(); @@ -14865,16 +14892,16 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { private NotificationRecord createAndPostNotification(Notification.Builder nb, String testName) throws RemoteException { - StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, testName, mUid, 0, + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 1, testName, mUid, 0, nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0); NotificationRecord nr = new NotificationRecord(mContext, sbn, mTestNotificationChannel); - mBinderService.enqueueNotificationWithTag(PKG, PKG, sbn.getTag(), + mBinderService.enqueueNotificationWithTag(mPkg, mPkg, sbn.getTag(), nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId()); waitForIdle(); return mService.findNotificationLocked( - PKG, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getUserId()); + mPkg, nr.getSbn().getTag(), nr.getSbn().getId(), nr.getSbn().getUserId()); } private static <T extends Parcelable> T parcelAndUnparcel(T source, diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationTimeComparatorTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationTimeComparatorTest.java new file mode 100644 index 000000000000..c39961e094ca --- /dev/null +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationTimeComparatorTest.java @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.notification; + +import static android.app.Notification.CATEGORY_MESSAGE; +import static android.app.NotificationManager.IMPORTANCE_DEFAULT; +import static android.app.NotificationManager.IMPORTANCE_HIGH; +import static android.app.NotificationManager.IMPORTANCE_LOW; +import static android.app.NotificationManager.IMPORTANCE_MIN; +import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT; +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import android.app.Notification; +import android.app.NotificationChannel; +import android.app.PendingIntent; +import android.app.Person; +import android.graphics.Color; +import android.media.session.MediaSession; +import android.platform.test.annotations.EnableFlags; +import android.platform.test.flag.junit.SetFlagsRule; +import android.service.notification.StatusBarNotification; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; +import com.android.server.UiServiceTestCase; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.MockitoAnnotations; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class NotificationTimeComparatorTest extends UiServiceTestCase { + + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT); + + @Test + @EnableFlags({android.app.Flags.FLAG_SORT_SECTION_BY_TIME}) + public void testCompare() { + NotificationRecord one = mock(NotificationRecord.class); + when(one.getRankingTimeMs()).thenReturn(1L); + + NotificationRecord five = mock(NotificationRecord.class); + when(five.getRankingTimeMs()).thenReturn(5L); + + NotificationRecord ten = mock(NotificationRecord.class); + when(ten.getRankingTimeMs()).thenReturn(10L); + + List<NotificationRecord> expected = new ArrayList<>(); + expected.add(ten); + expected.add(five); + expected.add(one); + + List<NotificationRecord> actual = new ArrayList<>(); + actual.addAll(expected); + Collections.shuffle(actual); + + Collections.sort(actual, new NotificationTimeComparator()); + + assertThat(actual).containsExactlyElementsIn(expected).inOrder(); + } +} diff --git a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java index cee6cdb06bf5..aeeca2ae86f5 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java @@ -173,11 +173,8 @@ import java.util.concurrent.ThreadLocalRandom; @SmallTest @RunWith(AndroidJUnit4.class) public class PreferencesHelperTest extends UiServiceTestCase { - private static final int UID_N_MR1 = 0; private static final int UID_HEADLESS = 1000000; private static final UserHandle USER = UserHandle.of(0); - private static final int UID_O = 1111; - private static final int UID_P = 2222; private static final String SYSTEM_PKG = "android"; private static final int SYSTEM_UID = 1000; private static final UserHandle USER2 = UserHandle.of(10); @@ -1102,18 +1099,15 @@ public class PreferencesHelperTest extends UiServiceTestCase { + "<package name=\"com.example.o\" show_badge=\"true\" " + "app_user_locked_fields=\"0\" sent_invalid_msg=\"false\" " + "sent_valid_msg=\"false\" user_demote_msg_app=\"false\" sent_valid_bubble" - + "=\"false\" uid=\"1111\">\n" + + "=\"false\" uid=\"10002\">\n" + "<channel id=\"id\" name=\"name\" importance=\"2\" " + "sound=\"content://settings/system/notification_sound\" usage=\"5\" " + "content_type=\"4\" flags=\"0\" show_badge=\"true\" orig_imp=\"2\" />\n" + "</package>\n" - + "<package name=\"com.example.p\" show_badge=\"true\" " - + "app_user_locked_fields=\"0\" sent_invalid_msg=\"true\" sent_valid_msg=\"true\"" - + " user_demote_msg_app=\"true\" sent_valid_bubble=\"false\" uid=\"2222\" />\n" + "<package name=\"com.example.n_mr1\" show_badge=\"true\" " + "app_user_locked_fields=\"0\" sent_invalid_msg=\"false\" " + "sent_valid_msg=\"false\" user_demote_msg_app=\"false\" sent_valid_bubble" - + "=\"false\" uid=\"0\">\n" + + "=\"false\" uid=\"10001\">\n" + "<channelGroup id=\"1\" name=\"bye\" blocked=\"false\" locked=\"0\" />\n" + "<channelGroup id=\"2\" name=\"hello\" blocked=\"false\" locked=\"0\" />\n" + "<channel id=\"id1\" name=\"name1\" importance=\"4\" show_badge=\"true\" " @@ -1129,6 +1123,9 @@ public class PreferencesHelperTest extends UiServiceTestCase { + "sound=\"content://settings/system/notification_sound\" usage=\"5\" " + "content_type=\"4\" flags=\"0\" show_badge=\"true\" />\n" + "</package>\n" + + "<package name=\"com.example.p\" show_badge=\"true\" " + + "app_user_locked_fields=\"0\" sent_invalid_msg=\"true\" sent_valid_msg=\"true\"" + + " user_demote_msg_app=\"true\" sent_valid_bubble=\"false\" uid=\"10003\" />\n" + "</ranking>"; assertThat(baos.toString()).contains(expected); } @@ -1194,10 +1191,6 @@ public class PreferencesHelperTest extends UiServiceTestCase { + "content_type=\"4\" flags=\"0\" show_badge=\"true\" orig_imp=\"2\" />\n" + "</package>\n" // Importance default because on in permission helper - + "<package name=\"com.example.p\" importance=\"3\" show_badge=\"true\" " - + "app_user_locked_fields=\"0\" sent_invalid_msg=\"true\" sent_valid_msg=\"true\"" - + " user_demote_msg_app=\"true\" sent_valid_bubble=\"false\" />\n" - // Importance default because on in permission helper + "<package name=\"com.example.n_mr1\" importance=\"3\" show_badge=\"true\" " + "app_user_locked_fields=\"0\" sent_invalid_msg=\"false\" " + "sent_valid_msg=\"false\" user_demote_msg_app=\"false\" sent_valid_bubble" @@ -1217,6 +1210,10 @@ public class PreferencesHelperTest extends UiServiceTestCase { + "sound=\"content://settings/system/notification_sound\" usage=\"5\" " + "content_type=\"4\" flags=\"0\" show_badge=\"true\" />\n" + "</package>\n" + // Importance default because on in permission helper + + "<package name=\"com.example.p\" importance=\"3\" show_badge=\"true\" " + + "app_user_locked_fields=\"0\" sent_invalid_msg=\"true\" sent_valid_msg=\"true\"" + + " user_demote_msg_app=\"true\" sent_valid_bubble=\"false\" />\n" // Packages that exist solely in permissionhelper + "<package name=\"first\" importance=\"3\" />\n" + "<package name=\"third\" importance=\"0\" />\n" @@ -1280,12 +1277,8 @@ public class PreferencesHelperTest extends UiServiceTestCase { + "sound=\"content://settings/system/notification_sound\" usage=\"5\" " + "content_type=\"4\" flags=\"0\" show_badge=\"true\" orig_imp=\"2\" />\n" + "</package>\n" - // Importance default because on in permission helper - + "<package name=\"com.example.p\" importance=\"3\" show_badge=\"true\" " - + "app_user_locked_fields=\"0\" sent_invalid_msg=\"true\" sent_valid_msg=\"true\"" - + " user_demote_msg_app=\"true\" sent_valid_bubble=\"false\" />\n" - // Importance missing because missing from permission helper - + "<package name=\"com.example.n_mr1\" show_badge=\"true\" " + // Importance 0 because missing from permission helper + + "<package name=\"com.example.n_mr1\" importance=\"0\" show_badge=\"true\" " + "app_user_locked_fields=\"0\" sent_invalid_msg=\"false\" " + "sent_valid_msg=\"false\" user_demote_msg_app=\"false\" sent_valid_bubble" + "=\"false\">\n" @@ -1304,6 +1297,10 @@ public class PreferencesHelperTest extends UiServiceTestCase { + "sound=\"content://settings/system/notification_sound\" usage=\"5\" " + "content_type=\"4\" flags=\"0\" show_badge=\"true\" />\n" + "</package>\n" + // Importance default because on in permission helper + + "<package name=\"com.example.p\" importance=\"3\" show_badge=\"true\" " + + "app_user_locked_fields=\"0\" sent_invalid_msg=\"true\" sent_valid_msg=\"true\"" + + " user_demote_msg_app=\"true\" sent_valid_bubble=\"false\" />\n" + "</ranking>"; assertThat(baos.toString()).contains(expected); } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java index d2c6028dea45..a071f0bfed60 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java @@ -18,6 +18,8 @@ package com.android.server.notification; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_LOW; +import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT; +import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertEquals; import static org.junit.Assert.assertTrue; @@ -27,6 +29,7 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import android.app.Flags; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; @@ -42,6 +45,9 @@ import android.net.Uri; import android.os.Build; import android.os.UserHandle; import android.os.Vibrator; +import android.platform.test.annotations.DisableFlags; +import android.platform.test.annotations.EnableFlags; +import android.platform.test.flag.junit.SetFlagsRule; import android.service.notification.StatusBarNotification; import android.testing.TestableContentResolver; @@ -52,24 +58,23 @@ import androidx.test.runner.AndroidJUnit4; import com.android.server.UiServiceTestCase; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.util.ArrayList; +import java.util.Collections; +import java.util.List; @SmallTest @RunWith(AndroidJUnit4.class) public class RankingHelperTest extends UiServiceTestCase { - private static final String PKG = "com.android.server.notification"; - private static final int UID = 0; - private static final UserHandle USER = UserHandle.of(0); - private static final String UPDATED_PKG = "updatedPkg"; + private static final String UPDATED_PKG = "updatedmPkg"; private static final int UID2 = 1111; private static final String SYSTEM_PKG = "android"; private static final int SYSTEM_UID= 1000; - private static final UserHandle USER2 = UserHandle.of(10); private static final String TEST_CHANNEL_ID = "test_channel_id"; private static final String TEST_AUTHORITY = "test"; private static final Uri SOUND_URI = @@ -98,28 +103,32 @@ public class RankingHelperTest extends UiServiceTestCase { private NotificationRecord mRecordNoGroup; private NotificationRecord mRecordNoGroup2; private NotificationRecord mRecordNoGroupSortA; + private NotificationRecord mRecentlyIntrusive; + private NotificationRecord mNewest; private RankingHelper mHelper; - private AudioAttributes mAudioAttributes; + + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT); @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - UserHandle user = UserHandle.ALL; + UserHandle mUser = UserHandle.ALL; final ApplicationInfo legacy = new ApplicationInfo(); legacy.targetSdkVersion = Build.VERSION_CODES.N_MR1; final ApplicationInfo upgrade = new ApplicationInfo(); upgrade.targetSdkVersion = Build.VERSION_CODES.O; - when(mPm.getApplicationInfoAsUser(eq(PKG), anyInt(), anyInt())).thenReturn(legacy); + when(mPm.getApplicationInfoAsUser(eq(mPkg), anyInt(), anyInt())).thenReturn(legacy); when(mPm.getApplicationInfoAsUser(eq(UPDATED_PKG), anyInt(), anyInt())).thenReturn(upgrade); when(mPm.getApplicationInfoAsUser(eq(SYSTEM_PKG), anyInt(), anyInt())).thenReturn(upgrade); - when(mPm.getPackageUidAsUser(eq(PKG), anyInt())).thenReturn(UID); + when(mPm.getPackageUidAsUser(eq(mPkg), anyInt())).thenReturn(mUid); when(mPm.getPackageUidAsUser(eq(UPDATED_PKG), anyInt())).thenReturn(UID2); when(mPm.getPackageUidAsUser(eq(SYSTEM_PKG), anyInt())).thenReturn(SYSTEM_UID); PackageInfo info = mock(PackageInfo.class); info.signatures = new Signature[] {mock(Signature.class)}; when(mPm.getPackageInfoAsUser(eq(SYSTEM_PKG), anyInt(), anyInt())).thenReturn(info); - when(mPm.getPackageInfoAsUser(eq(PKG), anyInt(), anyInt())) + when(mPm.getPackageInfoAsUser(eq(mPkg), anyInt(), anyInt())) .thenReturn(mock(PackageInfo.class)); when(mContext.getResources()).thenReturn( InstrumentationRegistry.getContext().getResources()); @@ -155,7 +164,7 @@ public class RankingHelperTest extends UiServiceTestCase { .setWhen(1205) .build(); mRecordGroupGSortA = new NotificationRecord(mContext, new StatusBarNotification( - PKG, PKG, 1, null, 0, 0, mNotiGroupGSortA, user, + mPkg, mPkg, 1, null, 0, 0, mNotiGroupGSortA, mUser, null, System.currentTimeMillis()), getLowChannel()); mNotiGroupGSortB = new Notification.Builder(mContext, TEST_CHANNEL_ID) @@ -165,7 +174,7 @@ public class RankingHelperTest extends UiServiceTestCase { .setWhen(1200) .build(); mRecordGroupGSortB = new NotificationRecord(mContext, new StatusBarNotification( - PKG, PKG, 1, null, 0, 0, mNotiGroupGSortB, user, + mPkg, mPkg, 1, null, 0, 0, mNotiGroupGSortB, mUser, null, System.currentTimeMillis()), getLowChannel()); mNotiNoGroup = new Notification.Builder(mContext, TEST_CHANNEL_ID) @@ -173,7 +182,7 @@ public class RankingHelperTest extends UiServiceTestCase { .setWhen(1201) .build(); mRecordNoGroup = new NotificationRecord(mContext, new StatusBarNotification( - PKG, PKG, 1, null, 0, 0, mNotiNoGroup, user, + mPkg, mPkg, 1, null, 0, 0, mNotiNoGroup, mUser, null, System.currentTimeMillis()), getLowChannel()); mNotiNoGroup2 = new Notification.Builder(mContext, TEST_CHANNEL_ID) @@ -181,7 +190,7 @@ public class RankingHelperTest extends UiServiceTestCase { .setWhen(1202) .build(); mRecordNoGroup2 = new NotificationRecord(mContext, new StatusBarNotification( - PKG, PKG, 1, null, 0, 0, mNotiNoGroup2, user, + mPkg, mPkg, 1, null, 0, 0, mNotiNoGroup2, mUser, null, System.currentTimeMillis()), getLowChannel()); mNotiNoGroupSortA = new Notification.Builder(mContext, TEST_CHANNEL_ID) @@ -190,14 +199,20 @@ public class RankingHelperTest extends UiServiceTestCase { .setSortKey("A") .build(); mRecordNoGroupSortA = new NotificationRecord(mContext, new StatusBarNotification( - PKG, PKG, 1, null, 0, 0, mNotiNoGroupSortA, user, + mPkg, mPkg, 1, null, 0, 0, mNotiNoGroupSortA, mUser, null, System.currentTimeMillis()), getLowChannel()); - mAudioAttributes = new AudioAttributes.Builder() - .setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN) - .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE) - .setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED) + Notification n = new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setContentTitle("D") .build(); + mRecentlyIntrusive = new NotificationRecord(mContext, new StatusBarNotification( + mPkg, mPkg, 1, null, 0, 0, n, mUser, + null, System.currentTimeMillis()+100), getDefaultChannel()); + mRecentlyIntrusive.setRecentlyIntrusive(true); + + mNewest = new NotificationRecord(mContext, new StatusBarNotification( + mPkg, mPkg, 2, null, 0, 0, n, mUser, + null, System.currentTimeMillis()+10000), getDefaultChannel()); } private NotificationChannel getLowChannel() { @@ -303,13 +318,13 @@ public class RankingHelperTest extends UiServiceTestCase { .setGroupSummary(true) .build(); NotificationRecord lowSummary = new NotificationRecord(mContext, new StatusBarNotification( - PKG, PKG, 1, "summary", 0, 0, lowSummaryN, USER, + mPkg, mPkg, 1, "summary", 0, 0, lowSummaryN, mUser, null, System.currentTimeMillis()), getLowChannel()); notificationList.add(lowSummary); Notification lowN = new Notification.Builder(mContext, "").build(); NotificationRecord low = new NotificationRecord(mContext, new StatusBarNotification( - PKG, PKG, 1, "low", 0, 0, lowN, USER, + mPkg, mPkg, 1, "low", 0, 0, lowN, mUser, null, System.currentTimeMillis()), getLowChannel()); low.setContactAffinity(0.5f); notificationList.add(low); @@ -319,7 +334,7 @@ public class RankingHelperTest extends UiServiceTestCase { .setGroupSummary(false) .build(); NotificationRecord highChild = new NotificationRecord(mContext, new StatusBarNotification( - PKG, PKG, 1, "child", 0, 0, highChildN, USER, + mPkg, mPkg, 1, "child", 0, 0, highChildN, mUser, null, System.currentTimeMillis()), getDefaultChannel()); notificationList.add(highChild); @@ -329,4 +344,187 @@ public class RankingHelperTest extends UiServiceTestCase { assertEquals(highChild, notificationList.get(1)); assertEquals(low, notificationList.get(2)); } + + @Test + @DisableFlags({android.app.Flags.FLAG_SORT_SECTION_BY_TIME}) + public void testSortByIntrusivenessNotRecency() { + ArrayList<NotificationRecord> expected = new ArrayList<>(); + expected.add(mRecentlyIntrusive); + expected.add(mNewest); + + ArrayList<NotificationRecord> actual = new ArrayList<>(); + actual.addAll(expected); + Collections.shuffle(actual); + + mHelper.sort(actual); + assertThat(actual).containsExactlyElementsIn(expected).inOrder(); + } + + @Test + @EnableFlags({android.app.Flags.FLAG_SORT_SECTION_BY_TIME}) + public void testSortByRecencyNotIntrusiveness() { + ArrayList<NotificationRecord> expected = new ArrayList<>(); + expected.add(mNewest); + expected.add(mRecentlyIntrusive); + + ArrayList<NotificationRecord> actual = new ArrayList<>(); + actual.addAll(expected); + Collections.shuffle(actual); + + mHelper.sort(actual); + assertThat(actual).containsExactlyElementsIn(expected).inOrder(); + } + + @Test + @EnableFlags({android.app.Flags.FLAG_SORT_SECTION_BY_TIME, Flags.FLAG_UPDATE_RANKING_TIME}) + public void testSort_oldWhenChildren_unspecifiedSummary() { + NotificationRecord child1 = new NotificationRecord(mContext, + new StatusBarNotification( + mPkg, mPkg, 1, null, 0, 0, + new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setGroup("G") + .setWhen(1200) + .build(), + mUser, null, System.currentTimeMillis()), getLowChannel()); + NotificationRecord child2 = new NotificationRecord(mContext, + new StatusBarNotification( + mPkg, mPkg, 2, null, 0, 0, + new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setGroup("G") + .setWhen(1300) + .build(), + mUser, null, System.currentTimeMillis()), getLowChannel()); + NotificationRecord summary = new NotificationRecord(mContext, + new StatusBarNotification( + mPkg, mPkg, 3, null, 0, 0, + new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setGroup("G") + .setGroupSummary(true) + .build(), + mUser, null, System.currentTimeMillis()), getLowChannel()); + + // in time slightly before the children, but much earlier than the summary. + // will only be sorted first if the summary is not the group proxy for group G. + NotificationRecord unrelated = new NotificationRecord(mContext, + new StatusBarNotification( + mPkg, mPkg, 11, null, 0, 0, + new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setWhen(1500) + .build(), + mUser, null, System.currentTimeMillis()), getLowChannel()); + + ArrayList<NotificationRecord> expected = new ArrayList<>(); + expected.add(unrelated); + expected.add(summary); + expected.add(child2); + expected.add(child1); + + ArrayList<NotificationRecord> actual = new ArrayList<>(); + actual.addAll(expected); + Collections.shuffle(actual); + + mHelper.sort(actual); + assertThat(actual).containsExactlyElementsIn(expected).inOrder(); + } + + @Test + @EnableFlags({android.app.Flags.FLAG_SORT_SECTION_BY_TIME, Flags.FLAG_UPDATE_RANKING_TIME}) + public void testSort_oldChildren_unspecifiedSummary() { + NotificationRecord child1 = new NotificationRecord(mContext, + new StatusBarNotification( + mPkg, mPkg, 1, null, 0, 0, + new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setGroup("G") + .build(), + mUser, null, 1200), getLowChannel()); + NotificationRecord child2 = new NotificationRecord(mContext, + new StatusBarNotification( + mPkg, mPkg, 2, null, 0, 0, + new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setGroup("G") + .build(), + mUser, null, 1300), getLowChannel()); + NotificationRecord summary = new NotificationRecord(mContext, + new StatusBarNotification( + mPkg, mPkg, 3, null, 0, 0, + new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setGroup("G") + .setGroupSummary(true) + .build(), + mUser, null, System.currentTimeMillis()), getLowChannel()); + + // in time slightly before the children, but much earlier than the summary. + // will only be sorted first if the summary is not the group proxy for group G. + NotificationRecord unrelated = new NotificationRecord(mContext, + new StatusBarNotification( + mPkg, mPkg, 11, null, 0, 0, + new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setWhen(1500) + .build(), + mUser, null, System.currentTimeMillis()), getLowChannel()); + + ArrayList<NotificationRecord> expected = new ArrayList<>(); + expected.add(unrelated); + expected.add(summary); + expected.add(child2); + expected.add(child1); + + ArrayList<NotificationRecord> actual = new ArrayList<>(); + actual.addAll(expected); + Collections.shuffle(actual); + + mHelper.sort(actual); + assertThat(actual).containsExactlyElementsIn(expected).inOrder(); + } + + @Test + @EnableFlags({android.app.Flags.FLAG_SORT_SECTION_BY_TIME, Flags.FLAG_UPDATE_RANKING_TIME}) + public void testSort_oldChildren_oldSummary() { + NotificationRecord child1 = new NotificationRecord(mContext, + new StatusBarNotification( + mPkg, mPkg, 1, null, 0, 0, + new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setGroup("G") + .build(), + mUser, null, 1200), getLowChannel()); + NotificationRecord child2 = new NotificationRecord(mContext, + new StatusBarNotification( + mPkg, mPkg, 2, null, 0, 0, + new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setGroup("G") + .build(), + mUser, null, 1300), getLowChannel()); + NotificationRecord summary = new NotificationRecord(mContext, + new StatusBarNotification( + mPkg, mPkg, 3, null, 0, 0, + new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setGroup("G") + .setGroupSummary(true) + .setWhen(1600) + .build(), + mUser, null, System.currentTimeMillis()), getLowChannel()); + + // in time slightly before the children, but much earlier than the summary. + // will only be sorted first if the summary is not the group proxy for group G. + NotificationRecord unrelated = new NotificationRecord(mContext, + new StatusBarNotification( + mPkg, mPkg, 11, null, 0, 0, + new Notification.Builder(mContext, TEST_CHANNEL_ID) + .setWhen(1500) + .build(), + mUser, null, System.currentTimeMillis()), getLowChannel()); + + ArrayList<NotificationRecord> expected = new ArrayList<>(); + expected.add(summary); + expected.add(child2); + expected.add(child1); + expected.add(unrelated); + + ArrayList<NotificationRecord> actual = new ArrayList<>(); + actual.addAll(expected); + Collections.shuffle(actual); + + mHelper.sort(actual); + assertThat(actual).containsExactlyElementsIn(expected).inOrder(); + } } diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java index 173a1b693d87..13550923cf3d 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java @@ -1634,6 +1634,28 @@ public class ActivityStarterTests extends WindowTestsBase { assertThat(transition.isInTransientHide(top.getTask())).isTrue(); } + /** + * Tests ATMS#startActivityWithScreenshot should collect display content for creating snapshot. + */ + @Test + public void testActivityStartWithScreenshot() { + final ActivityStarter starter = prepareStarter(0 /* flags */); + starter.setFreezeScreen(true); + + registerTestTransitionPlayer(); + + final Intent intent = new Intent(); + intent.setComponent(ActivityBuilder.getDefaultComponent()); + starter.setReason("testActivityStartWithScreenshot") + .setIntent(intent) + .execute(); + + final TransitionController controller = mRootWindowContainer.mTransitionController; + final Transition transition = controller.getCollectingTransition(); + final Transition.ChangeInfo targetChangeInfo = transition.mChanges.get(mDisplayContent); + assertThat(targetChangeInfo).isNotNull(); + } + @Test public void testActivityStart_expectAddedToRecentTask() { RecentTasks recentTasks = mock(RecentTasks.class); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java index ed99108e0da3..400f9bbec83e 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java @@ -38,18 +38,22 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.doCallRealMethod; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.Activity; import android.app.ActivityManager; +import android.app.ActivityManager.TaskDescription; import android.app.IApplicationThread; import android.app.PictureInPictureParams; import android.app.servertransaction.ClientTransactionItem; @@ -62,6 +66,7 @@ import android.os.Binder; import android.os.LocaleList; import android.os.PowerManagerInternal; import android.os.RemoteException; +import android.os.UserHandle; import android.platform.test.annotations.Presubmit; import android.view.Display; import android.view.DisplayInfo; @@ -1099,4 +1104,61 @@ public class ActivityTaskManagerServiceTests extends WindowTestsBase { verify(mClientLifecycleManager).onLayoutContinued(); } + + @Test + public void testGetTaskDescriptionIcon_matchingUid() { + // Ensure that we do not hold MANAGE_ACTIVITY_TASKS + doThrow(new SecurityException()).when(mAtm).enforceActivityTaskPermission(any()); + + final String filePath = "abc/def"; + // Create an activity with a task description at the test icon filepath + final ActivityRecord activity = new ActivityBuilder(mAtm) + .setUid(android.os.Process.myUid()) + .setCreateTask(true) + .build(); + final TaskDescription td = new TaskDescription.Builder().build(); + td.setIconFilename(filePath); + activity.setTaskDescription(td); + + // Verify this calls and does not throw a security exception + try { + mAtm.getTaskDescriptionIcon(filePath, activity.mUserId); + } catch (SecurityException e) { + fail("Unexpected security exception: " + e); + } catch (IllegalArgumentException e) { + // Ok, the file doesn't actually exist + } + } + + @Test + public void testGetTaskDescriptionIcon_noMatchingActivity_expectException() { + // Ensure that we do not hold MANAGE_ACTIVITY_TASKS + doThrow(new SecurityException()).when(mAtm).enforceActivityTaskPermission(any()); + + final String filePath = "abc/def"; + + // Verify this throws a security exception due to no matching activity + assertThrows(SecurityException.class, + () -> mAtm.getTaskDescriptionIcon(filePath, UserHandle.myUserId())); + } + + @Test + public void testGetTaskDescriptionIcon_noMatchingUid_expectException() { + // Ensure that we do not hold MANAGE_ACTIVITY_TASKS + doThrow(new SecurityException()).when(mAtm).enforceActivityTaskPermission(any()); + + final String filePath = "abc/def"; + // Create an activity with a task description at the test icon filepath + final ActivityRecord activity = new ActivityBuilder(mAtm) + .setCreateTask(true) + .setUid(101010) + .build(); + final TaskDescription td = new TaskDescription.Builder().build(); + td.setIconFilename(filePath); + activity.setTaskDescription(td); + + // Verify this throws a security exception due to no matching UID + assertThrows(SecurityException.class, + () -> mAtm.getTaskDescriptionIcon(filePath, activity.mUserId)); + } } diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java index bfa191e6f724..75b84d1c8a64 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java @@ -1472,7 +1472,6 @@ public class RecentTasksTest extends WindowTestsBase { assertSecurityException(expectCallable, () -> mAtm.registerTaskStackListener(null)); assertSecurityException(expectCallable, () -> mAtm.unregisterTaskStackListener(null)); - assertSecurityException(expectCallable, () -> mAtm.getTaskDescription(0)); assertSecurityException(expectCallable, () -> mAtm.cancelTaskWindowTransition(0)); assertSecurityException(expectCallable, () -> mAtm.startRecentsActivity(null, 0, null)); diff --git a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java index 680738b2800b..856ad2a02444 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java @@ -27,7 +27,6 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE; import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE; 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_SENSOR_LANDSCAPE; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_16_9; import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_3_2; @@ -1943,7 +1942,8 @@ public class SizeCompatTests extends WindowTestsBase { assertThat(mActivity.inSizeCompatMode()).isTrue(); assertActivityMaxBoundsSandboxed(); - final int scale = dh / dw; + + final int scale = dh / dw; // App bounds should be dh / scale x dw / scale assertEquals(dw, rotatedDisplayBounds.width()); @@ -4148,37 +4148,6 @@ public class SizeCompatTests extends WindowTestsBase { } @Test - public void testFixedAspectRatioAppInPortraitCloseToSquareDisplay_notInSizeCompat() { - setUpDisplaySizeWithApp(2200, 2280); - mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); - final DisplayContent display = mActivity.mDisplayContent; - // Simulate taskbar, final app bounds are (0, 0, 2200, 2130) - landscape - final WindowState navbar = createWindow(null, TYPE_NAVIGATION_BAR, mDisplayContent, - "navbar"); - final Binder owner = new Binder(); - navbar.mAttrs.providedInsets = new InsetsFrameProvider[] { - new InsetsFrameProvider(owner, 0, WindowInsets.Type.navigationBars()) - .setInsetsSize(Insets.of(0, 0, 0, 150)) - }; - display.getDisplayPolicy().addWindowLw(navbar, navbar.mAttrs); - assertTrue(navbar.providesDisplayDecorInsets() - && display.getDisplayPolicy().updateDecorInsetsInfo()); - display.sendNewConfiguration(); - - prepareMinAspectRatio(mActivity, OVERRIDE_MIN_ASPECT_RATIO_LARGE_VALUE, - SCREEN_ORIENTATION_LANDSCAPE); - // To force config to update again but with the same landscape orientation. - mActivity.setRequestedOrientation(SCREEN_ORIENTATION_SENSOR_LANDSCAPE); - - assertTrue(mActivity.shouldCreateCompatDisplayInsets()); - assertNotNull(mActivity.getCompatDisplayInsets()); - // Activity is not letterboxed for fixed orientation because orientation is respected - // with insets, and should not be in size compat mode - assertFalse(mActivity.isLetterboxedForFixedOrientationAndAspectRatio()); - assertFalse(mActivity.inSizeCompatMode()); - } - - @Test public void testApplyAspectRatio_activityAlignWithParentAppVertical() { if (Flags.insetsDecoupledConfiguration()) { // TODO (b/151861875): Re-enable it. This is disabled temporarily because the config diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java index dab966b0d514..1ca808f4153a 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java @@ -833,7 +833,7 @@ public class TaskTests extends WindowTestsBase { final ActivityRecord activity = new ActivityBuilder(mAtm).setTask(task).build(); final ActivityRecord.CompatDisplayInsets compatInsets = new ActivityRecord.CompatDisplayInsets( - display, activity, /* letterboxedContainerBounds */ null); + display, activity, /* fixedOrientationBounds= */ null); task.computeConfigResourceOverrides(inOutConfig, parentConfig, compatInsets); assertEquals(largerLandscapeBounds, inOutConfig.windowConfiguration.getAppBounds()); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java index e37da2040850..848702103e65 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java @@ -28,6 +28,7 @@ import static android.view.Display.INVALID_DISPLAY; import static android.view.flags.Flags.FLAG_SENSITIVE_CONTENT_APP_PROTECTION; import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; import static android.view.WindowManager.LayoutParams.FLAG_SECURE; +import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_SENSITIVE_FOR_TRACING; import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_SPY; import static android.view.WindowManager.LayoutParams.INVALID_WINDOW_TYPE; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY; @@ -319,7 +320,8 @@ public class WindowManagerServiceTests extends WindowTestsBase { // Non activity window can still get the last config. win.mActivityRecord = null; win.fillClientWindowFramesAndConfiguration(outFrames, outConfig, - false /* useLatestConfig */, true /* relayoutVisible */); + null /* outActivityWindowInfo*/, false /* useLatestConfig */, + true /* relayoutVisible */); assertEquals(win.getConfiguration().densityDpi, outConfig.getMergedConfiguration().densityDpi); } @@ -1115,6 +1117,34 @@ public class WindowManagerServiceTests extends WindowTestsBase { argThat(h -> (h.inputConfig & InputConfig.SPY) == InputConfig.SPY)); } + @Test + public void testUpdateInputChannel_sanitizeInputFeatureSensitive_forUntrustedWindows() { + final Session session = mock(Session.class); + final int callingUid = Process.FIRST_APPLICATION_UID; + final int callingPid = 1234; + final SurfaceControl surfaceControl = mock(SurfaceControl.class); + final IBinder window = new Binder(); + final InputTransferToken inputTransferToken = mock(InputTransferToken.class); + + final InputChannel inputChannel = new InputChannel(); + mWm.grantInputChannel(session, callingUid, callingPid, DEFAULT_DISPLAY, surfaceControl, + window, null /* hostInputToken */, FLAG_NOT_FOCUSABLE, 0 /* privateFlags */, + INPUT_FEATURE_SENSITIVE_FOR_TRACING, TYPE_APPLICATION, null /* windowToken */, + inputTransferToken, + "TestInputChannel", inputChannel); + verify(mTransaction).setInputWindowInfo( + eq(surfaceControl), + argThat(h -> (h.inputConfig & InputConfig.SENSITIVE_FOR_TRACING) == 0)); + + mWm.updateInputChannel(inputChannel.getToken(), DEFAULT_DISPLAY, surfaceControl, + FLAG_NOT_FOCUSABLE, PRIVATE_FLAG_TRUSTED_OVERLAY, + INPUT_FEATURE_SENSITIVE_FOR_TRACING, + null /* region */); + verify(mTransaction).setInputWindowInfo( + eq(surfaceControl), + argThat(h -> (h.inputConfig & InputConfig.SENSITIVE_FOR_TRACING) != 0)); + } + @RequiresFlagsDisabled(Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER) @Test public void testDrawMagnifiedViewport() { @@ -1239,12 +1269,43 @@ public class WindowManagerServiceTests extends WindowTestsBase { final InsetsSourceControl.Array outControls = new InsetsSourceControl.Array(); final Bundle outBundle = new Bundle(); - mWm.relayoutWindow(win.mSession, win.mClient, win.mAttrs, w, h, View.GONE, 0, 0, 0, + final ActivityRecord activity = win.mActivityRecord; + final ActivityWindowInfo expectedInfo = new ActivityWindowInfo(); + expectedInfo.set(true, new Rect(0, 0, 1000, 2000), new Rect(0, 0, 500, 2000)); + doReturn(expectedInfo).when(activity).getActivityWindowInfo(); + activity.setVisibleRequested(false); + activity.setVisible(false); + + mWm.relayoutWindow(win.mSession, win.mClient, win.mAttrs, w, h, View.VISIBLE, 0, 0, 0, outFrames, outConfig, outSurfaceControl, outInsetsState, outControls, outBundle); + // No latest reported value, so return empty when activity is invisible final ActivityWindowInfo activityWindowInfo = outBundle.getParcelable( IWindowSession.KEY_RELAYOUT_BUNDLE_ACTIVITY_WINDOW_INFO, ActivityWindowInfo.class); - assertEquals(win.mActivityRecord.getActivityWindowInfo(), activityWindowInfo); + assertEquals(new ActivityWindowInfo(), activityWindowInfo); + + activity.setVisibleRequested(true); + activity.setVisible(true); + + mWm.relayoutWindow(win.mSession, win.mClient, win.mAttrs, w, h, View.VISIBLE, 0, 0, 0, + outFrames, outConfig, outSurfaceControl, outInsetsState, outControls, outBundle); + + // Report the latest when activity is visible. + final ActivityWindowInfo activityWindowInfo2 = outBundle.getParcelable( + IWindowSession.KEY_RELAYOUT_BUNDLE_ACTIVITY_WINDOW_INFO, ActivityWindowInfo.class); + assertEquals(expectedInfo, activityWindowInfo2); + + expectedInfo.set(false, new Rect(0, 0, 1000, 2000), new Rect(0, 0, 1000, 2000)); + activity.setVisibleRequested(false); + activity.setVisible(false); + + mWm.relayoutWindow(win.mSession, win.mClient, win.mAttrs, w, h, View.VISIBLE, 0, 0, 0, + outFrames, outConfig, outSurfaceControl, outInsetsState, outControls, outBundle); + + // Report the last reported value when activity is invisible. + final ActivityWindowInfo activityWindowInfo3 = outBundle.getParcelable( + IWindowSession.KEY_RELAYOUT_BUNDLE_ACTIVITY_WINDOW_INFO, ActivityWindowInfo.class); + assertEquals(activityWindowInfo2, activityWindowInfo3); } class TestResultReceiver implements IResultReceiver { 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 28e03bfeaadb..6bd08740916d 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java @@ -107,6 +107,7 @@ import android.view.WindowInsets; import android.view.WindowManager; import android.view.WindowManager.DisplayImePolicy; import android.view.inputmethod.ImeTracker; +import android.window.ActivityWindowInfo; import android.window.ClientWindowFrames; import android.window.ITaskFragmentOrganizer; import android.window.ITransitionPlayer; @@ -694,7 +695,8 @@ class WindowTestsBase extends SystemServiceTestsBase { static void makeLastConfigReportedToClient(WindowState w, boolean visible) { w.fillClientWindowFramesAndConfiguration(new ClientWindowFrames(), - new MergedConfiguration(), true /* useLatestConfig */, visible); + new MergedConfiguration(), new ActivityWindowInfo(), true /* useLatestConfig */, + visible); } /** diff --git a/telephony/java/android/telephony/satellite/ISatelliteSupportedStateCallback.aidl b/telephony/java/android/telephony/satellite/ISatelliteSupportedStateCallback.aidl new file mode 100644 index 000000000000..04550906324b --- /dev/null +++ b/telephony/java/android/telephony/satellite/ISatelliteSupportedStateCallback.aidl @@ -0,0 +1,31 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.telephony.satellite; + +/** + * Interface for satellite supported state change callback. + * @hide + */ +oneway interface ISatelliteSupportedStateCallback { + /** + * Called when satellite supported state has changed. + * + * @param supoprted Whether satellite is supported or not. + */ + void onSatelliteSupportedStateChanged(in boolean supported); +} + diff --git a/telephony/java/android/telephony/satellite/SatelliteManager.java b/telephony/java/android/telephony/satellite/SatelliteManager.java index 4a6111444f31..20b24b9db6f4 100644 --- a/telephony/java/android/telephony/satellite/SatelliteManager.java +++ b/telephony/java/android/telephony/satellite/SatelliteManager.java @@ -87,6 +87,9 @@ public final class SatelliteManager { private static final ConcurrentHashMap<SatelliteCapabilitiesCallback, ISatelliteCapabilitiesCallback> sSatelliteCapabilitiesCallbackMap = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap<SatelliteSupportedStateCallback, + ISatelliteSupportedStateCallback> sSatelliteSupportedStateCallbackMap = + new ConcurrentHashMap<>(); private final int mSubId; @@ -2284,6 +2287,88 @@ public final class SatelliteManager { return new ArrayList<>(); } + /** + * Registers for the satellite supported state changed. + * + * @param executor The executor on which the callback will be called. + * @param callback The callback to handle the satellite supoprted state changed event. + * + * @return The {@link SatelliteResult} result of the operation. + * + * @throws SecurityException if the caller doesn't have required permission. + * @throws IllegalStateException if the Telephony process is not currently available. + * + * @hide + */ + @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) + @SatelliteResult public int registerForSupportedStateChanged( + @NonNull @CallbackExecutor Executor executor, + @NonNull SatelliteSupportedStateCallback callback) { + Objects.requireNonNull(executor); + Objects.requireNonNull(callback); + + try { + ITelephony telephony = getITelephony(); + if (telephony != null) { + ISatelliteSupportedStateCallback internalCallback = + new ISatelliteSupportedStateCallback.Stub() { + @Override + public void onSatelliteSupportedStateChanged(boolean supported) { + executor.execute(() -> Binder.withCleanCallingIdentity( + () -> callback.onSatelliteSupportedStateChanged( + supported))); + } + }; + sSatelliteSupportedStateCallbackMap.put(callback, internalCallback); + return telephony.registerForSatelliteSupportedStateChanged( + mSubId, internalCallback); + } else { + throw new IllegalStateException("telephony service is null."); + } + } catch (RemoteException ex) { + loge("registerForSupportedStateChanged() RemoteException: " + ex); + ex.rethrowAsRuntimeException(); + } + return SATELLITE_RESULT_REQUEST_FAILED; + } + + /** + * Unregisters for the satellite supported state changed. + * If callback was not registered before, the request will be ignored. + * + * @param callback The callback that was passed to + * {@link #registerForSupportedStateChanged(Executor, SatelliteSupportedStateCallback)} + * + * @throws SecurityException if the caller doesn't have required permission. + * @throws IllegalStateException if the Telephony process is not currently available. + * + * @hide + */ + @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) + @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) + public void unregisterForSupportedStateChanged( + @NonNull SatelliteSupportedStateCallback callback) { + Objects.requireNonNull(callback); + ISatelliteSupportedStateCallback internalCallback = + sSatelliteSupportedStateCallbackMap.remove(callback); + + try { + ITelephony telephony = getITelephony(); + if (telephony != null) { + if (internalCallback != null) { + telephony.unregisterForSatelliteSupportedStateChanged(mSubId, internalCallback); + } else { + loge("unregisterForSupportedStateChanged: No internal callback."); + } + } else { + throw new IllegalStateException("telephony service is null."); + } + } catch (RemoteException ex) { + loge("unregisterForSupportedStateChanged() RemoteException: " + ex); + ex.rethrowAsRuntimeException(); + } + } + @Nullable private static ITelephony getITelephony() { ITelephony binder = ITelephony.Stub.asInterface(TelephonyFrameworkInitializer .getTelephonyServiceManager() diff --git a/telephony/java/android/telephony/satellite/SatelliteSupportedStateCallback.java b/telephony/java/android/telephony/satellite/SatelliteSupportedStateCallback.java new file mode 100644 index 000000000000..7e19bd13140d --- /dev/null +++ b/telephony/java/android/telephony/satellite/SatelliteSupportedStateCallback.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.telephony.satellite; + +import android.annotation.FlaggedApi; + +import com.android.internal.telephony.flags.Flags; + +/** + * A callback class for monitoring satellite supported state change events. + * + * @hide + */ +@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) +public interface SatelliteSupportedStateCallback { + /** + * Called when satellite supported state changes. + * + * @param supported The new supported state. {@code true} means satellite is supported, + * {@code false} means satellite is not supported. + * + * @hide + */ + @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) + void onSatelliteSupportedStateChanged(boolean supported); +} diff --git a/telephony/java/android/telephony/satellite/stub/ISatelliteListener.aidl b/telephony/java/android/telephony/satellite/stub/ISatelliteListener.aidl index ccca5adba367..5b9dfc67c68c 100644 --- a/telephony/java/android/telephony/satellite/stub/ISatelliteListener.aidl +++ b/telephony/java/android/telephony/satellite/stub/ISatelliteListener.aidl @@ -74,4 +74,11 @@ oneway interface ISatelliteListener { * @param SatelliteCapabilities The current satellite capabilities. */ void onSatelliteCapabilitiesChanged(in SatelliteCapabilities capabilities); + + /** + * Called when supported state of satellite has changed + * + * @param supported True means satellite service is supported and false means it is not. + */ + void onSatelliteSupportedStateChanged(in boolean supported); } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index ff2ee27abc60..f25fc362a203 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -72,6 +72,7 @@ import android.telephony.satellite.ISatelliteCapabilitiesCallback; import android.telephony.satellite.ISatelliteDatagramCallback; import android.telephony.satellite.ISatelliteTransmissionUpdateCallback; import android.telephony.satellite.ISatelliteProvisionStateCallback; +import android.telephony.satellite.ISatelliteSupportedStateCallback; import android.telephony.satellite.ISatelliteModemStateCallback; import android.telephony.satellite.NtnSignalStrength; import android.telephony.satellite.SatelliteCapabilities; @@ -3315,4 +3316,29 @@ interface ITelephony { @JavaPassthrough(annotation="@android.annotation.RequiresPermission(" + "android.Manifest.permission.SATELLITE_COMMUNICATION)") List<String> getSatellitePlmnsForCarrier(int subId); + + /** + * Registers for supported state changed from satellite modem. + * + * @param subId The subId of the subscription to register for supported state changed. + * @param callback The callback to handle the satellite supported state changed event. + * + * @return The {@link SatelliteError} result of the operation. + */ + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(" + + "android.Manifest.permission.SATELLITE_COMMUNICATION)") + int registerForSatelliteSupportedStateChanged(int subId, + in ISatelliteSupportedStateCallback callback); + + /** + * Unregisters for supported state changed from satellite modem. + * If callback was not registered before, the request will be ignored. + * + * @param subId The subId of the subscription to unregister for supported state changed. + * @param callback The callback that was passed to registerForSatelliteSupportedStateChanged. + */ + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(" + + "android.Manifest.permission.SATELLITE_COMMUNICATION)") + void unregisterForSatelliteSupportedStateChanged(int subId, + in ISatelliteSupportedStateCallback callback); } |