diff options
660 files changed, 16113 insertions, 6953 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 26fbd270eb46..497619ae0613 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -348,6 +348,7 @@ java_aconfig_library { aconfig_declarations { name: "android.security.flags-aconfig", package: "android.security", + exportable: true, container: "system", srcs: ["core/java/android/security/*.aconfig"], } @@ -365,6 +366,13 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +java_aconfig_library { + name: "android.security.flags-aconfig-java-export", + aconfig_declarations: "android.security.flags-aconfig", + mode: "exported", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + cc_aconfig_library { name: "android_security_flags_aconfig_c_lib", aconfig_declarations: "android.security.flags-aconfig", diff --git a/apex/jobscheduler/framework/aconfig/job.aconfig b/apex/jobscheduler/framework/aconfig/job.aconfig index 79aef1e6a19a..47a85498f51b 100644 --- a/apex/jobscheduler/framework/aconfig/job.aconfig +++ b/apex/jobscheduler/framework/aconfig/job.aconfig @@ -45,3 +45,11 @@ flag { description: "Introduce a new getPendingJobReasons() API which returns reasons why a job may not have executed. Also deprecate the existing getPendingJobReason() API." bug: "372031023" } + +flag { + name: "get_pending_job_reasons_history_api" + is_exported: true + namespace: "backstage_power" + description: "Introduce a new getPendingJobReasonsHistory() API which returns a limited historical view of getPendingJobReasons()." + bug: "372031023" +} diff --git a/apex/jobscheduler/service/aconfig/device_idle.aconfig b/apex/jobscheduler/service/aconfig/device_idle.aconfig index c4d0d1850a18..426031fbeb9c 100644 --- a/apex/jobscheduler/service/aconfig/device_idle.aconfig +++ b/apex/jobscheduler/service/aconfig/device_idle.aconfig @@ -17,3 +17,13 @@ flag { description: "Disable wakelocks for background apps while Light Device Idle is active" bug: "326607666" } + +flag { + name: "use_cpu_time_for_temp_allowlist" + namespace: "backstage_power" + description: "Use CPU time for temporary allowlists" + bug: "376561328" + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java index 3e650da2e66f..41fd4a29cfd1 100644 --- a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java +++ b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java @@ -620,8 +620,8 @@ public class DeviceIdleController extends SystemService * the network and acquire wakelocks. Times are in milliseconds. */ @GuardedBy("this") - private final SparseArray<Pair<MutableLong, String>> mTempWhitelistAppIdEndTimes - = new SparseArray<>(); + @VisibleForTesting + final SparseArray<Pair<MutableLong, String>> mTempWhitelistAppIdEndTimes = new SparseArray<>(); private NetworkPolicyManagerInternal mNetworkPolicyManagerInternal; @@ -1941,7 +1941,8 @@ public class DeviceIdleController extends SystemService private static final int MSG_REPORT_IDLE_ON_LIGHT = 3; private static final int MSG_REPORT_IDLE_OFF = 4; private static final int MSG_REPORT_ACTIVE = 5; - private static final int MSG_TEMP_APP_WHITELIST_TIMEOUT = 6; + @VisibleForTesting + static final int MSG_TEMP_APP_WHITELIST_TIMEOUT = 6; @VisibleForTesting static final int MSG_REPORT_STATIONARY_STATUS = 7; private static final int MSG_FINISH_IDLE_OP = 8; @@ -2511,6 +2512,11 @@ public class DeviceIdleController extends SystemService return SystemClock.elapsedRealtime(); } + /** Returns the current elapsed realtime in milliseconds. */ + long getUptimeMillis() { + return SystemClock.uptimeMillis(); + } + LocationManager getLocationManager() { if (mLocationManager == null) { mLocationManager = mContext.getSystemService(LocationManager.class); @@ -3264,7 +3270,8 @@ public class DeviceIdleController extends SystemService void addPowerSaveTempWhitelistAppDirectInternal(int callingUid, int uid, long duration, @TempAllowListType int tempAllowListType, boolean sync, @ReasonCode int reasonCode, @Nullable String reason) { - final long timeNow = SystemClock.elapsedRealtime(); + final long timeNow = Flags.useCpuTimeForTempAllowlist() ? mInjector.getUptimeMillis() + : mInjector.getElapsedRealtime(); boolean informWhitelistChanged = false; int appId = UserHandle.getAppId(uid); synchronized (this) { @@ -3350,7 +3357,8 @@ public class DeviceIdleController extends SystemService } void checkTempAppWhitelistTimeout(int uid) { - final long timeNow = SystemClock.elapsedRealtime(); + final long timeNow = Flags.useCpuTimeForTempAllowlist() ? mInjector.getUptimeMillis() + : mInjector.getElapsedRealtime(); final int appId = UserHandle.getAppId(uid); if (DEBUG) { Slog.d(TAG, "checkTempAppWhitelistTimeout: uid=" + uid + ", timeNow=" + timeNow); @@ -5219,6 +5227,17 @@ public class DeviceIdleController extends SystemService } } + pw.println(" Flags:"); + pw.print(" "); + pw.print(Flags.FLAG_USE_CPU_TIME_FOR_TEMP_ALLOWLIST); + pw.print("="); + pw.println(Flags.useCpuTimeForTempAllowlist()); + pw.print(" "); + pw.print(Flags.FLAG_REMOVE_IDLE_LOCATION); + pw.print("="); + pw.println(Flags.removeIdleLocation()); + pw.println(); + synchronized (this) { mConstants.dump(pw); @@ -5449,7 +5468,8 @@ public class DeviceIdleController extends SystemService pw.println(" Temp whitelist schedule:"); prefix = " "; } - final long timeNow = SystemClock.elapsedRealtime(); + final long timeNow = Flags.useCpuTimeForTempAllowlist() ? mInjector.getUptimeMillis() + : mInjector.getElapsedRealtime(); for (int i = 0; i < size; i++) { pw.print(prefix); pw.print("UID="); diff --git a/api/Android.bp b/api/Android.bp index ff674c7f8bd3..0ac85e28de1a 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -73,6 +73,7 @@ combined_apis { "framework-bluetooth", "framework-configinfrastructure", "framework-connectivity", + "framework-connectivity-b", "framework-connectivity-t", "framework-devicelock", "framework-graphics", diff --git a/core/api/current.txt b/core/api/current.txt index 1e147cfb9131..9c106157b1cd 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -241,6 +241,7 @@ package android { field public static final String PROVIDE_REMOTE_CREDENTIALS = "android.permission.PROVIDE_REMOTE_CREDENTIALS"; field @FlaggedApi("android.security.aapm_api") public static final String QUERY_ADVANCED_PROTECTION_MODE = "android.permission.QUERY_ADVANCED_PROTECTION_MODE"; field public static final String QUERY_ALL_PACKAGES = "android.permission.QUERY_ALL_PACKAGES"; + field @FlaggedApi("android.permission.flags.ranging_permission_enabled") public static final String RANGING = "android.permission.RANGING"; field public static final String READ_ASSISTANT_APP_SEARCH_DATA = "android.permission.READ_ASSISTANT_APP_SEARCH_DATA"; field public static final String READ_BASIC_PHONE_STATE = "android.permission.READ_BASIC_PHONE_STATE"; field public static final String READ_CALENDAR = "android.permission.READ_CALENDAR"; @@ -12734,6 +12735,7 @@ package android.content.pm { method public abstract void onPackagesUnavailable(String[], android.os.UserHandle, boolean); method public void onPackagesUnsuspended(String[], android.os.UserHandle); method public void onShortcutsChanged(@NonNull String, @NonNull java.util.List<android.content.pm.ShortcutInfo>, @NonNull android.os.UserHandle); + method @FlaggedApi("android.multiuser.add_launcher_user_config") public void onUserConfigChanged(@NonNull android.content.pm.LauncherUserInfo); } public static final class LauncherApps.PinItemRequest implements android.os.Parcelable { @@ -12769,10 +12771,12 @@ package android.content.pm { @FlaggedApi("android.os.allow_private_profile") public final class LauncherUserInfo implements android.os.Parcelable { method @FlaggedApi("android.os.allow_private_profile") public int describeContents(); + method @FlaggedApi("android.multiuser.add_launcher_user_config") @NonNull public android.os.Bundle getUserConfig(); method @FlaggedApi("android.os.allow_private_profile") public int getUserSerialNumber(); method @FlaggedApi("android.os.allow_private_profile") @NonNull public String getUserType(); method @FlaggedApi("android.os.allow_private_profile") public void writeToParcel(@NonNull android.os.Parcel, int); field @FlaggedApi("android.os.allow_private_profile") @NonNull public static final android.os.Parcelable.Creator<android.content.pm.LauncherUserInfo> CREATOR; + field @FlaggedApi("android.multiuser.add_launcher_user_config") public static final String PRIVATE_SPACE_ENTRYPOINT_HIDDEN = "private_space_entrypoint_hidden"; } public final class ModuleInfo implements android.os.Parcelable { @@ -13703,7 +13707,7 @@ package android.content.pm { field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1 field public static final int FLAG_USE_APP_ZYGOTE = 8; // 0x8 field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_CAMERA}, anyOf={android.Manifest.permission.CAMERA}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_CAMERA = 64; // 0x40 - field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE}, anyOf={android.Manifest.permission.BLUETOOTH_ADVERTISE, android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.CHANGE_NETWORK_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_MULTICAST_STATE, android.Manifest.permission.NFC, android.Manifest.permission.TRANSMIT_IR, android.Manifest.permission.UWB_RANGING}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE = 16; // 0x10 + field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE}, anyOf={android.Manifest.permission.BLUETOOTH_ADVERTISE, android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.CHANGE_NETWORK_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_MULTICAST_STATE, android.Manifest.permission.NFC, android.Manifest.permission.TRANSMIT_IR, android.Manifest.permission.UWB_RANGING, android.Manifest.permission.RANGING}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE = 16; // 0x10 field @RequiresPermission(value=android.Manifest.permission.FOREGROUND_SERVICE_DATA_SYNC, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_DATA_SYNC = 1; // 0x1 field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_HEALTH}, anyOf={android.Manifest.permission.ACTIVITY_RECOGNITION, android.Manifest.permission.BODY_SENSORS, android.Manifest.permission.HIGH_SAMPLING_RATE_SENSORS}) public static final int FOREGROUND_SERVICE_TYPE_HEALTH = 256; // 0x100 field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_LOCATION}, anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_LOCATION = 8; // 0x8 @@ -20991,7 +20995,6 @@ package android.inputmethodservice { method @Deprecated public android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface(); method public android.view.View onCreateInputView(); method protected void onCurrentInputMethodSubtypeChanged(android.view.inputmethod.InputMethodSubtype); - method @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") public void onCustomImeSwitcherButtonRequestedVisible(boolean); method public void onDisplayCompletions(android.view.inputmethod.CompletionInfo[]); method public boolean onEvaluateFullscreenMode(); method @CallSuper public boolean onEvaluateInputViewShown(); @@ -32950,11 +32953,16 @@ package android.os { public class Build { ctor public Build(); + method @FlaggedApi("android.os.api_for_backported_fixes") public static int getBackportedFixStatus(long); method @NonNull public static java.util.List<android.os.Build.Partition> getFingerprintedPartitions(); method @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static int getMajorSdkVersion(int); method @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static int getMinorSdkVersion(int); method public static String getRadioVersion(); method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public static String getSerial(); + field @FlaggedApi("android.os.api_for_backported_fixes") public static final int BACKPORTED_FIX_STATUS_FIXED = 1; // 0x1 + field @FlaggedApi("android.os.api_for_backported_fixes") public static final int BACKPORTED_FIX_STATUS_NOT_APPLICABLE = 2; // 0x2 + field @FlaggedApi("android.os.api_for_backported_fixes") public static final int BACKPORTED_FIX_STATUS_NOT_FIXED = 3; // 0x3 + field @FlaggedApi("android.os.api_for_backported_fixes") public static final int BACKPORTED_FIX_STATUS_UNKNOWN = 0; // 0x0 field public static final String BOARD; field public static final String BOOTLOADER; field public static final String BRAND; @@ -33971,12 +33979,14 @@ package android.os { } public final class PowerManager { + method @FlaggedApi("android.os.allow_thermal_thresholds_callback") public void addThermalHeadroomListener(@NonNull android.os.PowerManager.OnThermalHeadroomChangedListener); + method @FlaggedApi("android.os.allow_thermal_thresholds_callback") public void addThermalHeadroomListener(@NonNull java.util.concurrent.Executor, @NonNull android.os.PowerManager.OnThermalHeadroomChangedListener); method public void addThermalStatusListener(@NonNull android.os.PowerManager.OnThermalStatusChangedListener); method public void addThermalStatusListener(@NonNull java.util.concurrent.Executor, @NonNull android.os.PowerManager.OnThermalStatusChangedListener); method @Nullable public java.time.Duration getBatteryDischargePrediction(); method public int getCurrentThermalStatus(); method public int getLocationPowerSaveMode(); - method public float getThermalHeadroom(@IntRange(from=0, to=60) int); + method @FloatRange(from=0.0f) public float getThermalHeadroom(@IntRange(from=0, to=60) int); method @FlaggedApi("android.os.allow_thermal_headroom_thresholds") @NonNull public java.util.Map<java.lang.Integer,java.lang.Float> getThermalHeadroomThresholds(); method public boolean isAllowedInLowPowerStandby(int); method public boolean isAllowedInLowPowerStandby(@NonNull String); @@ -33994,6 +34004,7 @@ package android.os { method public boolean isWakeLockLevelSupported(int); method public android.os.PowerManager.WakeLock newWakeLock(int, String); method @RequiresPermission(android.Manifest.permission.REBOOT) public void reboot(@Nullable String); + method @FlaggedApi("android.os.allow_thermal_thresholds_callback") public void removeThermalHeadroomListener(@NonNull android.os.PowerManager.OnThermalHeadroomChangedListener); method public void removeThermalStatusListener(@NonNull android.os.PowerManager.OnThermalStatusChangedListener); field @Deprecated @RequiresPermission(value=android.Manifest.permission.TURN_SCREEN_ON, conditional=true) public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000 field public static final String ACTION_DEVICE_IDLE_MODE_CHANGED = "android.os.action.DEVICE_IDLE_MODE_CHANGED"; @@ -34026,6 +34037,10 @@ package android.os { field public static final int THERMAL_STATUS_SHUTDOWN = 6; // 0x6 } + @FlaggedApi("android.os.allow_thermal_thresholds_callback") public static interface PowerManager.OnThermalHeadroomChangedListener { + method public void onThermalHeadroomChanged(@FloatRange(from=0.0f) float, @FloatRange(from=0.0f) float, @IntRange(from=0) int, @NonNull java.util.Map<java.lang.Integer,java.lang.Float>); + } + public static interface PowerManager.OnThermalStatusChangedListener { method public void onThermalStatusChanged(int); } diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 26cb5621bab0..2a01ca082832 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -696,6 +696,7 @@ package android.app { field public static final String OPSTR_PLAY_AUDIO = "android:play_audio"; field public static final String OPSTR_POST_NOTIFICATION = "android:post_notification"; field public static final String OPSTR_PROJECT_MEDIA = "android:project_media"; + field @FlaggedApi("android.permission.flags.ranging_permission_enabled") public static final String OPSTR_RANGING = "android:ranging"; field @FlaggedApi("android.view.contentprotection.flags.rapid_clear_notifications_by_listener_app_op_enabled") public static final String OPSTR_RAPID_CLEAR_NOTIFICATIONS_BY_LISTENER = "android:rapid_clear_notifications_by_listener"; field public static final String OPSTR_READ_CLIPBOARD = "android:read_clipboard"; field @FlaggedApi("android.permission.flags.replace_body_sensor_permission_enabled") public static final String OPSTR_READ_HEART_RATE = "android:read_heart_rate"; diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 98d6f58e6bcf..117351943587 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -402,6 +402,7 @@ package android.app { method @FlaggedApi("android.service.notification.notification_classification") @NonNull public java.util.Set<java.lang.String> getUnsupportedAdjustmentTypes(); method public boolean isNotificationPolicyAccessGrantedForPackage(@NonNull String); method @FlaggedApi("android.app.modes_api") public boolean removeAutomaticZenRule(@NonNull String, boolean); + method @FlaggedApi("android.service.notification.notification_classification") public void setAssistantAdjustmentKeyTypeState(int, boolean); method @FlaggedApi("android.app.api_rich_ongoing") public void setCanPostPromotedNotifications(@NonNull String, int, boolean); method @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public void setNotificationListenerAccessGranted(@NonNull android.content.ComponentName, boolean, boolean); method @RequiresPermission(android.Manifest.permission.MANAGE_TOAST_RATE_LIMITING) public void setToastRateLimitingEnabled(boolean); diff --git a/core/java/Android.bp b/core/java/Android.bp index 9875efe04361..71623c566501 100644 --- a/core/java/Android.bp +++ b/core/java/Android.bp @@ -206,6 +206,7 @@ filegroup { "android/os/Temperature.aidl", "android/os/CoolingDevice.aidl", "android/os/IThermalEventListener.aidl", + "android/os/IThermalHeadroomListener.aidl", "android/os/IThermalStatusListener.aidl", "android/os/IThermalService.aidl", "android/os/IPowerManager.aidl", diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 1b707f79ab81..b447897733e1 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -1017,12 +1017,6 @@ public class ActivityManager { public static final int PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL = 1 << 6; /** - * @hide - * Process is guaranteed cpu time (IE. it will not be frozen). - */ - public static final int PROCESS_CAPABILITY_CPU_TIME = 1 << 7; - - /** * @hide all capabilities, the ORing of all flags in {@link ProcessCapability}. * * Don't expose it as TestApi -- we may add new capabilities any time, which could @@ -1034,8 +1028,7 @@ public class ActivityManager { | PROCESS_CAPABILITY_POWER_RESTRICTED_NETWORK | PROCESS_CAPABILITY_BFSL | PROCESS_CAPABILITY_USER_RESTRICTED_NETWORK - | PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL - | PROCESS_CAPABILITY_CPU_TIME; + | PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL; /** * All implicit capabilities. This capability set is currently only used for processes under @@ -1060,7 +1053,6 @@ public class ActivityManager { pw.print((caps & PROCESS_CAPABILITY_BFSL) != 0 ? 'F' : '-'); pw.print((caps & PROCESS_CAPABILITY_USER_RESTRICTED_NETWORK) != 0 ? 'U' : '-'); pw.print((caps & PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL) != 0 ? 'A' : '-'); - pw.print((caps & PROCESS_CAPABILITY_CPU_TIME) != 0 ? 'T' : '-'); } /** @hide */ @@ -1073,7 +1065,6 @@ public class ActivityManager { sb.append((caps & PROCESS_CAPABILITY_BFSL) != 0 ? 'F' : '-'); sb.append((caps & PROCESS_CAPABILITY_USER_RESTRICTED_NETWORK) != 0 ? 'U' : '-'); sb.append((caps & PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL) != 0 ? 'A' : '-'); - sb.append((caps & PROCESS_CAPABILITY_CPU_TIME) != 0 ? 'T' : '-'); } /** diff --git a/core/java/android/app/AppCompatCallbacks.java b/core/java/android/app/AppCompatCallbacks.java index 4bfa3b340ec9..cf01f50c8026 100644 --- a/core/java/android/app/AppCompatCallbacks.java +++ b/core/java/android/app/AppCompatCallbacks.java @@ -28,6 +28,7 @@ import java.util.Arrays; * * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class AppCompatCallbacks implements Compatibility.BehaviorChangeDelegate { private final long[] mDisabledChanges; private final long[] mLoggableChanges; diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 4c860fac9871..38c8583dd024 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -1614,9 +1614,16 @@ public class AppOpsManager { /** @hide Access to read skin temperature. */ public static final int OP_READ_SKIN_TEMPERATURE = AppOpEnums.APP_OP_READ_SKIN_TEMPERATURE; + /** + * Allows an app to range with nearby devices using any ranging technology available. + * + * @hide + */ + public static final int OP_RANGING = AppOpEnums.APP_OP_RANGING; + /** @hide */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) - public static final int _NUM_OP = 151; + public static final int _NUM_OP = 152; /** * All app ops represented as strings. @@ -1771,6 +1778,7 @@ public class AppOpsManager { OPSTR_RECEIVE_SENSITIVE_NOTIFICATIONS, OPSTR_READ_HEART_RATE, OPSTR_READ_SKIN_TEMPERATURE, + OPSTR_RANGING, }) public @interface AppOpString {} @@ -2518,6 +2526,11 @@ public class AppOpsManager { @FlaggedApi(Flags.FLAG_PLATFORM_SKIN_TEMPERATURE_ENABLED) public static final String OPSTR_READ_SKIN_TEMPERATURE = "android:read_skin_temperature"; + /** @hide Access to ranging */ + @SystemApi + @FlaggedApi(Flags.FLAG_RANGING_PERMISSION_ENABLED) + public static final String OPSTR_RANGING = "android:ranging"; + /** {@link #sAppOpsToNote} not initialized yet for this op */ private static final byte SHOULD_COLLECT_NOTE_OP_NOT_INITIALIZED = 0; /** Should not collect noting of this app-op in {@link #sAppOpsToNote} */ @@ -2589,6 +2602,7 @@ public class AppOpsManager { OP_BLUETOOTH_ADVERTISE, OP_UWB_RANGING, OP_NEARBY_WIFI_DEVICES, + Flags.rangingPermissionEnabled() ? OP_RANGING : OP_NONE, // Notifications OP_POST_NOTIFICATION, // Health @@ -3111,6 +3125,10 @@ public class AppOpsManager { Flags.platformSkinTemperatureEnabled() ? HealthPermissions.READ_SKIN_TEMPERATURE : null) .setDefaultMode(AppOpsManager.MODE_ALLOWED).build(), + new AppOpInfo.Builder(OP_RANGING, OPSTR_RANGING, "RANGING") + .setPermission(Flags.rangingPermissionEnabled()? + Manifest.permission.RANGING : null) + .setDefaultMode(AppOpsManager.MODE_ALLOWED).build(), }; // The number of longs needed to form a full bitmask of app ops diff --git a/core/java/android/app/ForegroundServiceTypePolicy.java b/core/java/android/app/ForegroundServiceTypePolicy.java index d1e517bbd03c..16444dc5adde 100644 --- a/core/java/android/app/ForegroundServiceTypePolicy.java +++ b/core/java/android/app/ForegroundServiceTypePolicy.java @@ -398,6 +398,7 @@ public abstract class ForegroundServiceTypePolicy { new RegularPermission(Manifest.permission.NFC), new RegularPermission(Manifest.permission.TRANSMIT_IR), new RegularPermission(Manifest.permission.UWB_RANGING), + new RegularPermission(Manifest.permission.RANGING), new UsbDevicePermission(), new UsbAccessoryPermission(), }, false), diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl index a97fa18a3599..0654ac2f33ce 100644 --- a/core/java/android/app/INotificationManager.aidl +++ b/core/java/android/app/INotificationManager.aidl @@ -267,4 +267,7 @@ interface INotificationManager void setAdjustmentTypeSupportedState(in INotificationListener token, String key, boolean supported); List<String> getUnsupportedAdjustmentTypes(); + + int[] getAllowedAdjustmentKeyTypes(); + void setAssistantAdjustmentKeyTypeState(int type, boolean enabled); } diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java index 768b70c28632..c49b02210dd4 100644 --- a/core/java/android/app/NotificationManager.java +++ b/core/java/android/app/NotificationManager.java @@ -1848,6 +1848,20 @@ public class NotificationManager { /** * @hide */ + @TestApi + @FlaggedApi(android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION) + public void setAssistantAdjustmentKeyTypeState(@Adjustment.Types int type, boolean enabled) { + INotificationManager service = getService(); + try { + service.setAssistantAdjustmentKeyTypeState(type, enabled); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * @hide + */ public List<String> getEnabledNotificationListenerPackages() { INotificationManager service = getService(); try { diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig index 3aaca25eca15..04a9d13420ee 100644 --- a/core/java/android/app/admin/flags/flags.aconfig +++ b/core/java/android/app/admin/flags/flags.aconfig @@ -276,6 +276,16 @@ flag { } flag { + name: "suspend_packages_coexistence" + namespace: "enterprise" + description: "Migrate setPackagesSuspended for unmanaged mode" + bug: "335624297" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "backup_connected_apps_settings" namespace: "enterprise" description: "backup and restore connected work and personal apps user settings across devices" diff --git a/core/java/android/app/compat/ChangeIdStateCache.java b/core/java/android/app/compat/ChangeIdStateCache.java index db663f8ed4c4..7d21cbf955d9 100644 --- a/core/java/android/app/compat/ChangeIdStateCache.java +++ b/core/java/android/app/compat/ChangeIdStateCache.java @@ -31,13 +31,24 @@ import com.android.internal.compat.IPlatformCompat; * Handles caching of calls to {@link com.android.internal.compat.IPlatformCompat} * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class ChangeIdStateCache extends PropertyInvalidatedCache<ChangeIdStateQuery, Boolean> { private static final String CACHE_KEY = createSystemCacheKey("is_compat_change_enabled"); private static final int MAX_ENTRIES = 2048; - private static boolean sDisabled = false; + private static boolean sDisabled = getDefaultDisabled(); private volatile IPlatformCompat mPlatformCompat; + + @android.ravenwood.annotation.RavenwoodReplace + private static boolean getDefaultDisabled() { + return false; + } + + private static boolean getDefaultDisabled$ravenwood() { + return true; // TODO(b/376676753) Disable the cache for now. + } + /** @hide */ public ChangeIdStateCache() { super(MAX_ENTRIES, CACHE_KEY); diff --git a/core/java/android/app/compat/ChangeIdStateQuery.java b/core/java/android/app/compat/ChangeIdStateQuery.java index 7598d6c90d3d..26d9ab65417e 100644 --- a/core/java/android/app/compat/ChangeIdStateQuery.java +++ b/core/java/android/app/compat/ChangeIdStateQuery.java @@ -35,6 +35,7 @@ import java.util.Objects; * @hide */ @Immutable +@android.ravenwood.annotation.RavenwoodKeepWholeClass final class ChangeIdStateQuery { static final int QUERY_BY_PACKAGE_NAME = 0; diff --git a/core/java/android/app/compat/CompatChanges.java b/core/java/android/app/compat/CompatChanges.java index d7b2ab4351a4..643d4c96f7b9 100644 --- a/core/java/android/app/compat/CompatChanges.java +++ b/core/java/android/app/compat/CompatChanges.java @@ -39,6 +39,7 @@ import java.util.Set; * @hide */ @SystemApi +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class CompatChanges { private static final ChangeIdStateCache QUERY_CACHE = new ChangeIdStateCache(); diff --git a/core/java/android/app/compat/PackageOverride.java b/core/java/android/app/compat/PackageOverride.java index ebc2945fb1a0..ffc1eec05667 100644 --- a/core/java/android/app/compat/PackageOverride.java +++ b/core/java/android/app/compat/PackageOverride.java @@ -36,6 +36,7 @@ import java.util.Objects; * @hide */ @SystemApi +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class PackageOverride { /** @hide */ diff --git a/core/java/android/content/pm/IOnAppsChangedListener.aidl b/core/java/android/content/pm/IOnAppsChangedListener.aidl index 830cbe0e0dd0..ade58c45b024 100644 --- a/core/java/android/content/pm/IOnAppsChangedListener.aidl +++ b/core/java/android/content/pm/IOnAppsChangedListener.aidl @@ -16,6 +16,7 @@ package android.content.pm; +import android.content.pm.LauncherUserInfo; import android.content.pm.ParceledListSlice; import android.os.Bundle; import android.os.UserHandle; @@ -34,4 +35,5 @@ oneway interface IOnAppsChangedListener { void onPackagesUnsuspended(in UserHandle user, in String[] packageNames); void onShortcutChanged(in UserHandle user, String packageName, in ParceledListSlice shortcuts); void onPackageLoadingProgressChanged(in UserHandle user, String packageName, float progress); + void onUserConfigChanged(in LauncherUserInfo launcherUserInfo); } diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java index 26f919f99ee9..26b835689b67 100644 --- a/core/java/android/content/pm/LauncherApps.java +++ b/core/java/android/content/pm/LauncherApps.java @@ -182,6 +182,8 @@ public class LauncherApps { */ public static final int FLAG_CACHE_PEOPLE_TILE_SHORTCUTS = 2; + private static final String LAUNCHER_USER_INFO_EXTRA_KEY = "launcher_user_info"; + /** @hide */ @IntDef(flag = false, prefix = { "FLAG_CACHE_" }, value = { FLAG_CACHE_NOTIFICATION_SHORTCUTS, @@ -349,6 +351,19 @@ public class LauncherApps { */ public void onPackageLoadingProgressChanged(@NonNull String packageName, @NonNull UserHandle user, float progress) {} + + /** + * Indicates {@link LauncherUserInfo} configs for a user have changed. The new + * {@link LauncherUserInfo} is given as a parameter. + * + * {@link LauncherUserInfo#getUserConfig} to get the updated user configs. + * + * @param launcherUserInfo The LauncherUserInfo of the user/profile whose configs have + * changed. + */ + @FlaggedApi(android.multiuser.Flags.FLAG_ADD_LAUNCHER_USER_CONFIG) + public void onUserConfigChanged(@NonNull LauncherUserInfo launcherUserInfo) { + } } /** @@ -2168,6 +2183,21 @@ public class LauncherApps { } } } + + public void onUserConfigChanged(LauncherUserInfo launcherUserInfo) { + if (DEBUG) { + if (Flags.allowPrivateProfile() + && android.multiuser.Flags.addLauncherUserConfig()) { + Log.d(TAG, "OnUserConfigChanged for user type " + launcherUserInfo.getUserType() + + ", new userConfig: " + launcherUserInfo.getUserConfig()); + } + } + synchronized (LauncherApps.this) { + for (CallbackMessageHandler callback : mCallbacks) { + callback.postOnUserConfigChanged(launcherUserInfo); + } + } + } }; /** @@ -2224,6 +2254,7 @@ public class LauncherApps { private static final int MSG_UNSUSPENDED = 7; private static final int MSG_SHORTCUT_CHANGED = 8; private static final int MSG_LOADING_PROGRESS_CHANGED = 9; + private static final int MSG_USER_CONFIG_CHANGED = 10; private final LauncherApps.Callback mCallback; @@ -2278,6 +2309,14 @@ public class LauncherApps { mCallback.onPackageLoadingProgressChanged(info.packageName, info.user, info.mLoadingProgress); break; + case MSG_USER_CONFIG_CHANGED: + if (Flags.allowPrivateProfile() + && android.multiuser.Flags.addLauncherUserConfig()) { + mCallback.onUserConfigChanged(Objects.requireNonNull( + info.launcherExtras.getParcelable(LAUNCHER_USER_INFO_EXTRA_KEY, + LauncherUserInfo.class))); + } + break; } } @@ -2353,6 +2392,13 @@ public class LauncherApps { info.mLoadingProgress = progress; obtainMessage(MSG_LOADING_PROGRESS_CHANGED, info).sendToTarget(); } + + public void postOnUserConfigChanged(LauncherUserInfo launcherUserInfo) { + CallbackInfo info = new CallbackInfo(); + info.launcherExtras = new Bundle(); + info.launcherExtras.putParcelable(LAUNCHER_USER_INFO_EXTRA_KEY, launcherUserInfo); + obtainMessage(MSG_USER_CONFIG_CHANGED, info).sendToTarget(); + } } /** diff --git a/core/java/android/content/pm/LauncherUserInfo.java b/core/java/android/content/pm/LauncherUserInfo.java index 8426f54d4754..574af5902e89 100644 --- a/core/java/android/content/pm/LauncherUserInfo.java +++ b/core/java/android/content/pm/LauncherUserInfo.java @@ -18,6 +18,7 @@ package android.content.pm; import android.annotation.FlaggedApi; import android.annotation.NonNull; +import android.os.Bundle; import android.os.Flags; import android.os.Parcel; import android.os.Parcelable; @@ -31,11 +32,25 @@ import android.os.UserManager; @FlaggedApi(Flags.FLAG_ALLOW_PRIVATE_PROFILE) public final class LauncherUserInfo implements Parcelable { + /** + * A boolean extra indicating whether the private space entrypoint should be hidden when locked. + * + * @see #getUserConfig + */ + @FlaggedApi(android.multiuser.Flags.FLAG_ADD_LAUNCHER_USER_CONFIG) + public static final String PRIVATE_SPACE_ENTRYPOINT_HIDDEN = + "private_space_entrypoint_hidden"; + private final String mUserType; // Serial number for the user, should be same as in the {@link UserInfo} object. private final int mUserSerialNumber; + // Additional configs for the user, e.g., whether to hide the private space entrypoint when + // locked. + private final Bundle mUserConfig; + + /** * Returns type of the user as defined in {@link UserManager}. e.g., * {@link UserManager.USER_TYPE_PROFILE_MANAGED} or {@link UserManager.USER_TYPE_PROFILE_ClONE} @@ -50,6 +65,17 @@ public final class LauncherUserInfo implements Parcelable { } /** + * Returns additional configs for this launcher user + * + * @see #PRIVATE_SPACE_ENTRYPOINT_HIDDEN + */ + @FlaggedApi(android.multiuser.Flags.FLAG_ADD_LAUNCHER_USER_CONFIG) + @NonNull + public Bundle getUserConfig() { + return mUserConfig; + } + + /** * Returns serial number of user as returned by * {@link UserManager#getSerialNumberForUser(UserHandle)} * @@ -63,6 +89,7 @@ public final class LauncherUserInfo implements Parcelable { private LauncherUserInfo(@NonNull Parcel in) { mUserType = in.readString16NoHelper(); mUserSerialNumber = in.readInt(); + mUserConfig = in.readBundle(Bundle.class.getClassLoader()); } @Override @@ -70,6 +97,7 @@ public final class LauncherUserInfo implements Parcelable { public void writeToParcel(@NonNull Parcel dest, int flags) { dest.writeString16NoHelper(mUserType); dest.writeInt(mUserSerialNumber); + dest.writeBundle(mUserConfig); } @Override @@ -99,23 +127,36 @@ public final class LauncherUserInfo implements Parcelable { private final String mUserType; private final int mUserSerialNumber; + private final Bundle mUserConfig; + + + @FlaggedApi(android.multiuser.Flags.FLAG_ADD_LAUNCHER_USER_CONFIG) + public Builder(@NonNull String userType, int userSerialNumber, @NonNull Bundle config) { + this.mUserType = userType; + this.mUserSerialNumber = userSerialNumber; + this.mUserConfig = config; + } public Builder(@NonNull String userType, int userSerialNumber) { this.mUserType = userType; this.mUserSerialNumber = userSerialNumber; + this.mUserConfig = new Bundle(); } /** * Builds the LauncherUserInfo object */ - @NonNull public LauncherUserInfo build() { - return new LauncherUserInfo(this.mUserType, this.mUserSerialNumber); + @NonNull + public LauncherUserInfo build() { + return new LauncherUserInfo(this.mUserType, this.mUserSerialNumber, this.mUserConfig); } } // End builder - private LauncherUserInfo(@NonNull String userType, int userSerialNumber) { + private LauncherUserInfo(@NonNull String userType, int userSerialNumber, + @NonNull Bundle config) { this.mUserType = userType; this.mUserSerialNumber = userSerialNumber; + this.mUserConfig = config; } } diff --git a/core/java/android/content/pm/ServiceInfo.java b/core/java/android/content/pm/ServiceInfo.java index 5b0cee75e591..4285b0a2b91a 100644 --- a/core/java/android/content/pm/ServiceInfo.java +++ b/core/java/android/content/pm/ServiceInfo.java @@ -251,6 +251,7 @@ public class ServiceInfo extends ComponentInfo * {@link android.Manifest.permission#NFC}, * {@link android.Manifest.permission#TRANSMIT_IR}, * {@link android.Manifest.permission#UWB_RANGING}, + * {@link android.Manifest.permission#RANGING}, * or has been granted the access to one of the attached USB devices/accessories. */ @RequiresPermission( @@ -267,6 +268,7 @@ public class ServiceInfo extends ComponentInfo Manifest.permission.NFC, Manifest.permission.TRANSMIT_IR, Manifest.permission.UWB_RANGING, + Manifest.permission.RANGING, }, conditional = true ) diff --git a/core/java/android/content/pm/flags.aconfig b/core/java/android/content/pm/flags.aconfig index 6f70586881be..fff980fa8585 100644 --- a/core/java/android/content/pm/flags.aconfig +++ b/core/java/android/content/pm/flags.aconfig @@ -349,3 +349,12 @@ flag { bug: "364760703" is_fixed_read_only: true } + +flag { + name: "cloud_compilation_pm" + is_exported: true + namespace: "package_manager_service" + description: "Feature flag to enable the Cloud Compilation support on the package manager side." + bug: "377474232" + is_fixed_read_only: true +} diff --git a/core/java/android/content/pm/multiuser.aconfig b/core/java/android/content/pm/multiuser.aconfig index 528bde80cd3d..3d89ce12dec4 100644 --- a/core/java/android/content/pm/multiuser.aconfig +++ b/core/java/android/content/pm/multiuser.aconfig @@ -543,3 +543,10 @@ flag { purpose: PURPOSE_BUGFIX } } + +flag { + name: "add_launcher_user_config" + namespace: "profile_experiences" + description: "Add support for LauncherUserInfo configs" + bug: "346553745" +} diff --git a/core/java/android/hardware/input/AidlInputGestureData.aidl b/core/java/android/hardware/input/AidlInputGestureData.aidl index 137f672bf59c..e33ec53dd208 100644 --- a/core/java/android/hardware/input/AidlInputGestureData.aidl +++ b/core/java/android/hardware/input/AidlInputGestureData.aidl @@ -19,13 +19,26 @@ package android.hardware.input; /** @hide */ @JavaDerive(equals=true) parcelable AidlInputGestureData { - int keycode; - int modifierState; - int gestureType; + Trigger trigger; - // App launch parameters: Only set if gestureType is KEY_GESTURE_TYPE_LAUNCH_APPLICATION + int gestureType; + // App launch parameters (Only set if gestureType is LAUNCH_APPLICATION) String appLaunchCategory; String appLaunchRole; String appLaunchPackageName; String appLaunchClassName; + + parcelable KeyTrigger { + int keycode; + int modifierState; + } + + parcelable TouchpadGestureTrigger { + int gestureType; + } + + union Trigger { + KeyTrigger key; + TouchpadGestureTrigger touchpadGesture; + } } diff --git a/core/java/android/hardware/input/IInputManager.aidl b/core/java/android/hardware/input/IInputManager.aidl index 39dddb723cb9..1b96224f03da 100644 --- a/core/java/android/hardware/input/IInputManager.aidl +++ b/core/java/android/hardware/input/IInputManager.aidl @@ -266,19 +266,19 @@ interface IInputManager { @PermissionManuallyEnforced @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = " + "android.Manifest.permission.MANAGE_KEY_GESTURES)") - int addCustomInputGesture(in AidlInputGestureData data); + int addCustomInputGesture(int userId, in AidlInputGestureData data); @PermissionManuallyEnforced @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = " + "android.Manifest.permission.MANAGE_KEY_GESTURES)") - int removeCustomInputGesture(in AidlInputGestureData data); + int removeCustomInputGesture(int userId, in AidlInputGestureData data); @PermissionManuallyEnforced @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = " + "android.Manifest.permission.MANAGE_KEY_GESTURES)") - void removeAllCustomInputGestures(); + void removeAllCustomInputGestures(int userId); - AidlInputGestureData[] getCustomInputGestures(); + AidlInputGestureData[] getCustomInputGestures(int userId); AidlInputGestureData[] getAppLaunchBookmarks(); } diff --git a/core/java/android/hardware/input/InputGestureData.java b/core/java/android/hardware/input/InputGestureData.java index 5ab73cee9641..ee0a2a9cf88c 100644 --- a/core/java/android/hardware/input/InputGestureData.java +++ b/core/java/android/hardware/input/InputGestureData.java @@ -35,20 +35,40 @@ import java.util.Objects; */ public final class InputGestureData { + public static final int TOUCHPAD_GESTURE_TYPE_UNKNOWN = 0; + public static final int TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP = 1; + @NonNull private final AidlInputGestureData mInputGestureData; - public InputGestureData(AidlInputGestureData inputGestureData) { + public InputGestureData(@NonNull AidlInputGestureData inputGestureData) { this.mInputGestureData = inputGestureData; validate(); } /** Returns the trigger information for this input gesture */ public Trigger getTrigger() { - if (mInputGestureData.keycode != KeyEvent.KEYCODE_UNKNOWN) { - return new KeyTrigger(mInputGestureData.keycode, mInputGestureData.modifierState); + switch (mInputGestureData.trigger.getTag()) { + case AidlInputGestureData.Trigger.Tag.key: { + AidlInputGestureData.KeyTrigger trigger = mInputGestureData.trigger.getKey(); + if (trigger == null) { + throw new RuntimeException("InputGestureData is corrupted, null key trigger!"); + } + return createKeyTrigger(trigger.keycode, trigger.modifierState); + } + case AidlInputGestureData.Trigger.Tag.touchpadGesture: { + AidlInputGestureData.TouchpadGestureTrigger trigger = + mInputGestureData.trigger.getTouchpadGesture(); + if (trigger == null) { + throw new RuntimeException( + "InputGestureData is corrupted, null touchpad trigger!"); + } + return createTouchpadTrigger(trigger.gestureType); + } + default: + throw new RuntimeException("InputGestureData is corrupted, invalid trigger type!"); + } - throw new RuntimeException("InputGestureData is corrupted, invalid trigger type!"); } /** Returns the action to perform for this input gesture */ @@ -127,9 +147,15 @@ public final class InputGestureData { "No app launch data for system action launch application"); } AidlInputGestureData data = new AidlInputGestureData(); + data.trigger = new AidlInputGestureData.Trigger(); if (mTrigger instanceof KeyTrigger keyTrigger) { - data.keycode = keyTrigger.getKeycode(); - data.modifierState = keyTrigger.getModifierState(); + data.trigger.setKey(new AidlInputGestureData.KeyTrigger()); + data.trigger.getKey().keycode = keyTrigger.getKeycode(); + data.trigger.getKey().modifierState = keyTrigger.getModifierState(); + } else if (mTrigger instanceof TouchpadTrigger touchpadTrigger) { + data.trigger.setTouchpadGesture(new AidlInputGestureData.TouchpadGestureTrigger()); + data.trigger.getTouchpadGesture().gestureType = + touchpadTrigger.getTouchpadGestureType(); } else { throw new IllegalArgumentException("Invalid trigger type!"); } @@ -163,30 +189,12 @@ public final class InputGestureData { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; InputGestureData that = (InputGestureData) o; - return mInputGestureData.keycode == that.mInputGestureData.keycode - && mInputGestureData.modifierState == that.mInputGestureData.modifierState - && mInputGestureData.gestureType == that.mInputGestureData.gestureType - && Objects.equals(mInputGestureData.appLaunchCategory, that.mInputGestureData.appLaunchCategory) - && Objects.equals(mInputGestureData.appLaunchRole, that.mInputGestureData.appLaunchRole) - && Objects.equals(mInputGestureData.appLaunchPackageName, that.mInputGestureData.appLaunchPackageName) - && Objects.equals(mInputGestureData.appLaunchPackageName, that.mInputGestureData.appLaunchPackageName); + return Objects.equals(mInputGestureData, that.mInputGestureData); } @Override public int hashCode() { - int _hash = 1; - _hash = 31 * _hash + mInputGestureData.keycode; - _hash = 31 * _hash + mInputGestureData.modifierState; - _hash = 31 * _hash + mInputGestureData.gestureType; - _hash = 31 * _hash + (mInputGestureData.appLaunchCategory != null - ? mInputGestureData.appLaunchCategory.hashCode() : 0); - _hash = 31 * _hash + (mInputGestureData.appLaunchRole != null - ? mInputGestureData.appLaunchRole.hashCode() : 0); - _hash = 31 * _hash + (mInputGestureData.appLaunchPackageName != null - ? mInputGestureData.appLaunchPackageName.hashCode() : 0); - _hash = 31 * _hash + (mInputGestureData.appLaunchPackageName != null - ? mInputGestureData.appLaunchPackageName.hashCode() : 0); - return _hash; + return mInputGestureData.hashCode(); } public interface Trigger { @@ -197,6 +205,11 @@ public final class InputGestureData { return new KeyTrigger(keycode, modifierState); } + /** Creates a input gesture trigger based on a touchpad gesture */ + public static Trigger createTouchpadTrigger(int touchpadGestureType) { + return new TouchpadTrigger(touchpadGestureType); + } + /** Key based input gesture trigger */ public static class KeyTrigger implements Trigger { private static final int SHORTCUT_META_MASK = @@ -242,6 +255,43 @@ public final class InputGestureData { } } + /** Touchpad based input gesture trigger */ + public static class TouchpadTrigger implements Trigger { + private final int mTouchpadGestureType; + + private TouchpadTrigger(int touchpadGestureType) { + if (touchpadGestureType != TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP) { + throw new IllegalArgumentException( + "Invalid touchpadGestureType = " + touchpadGestureType); + } + mTouchpadGestureType = touchpadGestureType; + } + + public int getTouchpadGestureType() { + return mTouchpadGestureType; + } + + @Override + public String toString() { + return "TouchpadTrigger{" + + "mTouchpadGestureType=" + mTouchpadGestureType + + '}'; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + TouchpadTrigger that = (TouchpadTrigger) o; + return mTouchpadGestureType == that.mTouchpadGestureType; + } + + @Override + public int hashCode() { + return Objects.hashCode(mTouchpadGestureType); + } + } + /** Data for action to perform when input gesture is triggered */ public record Action(@KeyGestureEvent.KeyGestureType int keyGestureType, @Nullable AppLaunchData appLaunchData) { diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index 2051dbe7fb2e..9050ae235ce7 100644 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -34,6 +34,7 @@ import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SuppressLint; import android.annotation.SystemService; import android.annotation.TestApi; +import android.annotation.UserHandleAware; import android.annotation.UserIdInt; import android.app.ActivityThread; import android.compat.annotation.ChangeId; @@ -1487,12 +1488,13 @@ public final class InputManager { */ @RequiresPermission(Manifest.permission.MANAGE_KEY_GESTURES) @CustomInputGestureResult + @UserHandleAware public int addCustomInputGesture(@NonNull InputGestureData inputGestureData) { if (!enableCustomizableInputGestures()) { return CUSTOM_INPUT_GESTURE_RESULT_ERROR_OTHER; } try { - return mIm.addCustomInputGesture(inputGestureData.getAidlData()); + return mIm.addCustomInputGesture(mContext.getUserId(), inputGestureData.getAidlData()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1509,12 +1511,14 @@ public final class InputManager { */ @RequiresPermission(Manifest.permission.MANAGE_KEY_GESTURES) @CustomInputGestureResult + @UserHandleAware public int removeCustomInputGesture(@NonNull InputGestureData inputGestureData) { if (!enableCustomizableInputGestures()) { return CUSTOM_INPUT_GESTURE_RESULT_ERROR_OTHER; } try { - return mIm.removeCustomInputGesture(inputGestureData.getAidlData()); + return mIm.removeCustomInputGesture(mContext.getUserId(), + inputGestureData.getAidlData()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1525,12 +1529,13 @@ public final class InputManager { * @hide */ @RequiresPermission(Manifest.permission.MANAGE_KEY_GESTURES) + @UserHandleAware public void removeAllCustomInputGestures() { if (!enableCustomizableInputGestures()) { return; } try { - mIm.removeAllCustomInputGestures(); + mIm.removeAllCustomInputGestures(mContext.getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1540,13 +1545,14 @@ public final class InputManager { * * @hide */ + @UserHandleAware public List<InputGestureData> getCustomInputGestures() { List<InputGestureData> result = new ArrayList<>(); if (!enableCustomizableInputGestures()) { return result; } try { - for (AidlInputGestureData data : mIm.getCustomInputGestures()) { + for (AidlInputGestureData data : mIm.getCustomInputGestures(mContext.getUserId())) { result.add(new InputGestureData(data)); } } catch (RemoteException e) { diff --git a/core/java/android/hardware/input/input_framework.aconfig b/core/java/android/hardware/input/input_framework.aconfig index f9cb94aca54e..38e32c61c99e 100644 --- a/core/java/android/hardware/input/input_framework.aconfig +++ b/core/java/android/hardware/input/input_framework.aconfig @@ -141,7 +141,7 @@ flag { flag { name: "keyboard_a11y_shortcut_control" namespace: "input" - description: "Adds shortcuts to toggle and control a11y features" + description: "Adds shortcuts to toggle and control a11y keyboard features" bug: "373458181" } @@ -165,3 +165,10 @@ flag { description: "Turns three-finger touchpad taps into a customizable shortcut." bug: "365063048" } + +flag { + name: "enable_talkback_and_magnifier_key_gestures" + namespace: "input" + description: "Adds key gestures for talkback and magnifier" + bug: "375277034" +}
\ No newline at end of file diff --git a/core/java/android/hardware/location/OWNERS b/core/java/android/hardware/location/OWNERS index 747f90947b9c..340d6f2eb08c 100644 --- a/core/java/android/hardware/location/OWNERS +++ b/core/java/android/hardware/location/OWNERS @@ -9,4 +9,4 @@ wyattriley@google.com yuhany@google.com # ContextHub team -per-file *ContextHub*,*NanoApp* = file:platform/system/chre:/OWNERS +per-file Android.bp,*Hub*,*NanoApp* = file:platform/system/chre:/OWNERS diff --git a/core/java/android/hardware/soundtrigger/SoundTrigger.java b/core/java/android/hardware/soundtrigger/SoundTrigger.java index 85cf9491287c..7745b036bcbe 100644 --- a/core/java/android/hardware/soundtrigger/SoundTrigger.java +++ b/core/java/android/hardware/soundtrigger/SoundTrigger.java @@ -1521,8 +1521,7 @@ public class SoundTrigger { private final boolean mAllowMultipleTriggers; private final KeyphraseRecognitionExtra mKeyphrases[]; private final byte[] mData; - @ModuleProperties.AudioCapabilities - private final int mAudioCapabilities; + private final @ModuleProperties.AudioCapabilities int mAudioCapabilities; /** * Constructor for {@link RecognitionConfig} with {@code audioCapabilities} describes a @@ -1535,11 +1534,12 @@ public class SoundTrigger { * @param keyphrases List of keyphrases in the sound model. * @param data Opaque data for use by system applications who know about voice engine * internals, typically during enrollment. - * @param audioCapabilities Bit field encoding of the AudioCapabilities. + * @param audioCapabilities Bit field encoding of the AudioCapabilities. See + * {@link ModuleProperties.AudioCapabilities} for details. */ private RecognitionConfig(boolean captureRequested, boolean allowMultipleTriggers, @Nullable KeyphraseRecognitionExtra[] keyphrases, @Nullable byte[] data, - int audioCapabilities) { + @ModuleProperties.AudioCapabilities int audioCapabilities) { this.mCaptureRequested = captureRequested; this.mAllowMultipleTriggers = allowMultipleTriggers; this.mKeyphrases = keyphrases != null ? keyphrases : new KeyphraseRecognitionExtra[0]; @@ -1617,8 +1617,11 @@ public class SoundTrigger { return mData; } - /** Bit field encoding of the AudioCapabilities supported by the firmware. */ - public int getAudioCapabilities() { + /** + * Bit field encoding of the AudioCapabilities supported by the firmware. See + * {@link ModuleProperties.AudioCapabilities} for details. + */ + public @ModuleProperties.AudioCapabilities int getAudioCapabilities() { return mAudioCapabilities; } @@ -1702,7 +1705,7 @@ public class SoundTrigger { private boolean mAllowMultipleTriggers; @Nullable private KeyphraseRecognitionExtra[] mKeyphrases; @Nullable private byte[] mData; - private int mAudioCapabilities; + private @ModuleProperties.AudioCapabilities int mAudioCapabilities; /** * Constructs a new Builder with the default values. @@ -1758,10 +1761,12 @@ public class SoundTrigger { /** * Sets the audio capabilities field. * @param audioCapabilities The bit field encoding of the audio capabilities associated - * with this recognition session. + * with this recognition session. See + * {@link ModuleProperties.AudioCapabilities} for details. * @return the same Builder instance. */ - public @NonNull Builder setAudioCapabilities(int audioCapabilities) { + public @NonNull Builder setAudioCapabilities( + @ModuleProperties.AudioCapabilities int audioCapabilities) { mAudioCapabilities = audioCapabilities; return this; } diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index ae8366817f2b..8c3f0ef08039 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -55,7 +55,6 @@ import static android.view.inputmethod.ConnectionlessHandwritingCallback.CONNECT import static android.view.inputmethod.ConnectionlessHandwritingCallback.CONNECTIONLESS_HANDWRITING_ERROR_OTHER; import static android.view.inputmethod.ConnectionlessHandwritingCallback.CONNECTIONLESS_HANDWRITING_ERROR_UNSUPPORTED; import static android.view.inputmethod.Flags.FLAG_CONNECTIONLESS_HANDWRITING; -import static android.view.inputmethod.Flags.FLAG_IME_SWITCHER_REVAMP_API; import static android.view.inputmethod.Flags.ctrlShiftShortcut; import static android.view.inputmethod.Flags.predictiveBackIme; @@ -4393,39 +4392,6 @@ public class InputMethodService extends AbstractInputMethodService { } /** - * Called when the requested visibility of a custom IME Switcher button changes. - * - * <p>When the system provides an IME navigation bar, it may decide to show an IME Switcher - * button inside this bar. However, the IME can request hiding the bar provided by the system - * with {@code getWindowInsetsController().hide(captionBar())} (the IME navigation bar provides - * {@link Type#captionBar() captionBar} insets to the IME window). If the request is successful, - * then it becomes the IME's responsibility to provide a custom IME Switcher button in its - * input view, with equivalent functionality.</p> - * - * <p>This custom button is only requested to be visible when the system provides the IME - * navigation bar, both the bar and the IME Switcher button inside it should be visible, - * but the IME successfully requested to hide the bar. This does not depend on the current - * visibility of the IME. It could be called with {@code true} while the IME is hidden, in - * which case the IME should prepare to show the button as soon as the IME itself is shown.</p> - * - * <p>This is only called when the requested visibility changes. The default value is - * {@code false} and as such, this will not be called initially if the resulting value is - * {@code false}.</p> - * - * <p>This can be called at any time after {@link #onCreate}, even if the IME is not currently - * visible. However, this is not guaranteed to be called before the IME is shown, as it depends - * on when the IME requested hiding the IME navigation bar. If the request is sent during - * the showing flow (e.g. during {@link #onStartInputView}), this will be called shortly after - * {@link #onWindowShown}, but before the first IME frame is drawn.</p> - * - * @param visible whether the button is requested visible or not. - */ - @FlaggedApi(FLAG_IME_SWITCHER_REVAMP_API) - public void onCustomImeSwitcherButtonRequestedVisible(boolean visible) { - // Intentionally empty - } - - /** * Called when the IME switch button was clicked from the client. Depending on the number of * enabled IME subtypes, this will either switch to the next IME/subtype, or show the input * method picker dialog. diff --git a/core/java/android/inputmethodservice/NavigationBarController.java b/core/java/android/inputmethodservice/NavigationBarController.java index 38be8d9f772d..b08454dd7f8f 100644 --- a/core/java/android/inputmethodservice/NavigationBarController.java +++ b/core/java/android/inputmethodservice/NavigationBarController.java @@ -41,7 +41,6 @@ import android.view.WindowInsets; import android.view.WindowInsetsController.Appearance; import android.view.animation.Interpolator; import android.view.animation.PathInterpolator; -import android.view.inputmethod.Flags; import android.view.inputmethod.InputMethodManager; import android.widget.FrameLayout; @@ -179,9 +178,6 @@ final class NavigationBarController { private boolean mDrawLegacyNavigationBarBackground; - /** Whether a custom IME Switcher button should be visible. */ - private boolean mCustomImeSwitcherVisible; - private final Rect mTempRect = new Rect(); private final int[] mTempPos = new int[2]; @@ -269,7 +265,6 @@ final class NavigationBarController { // IME navigation bar. boolean visible = insets.isVisible(captionBar()); mNavigationBarFrame.setVisibility(visible ? View.VISIBLE : View.GONE); - checkCustomImeSwitcherVisibility(); } return view.onApplyWindowInsets(insets); }); @@ -496,8 +491,6 @@ final class NavigationBarController { mShouldShowImeSwitcherWhenImeIsShown; mShouldShowImeSwitcherWhenImeIsShown = shouldShowImeSwitcherWhenImeIsShown; - checkCustomImeSwitcherVisibility(); - mService.mWindow.getWindow().getDecorView().getWindowInsetsController() .setImeCaptionBarInsetsHeight(getImeCaptionBarHeight(imeDrawsImeNavBar)); @@ -623,33 +616,12 @@ final class NavigationBarController { && mNavigationBarFrame.getVisibility() == View.VISIBLE; } - /** - * Checks if a custom IME Switcher button should be visible, and notifies the IME when this - * state changes. This can only be {@code true} if three conditions are met: - * - * <li>The IME should draw the IME navigation bar.</li> - * <li>The IME Switcher button should be visible when the IME is visible.</li> - * <li>The IME navigation bar should be visible, but was requested hidden by the IME.</li> - */ - private void checkCustomImeSwitcherVisibility() { - if (!Flags.imeSwitcherRevampApi()) { - return; - } - final boolean visible = mImeDrawsImeNavBar && mShouldShowImeSwitcherWhenImeIsShown - && mNavigationBarFrame != null && !isShown(); - if (visible != mCustomImeSwitcherVisible) { - mCustomImeSwitcherVisible = visible; - mService.onCustomImeSwitcherButtonRequestedVisible(mCustomImeSwitcherVisible); - } - } - @Override public String toDebugString() { return "{mImeDrawsImeNavBar=" + mImeDrawsImeNavBar + " mNavigationBarFrame=" + mNavigationBarFrame + " mShouldShowImeSwitcherWhenImeIsShown=" + mShouldShowImeSwitcherWhenImeIsShown - + " mCustomImeSwitcherVisible=" + mCustomImeSwitcherVisible + " mAppearance=0x" + Integer.toHexString(mAppearance) + " mDarkIntensity=" + mDarkIntensity + " mDrawLegacyNavigationBarBackground=" + mDrawLegacyNavigationBarBackground diff --git a/core/java/android/os/AggregateBatteryConsumer.java b/core/java/android/os/AggregateBatteryConsumer.java index c7f8878f104e..f0e12ca644dd 100644 --- a/core/java/android/os/AggregateBatteryConsumer.java +++ b/core/java/android/os/AggregateBatteryConsumer.java @@ -85,7 +85,7 @@ public final class AggregateBatteryConsumer extends BatteryConsumer { throw new XmlPullParserException("Invalid XML parser state"); } - consumerBuilder.setConsumedPower( + consumerBuilder.addConsumedPower( parser.getAttributeDouble(null, BatteryUsageStats.XML_ATTR_POWER)); while (!(eventType == XmlPullParser.END_TAG && parser.getName().equals( @@ -132,11 +132,19 @@ public final class AggregateBatteryConsumer extends BatteryConsumer { } /** + * Adds the total power included in this aggregate. + */ + public Builder addConsumedPower(double consumedPowerMah) { + mData.putDouble(COLUMN_INDEX_CONSUMED_POWER, + mData.getDouble(COLUMN_INDEX_CONSUMED_POWER) + consumedPowerMah); + return this; + } + + /** * Adds power and usage duration from the supplied AggregateBatteryConsumer. */ public void add(AggregateBatteryConsumer aggregateBatteryConsumer) { - setConsumedPower(mData.getDouble(COLUMN_INDEX_CONSUMED_POWER) - + aggregateBatteryConsumer.getConsumedPower()); + addConsumedPower(aggregateBatteryConsumer.getConsumedPower()); mPowerComponentsBuilder.addPowerAndDuration(aggregateBatteryConsumer.mPowerComponents); } diff --git a/core/java/android/os/BatteryConsumer.java b/core/java/android/os/BatteryConsumer.java index b0ecca790b80..14b67f64b6da 100644 --- a/core/java/android/os/BatteryConsumer.java +++ b/core/java/android/os/BatteryConsumer.java @@ -1064,7 +1064,9 @@ public abstract class BatteryConsumer { * @param componentId The ID of the power component, e.g. * {@link BatteryConsumer#POWER_COMPONENT_CPU}. * @param componentPower Amount of consumed power in mAh. + * @deprecated use {@link #addConsumedPower} */ + @Deprecated @NonNull public T setConsumedPower(@PowerComponentId int componentId, double componentPower) { return setConsumedPower(componentId, componentPower, POWER_MODEL_POWER_PROFILE); @@ -1076,7 +1078,9 @@ public abstract class BatteryConsumer { * @param componentId The ID of the power component, e.g. * {@link BatteryConsumer#POWER_COMPONENT_CPU}. * @param componentPower Amount of consumed power in mAh. + * @deprecated use {@link #addConsumedPower} */ + @Deprecated @SuppressWarnings("unchecked") @NonNull public T setConsumedPower(@PowerComponentId int componentId, double componentPower, @@ -1104,6 +1108,21 @@ public abstract class BatteryConsumer { @SuppressWarnings("unchecked") @NonNull + public T addConsumedPower(@PowerComponentId int componentId, double componentPower) { + mPowerComponentsBuilder.addConsumedPower(getKey(componentId, PROCESS_STATE_UNSPECIFIED), + componentPower, POWER_MODEL_UNDEFINED); + return (T) this; + } + + @SuppressWarnings("unchecked") + @NonNull + public T addConsumedPower(Key key, double componentPower) { + mPowerComponentsBuilder.addConsumedPower(key, componentPower, POWER_MODEL_UNDEFINED); + return (T) this; + } + + @SuppressWarnings("unchecked") + @NonNull public T addConsumedPower(Key key, double componentPower, @PowerModel int powerModel) { mPowerComponentsBuilder.addConsumedPower(key, componentPower, powerModel); return (T) this; @@ -1115,7 +1134,9 @@ public abstract class BatteryConsumer { * @param componentId The ID of the power component, e.g. * {@link UidBatteryConsumer#POWER_COMPONENT_CPU}. * @param componentUsageTimeMillis Amount of time in microseconds. + * @deprecated use {@link #addUsageDurationMillis} */ + @Deprecated @SuppressWarnings("unchecked") @NonNull public T setUsageDurationMillis(@PowerComponentId int componentId, @@ -1126,6 +1147,7 @@ public abstract class BatteryConsumer { return (T) this; } + @Deprecated @SuppressWarnings("unchecked") @NonNull public T setUsageDurationMillis(Key key, long componentUsageTimeMillis) { @@ -1133,6 +1155,14 @@ public abstract class BatteryConsumer { return (T) this; } + @NonNull + public T addUsageDurationMillis(@PowerComponentId int componentId, + long componentUsageTimeMillis) { + mPowerComponentsBuilder.addUsageDurationMillis( + getKey(componentId, PROCESS_STATE_UNSPECIFIED), componentUsageTimeMillis); + return (T) this; + } + @SuppressWarnings("unchecked") @NonNull public T addUsageDurationMillis(Key key, long componentUsageTimeMillis) { diff --git a/core/java/android/os/BatteryUsageStats.java b/core/java/android/os/BatteryUsageStats.java index 5ae425f184c7..72e4cef2f6eb 100644 --- a/core/java/android/os/BatteryUsageStats.java +++ b/core/java/android/os/BatteryUsageStats.java @@ -209,7 +209,7 @@ public final class BatteryUsageStats implements Parcelable, Closeable { } builder.getAggregateBatteryConsumerBuilder(AGGREGATE_BATTERY_CONSUMER_SCOPE_ALL_APPS) - .setConsumedPower(totalPowerMah); + .addConsumedPower(totalPowerMah); mAggregateBatteryConsumers = new AggregateBatteryConsumer[AGGREGATE_BATTERY_CONSUMER_SCOPE_COUNT]; diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index b3aebad1b160..102bdd0b625c 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -1565,6 +1565,61 @@ public class Build { /** A string that uniquely identifies this build. Do not attempt to parse this value. */ public static final String FINGERPRINT = deriveFingerprint(); + /** The status of the known issue on this device is not known. */ + @FlaggedApi(android.os.Flags.FLAG_API_FOR_BACKPORTED_FIXES) + public static final int BACKPORTED_FIX_STATUS_UNKNOWN = 0; + /** The known issue is fixed on this device. */ + @FlaggedApi(android.os.Flags.FLAG_API_FOR_BACKPORTED_FIXES) + public static final int BACKPORTED_FIX_STATUS_FIXED = 1; + /** + * The known issue is not applicable to this device. + * + * <p>For example if the issue only affects a specific brand, devices + * from other brands would report not applicable. + */ + @FlaggedApi(android.os.Flags.FLAG_API_FOR_BACKPORTED_FIXES) + public static final int BACKPORTED_FIX_STATUS_NOT_APPLICABLE = 2; + /** The known issue is not fixed on this device. */ + @FlaggedApi(android.os.Flags.FLAG_API_FOR_BACKPORTED_FIXES) + public static final int BACKPORTED_FIX_STATUS_NOT_FIXED = 3; + + /** + * The status of the backported fix for a known issue on this device. + * + * @hide + */ + @IntDef( + prefix = {"BACKPORTED_FIX_STATUS_"}, + value = { + BACKPORTED_FIX_STATUS_UNKNOWN, + BACKPORTED_FIX_STATUS_FIXED, + BACKPORTED_FIX_STATUS_NOT_APPLICABLE, + BACKPORTED_FIX_STATUS_NOT_FIXED, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface BackportedFixStatus { + } + + /** + * The status of the backported fix for a known issue on this device. + * + * @param id The id of the known issue to check. + * @return {@link #BACKPORTED_FIX_STATUS_FIXED} if the known issue is + * fixed on this device, + * {@link #BACKPORTED_FIX_STATUS_NOT_FIXED} if the known issue is not + * fixed on this device, + * {@link #BACKPORTED_FIX_STATUS_NOT_APPLICABLE} if the known issue is + * is not applicable on this device, + * otherwise {@link #BACKPORTED_FIX_STATUS_UNKNOWN}. + */ + + @FlaggedApi(android.os.Flags.FLAG_API_FOR_BACKPORTED_FIXES) + public static @BackportedFixStatus int getBackportedFixStatus(long id) { + // TODO: b/308461809 - query aliases from system prop + // TODO: b/372518979 - use backported fix datastore. + return BACKPORTED_FIX_STATUS_UNKNOWN; + } + /** * Some devices split the fingerprint components between multiple * partitions, so we might derive the fingerprint at runtime. diff --git a/core/java/android/os/CombinedMessageQueue/MessageQueue.java b/core/java/android/os/CombinedMessageQueue/MessageQueue.java index 6cfbf4ebf661..acda0c5664fe 100644 --- a/core/java/android/os/CombinedMessageQueue/MessageQueue.java +++ b/core/java/android/os/CombinedMessageQueue/MessageQueue.java @@ -426,13 +426,26 @@ public final class MessageQueue { // Update the file descriptor record if the listener changed the set of // events to watch and the listener itself hasn't been updated since. if (newWatchedEvents != oldWatchedEvents) { - synchronized (this) { - int index = mFileDescriptorRecords.indexOfKey(fd); - if (index >= 0 && mFileDescriptorRecords.valueAt(index) == record - && record.mSeq == seq) { - record.mEvents = newWatchedEvents; - if (newWatchedEvents == 0) { - mFileDescriptorRecords.removeAt(index); + if (mUseConcurrent) { + synchronized (mFileDescriptorRecordsLock) { + int index = mFileDescriptorRecords.indexOfKey(fd); + if (index >= 0 && mFileDescriptorRecords.valueAt(index) == record + && record.mSeq == seq) { + record.mEvents = newWatchedEvents; + if (newWatchedEvents == 0) { + mFileDescriptorRecords.removeAt(index); + } + } + } + } else { + synchronized (this) { + int index = mFileDescriptorRecords.indexOfKey(fd); + if (index >= 0 && mFileDescriptorRecords.valueAt(index) == record + && record.mSeq == seq) { + record.mEvents = newWatchedEvents; + if (newWatchedEvents == 0) { + mFileDescriptorRecords.removeAt(index); + } } } } diff --git a/core/java/android/os/IThermalHeadroomListener.aidl b/core/java/android/os/IThermalHeadroomListener.aidl new file mode 100644 index 000000000000..b2797d8805fa --- /dev/null +++ b/core/java/android/os/IThermalHeadroomListener.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.os; + +/** + * Listener for thermal headroom and threshold changes. + * This is mainly used by {@link android.os.PowerManager} to serve public thermal headoom related + * APIs. + * {@hide} + */ +oneway interface IThermalHeadroomListener { + /** + * Called when thermal headroom or thresholds changed. + */ + void onHeadroomChange(in float headroom, in float forecastHeadroom, + in int forecastSeconds, in float[] thresholds); +} diff --git a/core/java/android/os/IThermalService.aidl b/core/java/android/os/IThermalService.aidl index bcffa45fbbd2..aa3bcfab6b66 100644 --- a/core/java/android/os/IThermalService.aidl +++ b/core/java/android/os/IThermalService.aidl @@ -18,6 +18,7 @@ package android.os; import android.os.CoolingDevice; import android.os.IThermalEventListener; +import android.os.IThermalHeadroomListener; import android.os.IThermalStatusListener; import android.os.Temperature; @@ -116,4 +117,20 @@ interface IThermalService { * @return thermal headroom for each thermal status */ float[] getThermalHeadroomThresholds(); + + /** + * Register a listener for thermal headroom change. + * @param listener the {@link android.os.IThermalHeadroomListener} to be notified. + * @return true if registered successfully. + * {@hide} + */ + boolean registerThermalHeadroomListener(in IThermalHeadroomListener listener); + + /** + * Unregister a previously-registered listener for thermal headroom. + * @param listener the {@link android.os.IThermalHeadroomListener} to no longer be notified. + * @return true if unregistered successfully. + * {@hide} + */ + boolean unregisterThermalHeadroomListener(in IThermalHeadroomListener listener); } diff --git a/core/java/android/os/PowerComponents.java b/core/java/android/os/PowerComponents.java index f4e3f3b6e430..d116e0737c46 100644 --- a/core/java/android/os/PowerComponents.java +++ b/core/java/android/os/PowerComponents.java @@ -439,8 +439,8 @@ class PowerComponents { } final BatteryConsumer.Key key = builder.mData.layout.getKey(componentId, processState, screenState, powerState); - builder.setConsumedPower(key, powerMah, model); - builder.setUsageDurationMillis(key, durationMs); + builder.addConsumedPower(key, powerMah, model); + builder.addUsageDurationMillis(key, durationMs); break; } } @@ -468,6 +468,10 @@ class PowerComponents { } } + /** + * @deprecated use {@link #addConsumedPower(BatteryConsumer.Key, double, int)} + */ + @Deprecated @NonNull public Builder setConsumedPower(BatteryConsumer.Key key, double componentPower, int powerModel) { @@ -489,6 +493,10 @@ class PowerComponents { return this; } + /** + * @deprecated use {@link #addUsageDurationMillis(BatteryConsumer.Key, long)} + */ + @Deprecated @NonNull public Builder setUsageDurationMillis(BatteryConsumer.Key key, long componentUsageDurationMillis) { diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 9d4ac2963b2d..07fded19c799 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -20,6 +20,7 @@ import android.Manifest.permission; import android.annotation.CallbackExecutor; import android.annotation.CurrentTimeMillisLong; import android.annotation.FlaggedApi; +import android.annotation.FloatRange; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; @@ -40,6 +41,7 @@ import android.util.Log; import android.util.proto.ProtoOutputStream; import android.view.Display; +import com.android.internal.annotations.GuardedBy; import com.android.internal.util.Preconditions; import java.lang.annotation.ElementType; @@ -1199,10 +1201,12 @@ public final class PowerManager { /** We lazily initialize it.*/ private PowerExemptionManager mPowerExemptionManager; + @GuardedBy("mThermalStatusListenerMap") private final ArrayMap<OnThermalStatusChangedListener, IThermalStatusListener> - mListenerMap = new ArrayMap<>(); - private final Object mThermalHeadroomThresholdsLock = new Object(); - private float[] mThermalHeadroomThresholds = null; + mThermalStatusListenerMap = new ArrayMap<>(); + @GuardedBy("mThermalHeadroomListenerMap") + private final ArrayMap<OnThermalHeadroomChangedListener, IThermalHeadroomListener> + mThermalHeadroomListenerMap = new ArrayMap<>(); /** * {@hide} @@ -2689,15 +2693,59 @@ public final class PowerManager { void onThermalStatusChanged(@ThermalStatus int status); } + /** + * Listener passed to + * {@link PowerManager#addThermalHeadroomListener} and + * {@link PowerManager#removeThermalHeadroomListener} + * to notify caller of Thermal headroom or thresholds changes. + */ + @FlaggedApi(Flags.FLAG_ALLOW_THERMAL_THRESHOLDS_CALLBACK) + public interface OnThermalHeadroomChangedListener { + + /** + * Called when overall thermal headroom or headroom thresholds have significantly + * changed that requires action. + * <p> + * This may not be used to fully replace the {@link #getThermalHeadroom(int)} API as it will + * only notify on one of the conditions below that will significantly change one or both + * values of current headroom and headroom thresholds since previous callback: + * 1. thermal throttling events: when the skin temperature has cross any of the thresholds + * and there isn't a previous callback in a short time ago with similar values. + * 2. skin temperature threshold change events: note that if the absolute °C threshold + * values change in a way that does not significantly change the current headroom nor + * headroom thresholds, it will not trigger any callback. The client should not + * need to take action in such case since the difference from temperature vs threshold + * hasn't changed. + * <p> + * By API version 36, it provides a forecast in the same call for developer's convenience + * based on a {@code forecastSeconds} defined by the device, which can be static or dynamic + * varied by OEM. Be aware that it will not notify on forecast temperature change but the + * events mentioned above. So periodically polling against {@link #getThermalHeadroom(int)} + * API should still be used to actively monitor temperature forecast in advance. + * <p> + * This serves as a more advanced option compared to thermal status listener, where the + * latter will only notify on thermal throttling events with status update. + * + * @param headroom current headroom + * @param forecastHeadroom forecasted headroom in future + * @param forecastSeconds how many seconds in the future used in forecast + * @param thresholds new headroom thresholds, see {@link #getThermalHeadroomThresholds()} + */ + void onThermalHeadroomChanged( + @FloatRange(from = 0f) float headroom, + @FloatRange(from = 0f) float forecastHeadroom, + @IntRange(from = 0) int forecastSeconds, + @NonNull Map<@ThermalStatus Integer, Float> thresholds); + } /** - * This function adds a listener for thermal status change, listen call back will be + * This function adds a listener for thermal status change, listener callback will be * enqueued tasks on the main thread * * @param listener listener to be added, */ public void addThermalStatusListener(@NonNull OnThermalStatusChangedListener listener) { - Objects.requireNonNull(listener, "listener cannot be null"); + Objects.requireNonNull(listener, "Thermal status listener cannot be null"); addThermalStatusListener(mContext.getMainExecutor(), listener); } @@ -2709,29 +2757,31 @@ public final class PowerManager { */ public void addThermalStatusListener(@NonNull @CallbackExecutor Executor executor, @NonNull OnThermalStatusChangedListener listener) { - Objects.requireNonNull(listener, "listener cannot be null"); - Objects.requireNonNull(executor, "executor cannot be null"); - Preconditions.checkArgument(!mListenerMap.containsKey(listener), - "Listener already registered: %s", listener); - IThermalStatusListener internalListener = new IThermalStatusListener.Stub() { - @Override - public void onStatusChange(int status) { - final long token = Binder.clearCallingIdentity(); - try { - executor.execute(() -> listener.onThermalStatusChanged(status)); - } finally { - Binder.restoreCallingIdentity(token); + Objects.requireNonNull(listener, "Thermal status listener cannot be null"); + Objects.requireNonNull(executor, "Executor cannot be null"); + synchronized (mThermalStatusListenerMap) { + Preconditions.checkArgument(!mThermalStatusListenerMap.containsKey(listener), + "Thermal status listener already registered: %s", listener); + IThermalStatusListener internalListener = new IThermalStatusListener.Stub() { + @Override + public void onStatusChange(int status) { + final long token = Binder.clearCallingIdentity(); + try { + executor.execute(() -> listener.onThermalStatusChanged(status)); + } finally { + Binder.restoreCallingIdentity(token); + } } + }; + try { + if (mThermalService.registerThermalStatusListener(internalListener)) { + mThermalStatusListenerMap.put(listener, internalListener); + } else { + throw new RuntimeException("Thermal status listener failed to set"); + } + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } - }; - try { - if (mThermalService.registerThermalStatusListener(internalListener)) { - mListenerMap.put(listener, internalListener); - } else { - throw new RuntimeException("Listener failed to set"); - } - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); } } @@ -2741,20 +2791,101 @@ public final class PowerManager { * @param listener listener to be removed */ public void removeThermalStatusListener(@NonNull OnThermalStatusChangedListener listener) { - Objects.requireNonNull(listener, "listener cannot be null"); - IThermalStatusListener internalListener = mListenerMap.get(listener); - Preconditions.checkArgument(internalListener != null, "Listener was not added"); - try { - if (mThermalService.unregisterThermalStatusListener(internalListener)) { - mListenerMap.remove(listener); - } else { - throw new RuntimeException("Listener failed to remove"); + Objects.requireNonNull(listener, "Thermal status listener cannot be null"); + synchronized (mThermalStatusListenerMap) { + IThermalStatusListener internalListener = mThermalStatusListenerMap.get(listener); + Preconditions.checkArgument(internalListener != null, + "Thermal status listener was not added"); + try { + if (mThermalService.unregisterThermalStatusListener(internalListener)) { + mThermalStatusListenerMap.remove(listener); + } else { + throw new RuntimeException("Failed to unregister thermal status listener"); + } + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); } } + /** + * This function adds a listener for thermal headroom change, listener callback will be + * enqueued tasks on the main thread + * + * @param listener listener to be added, + */ + @FlaggedApi(Flags.FLAG_ALLOW_THERMAL_THRESHOLDS_CALLBACK) + public void addThermalHeadroomListener(@NonNull OnThermalHeadroomChangedListener listener) { + Objects.requireNonNull(listener, "Thermal headroom listener cannot be null"); + addThermalHeadroomListener(mContext.getMainExecutor(), listener); + } + + /** + * This function adds a listener for thermal headroom change. + * + * @param executor {@link Executor} to handle listener callback. + * @param listener listener to be added. + */ + @FlaggedApi(Flags.FLAG_ALLOW_THERMAL_THRESHOLDS_CALLBACK) + public void addThermalHeadroomListener(@NonNull @CallbackExecutor Executor executor, + @NonNull OnThermalHeadroomChangedListener listener) { + Objects.requireNonNull(listener, "Thermal headroom listener cannot be null"); + Objects.requireNonNull(executor, "Executor cannot be null"); + synchronized (mThermalHeadroomListenerMap) { + Preconditions.checkArgument(!mThermalHeadroomListenerMap.containsKey(listener), + "Thermal headroom listener already registered: %s", listener); + IThermalHeadroomListener internalListener = new IThermalHeadroomListener.Stub() { + @Override + public void onHeadroomChange(float headroom, float forecastHeadroom, + int forecastSeconds, float[] thresholds) + throws RemoteException { + final Map<Integer, Float> map = convertThresholdsToMap(thresholds); + final long token = Binder.clearCallingIdentity(); + try { + executor.execute(() -> listener.onThermalHeadroomChanged(headroom, + forecastHeadroom, forecastSeconds, map)); + } finally { + Binder.restoreCallingIdentity(token); + } + } + }; + try { + if (mThermalService.registerThermalHeadroomListener(internalListener)) { + mThermalHeadroomListenerMap.put(listener, internalListener); + } else { + throw new RuntimeException("Thermal headroom listener failed to set"); + } + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + + /** + * This function removes a listener for Thermal headroom change + * + * @param listener listener to be removed + */ + @FlaggedApi(Flags.FLAG_ALLOW_THERMAL_THRESHOLDS_CALLBACK) + public void removeThermalHeadroomListener(@NonNull OnThermalHeadroomChangedListener listener) { + Objects.requireNonNull(listener, "Thermal headroom listener cannot be null"); + synchronized (mThermalHeadroomListenerMap) { + IThermalHeadroomListener internalListener = mThermalHeadroomListenerMap.get(listener); + Preconditions.checkArgument(internalListener != null, + "Thermal headroom listener was not added"); + try { + if (mThermalService.unregisterThermalHeadroomListener(internalListener)) { + mThermalHeadroomListenerMap.remove(listener); + } else { + throw new RuntimeException("Failed to unregister thermal status listener"); + } + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + + @CurrentTimeMillisLong private final AtomicLong mLastHeadroomUpdate = new AtomicLong(0L); private static final int MINIMUM_HEADROOM_TIME_MILLIS = 500; @@ -2794,7 +2925,8 @@ public final class PowerManager { * functionality or if this function is called significantly faster than once per * second. */ - public float getThermalHeadroom(@IntRange(from = 0, to = 60) int forecastSeconds) { + public @FloatRange(from = 0f) float getThermalHeadroom( + @IntRange(from = 0, to = 60) int forecastSeconds) { // Rate-limit calls into the thermal service long now = SystemClock.elapsedRealtime(); long timeSinceLastUpdate = now - mLastHeadroomUpdate.get(); @@ -2839,9 +2971,11 @@ public final class PowerManager { * headroom of 0.75 will never come with {@link #THERMAL_STATUS_MODERATE} but lower, and 0.65 * will never come with {@link #THERMAL_STATUS_LIGHT} but {@link #THERMAL_STATUS_NONE}. * <p> - * The returned map of thresholds will not change between calls to this function, so it's - * best to call this once on initialization. Modifying the result will not change the thresholds - * cached by the system, and a new call to the API will get a new copy. + * Starting at {@link android.os.Build.VERSION_CODES#BAKLAVA} the returned map of thresholds can + * change between calls to this function, one could use the new + * {@link #addThermalHeadroomListener(Executor, OnThermalHeadroomChangedListener)} API to + * register a listener and get callback for changes to thresholds. + * <p> * * @return map from each thermal status to its thermal headroom * @throws IllegalStateException if the thermal service is not ready @@ -2850,24 +2984,22 @@ public final class PowerManager { @FlaggedApi(Flags.FLAG_ALLOW_THERMAL_HEADROOM_THRESHOLDS) public @NonNull Map<@ThermalStatus Integer, Float> getThermalHeadroomThresholds() { try { - synchronized (mThermalHeadroomThresholdsLock) { - if (mThermalHeadroomThresholds == null) { - mThermalHeadroomThresholds = mThermalService.getThermalHeadroomThresholds(); - } - final ArrayMap<Integer, Float> ret = new ArrayMap<>(THERMAL_STATUS_SHUTDOWN); - for (int status = THERMAL_STATUS_LIGHT; status <= THERMAL_STATUS_SHUTDOWN; - status++) { - if (!Float.isNaN(mThermalHeadroomThresholds[status])) { - ret.put(status, mThermalHeadroomThresholds[status]); - } - } - return ret; - } + return convertThresholdsToMap(mThermalService.getThermalHeadroomThresholds()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } + private Map<@ThermalStatus Integer, Float> convertThresholdsToMap(final float[] thresholds) { + final ArrayMap<Integer, Float> ret = new ArrayMap<>(THERMAL_STATUS_SHUTDOWN); + for (int status = THERMAL_STATUS_LIGHT; status <= THERMAL_STATUS_SHUTDOWN; status++) { + if (!Float.isNaN(thresholds[status])) { + ret.put(status, thresholds[status]); + } + } + return ret; + } + /** * If true, the doze component is not started until after the screen has been * turned off and the screen off animation has been performed. diff --git a/core/java/android/os/UidBatteryConsumer.java b/core/java/android/os/UidBatteryConsumer.java index f893739fcf28..976bfe41ba45 100644 --- a/core/java/android/os/UidBatteryConsumer.java +++ b/core/java/android/os/UidBatteryConsumer.java @@ -210,12 +210,6 @@ public final class UidBatteryConsumer extends BatteryConsumer { serializer.attribute(null, BatteryUsageStats.XML_ATTR_HIGHEST_DRAIN_PACKAGE, packageWithHighestDrain); } - serializer.attributeLong(null, BatteryUsageStats.XML_ATTR_TIME_IN_FOREGROUND, - getTimeInProcessStateMs(PROCESS_STATE_FOREGROUND)); - serializer.attributeLong(null, BatteryUsageStats.XML_ATTR_TIME_IN_BACKGROUND, - getTimeInProcessStateMs(PROCESS_STATE_BACKGROUND)); - serializer.attributeLong(null, BatteryUsageStats.XML_ATTR_TIME_IN_FOREGROUND_SERVICE, - getTimeInProcessStateMs(PROCESS_STATE_FOREGROUND_SERVICE)); mPowerComponents.writeToXml(serializer); serializer.endTag(null, BatteryUsageStats.XML_TAG_UID); } @@ -235,13 +229,6 @@ public final class UidBatteryConsumer extends BatteryConsumer { consumerBuilder.setPackageWithHighestDrain( parser.getAttributeValue(null, BatteryUsageStats.XML_ATTR_HIGHEST_DRAIN_PACKAGE)); - consumerBuilder.setTimeInProcessStateMs(PROCESS_STATE_FOREGROUND, - parser.getAttributeLong(null, BatteryUsageStats.XML_ATTR_TIME_IN_FOREGROUND)); - consumerBuilder.setTimeInProcessStateMs(PROCESS_STATE_BACKGROUND, - parser.getAttributeLong(null, BatteryUsageStats.XML_ATTR_TIME_IN_BACKGROUND)); - consumerBuilder.setTimeInProcessStateMs(PROCESS_STATE_FOREGROUND_SERVICE, - parser.getAttributeLong(null, - BatteryUsageStats.XML_ATTR_TIME_IN_FOREGROUND_SERVICE)); while (!(eventType == XmlPullParser.END_TAG && parser.getName().equals(BatteryUsageStats.XML_TAG_UID)) && eventType != XmlPullParser.END_DOCUMENT) { @@ -335,7 +322,11 @@ public final class UidBatteryConsumer extends BatteryConsumer { /** * Sets the duration, in milliseconds, that this UID was active in a particular process * state, such as foreground service. + * + * @deprecated time in process is now derived from the + * {@link BatteryConsumer#POWER_COMPONENT_BASE} duration */ + @Deprecated @NonNull public Builder setTimeInProcessStateMs(@ProcessState int state, long timeInProcessStateMs) { Key key = getKey(POWER_COMPONENT_BASE, state); diff --git a/core/java/android/os/storage/IStorageManager.aidl b/core/java/android/os/storage/IStorageManager.aidl index 1ab48a22cbbd..09b96da39a84 100644 --- a/core/java/android/os/storage/IStorageManager.aidl +++ b/core/java/android/os/storage/IStorageManager.aidl @@ -181,6 +181,5 @@ interface IStorageManager { * device's useful lifetime remains. If no information is available, -1 * is returned. */ - @EnforcePermission("READ_PRIVILEGED_PHONE_STATE") int getInternalStorageRemainingLifetime() = 99; } diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig index bd6915d95b28..9e0d0e195a96 100644 --- a/core/java/android/permission/flags.aconfig +++ b/core/java/android/permission/flags.aconfig @@ -376,3 +376,12 @@ flag { description: "Enables SQlite for recording discrete and historical AppOp accesses" bug: "377584611" } + +flag { + name: "ranging_permission_enabled" + is_fixed_read_only: true + is_exported: true + namespace: "uwb" + description: "This fixed read-only flag is used to enable new ranging permission for all ranging use cases." + bug: "370977414" +} diff --git a/core/java/android/security/responsible_apis_flags.aconfig b/core/java/android/security/responsible_apis_flags.aconfig index 5995760a41ec..66e1f38621ae 100644 --- a/core/java/android/security/responsible_apis_flags.aconfig +++ b/core/java/android/security/responsible_apis_flags.aconfig @@ -67,6 +67,7 @@ flag { name: "aapm_api" namespace: "responsible_apis" description: "Android Advanced Protection Mode Service and Manager" + is_exported: true bug: "352420507" is_fixed_read_only: true } diff --git a/core/java/android/service/notification/flags.aconfig b/core/java/android/service/notification/flags.aconfig index 34e311f8c932..d065939bc19d 100644 --- a/core/java/android/service/notification/flags.aconfig +++ b/core/java/android/service/notification/flags.aconfig @@ -65,4 +65,11 @@ flag { namespace: "systemui" description: "Allows the NAS to create and modify conversation notifications" bug: "373599715" -}
\ No newline at end of file +} + +flag { + name: "notification_regroup_on_classification" + namespace: "systemui" + description: "This flag controls regrouping after notification classification" + bug: "372775153" +} diff --git a/core/java/android/view/ImeBackAnimationController.java b/core/java/android/view/ImeBackAnimationController.java index b80146505a1b..19e0913fbc65 100644 --- a/core/java/android/view/ImeBackAnimationController.java +++ b/core/java/android/view/ImeBackAnimationController.java @@ -33,6 +33,7 @@ import android.util.Log; import android.view.animation.BackGestureInterpolator; import android.view.animation.Interpolator; import android.view.animation.PathInterpolator; +import android.view.inputmethod.Flags; import android.view.inputmethod.ImeTracker; import android.window.BackEvent; import android.window.OnBackAnimationCallback; @@ -142,9 +143,15 @@ public class ImeBackAnimationController implements OnBackAnimationCallback { // control has been cancelled by the system. This can happen in multi-window mode for // example (i.e. split-screen or activity-embedding) notifyHideIme(); - return; + } else { + startPostCommitAnim(/*hideIme*/ true); + } + if (Flags.refactorInsetsController()) { + // Unregister all IME back callbacks so that back events are sent to the next callback + // even while the hide animation is playing + mInsetsController.getHost().getInputMethodManager().getImeOnBackInvokedDispatcher() + .preliminaryClear(); } - startPostCommitAnim(/*hideIme*/ true); } private void setPreCommitProgress(float progress) { diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java index 25d2246424de..26ca813a9caa 100644 --- a/core/java/android/view/InsetsController.java +++ b/core/java/android/view/InsetsController.java @@ -1344,6 +1344,11 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation boolean fromPredictiveBack) { final boolean visible = layoutInsetsDuringAnimation == LAYOUT_INSETS_DURING_ANIMATION_SHOWN; + if (Flags.refactorInsetsController() && !fromPredictiveBack && !visible + && (types & ime()) != 0 && (mRequestedVisibleTypes & ime()) != 0) { + // Clear IME back callbacks if a IME hide animation is requested + mHost.getInputMethodManager().getImeOnBackInvokedDispatcher().preliminaryClear(); + } // Basically, we accept the requested visibilities from the upstream callers... setRequestedVisibleTypes(visible ? types : 0, types); @@ -1921,6 +1926,14 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation final @InsetsType int requestedVisibleTypes = (mRequestedVisibleTypes & ~mask) | (visibleTypes & mask); if (mRequestedVisibleTypes != requestedVisibleTypes) { + if (Flags.refactorInsetsController() && (mRequestedVisibleTypes & ime()) == 0 + && (requestedVisibleTypes & ime()) != 0) { + // In case the IME back callbacks have been preliminarily cleared before, let's + // reregister them. This can happen if an IME hide animation was interrupted and the + // IME is requested to be shown again. + getHost().getInputMethodManager().getImeOnBackInvokedDispatcher() + .undoPreliminaryClear(); + } ProtoLog.d(IME_INSETS_CONTROLLER, "Setting requestedVisibleTypes to %d (was %d)", requestedVisibleTypes, mRequestedVisibleTypes); mRequestedVisibleTypes = requestedVisibleTypes; diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index 59a82bef1c92..fe4f0cd73fff 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -5492,26 +5492,6 @@ public class AccessibilityNodeInfo implements Parcelable { } } - private static String getExpandedStateSymbolicName(int state) { - if (Flags.a11yExpansionStateApi()) { - switch (state) { - case EXPANDED_STATE_UNDEFINED: - return "EXPANDED_STATE_UNDEFINED"; - case EXPANDED_STATE_COLLAPSED: - return "EXPANDED_STATE_COLLAPSED"; - case EXPANDED_STATE_PARTIAL: - return "EXPANDED_STATE_PARTIAL"; - case EXPANDED_STATE_FULL: - return "EXPANDED_STATE_FULL"; - default: - throw new IllegalArgumentException("Unknown expanded state: " + state); - } - } else { - // TODO(b/362782158) Remove when flag is removed. - return ""; - } - } - private static boolean canPerformRequestOverConnection(int connectionId, int windowId, long accessibilityNodeId) { final boolean hasWindowId = windowId != AccessibilityWindowInfo.UNDEFINED_WINDOW_ID; @@ -5609,7 +5589,6 @@ public class AccessibilityNodeInfo implements Parcelable { builder.append("; containerTitle: ").append(mContainerTitle); builder.append("; viewIdResName: ").append(mViewIdResourceName); builder.append("; uniqueId: ").append(mUniqueId); - builder.append("; expandedState: ").append(getExpandedStateSymbolicName(mExpandedState)); builder.append("; checkable: ").append(isCheckable()); builder.append("; checked: ").append(isChecked()); builder.append("; focusable: ").append(isFocusable()); diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 7dc77b175c79..73f9d9fc23dc 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -3667,6 +3667,14 @@ public final class InputMethodManager { } /** + * Returns the ImeOnBackInvokedDispatcher. + * @hide + */ + public ImeOnBackInvokedDispatcher getImeOnBackInvokedDispatcher() { + return mImeDispatcher; + } + + /** * Check the next served view if needs to start input. */ @GuardedBy("mH") diff --git a/core/java/android/window/ImeOnBackInvokedDispatcher.java b/core/java/android/window/ImeOnBackInvokedDispatcher.java index bd01899a649b..c67b9cac250b 100644 --- a/core/java/android/window/ImeOnBackInvokedDispatcher.java +++ b/core/java/android/window/ImeOnBackInvokedDispatcher.java @@ -203,6 +203,34 @@ public class ImeOnBackInvokedDispatcher implements OnBackInvokedDispatcher, Parc mImeCallbacks.remove(callback); } + /** + * Unregisters all callbacks on the receiving dispatcher but keeps a reference of the callbacks + * in case the clearance is reverted in + * {@link ImeOnBackInvokedDispatcher#undoPreliminaryClear()}. + */ + public void preliminaryClear() { + // Unregister previously registered callbacks if there's any. + if (getReceivingDispatcher() != null) { + for (ImeOnBackInvokedCallback callback : mImeCallbacks) { + getReceivingDispatcher().unregisterOnBackInvokedCallback(callback); + } + } + } + + /** + * Reregisters all callbacks on the receiving dispatcher that have previously been cleared by + * calling {@link ImeOnBackInvokedDispatcher#preliminaryClear()}. This can happen if an IME hide + * animation is interrupted causing the IME to reappear. + */ + public void undoPreliminaryClear() { + if (getReceivingDispatcher() != null) { + for (ImeOnBackInvokedCallback callback : mImeCallbacks) { + getReceivingDispatcher().registerOnBackInvokedCallbackUnchecked(callback, + callback.mPriority); + } + } + } + /** Clears all registered callbacks on the instance. */ public void clear() { // Unregister previously registered callbacks if there's any. diff --git a/core/java/android/window/TransitionFilter.java b/core/java/android/window/TransitionFilter.java index 8bb4c526b20d..61fc6226f822 100644 --- a/core/java/android/window/TransitionFilter.java +++ b/core/java/android/window/TransitionFilter.java @@ -17,6 +17,7 @@ package android.window; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; +import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.view.WindowManager.TransitionType; import android.annotation.IntDef; @@ -189,6 +190,8 @@ public final class TransitionFilter implements Parcelable { public Boolean mCustomAnimation = null; public IBinder mTaskFragmentToken = null; + public int mWindowingMode = WINDOWING_MODE_UNDEFINED; + public Requirement() { } @@ -206,6 +209,7 @@ public final class TransitionFilter implements Parcelable { final int customAnimRaw = in.readInt(); mCustomAnimation = customAnimRaw == 0 ? null : Boolean.valueOf(customAnimRaw == 2); mTaskFragmentToken = in.readStrongBinder(); + mWindowingMode = in.readInt(); } /** Go through changes and find if at-least one change matches this filter */ @@ -270,6 +274,12 @@ public final class TransitionFilter implements Parcelable { continue; } } + if (mWindowingMode != WINDOWING_MODE_UNDEFINED) { + if (change.getTaskInfo() == null + || change.getTaskInfo().getWindowingMode() != mWindowingMode) { + continue; + } + } return true; } return false; @@ -322,6 +332,7 @@ public final class TransitionFilter implements Parcelable { int customAnimRaw = mCustomAnimation == null ? 0 : (mCustomAnimation ? 2 : 1); dest.writeInt(customAnimRaw); dest.writeStrongBinder(mTaskFragmentToken); + dest.writeInt(mWindowingMode); } @NonNull @@ -369,6 +380,8 @@ public final class TransitionFilter implements Parcelable { if (mTaskFragmentToken != null) { out.append(" taskFragmentToken=").append(mTaskFragmentToken); } + out.append(" windowingMode=" + + WindowConfiguration.windowingModeToString(mWindowingMode)); out.append("}"); return out.toString(); } diff --git a/core/java/android/window/flags/lse_desktop_experience.aconfig b/core/java/android/window/flags/lse_desktop_experience.aconfig index 731d10048d7c..d39ecabbb2d2 100644 --- a/core/java/android/window/flags/lse_desktop_experience.aconfig +++ b/core/java/android/window/flags/lse_desktop_experience.aconfig @@ -96,6 +96,16 @@ flag { } flag { + name: "enable_accessible_custom_headers" + namespace: "lse_desktop_experience" + description: "Enables a11y-friendly custom header input handling" + bug: "339302584" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "enable_app_header_with_task_density" namespace: "lse_desktop_experience" description: "Matches the App Header density to that of the app window, instead of SysUI's" diff --git a/core/java/com/android/internal/compat/AndroidBuildClassifier.java b/core/java/com/android/internal/compat/AndroidBuildClassifier.java index 364db06976a0..19f8889996dc 100644 --- a/core/java/com/android/internal/compat/AndroidBuildClassifier.java +++ b/core/java/com/android/internal/compat/AndroidBuildClassifier.java @@ -22,6 +22,7 @@ import android.os.Build; * Platform private class for determining the type of Android build installed. * */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public class AndroidBuildClassifier { public boolean isDebuggableBuild() { diff --git a/core/java/com/android/internal/compat/ChangeReporter.java b/core/java/com/android/internal/compat/ChangeReporter.java index f61157175f9d..f714098e8bc4 100644 --- a/core/java/com/android/internal/compat/ChangeReporter.java +++ b/core/java/com/android/internal/compat/ChangeReporter.java @@ -42,6 +42,7 @@ import java.util.function.Function; * * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public class ChangeReporter { private static final String TAG = "CompatChangeReporter"; private static final Function<Integer, Set<ChangeReport>> NEW_CHANGE_REPORT_SET = diff --git a/core/java/com/android/internal/compat/CompatibilityChangeConfig.java b/core/java/com/android/internal/compat/CompatibilityChangeConfig.java index 182dba71d0d7..8fd914aecf55 100644 --- a/core/java/com/android/internal/compat/CompatibilityChangeConfig.java +++ b/core/java/com/android/internal/compat/CompatibilityChangeConfig.java @@ -28,6 +28,7 @@ import java.util.Set; * Parcelable containing compat config overrides for a given application. * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class CompatibilityChangeConfig implements Parcelable { private final ChangeConfig mChangeConfig; diff --git a/core/java/com/android/internal/compat/CompatibilityChangeInfo.java b/core/java/com/android/internal/compat/CompatibilityChangeInfo.java index 03fe4551c249..505fd2319a6b 100644 --- a/core/java/com/android/internal/compat/CompatibilityChangeInfo.java +++ b/core/java/com/android/internal/compat/CompatibilityChangeInfo.java @@ -25,6 +25,7 @@ import android.os.Parcelable; * * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public class CompatibilityChangeInfo implements Parcelable { private final long mChangeId; private final @Nullable String mName; diff --git a/core/java/com/android/internal/compat/CompatibilityOverrideConfig.java b/core/java/com/android/internal/compat/CompatibilityOverrideConfig.java index 9a02b7b7aae9..32206c9950dd 100644 --- a/core/java/com/android/internal/compat/CompatibilityOverrideConfig.java +++ b/core/java/com/android/internal/compat/CompatibilityOverrideConfig.java @@ -28,6 +28,7 @@ import java.util.Map; * Parcelable containing compat config overrides for a given application. * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class CompatibilityOverrideConfig implements Parcelable { public final Map<Long, PackageOverride> overrides; diff --git a/core/java/com/android/internal/compat/CompatibilityOverridesByPackageConfig.java b/core/java/com/android/internal/compat/CompatibilityOverridesByPackageConfig.java index 8652bb6d05e4..998b48a8a76e 100644 --- a/core/java/com/android/internal/compat/CompatibilityOverridesByPackageConfig.java +++ b/core/java/com/android/internal/compat/CompatibilityOverridesByPackageConfig.java @@ -26,6 +26,7 @@ import java.util.Map; * Parcelable containing compat config overrides by application. * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class CompatibilityOverridesByPackageConfig implements Parcelable { public final Map<String, CompatibilityOverrideConfig> packageNameToOverrides; diff --git a/core/java/com/android/internal/compat/CompatibilityOverridesToRemoveByPackageConfig.java b/core/java/com/android/internal/compat/CompatibilityOverridesToRemoveByPackageConfig.java index b408d6440070..c0e2217d509e 100644 --- a/core/java/com/android/internal/compat/CompatibilityOverridesToRemoveByPackageConfig.java +++ b/core/java/com/android/internal/compat/CompatibilityOverridesToRemoveByPackageConfig.java @@ -29,6 +29,7 @@ import java.util.Map; * IDs. * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class CompatibilityOverridesToRemoveByPackageConfig implements Parcelable { public final Map<String, CompatibilityOverridesToRemoveConfig> packageNameToOverridesToRemove; diff --git a/core/java/com/android/internal/compat/CompatibilityOverridesToRemoveConfig.java b/core/java/com/android/internal/compat/CompatibilityOverridesToRemoveConfig.java index e85afefdc39a..10461ec0b4c6 100644 --- a/core/java/com/android/internal/compat/CompatibilityOverridesToRemoveConfig.java +++ b/core/java/com/android/internal/compat/CompatibilityOverridesToRemoveConfig.java @@ -30,6 +30,7 @@ import java.util.Set; * <p>This class is separate from CompatibilityOverrideConfig since we only need change IDs. * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class CompatibilityOverridesToRemoveConfig implements Parcelable { public final Set<Long> changeIds; diff --git a/core/java/com/android/internal/compat/OverrideAllowedState.java b/core/java/com/android/internal/compat/OverrideAllowedState.java index e408be2ab471..f018c3a830bd 100644 --- a/core/java/com/android/internal/compat/OverrideAllowedState.java +++ b/core/java/com/android/internal/compat/OverrideAllowedState.java @@ -27,6 +27,7 @@ import java.lang.annotation.RetentionPolicy; /** * This class contains all the possible override allowed states. */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class OverrideAllowedState implements Parcelable { @IntDef({ ALLOWED, diff --git a/core/java/com/android/internal/ravenwood/RavenwoodEnvironment.java b/core/java/com/android/internal/ravenwood/RavenwoodEnvironment.java index a69d2e4f4dca..3303d875c427 100644 --- a/core/java/com/android/internal/ravenwood/RavenwoodEnvironment.java +++ b/core/java/com/android/internal/ravenwood/RavenwoodEnvironment.java @@ -15,6 +15,12 @@ */ package com.android.internal.ravenwood; +import static android.os.Build.VERSION_CODES.S; +import static android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE; + +import android.compat.annotation.ChangeId; +import android.compat.annotation.Disabled; +import android.compat.annotation.EnabledAfter; import android.ravenwood.annotation.RavenwoodKeepWholeClass; import android.ravenwood.annotation.RavenwoodRedirect; import android.ravenwood.annotation.RavenwoodRedirectionClass; @@ -78,4 +84,20 @@ public final class RavenwoodEnvironment { public String getRavenwoodRuntimePath() { throw notSupportedOnDevice(); } + + /** @hide */ + public static class CompatIdsForTest { + // Enabled by default + @ChangeId + public static final long TEST_COMPAT_ID_1 = 368131859L; + + @Disabled + @ChangeId public static final long TEST_COMPAT_ID_2 = 368131701L; + + @EnabledAfter(targetSdkVersion = S) + @ChangeId public static final long TEST_COMPAT_ID_3 = 368131659L; + + @EnabledAfter(targetSdkVersion = UPSIDE_DOWN_CAKE) + @ChangeId public static final long TEST_COMPAT_ID_4 = 368132057L; + } } diff --git a/core/res/Android.bp b/core/res/Android.bp index f6ca8218926c..66c2e12f7cdf 100644 --- a/core/res/Android.bp +++ b/core/res/Android.bp @@ -171,6 +171,7 @@ android_app { "android.security.flags-aconfig", "com.android.hardware.input.input-aconfig", "aconfig_trade_in_mode_flags", + "ranging_aconfig_flags", ], } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 0479318ad9ed..5913992004b8 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2412,6 +2412,16 @@ android:label="@string/permlab_nearby_wifi_devices" android:protectionLevel="dangerous" /> + <!-- Required to be able to range to devices using generic ranging module. + @FlaggedApi("android.permission.flags.ranging_permission_enabled") + <p>Protection level: dangerous --> + <permission android:name="android.permission.RANGING" + android:permissionGroup="android.permission-group.UNDEFINED" + android:description="@string/permdesc_ranging" + android:label="@string/permlab_ranging" + android:protectionLevel="dangerous" + android:featureFlag="android.permission.flags.ranging_permission_enabled"/> + <!-- @SystemApi @TestApi Allows an application to suspend other apps, which will prevent the user from using them until they are unsuspended. @hide diff --git a/core/res/res/drawable/ic_zen_mode_type_unknown.xml b/core/res/res/drawable/ic_zen_mode_icon_star_badge.xml index 04df5f91fd68..04df5f91fd68 100644 --- a/core/res/res/drawable/ic_zen_mode_type_unknown.xml +++ b/core/res/res/drawable/ic_zen_mode_icon_star_badge.xml diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index ccc584a0710b..1e3f40296b43 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Naweek"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Geleentheid"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Slaap"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Moenie Steur Nie (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> tot <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Enige kalender"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Stuur en ontvang boodskappe sonder ’n selfoon- of wi-fi-netwerk"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Maak Boodskappe oop"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Hoe dit werk"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Skakel “Kies netwerk outomaties” aan"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Skakel “Kies netwerk outomaties” in Instellings aan sodat jou foon ’n netwerk kan vind wat met satelliet werk"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Skakel aan"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Gaan terug"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Hangend …"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Hangend …"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Stel Vingerafdrukslot weer op"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> kan nie meer herken word nie."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> en <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> kan nie meer herken word nie."</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 22dc49ca7fb8..91b4ef017014 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"አትረብሽ (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"ከ<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"ያለ ሞባይል ወይም የWi-Fi አውታረ መረብ መልዕክቶችን ይላኩ እና ይቀበሉ"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"መልዕክቶች ይክፈቱ"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"እንዴት እንደሚሠራ"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"«አውታረ መረብን በራስ-ሰር ምረጥ» የሚለውን ያብሩ"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"ስልክዎ ከሳተላይት ጋር የሚሠራ አውታረ መረብ እንዲያገኝ በቅንብሮች ውስጥ «አውታረ መረብን በራስ-ሰር ምረጥ» የሚለውን ያብሩ"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"አብራ"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"ወደኋላ ተመለስ"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"በመጠባበቅ ላይ..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"በመጠባበቅ ላይ..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"በጣት አሻራ መክፈቻን እንደገና ያዋቅሩ"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> ከእንግዲህ መለየት አይችልም።"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> እና <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> ከእንግዲህ መለየት አይችሉም።"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 1aaad07761e1..6e5dcd36fd31 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -1942,13 +1942,13 @@ <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_implicit_name" msgid="177586786232302019">"عدم الإزعاج (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"من <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> @@ -2430,15 +2430,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"يمكنك إرسال الرسائل واستلامها بدون شبكة الجوّال أو شبكة Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"فتح تطبيق \"الرسائل\""</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"طريقة العمل"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"تفعيل الإعداد \"اختيار الشبكة تلقائيًا\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"يمكنك تفعيل الإعداد \"اختيار الشبكة تلقائيًا\" من خلال \"الإعدادات\" لكي يتمكّن هاتفك من العثور على شبكة تعمل مع القمر الصناعي"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"تفعيل"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"رجوع"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"بانتظار الإزالة من الأرشيف…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"بانتظار الإزالة من الأرشيف…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"إعادة إعداد ميزة \"فتح الجهاز ببصمة الإصبع\""</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"لا يمكن بعد الآن التعرّف على \"<xliff:g id="FINGERPRINT">%s</xliff:g>\"."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"لا يمكن بعد الآن التعرّف على \"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g>\" و\"<xliff:g id="FINGERPRINT_1">%2$s</xliff:g>\"."</string> diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml index 74d8ed67543d..1af7810acfeb 100644 --- a/core/res/res/values-as/strings.xml +++ b/core/res/res/values-as/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"অসুবিধা নিদিব (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"আপুনি কোনো ম’বাইল বা ৱাই-ফাই নেটৱৰ্ক নোহোৱাকৈ বাৰ্তা পঠিয়াওক আৰু লাভ কৰক"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages খোলক"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"ই কেনেকৈ কাম কৰে"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"স্বয়ংক্ৰিয়ভাৱে নেটৱৰ্ক বাছনি কৰক\" অন কৰক"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"ছেটিঙত \"স্বয়ংক্ৰিয়ভাৱে নেটৱৰ্ক বাছনি কৰক\" অন কৰক, যাতে আপোনাৰ ফ’নটোৱে উপগ্ৰহৰ সৈতে কাম কৰা এটা নেটৱৰ্ক বিচাৰি পাব পাৰে"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"অন কৰক"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"উভতি যাওক"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"বিবেচনাধীন হৈ আছে..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"বিবেচনাধীন হৈ আছে..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"ফিংগাৰপ্ৰিণ্ট আনলক পুনৰ ছেট আপ কৰক"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> আৰু চিনাক্ত কৰিব নোৱাৰি।"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> আৰু <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> আৰু চিনাক্ত কৰিব নোৱাৰি।"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index 22e86dfc089f..1ba96fea7a19 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Həftə sonu"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Tədbir"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Yuxu vaxtı"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Narahat Etməyin (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"İstənilən təqvim"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Mobil və ya Wi-Fi şəbəkəsi olmadan mesajlar göndərin və qəbul edin"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Mesajı açın"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Haqqında"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"Avtomatik şəbəkə seçin\" funksiyasını aktiv edin"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Telefonunuzun peyklə işləyən şəbəkə tapa bilməsi üçün Ayarlarda \"Avtomatik şəbəkə seçin\" funksiyasını aktiv edin"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Aktiv edin"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Geri qayıdın"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Gözləmədə..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Gözləmədə..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Barmaqla Kilidaçmanı yenidən ayarlayın"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> artıq tanınmır."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> və <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> artıq tanınmır."</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index b9f909f74ca2..4c78d30c874e 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -1939,13 +1939,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Vikend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Događaj"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Spavanje"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Ne uznemiravaj (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"Bilo koji kalendar"</string> <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> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Šaljite i primajte poruke bez mobilne ili WiFi mreže"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Otvori Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Princip rada"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Uključite opciju Automatski izaberi mrežu"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Uključite opciju Automatski izaberi mrežu u Podešavanjima da bi telefon mogao da pronađe mrežu koja radi sa satelitom"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Uključi"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Nazad"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Na čekanju..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Na čekanju..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Ponovo podesite otključavanje otiskom prsta"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> više ne može da se prepozna."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> i <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> više ne mogu da se prepoznaju."</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index b2520944e3ff..549ec78cc7d8 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -1940,13 +1940,13 @@ <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_implicit_name" msgid="177586786232302019">"Не турбаваць (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2428,15 +2428,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Вы можаце адпраўляць і атрымліваць паведамленні, калі падключэнне да мабільнай сеткі або сеткі Wi-Fi адсутнічае"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Адкрыць Паведамленні"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Як гэта працуе"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Уключыце параметр \"Выбіраць сетку аўтаматычна\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Уключыце ў наладах параметр \"Выбіраць сетку аўтаматычна\", каб ваш тэлефон мог знаходзіць сетку, якая працуе са спадарожнікам"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Уключыць"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Назад"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"У чаканні..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"У чаканні..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Наладзіць разблакіроўку адбіткам пальца паўторна"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Адбітак пальца \"<xliff:g id="FINGERPRINT">%s</xliff:g>\" больш не можа быць распазнаны."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Адбіткі пальцаў \"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g>\" і \"<xliff:g id="FINGERPRINT_1">%2$s</xliff:g>\" больш не могуць быць распазнаны."</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index e5a08bb8c1fb..40aae5144448 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"Не безпокойте (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"От <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Изпращайте и получавайте съобщения без мобилна или Wi-Fi мрежа"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Отваряне на Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Начин на работа"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Включване на „Автоматично избиране на мрежа“"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Включете „Автоматично избиране на мрежа“ в „Настройки“, за да може телефонът ви да намери мрежа, която работи със сателит"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Включване"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Назад"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Изчаква..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Изчаква..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Повторно настройване на „Отключване с отпечатък“"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> вече не може да се разпознае."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> и <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> вече не могат да бъдат разпознати."</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index df8a90841215..32077d8a4374 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"বিরক্ত করবে না (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"কোনও মেবাইল বা ওয়াই-ফাই নেটওয়ার্ক ছাড়াই মেসেজ পাঠান ও রিসিভ করুন"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages খুলুন"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"এটি কীভাবে কাজ করে"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"নেটওয়ার্ক অটোমেটিক বেছে নিন\" বিকল্প চালু করুন"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"সেটিংসে \"নেটওয়ার্ক অটোমেটিক বেছে নিন\" বিকল্পটি চালু করলে আপনার ফোন এমন নেটওয়ার্ক বেছে নিতে পারবে যা স্যাটেলাইটের মাধ্যমে কাজ করে"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"চালু করুন"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"ফিরে যান"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"বাকি আছে…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"বাকি আছে…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"\'ফিঙ্গারপ্রিন্ট আনলক\' আবার সেট-আপ করুন"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> আর শনাক্ত করা যাবে না।"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> ও <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> আর শনাক্ত করা যাবে না।"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index 35e30ba16e4c..266dee2b984a 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -76,7 +76,7 @@ <string name="CLIRPermanent" msgid="166443681876381118">"Ne možete promijeniti postavke ID-a pozivaoca."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Prijenos podataka usmjeravanjem na <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> <string name="auto_data_switch_content" msgid="803557715007110959">"Ove postavke možete uvijek promijeniti u Postavkama"</string> - <string name="RestrictedOnDataTitle" msgid="1500576417268169774">"Nema usluge prijenosa podataka na mobilnoj mreži"</string> + <string name="RestrictedOnDataTitle" msgid="1500576417268169774">"Nema usluge prenosa podataka na mobilnoj mreži"</string> <string name="RestrictedOnEmergencyTitle" msgid="2852916906106191866">"Hitni pozivi su nedostupni"</string> <string name="RestrictedOnNormalTitle" msgid="7009474589746551737">"Nema usluge govornih poziva"</string> <string name="RestrictedOnAllVoiceTitle" msgid="3982069078579103087">"Nema glasovne usluge ili hitnih poziva"</string> @@ -89,7 +89,7 @@ <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> - <string name="notification_channel_mobile_data_status" msgid="1941911162076442474">"Status prijenosa podataka na mobilnoj mreži"</string> + <string name="notification_channel_mobile_data_status" msgid="1941911162076442474">"Status prenosa podataka na mobilnoj mreži"</string> <string name="notification_channel_sms" msgid="1243384981025535724">"SMS poruke"</string> <string name="notification_channel_voice_mail" msgid="8457433203106654172">"Poruke govorne pošte"</string> <string name="notification_channel_wfc" msgid="9048240466765169038">"Pozivanje putem WiFi-ja"</string> @@ -310,7 +310,7 @@ <string name="notification_channel_display" msgid="6905032605735615090">"Ekran"</string> <string name="foreground_service_app_in_background" msgid="1439289699671273555">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> troši bateriju"</string> <string name="foreground_service_apps_in_background" msgid="7340037176412387863">"Broj aplikacija koje troše bateriju: <xliff:g id="NUMBER">%1$d</xliff:g>"</string> - <string name="foreground_service_tap_for_details" msgid="9078123626015586751">"Dodirnite za detalje o potrošnji baterije i prijenosa podataka"</string> + <string name="foreground_service_tap_for_details" msgid="9078123626015586751">"Dodirnite za detalje o potrošnji baterije i prenosa podataka"</string> <string name="foreground_service_multiple_separator" msgid="5002287361849863168">"<xliff:g id="LEFT_SIDE">%1$s</xliff:g>, <xliff:g id="RIGHT_SIDE">%2$s</xliff:g>"</string> <string name="safeMode" msgid="8974401416068943888">"Siguran način rada"</string> <string name="android_system_label" msgid="5974767339591067210">"Sistem Android"</string> @@ -812,7 +812,7 @@ <string name="permlab_accessDrmCertificates" msgid="6473765454472436597">"pristupi DRM certifikatima"</string> <string name="permdesc_accessDrmCertificates" msgid="6983139753493781941">"Dozvoljava aplikaciji da obezbijedi i koristi DRM certifikate. Nije potrebno za obične aplikacije."</string> <string name="permlab_handoverStatus" msgid="7620438488137057281">"prijem statusa prebacivanja preko Android prebacivanja"</string> - <string name="permdesc_handoverStatus" msgid="3842269451732571070">"Dozvoljava aplikaciji prijem informacija o trenutnim prijenosima putem funkcije Android Beam"</string> + <string name="permdesc_handoverStatus" msgid="3842269451732571070">"Dozvoljava aplikaciji prijem informacija o trenutnim prenosima putem funkcije Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="710576248717404416">"ukloni DRM certifikate"</string> <string name="permdesc_removeDrmCertificates" msgid="4068445390318355716">"Dozvoljava aplikaciji da ukloni DRM certifikate. Nije potrebno za obične aplikacije."</string> <string name="permlab_bindCarrierMessagingService" msgid="3363450860593096967">"poveži sa servisom za poruke operatera"</string> @@ -1163,7 +1163,7 @@ <string name="duration_days_relative_future" msgid="8870658635774250746">"{count,plural, =1{# dan}one{# dan}few{# dana}other{# dana}}"</string> <string name="duration_years_relative_future" msgid="8855853883925918380">"{count,plural, =1{# godina}one{# godina}few{# godine}other{# godina}}"</string> <string name="VideoView_error_title" msgid="5750686717225068016">"Problem sa prikazom video sadržaja"</string> - <string name="VideoView_error_text_invalid_progressive_playback" msgid="3782449246085134720">"Prijenos ovog video sadržaja ne može se izvršiti na ovom uređaju."</string> + <string name="VideoView_error_text_invalid_progressive_playback" msgid="3782449246085134720">"Prenos ovog video sadržaja ne može se izvršiti na ovom uređaju."</string> <string name="VideoView_error_text_unknown" msgid="7658683339707607138">"Greška prilikom reproduciranja video sadržaja."</string> <string name="VideoView_error_button" msgid="5138809446603764272">"Uredu"</string> <string name="relative_time" msgid="8572030016028033243">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string> @@ -1478,7 +1478,7 @@ <string name="ext_media_missing_message" msgid="4408988706227922909">"Ponovo umetnite uređaj"</string> <string name="ext_media_move_specific_title" msgid="8492118544775964250">"Premješta se <xliff:g id="NAME">%s</xliff:g>"</string> <string name="ext_media_move_title" msgid="2682741525619033637">"Premještanje podataka"</string> - <string name="ext_media_move_success_title" msgid="4901763082647316767">"Prijenos sadržaja je završen"</string> + <string name="ext_media_move_success_title" msgid="4901763082647316767">"Prenos sadržaja je završen"</string> <string name="ext_media_move_success_message" msgid="9159542002276982979">"Sadržaj je premješten na uređaj <xliff:g id="NAME">%s</xliff:g>"</string> <string name="ext_media_move_failure_title" msgid="3184577479181333665">"Nije moguće premjestiti sadržaj"</string> <string name="ext_media_move_failure_message" msgid="4197306718121869335">"Pokušajte ponovo premjestiti sadržaj"</string> @@ -1620,9 +1620,9 @@ <string name="storage_usb_drive_label" msgid="6631740655876540521">"<xliff:g id="MANUFACTURER">%s</xliff:g> USB disk"</string> <string name="storage_usb" msgid="2391213347883616886">"USB pohrana"</string> <string name="extract_edit_menu_button" msgid="63954536535863040">"Uredi"</string> - <string name="data_usage_warning_title" msgid="9034893717078325845">"Upozorenje o prijenosu podataka"</string> + <string name="data_usage_warning_title" msgid="9034893717078325845">"Upozorenje o prenosu podataka"</string> <string name="data_usage_warning_body" msgid="1669325367188029454">"Potrošili ste <xliff:g id="APP">%s</xliff:g> podataka"</string> - <string name="data_usage_mobile_limit_title" msgid="3911447354393775241">"Dostignuto ograničenje za prijenos podataka"</string> + <string name="data_usage_mobile_limit_title" msgid="3911447354393775241">"Dostignuto ograničenje za prenos podataka"</string> <string name="data_usage_wifi_limit_title" msgid="2069698056520812232">"Dostignut limit WiFi podataka"</string> <string name="data_usage_limit_body" msgid="3567699582000085710">"Prijenos podataka je pauziran do kraja ciklusa"</string> <string name="data_usage_mobile_limit_snoozed_title" msgid="101888478915677895">"Pređen limit mobilnih podataka"</string> @@ -1915,7 +1915,7 @@ <string name="confirm_battery_saver" msgid="5247976246208245754">"Uredu"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Ušteda baterije uključuje tamnu temu i ograničava ili isključuje aktivnost u pozadini, određene vizuelne efekte i funkcije te neke mrežne veze."</string> <string name="battery_saver_description" msgid="8518809702138617167">"Ušteda baterije uključuje tamnu temu i ograničava ili isključuje aktivnost u pozadini, određene vizuelne efekte i funkcije te neke mrežne veze."</string> - <string name="data_saver_description" msgid="4995164271550590517">"Radi smanjenja prijenosa podataka, Ušteda podataka sprečava da neke aplikacije šalju ili primaju podatke u pozadini. Aplikacija koju trenutno koristite može pristupati podacima, ali će to činiti rjeđe. Naprimjer, to može značiti da se slike ne prikazuju dok ih ne dodirnete."</string> + <string name="data_saver_description" msgid="4995164271550590517">"Radi smanjenja prenosa podataka, Ušteda podataka sprečava da neke aplikacije šalju ili primaju podatke u pozadini. Aplikacija koju trenutno koristite može pristupati podacima, ali će to činiti rjeđe. Naprimjer, to može značiti da se slike ne prikazuju dok ih ne dodirnete."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Uključiti Uštedu podataka?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Uključi"</string> <string name="zen_mode_duration_minutes_summary" msgid="4555514757230849789">"{count,plural, =1{Traje jednu minutu (do {formattedTime})}one{Traje # min (do {formattedTime})}few{Traje # min (do {formattedTime})}other{Traje # min (do {formattedTime})}}"</string> @@ -1939,13 +1939,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Vikend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Događaj"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Spavanje"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Ne ometaj (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"Bilo koji kalendar"</string> <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> @@ -2028,9 +2028,9 @@ <string name="app_streaming_blocked_message" product="tv" msgid="4003011766528814377">"Trenutno ne možete pristupiti ovoj aplikaciji na uređaju <xliff:g id="DEVICE">%1$s</xliff:g>. Umjesto toga pokušajte na uređaju Android TV."</string> <string name="app_streaming_blocked_message" product="tablet" msgid="4242053045964946062">"Trenutno ne možete pristupiti ovoj aplikaciji na uređaju <xliff:g id="DEVICE">%1$s</xliff:g>. Umjesto toga pokušajte na tabletu."</string> <string name="app_streaming_blocked_message" product="default" msgid="6159168735030739398">"Trenutno ne možete pristupiti ovoj aplikaciji na uređaju <xliff:g id="DEVICE">%1$s</xliff:g>. Umjesto toga pokušajte na telefonu."</string> - <string name="app_streaming_blocked_message_for_permission_request" product="tv" msgid="4706276040125072077">"Aplikacija traži dodatna odobrenja, ali se ona ne mogu dati u sesiji prijenosa. Prvo dajte odobrenje na Android TV uređaju."</string> - <string name="app_streaming_blocked_message_for_permission_request" product="tablet" msgid="1824604581465771629">"Aplikacija traži dodatna odobrenja, ali se ona ne mogu dati u sesiji prijenosa. Prvo dajte odobrenje na tabletu."</string> - <string name="app_streaming_blocked_message_for_permission_request" product="default" msgid="7755223160363292105">"Aplikacija traži dodatna odobrenja, ali se ona ne mogu dati u sesiji prijenosa. Prvo dodajte odobrenje na telefonu."</string> + <string name="app_streaming_blocked_message_for_permission_request" product="tv" msgid="4706276040125072077">"Aplikacija traži dodatna odobrenja, ali se ona ne mogu dati u sesiji prenosa. Prvo dajte odobrenje na Android TV uređaju."</string> + <string name="app_streaming_blocked_message_for_permission_request" product="tablet" msgid="1824604581465771629">"Aplikacija traži dodatna odobrenja, ali se ona ne mogu dati u sesiji prenosa. Prvo dajte odobrenje na tabletu."</string> + <string name="app_streaming_blocked_message_for_permission_request" product="default" msgid="7755223160363292105">"Aplikacija traži dodatna odobrenja, ali se ona ne mogu dati u sesiji prenosa. Prvo dodajte odobrenje na telefonu."</string> <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tv" msgid="3470977315395784567">"Ova aplikacija zahtijeva dodatnu sigurnost. Umjesto toga pokušajte na uređaju Android TV."</string> <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tablet" msgid="698460091901465092">"Ova aplikacija zahtijeva dodatnu sigurnost. Umjesto toga pokušajte na tabletu."</string> <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="default" msgid="8552691971910603907">"Ova aplikacija zahtijeva dodatnu sigurnost. Umjesto toga pokušajte na telefonu."</string> @@ -2373,8 +2373,8 @@ <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Provjerite aktivne aplikacije"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Nije moguće pristupiti kameri telefona s uređaja <xliff:g id="DEVICE">%1$s</xliff:g>"</string> <string name="vdm_camera_access_denied" product="tablet" msgid="6895968310395249076">"Nije moguće pristupiti kameri tableta s uređaja <xliff:g id="DEVICE">%1$s</xliff:g>"</string> - <string name="vdm_secure_window" msgid="161700398158812314">"Ovom ne možete pristupiti tokom prijenosa. Umjesto toga pokušajte na telefonu."</string> - <string name="vdm_pip_blocked" msgid="4036107522497281397">"Tokom prijenosa nije moguće gledati sliku u slici"</string> + <string name="vdm_secure_window" msgid="161700398158812314">"Ovom ne možete pristupiti tokom prenosa. Umjesto toga pokušajte na telefonu."</string> + <string name="vdm_pip_blocked" msgid="4036107522497281397">"Tokom prenosa nije moguće gledati sliku u slici"</string> <string name="system_locale_title" msgid="711882686834677268">"Sistemski zadano"</string> <string name="default_card_name" msgid="9198284935962911468">"KARTICA <xliff:g id="CARDNUMBER">%d</xliff:g>"</string> <string name="permlab_companionProfileWatch" msgid="2457738382085872542">"Odobrenje za profil pratećeg sata da upravlja satovima"</string> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Šaljite i primajte poruke bez mobilne ili WiFi mreže"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Otvorite Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Kako ovo funkcionira"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Uključite \"Automatski odaberi mrežu\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Uključite \"Automatski odaberi mrežu\" u Postavkama da telefon može pronaći mrežu koja funkcionira sa satelitom"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Uključi"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Nazad"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Na čekanju…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Na čekanju…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Ponovo postavite otključavanje otiskom prsta"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> se više ne može prepoznati."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> i <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> se više ne mogu prepoznati."</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 7c817b9c3965..691126bb58ba 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -1929,7 +1929,7 @@ <string name="zen_mode_until_next_day" msgid="1403042784161725038">"Finalitza: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_until" msgid="2250286190237669079">"Finalitza: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_alarm" msgid="7046911727540499275">"Finalitza: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> (propera alarma)"</string> - <string name="zen_mode_forever" msgid="740585666364912448">"Fins que no el desactivis"</string> + <string name="zen_mode_forever" msgid="740585666364912448">"Fins que no ho desactivis"</string> <string name="zen_mode_forever_dnd" msgid="3423201955704180067">"Fins que desactivis el mode No molestis"</string> <string name="zen_mode_rule_name_combination" msgid="7174598364351313725">"<xliff:g id="FIRST">%1$s</xliff:g> / <xliff:g id="REST">%2$s</xliff:g>"</string> <string name="toolbar_collapse_description" msgid="8009920446193610996">"Replega"</string> @@ -1939,13 +1939,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Cap de setmana"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Esdeveniment"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Mentre dormo"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"No molestis (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"De <xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Qualsevol calendari"</string> <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> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Envia i rep missatges sense una xarxa mòbil o Wi‑Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Obre Missatges"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Com funciona"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Activa l\'opció Selecciona la xarxa automàticament"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Activa l\'opció Selecciona la xarxa automàticament a Configuració perquè el telèfon pugui trobar una xarxa que funcioni per satèl·lit"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Activa"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Torna"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pendent..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pendent..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Torna a configurar Desbloqueig amb empremta digital"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> ja no es pot reconèixer."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> i <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> ja no es poden reconèixer."</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index a9766bf1fdeb..f6ee489802a9 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -1940,13 +1940,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Víkend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Událost"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Spánek"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Nerušit (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"V libovolném kalendáři"</string> <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> @@ -2428,15 +2428,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Odesílejte a přijímejte zprávy bez mobilní sítě nebo Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Otevřít Zprávy"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Jak to funguje"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Zapněte Vybírat síť automaticky"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Zapněte v Nastavení možnost Vybírat síť automaticky, aby telefon našel síť, která používá satelit"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Zapnout"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Zpět"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Čeká na vyřízení…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Čeká na vyřízení…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Opětovné nastavení odemknutí otiskem prstu"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> se nedaří rozpoznat."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> a <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> se nedaří rozpoznat."</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 58e9e6f3efd7..a861e3acfb23 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -563,7 +563,7 @@ <string name="permlab_accessHiddenProfile" msgid="8607094418491556823">"Adgang til skjulte profiler"</string> <string name="permdesc_accessHiddenProfile" msgid="1543153202481009676">"Giver appen adgang til skjulte profiler."</string> <string name="permlab_setWallpaperHints" msgid="1153485176642032714">"ændre størrelsen på din baggrund"</string> - <string name="permdesc_setWallpaperHints" msgid="6257053376990044668">"Tillader, at appen giver tips til systembaggrundens størrelse."</string> + <string name="permdesc_setWallpaperHints" msgid="6257053376990044668">"Tillader, at appen giver tip til systembaggrundens størrelse."</string> <string name="permlab_setTimeZone" msgid="7922618798611542432">"angive tidszone"</string> <string name="permdesc_setTimeZone" product="tablet" msgid="1788868809638682503">"Tillader, at appen kan ændre tidszonen på din tablet."</string> <string name="permdesc_setTimeZone" product="tv" msgid="9069045914174455938">"Tillader, at appen kan ændre tidszonen på din Android TV-enhed."</string> @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Begivenhed"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Sover"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Forstyr ikke (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> til <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Alle kalendere"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Send og modtag beskeder uden et mobil- eller Wi-Fi-netværk"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Åbn Beskeder"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Sådan fungerer det"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Aktivér \"Vælg netværk automatisk\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Aktivér \"Vælg netværk automatisk\" under Indstillinger, så din telefon kan finde et netværk, der fungerer sammen med satellit"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Aktivér"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Gå tilbage"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Afventer…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Afventer…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Konfigurer fingeroplåsning igen"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> kan ikke længere genkendes."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> og <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> kan ikke længere genkendes."</string> @@ -2454,7 +2498,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="3523799286376321137">"Sms"</string> <string name="keyboard_shortcut_group_applications_music" msgid="2051507523525651067">"Musik"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="3571770335653387606">"Kalender"</string> - <string name="keyboard_shortcut_group_applications_calculator" msgid="6753209559716091507">"Lommeregner"</string> + <string name="keyboard_shortcut_group_applications_calculator" msgid="6753209559716091507">"Lommeregner"</string> <string name="keyboard_shortcut_group_applications_maps" msgid="7950000659522589471">"Kort"</string> <string name="keyboard_shortcut_group_applications" msgid="3010389163951364798">"Apps"</string> <string name="fingerprint_loe_notification_msg" msgid="3927447270148854546">"Dine fingeraftryk kan ikke længere genkendes. Konfigurer fingeroplåsning igen."</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index fa2c9cf73911..58c4c5e93ef1 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Wochenende"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Termin"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Schlafen"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Bitte nicht stören (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> bis <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Alle Kalender"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Du kannst ohne Mobilgerät oder WLAN Nachrichten senden und empfangen"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages öffnen"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"So funktionierts"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"„Netz automatisch auswählen“ aktivieren"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Aktiviere in den Einstellungen die Option „Netz automatisch auswählen“, damit dein Smartphone ein Netzwerk finden kann, das mit dem Satelliten funktioniert"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Aktivieren"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Zurück"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Ausstehend…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Ausstehend…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Entsperrung per Fingerabdruck neu einrichten"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> wird nicht mehr erkannt."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> und <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> werden nicht mehr erkannt."</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 9e360e8cc905..3a32c528d72f 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"Μην ενοχλείτε (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Αποστολή και λήψη μηνυμάτων χωρίς δίκτυο κινητής τηλεφωνίας ή Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Άνοιγμα Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Πώς λειτουργεί"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Ενεργοποίηση της λειτουργίας Αυτόματη επιλογή δικτύου"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Ενεργοποιήστε τη λειτουργία Αυτόματη επιλογή δικτύου στις Ρυθμίσεις, ώστε το τηλέφωνό σας να μπορεί να βρει ένα δίκτυο που λειτουργεί με δορυφόρο"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Ενεργοποίηση"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Επιστροφή"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Σε εκκρεμότητα…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Σε εκκρεμότητα…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Επαναρρύθμιση λειτουργίας Ξεκλείδωμα με δακτυλικό αποτύπωμα"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Δεν είναι πλέον δυνατή η αναγνώριση του <xliff:g id="FINGERPRINT">%s</xliff:g>."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Δεν είναι πλέον δυνατή η αναγνώριση του <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> και του <xliff:g id="FINGERPRINT_1">%2$s</xliff:g>."</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index d36ccf5a69a1..84cc4095457d 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Event"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Sleeping"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Do Not Disturb (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> to <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Send and receive messages without a mobile or Wi-Fi network"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Open Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"How it works"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Turn on \'Automatically select network\'"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Turn on \'Automatically select network\' in Settings so your phone can find a network that works with satellite"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Turn on"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Go back"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pending…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pending…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Set up Fingerprint Unlock again"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> can no longer be recognised."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> and <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> can no longer be recognised."</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index 3fac7360c8f2..42250049636a 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -1938,6 +1938,7 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Event"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Sleeping"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Do Not Disturb (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> @@ -2430,6 +2431,30 @@ <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Turn on"</string> <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Go back"</string> <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pending..."</string> + <string name="satellite_sos_available_notification_title" msgid="5396708154268096124">"Satellite SOS is now available"</string> + <string name="satellite_sos_available_notification_summary" msgid="1727088812951848330">"You can message emergency services if there\'s no mobile or Wi-Fi network. Google Messages must be your default messaging app."</string> + <string name="satellite_sos_not_supported_notification_title" msgid="2659100983227637285">"Satellite SOS isn\'t supported"</string> + <string name="satellite_sos_not_supported_notification_summary" msgid="1071762454665310549">"Satellite SOS isn\'t supported on this device"</string> + <string name="satellite_sos_not_provisioned_notification_title" msgid="8564738683795406715">"Satellite SOS isn\'t set up"</string> + <string name="satellite_sos_not_provisioned_notification_summary" msgid="3127320958911180629">"Make sure you\'re connected to the internet and try setup again"</string> + <string name="satellite_sos_not_in_allowed_region_notification_title" msgid="3164093193467075926">"Satellite SOS isn\'t available"</string> + <string name="satellite_sos_not_in_allowed_region_notification_summary" msgid="7686947667515679672">"Satellite SOS isn\'t available in this country or region"</string> + <string name="satellite_sos_unsupported_default_sms_app_notification_title" msgid="292528603128702080">"Satellite SOS not set up"</string> + <string name="satellite_sos_unsupported_default_sms_app_notification_summary" msgid="3165168393504548437">"To message by satellite, set Google Messages as your default messaging app"</string> + <string name="satellite_sos_location_disabled_notification_title" msgid="5427987916850950591">"Satellite SOS isn\'t available"</string> + <string name="satellite_sos_location_disabled_notification_summary" msgid="1544937460641058567">"To check if satellite SOS is available in this country or region, turn on location settings"</string> + <string name="satellite_messaging_available_notification_title" msgid="3366657987618784706">"Satellite messaging available"</string> + <string name="satellite_messaging_available_notification_summary" msgid="7573949038500243670">"You can message by satellite if there\'s no mobile or Wi-Fi network. Google Messages must be your default messaging app."</string> + <string name="satellite_messaging_not_supported_notification_title" msgid="8202139632766878610">"Satellite messaging not supported"</string> + <string name="satellite_messaging_not_supported_notification_summary" msgid="61629858627638545">"Satellite messaging isn\'t supported on this device"</string> + <string name="satellite_messaging_not_provisioned_notification_title" msgid="961909101918169727">"Satellite messaging not set up"</string> + <string name="satellite_messaging_not_provisioned_notification_summary" msgid="1060961852174442155">"Make sure you\'re connected to the internet and try setup again"</string> + <string name="satellite_messaging_not_in_allowed_region_notification_title" msgid="2035303593479031655">"Satellite messaging not available"</string> + <string name="satellite_messaging_not_in_allowed_region_notification_summary" msgid="5270294879531815854">"Satellite messaging isn\'t available in this country or region"</string> + <string name="satellite_messaging_unsupported_default_sms_app_notification_title" msgid="1004808759472360189">"Satellite messaging not set up"</string> + <string name="satellite_messaging_unsupported_default_sms_app_notification_summary" msgid="17084124893763593">"To message by satellite, set Google Messages as your default messaging app"</string> + <string name="satellite_messaging_location_disabled_notification_title" msgid="7270641894250928494">"Satellite messaging not available"</string> + <string name="satellite_messaging_location_disabled_notification_summary" msgid="1450824950686221810">"To check if satellite messaging is available in this country or region, turn on location settings"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Set up Fingerprint Unlock again"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> can no longer be recognized."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> and <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> can no longer be recognized."</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 48f0e1aea91a..a80d0674d265 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Event"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Sleeping"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Do Not Disturb (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> to <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Send and receive messages without a mobile or Wi-Fi network"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Open Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"How it works"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Turn on \'Automatically select network\'"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Turn on \'Automatically select network\' in Settings so your phone can find a network that works with satellite"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Turn on"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Go back"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pending…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pending…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Set up Fingerprint Unlock again"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> can no longer be recognised."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> and <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> can no longer be recognised."</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 190e8abcff80..c123499b6883 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Event"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Sleeping"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Do Not Disturb (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> to <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Send and receive messages without a mobile or Wi-Fi network"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Open Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"How it works"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Turn on \'Automatically select network\'"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Turn on \'Automatically select network\' in Settings so your phone can find a network that works with satellite"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Turn on"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Go back"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pending…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pending…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Set up Fingerprint Unlock again"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> can no longer be recognised."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> and <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> can no longer be recognised."</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index a48f5fa984b8..26b4dfa4f2f4 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -1938,14 +1938,14 @@ <string name="zen_mode_default_weeknights_name" msgid="7902108149994062847">"Noche, en la semana"</string> <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Fin de semana"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Evento"</string> - <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Dormir"</string> + <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Sueño"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"No interrumpir (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"De <xliff:g id="START">%1$s</xliff:g> a <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> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Envía y recibe mensajes sin una red móvil ni Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Abrir Mensajes"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Cómo funciona"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Activa \"Seleccionar red de forma automática\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Activa \"Seleccionar red de forma automática\" en la configuración para que tu teléfono pueda encontrar una red que funcione con satélite"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Activar"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Atrás"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pendiente…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pendiente…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Vuelve a configurar el Desbloqueo con huellas dactilares"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Ya no se puede reconocer <xliff:g id="FINGERPRINT">%s</xliff:g>."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Ya no se pueden reconocer <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> y <xliff:g id="FINGERPRINT_1">%2$s</xliff:g>."</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index a573e9d42b1e..166e2dac1366 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -1939,13 +1939,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Fin de semana"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Evento"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Durmiendo"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"No molestar (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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">"Activada"</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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"De <xliff:g id="START">%1$s</xliff:g> a <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">"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> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Envía y recibe mensajes sin una red móvil ni Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Abre Mensajes"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Cómo funciona"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Activa la opción Seleccionar red automáticamente"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Activa la opción Seleccionar red automáticamente en Ajustes para que tu teléfono pueda encontrar una red que funcione con satélite"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Activar"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Volver"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pendiente..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pendiente..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Configura Desbloqueo con huella digital de nuevo"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> ya no puede reconocerse."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> y <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> ya no pueden reconocerse."</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 22c777707dee..fed97a191c87 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Nädalavahetus"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Sündmus"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Magamine"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Mitte segada (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> kuni <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Mis tahes kalender"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Sõnumite saatmine ja vastuvõtmine ilma mobiilside- või WiFi-võrguta"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Ava rakendus Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Tööpõhimõtted"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Valiku „Vali võrk automaatselt“ sisselülitamine"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Lülitage seadetes sisse valik „Vali võrk automaatselt“, et telefon leiaks satelliidi abil töötava võrgu"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Lülita sisse"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Mine tagasi"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Ootel …"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Ootel …"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Seadistage sõrmejäljega avamine uuesti"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Sõrmejälge <xliff:g id="FINGERPRINT">%s</xliff:g> ei saa enam tuvastada."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Sõrmejälgi <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> ja <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> ei saa enam tuvastada."</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index 8d8ed8fb369b..26e41140f391 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -1532,7 +1532,7 @@ <string name="wallpaper_binding_label" msgid="1197440498000786738">"Horma-papera"</string> <string name="chooser_wallpaper" msgid="3082405680079923708">"Aldatu horma-papera"</string> <string name="notification_listener_binding_label" msgid="2702165274471499713">"Jakinarazpen-hautemailea"</string> - <string name="vr_listener_binding_label" msgid="8013112996671206429">"Errealitate birtualeko hautemailea"</string> + <string name="vr_listener_binding_label" msgid="8013112996671206429">"EBko hautemailea"</string> <string name="condition_provider_service_binding_label" msgid="8490641013951857673">"Baldintza-hornitzailea"</string> <string name="notification_ranker_binding_label" msgid="432708245635563763">"Jakinarazpenen sailkapen-zerbitzua"</string> <string name="vpn_title" msgid="5906991595291514182">"VPN eginbidea aktibatuta"</string> @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Asteburua"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Gertaera"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Lo egiteko"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Ez molestatzeko modua (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"Edozein egutegi"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Bidali eta jaso mezuak sare mugikorrik edo wifi-sarerik gabe"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Ireki Mezuak"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Nola funtzionatzen du?"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Aktibatu \"Hautatu sarea automatikoki\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Aktibatu \"Hautatu sarea automatikoki\" ezarpenetan, telefonoak satelitearekin bateragarria den sare bat bilatu ahal izan dezan"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Aktibatu"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Egin atzera"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Zain…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Zain…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Konfiguratu berriro hatz-marka bidez desblokeatzeko eginbidea"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> ez da ezagutzen jada."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> eta <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> ez dira ezagutzen jada."</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index d6d950c0f12a..a8659eb289de 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -1568,7 +1568,7 @@ <string name="gpsNotifMessage" msgid="7346649122793758032">"درخواستکننده <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SERVICE">%2$s</xliff:g>)"</string> <string name="gpsVerifYes" msgid="3719843080744112940">"بله"</string> <string name="gpsVerifNo" msgid="1671201856091564741">"نه"</string> - <string name="sync_too_many_deletes" msgid="6999440774578705300">"از حد مجاز حذف فراتر رفت"</string> + <string name="sync_too_many_deletes" msgid="6999440774578705300">"از حد حذف کردن فراتر رفتید"</string> <string name="sync_too_many_deletes_desc" msgid="7409327940303504440">"<xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> مورد حذفشده برای <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>، حساب <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g> وجود دارد. میخواهید چه کار بکنید؟"</string> <string name="sync_really_delete" msgid="5657871730315579051">"حذف موارد"</string> <string name="sync_undo_deletes" msgid="5786033331266418896">"واگرد موارد حذف شده"</string> @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"مزاحم نشوید (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"ارسال و دریافت پیام بدون شبکه تلفن همراه یا Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"باز کردن «پیامنگار»"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"روش کار"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"روشن کردن «انتخاب خودکار شبکه»"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"برای اینکه تلفنتان بتواند شبکهای که با ماهواره کار میکند پیدا کند، «انتخاب خودکار شبکه» را در «تنظیمات» روشن کنید"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"روشن کردن"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"برگشتن"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"درحال تعلیق…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"درحال تعلیق…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"راهاندازی مجدد «قفلگشایی با اثر انگشت»"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> دیگر قابلشناسایی نیست."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> و <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> دیگر قابلشناسایی نیستند."</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index afc20f6c0fcd..1f4372abb677 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Viikonloppuna"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Tapahtuma"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Nukkuminen"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Älä häiritse (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"Kaikki kalenterit"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Lähetä ja vastaanota viestejä ilman mobiili- tai Wi-Fi-verkkoa"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Avaa Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Näin se toimii"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Laita \"Valitse verkko automaattisesti\" päälle"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Laita \"Valitse verkko automaattisesti\" päälle asetuksista, jotta puhelin voi löytää satelliitin kanssa toimivan verkon."</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Laita päälle"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Takaisin"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Odottaa…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Odottaa…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Ota sormenjälkiavaus uudelleen käyttöön"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> ei enää ole tunnistettavissa."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> ja <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> eivät enää ole tunnistettavissa."</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 6add38ad671a..f7f1474fca7b 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -1939,13 +1939,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Fin de semaine"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Événement"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Sommeil"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Ne pas déranger (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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ée"</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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"De <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">"N\'importe quel agenda"</string> <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> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Envoyez et recevez des messages sans réseau cellulaire ou Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Ouvrir Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Fonctionnement"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Activer « Sélectionner automatiquement le réseau »"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Activez « Sélectionner automatiquement le réseau » dans les paramètres pour que votre téléphone puisse trouver un réseau qui fonctionne par satellite"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Activer"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Retour"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"En attente…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"En attente…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Configurer le Déverrouillage par empreinte digitale à nouveau"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"L\'empreinte digitale <xliff:g id="FINGERPRINT">%s</xliff:g> ne peut plus être reconnue."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Les empreintes digitales <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> et <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> ne peuvent plus être reconnues."</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 9de43343ded8..bed2927867c4 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -1939,13 +1939,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Week-end"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Événement"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Sommeil"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Ne pas déranger (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"De <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">"Tous les agendas"</string> <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> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Envoyer et recevoir des messages sans réseau mobile ou Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Ouvrir Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Fonctionnement"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Activer \"Sélectionner automatiquement le réseau\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Activez \"Sélectionner automatiquement le réseau\" dans Paramètres pour que votre téléphone puisse trouver un réseau compatible avec un satellite"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Activer"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Retour"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"En attente…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"En attente…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Reconfigurer le déverrouillage par empreinte digitale"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> ne peut plus être reconnue."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> et <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> ne peuvent plus être reconnues."</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index 06c63ecd02ac..532c07880100 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -612,8 +612,8 @@ <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"Permite que a aplicación determine a posición relativa entre os dispositivos próximos que usen banda ultralarga"</string> <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"interactuar con dispositivos wifi próximos"</string> <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Permítelle á aplicación enviar anuncios e conectarse a dispositivos wifi próximos, e determinar a súa posición relativa"</string> - <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Información do servizo de pago de NFC preferido"</string> - <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Permite que a aplicación obteña información do servizo de pago de NFC preferido, como as axudas rexistradas e o destino da ruta."</string> + <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Información do servizo de pagos de NFC preferido"</string> + <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Permite que a aplicación obteña información do servizo de pagos de NFC preferido, como as axudas rexistradas e o destino da ruta."</string> <string name="permlab_nfc" msgid="1904455246837674977">"controlar Near Field Communication"</string> <string name="permdesc_nfc" msgid="8352737680695296741">"Permite á aplicación comunicarse con etiquetas, tarxetas e lectores Near Field Communication (NFC)."</string> <string name="permlab_nfcTransactionEvent" msgid="5868209446710407679">"Evento de transacción no elemento seguro"</string> @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Fin de semana"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Evento"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Mentres durmo"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Modo Non molestar (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"De <xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Calquera calendario"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Envía e recibe mensaxes sen ter acceso a redes de telefonía móbil ou wifi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Abrir Mensaxes"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Como funciona?"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Activar Seleccionar rede automaticamente"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Activa a opción Seleccionar rede automaticamente en Configuración para que o teléfono busque unha rede que funcione co satélite"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Activar"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Volver"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pendente..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pendente..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Configura de novo o desbloqueo dactilar"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> xa non se recoñece."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> e <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> xa non se recoñecen."</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index b0194ca80400..7e36c616e816 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"ખલેલ પાડશો નહીં (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"મોબાઇલ કે વાઇ-ફાઇ નેટવર્ક વિના મેસેજ મોકલો અને મેળવો"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages ખોલો"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"તેની કામ કરવાની રીત"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"ઑટોમૅટિક રીતે નેટવર્ક પસંદ કરો\" ચાલુ કરો"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"સેટિંગમાં \"ઑટોમૅટિક રીતે નેટવર્ક પસંદ કરો\" ચાલુ કરો, જેથી તમારો ફોન સૅટલાઇટ સાથે કામ કરતું નેટવર્ક શોધી શકે"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"ચાલુ કરો"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"પાછા જાઓ"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"બાકી..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"બાકી..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"ફિંગરપ્રિન્ટ અનલૉક સુવિધાનું ફરી સેટઅપ કરો"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"હવે <xliff:g id="FINGERPRINT">%s</xliff:g> ઓળખી શકાતી નથી."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"હવે <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> અને <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> ઓળખી શકાતી નથી."</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 7e27cff5ba13..38e79b1988dc 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -1937,15 +1937,15 @@ <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_name" msgid="177586786232302019">"\'परेशान न करें\' सुविधा (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> - <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"कोई भी कैलेंडर"</string> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"मोबाइल या वाई-फ़ाई नेटवर्क के बिना मैसेज भेजें और पाएं"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages ऐप्लिकेशन खोलें"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"यह सेटिंग कैसे काम करती है"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"नेटवर्क अपने-आप चुना जाए\" को चालू करें"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"सेटिंग में जाकर, \"नेटवर्क अपने-आप चुना जाए\" को चालू करें, ताकि आपका फ़ोन ऐसा नेटवर्क ढूंढ सके जो सैटलाइट के साथ काम करता है"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"चालू करें"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"रद्द करें"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"प्रोसेस जारी है..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"प्रोसेस जारी है..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"फ़िंगरप्रिंट अनलॉक की सुविधा दोबारा सेट अप करें"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"अब <xliff:g id="FINGERPRINT">%s</xliff:g> की पहचान नहीं की जा सकती."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"अब <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> और <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> की पहचान नहीं की जा सकती."</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 1066559d8f7c..90e228e65afa 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -1939,13 +1939,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Vikend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Događaj"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Spavanje"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Ne uznemiravaj (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"Bilo koji kalendar"</string> <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> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Šaljite i primajte poruke kad nije dostupna mobilna ili Wi-Fi mreža"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Otvori Poruke"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Kako to funkcionira"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Uključite opciju Automatski odaberi mrežu"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Uključite opciju Automatski odaberi mrežu u postavkama da bi telefon mogao pronaći mrežu koja funkcionira sa satelitom"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Uključi"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Natrag"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Na čekanju..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Na čekanju..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Ponovno postavite otključavanje otiskom prsta"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> više se ne prepoznaje."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> i <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> više se ne prepoznaju."</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index c76d9f493c30..d5a28f8e2198 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Hétvége"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Esemény"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Alvás"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Ne zavarjanak (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Küldhet és fogadhat üzeneteket mobil- és Wi-Fi-hálózat nélkül is"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"A Messages megnyitása"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Hogyan működik?"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Kapcsolja be a „Hálózat automatikus kiválasztása” beállítást"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Kapcsolja be a „Hálózat automatikus kiválasztása” beállítást a Beállításokban, hogy a telefon megtalálja a műholddal működő hálózatot"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Bekapcsolás"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Vissza"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Függőben…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Függőben…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"A Feloldás ujjlenyomattal funkció újbóli beállítása"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"A következő már nem felismerhető: <xliff:g id="FINGERPRINT">%s</xliff:g>."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"A következők már nem felismerhetők: <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> és <xliff:g id="FINGERPRINT_1">%2$s</xliff:g>."</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index c91918da268e..14534a7ca2a8 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -1112,7 +1112,7 @@ <string name="menu_sym_shortcut_label" msgid="4037566049061218776">"Sym+"</string> <string name="menu_function_shortcut_label" msgid="2367112760987662566">"Function+"</string> <string name="menu_space_shortcut_label" msgid="5949311515646872071">"բացակ"</string> - <string name="menu_enter_shortcut_label" msgid="6709499510082897320">"մուտք"</string> + <string name="menu_enter_shortcut_label" msgid="6709499510082897320">"enter"</string> <string name="menu_delete_shortcut_label" msgid="4365787714477739080">"ջնջել"</string> <string name="search_go" msgid="2141477624421347086">"Որոնել"</string> <string name="search_hint" msgid="455364685740251925">"Որոնում..."</string> @@ -1600,7 +1600,7 @@ <string name="keyboardview_keycode_done" msgid="2524518019001653851">"Պատրաստ է"</string> <string name="keyboardview_keycode_mode_change" msgid="2743735349997999020">"Ռեժիմի փոփոխում"</string> <string name="keyboardview_keycode_shift" msgid="3026509237043975573">"Shift"</string> - <string name="keyboardview_keycode_enter" msgid="168054869339091055">"Մուտք"</string> + <string name="keyboardview_keycode_enter" msgid="168054869339091055">"Enter"</string> <string name="activitychooserview_choose_application" msgid="3500574466367891463">"Ընտրել ծրագիր"</string> <string name="activitychooserview_choose_application_error" msgid="6937782107559241734">"Չհաջողվեց գործարկել <xliff:g id="APPLICATION_NAME">%s</xliff:g> ծրագիրը"</string> <string name="shareactionprovider_share_with" msgid="2753089758467748982">"Կիսվել"</string> @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"Չանհանգստացնել (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Ուղարկեք և ստացեք հաղորդագրություններ առանց բջջային կամ Wi-Fi ցանցի"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Բացել Messages-ը"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Ինչպես է դա աշխատում"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Միացրեք «Ավտոմատ ընտրել ցանցը»"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Կարգավորումներում միացրեք «Ավտոմատ ընտրել ցանցը», որպեսզի ձեր հեռախոսը կարողանա արբանյակի հետ աշխատող ցանց գտնել"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Միացնել"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Հետ"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Առկախ է…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Առկախ է…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Նորից կարգավորեք մատնահետքով ապակողպումը"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> մատնահետքն այլևս չի կարող ճանաչվել։"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> և <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> մատնահետքերն այլևս չեն կարող ճանաչվել։"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 498463083d68..360102f13139 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Akhir pekan"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Acara"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Tidur"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Jangan Ganggu (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> hingga <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Kalender mana saja"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Mengirim dan menerima pesan tanpa jaringan seluler atau Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Buka Message"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Cara kerjanya"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Aktifkan \"Pilih jaringan secara otomatis\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Aktifkan \"Pilih jaringan secara otomatis\" di Setelan agar ponsel dapat menemukan jaringan yang berfungsi dengan satelit"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Aktifkan"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Kembali"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Tertunda..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Tertunda..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Siapkan Buka dengan Sidik Jari lagi"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> tidak dapat dikenali lagi."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> dan <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> tidak dapat dikenali lagi."</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index 47a6c3584f52..9d3e2e42fb11 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Helgi"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Viðburður"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Svefn"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Ónáðið ekki (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> til <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Öll dagatöl"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Senda og fá skilaboð án tengingar við farsímakerfi eða Wi-Fi-net"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Opna Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Svona virkar þetta"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Kveiktu á „Velja net sjálfkrafa“"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Kveiktu á „Velja net sjálfkrafa“ í stillingunum til að gera símanum kleift að finna net sem virkar með gervihnetti"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Kveikja"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Til baka"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Í bið…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Í bið…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Setja upp fingrafarskenni aftur"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Ekki er hægt að bera kennsl á <xliff:g id="FINGERPRINT">%s</xliff:g> lengur."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Ekki er hægt að bera kennsl á <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> og <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> lengur."</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 4070f1160aec..ee7f08db3e51 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -1939,6 +1939,7 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Fine settimana"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Evento"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Notte"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Non disturbare (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> @@ -2431,6 +2432,54 @@ <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Attiva"</string> <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Indietro"</string> <string name="unarchival_session_app_label" msgid="6811856981546348205">"In attesa…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> + <skip /> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> + <skip /> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> + <skip /> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> + <skip /> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Riconfigura lo Sblocco con l\'Impronta"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> non può più essere riconosciuto."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> e <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> non possono più essere riconosciuti."</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 8b0dd8069f58..e3f2a7cab5eb 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -1939,13 +1939,13 @@ <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_implicit_name" msgid="177586786232302019">"נא לא להפריע (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"אפשר לשלוח ולקבל הודעות ללא רשת סלולרית או Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"לפתיחת Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"איך זה עובד"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"הפעלת האפשרות \'בחירה אוטומטית של הרשת\'"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"כדי למצוא רשת שעובדת עם לוויין בטלפון, צריך להפעיל את האפשרות \'בחירה אוטומטית של הרשת\' בהגדרות"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"הפעלה"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"חזרה"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"בהמתנה..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"בהמתנה..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"הגדרה חוזרת של \'ביטול הנעילה בטביעת אצבע\'"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"כבר לא ניתן לזהות את <xliff:g id="FINGERPRINT">%s</xliff:g>."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"כבר לא ניתן לזהות את <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> ואת <xliff:g id="FINGERPRINT_1">%2$s</xliff:g>."</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 2f389293d843..0d3a80c9b69a 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"サイレント モード（<xliff:g id="APP_NAME">%1$s</xliff:g>）"</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">"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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"モバイル ネットワークや Wi-Fi ネットワークがなくてもメッセージを送受信できます"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"メッセージ アプリを開く"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"仕組み"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"[ネットワークを自動的に選択] を ON にする"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"設定で [ネットワークを自動的に選択] を ON にすると、衛星と通信可能なネットワークをスマートフォンが検出できるようになります"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"ON にする"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"戻る"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"保留中..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"保留中..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"指紋認証をもう一度設定してください"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g>を認識できなくなりました。"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g>と<xliff:g id="FINGERPRINT_1">%2$s</xliff:g>を認識できなくなりました。"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 2d9aecd908ca..19177d65a991 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"არ შემაწუხოთ (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"შეტყობინებების გაგზავნა და მიღება მობილური ან Wi-Fi ქსელის გარეშე"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages-ის გახსნა"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"მუშაობის პრინციპი"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"„ქსელის ავტომატურად არჩევის“ ჩართვა"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"ჩართეთ „ქსელის ავტომატურად არჩევა“ პარამეტრებში, რათა თქვენმა ტელეფონმა სატელიტთან თავსებადი ქსელის პოვნა შეძლოს"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"ჩართვა"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"უკან დაბრუნება"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"მომლოდინე..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"მომლოდინე..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"ანაბეჭდით განბლოკვის ხელახლა დაყენება"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g>-ის ამოცნობა ვეღარ ხერხდება."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g>-ისა და <xliff:g id="FINGERPRINT_1">%2$s</xliff:g>-ის ამოცნობა ვეღარ ხერხდება."</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 6986a7b914a5..70774d6cafe1 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"Мазаламау (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"There\'s an internal problem with your device, and it may be unstable until you factory data reset."</string> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Хабарландыруларды мобильдік желіге немесе Wi-Fi желісіне қосылмай жіберіңіз және алыңыз."</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages қолданбасын ашу"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Бұл қалай орындалады?"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"Желіні автоматты түрде таңдау\" опциясын қосу"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Телефоныңыз жерсерікпен жұмыс істейтін желіні таба алуы үшін, \"Параметрлер\" бөлімінен \"Желіні автоматты түрде таңдау\" опциясын қосыңыз."</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Қосу"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Артқа"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Дайын емес…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Дайын емес…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Саусақ ізімен ашу функциясын қайта реттеу"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> бұдан былай танылмайды."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> және <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> бұдан былай танылмайды."</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index b2bb78b611d5..c758e0501aa8 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"កុំរំខាន (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"ផ្ញើ និងទទួលសារដោយគ្មានបណ្ដាញ Wi-Fi ឬបណ្ដាញទូរសព្ទចល័ត"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"បើកកម្មវិធី Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"របៀបដែលវាដំណើរការ"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"បើក \"ជ្រើសរើសបណ្ដាញដោយស្វ័យប្រវត្តិ\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"បើក \"ជ្រើសរើសបណ្ដាញដោយស្វ័យប្រវត្តិ\" នៅក្នុងការកំណត់ ដើម្បីឱ្យទូរសព្ទរបស់អ្នកអាចស្វែងរកបណ្ដាញ ដែលដំណើរការតាមរយៈផ្កាយរណប"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"បើក"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"ថយក្រោយ"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"កំពុងរង់ចាំ..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"កំពុងរង់ចាំ..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"រៀបចំការដោះសោដោយស្កេនស្នាមម្រាមដៃម្ដងទៀត"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"លែងអាចសម្គាល់ <xliff:g id="FINGERPRINT">%s</xliff:g> បានទៀតហើយ។"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"លែងអាចសម្គាល់ <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> និង <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> បានទៀតហើយ។"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index 8332cfcbd2ec..8efcd0869303 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"ಮೊಬೈಲ್ ಅಥವಾ ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ ಇಲ್ಲದೆಯೇ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಿ ಮತ್ತು ಸ್ವೀಕರಿಸಿ"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages ಅನ್ನು ತೆರೆಯಿರಿ"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"ಇದು ಹೇಗೆ ಕೆಲಸ ಮಾಡುತ್ತದೆ"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನೆಟ್ವರ್ಕ್ ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ\" ಅನ್ನು ಆನ್ ಮಾಡಿ"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ \"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನೆಟ್ವರ್ಕ್ ಆಯ್ಕೆಮಾಡಿ\" ಅನ್ನು ಆನ್ ಮಾಡಿ ಇದರಿಂದ ನಿಮ್ಮ ಫೋನ್ ಸ್ಯಾಟಲೈಟ್ ಜೊತೆಗೆ ಕಾರ್ಯನಿರ್ವಹಿಸುವ ನೆಟ್ವರ್ಕ್ ಅನ್ನು ಹುಡುಕಬಹುದು"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"ಆನ್ ಮಾಡಿ"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"ಹಿಂದಿರುಗಿ"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"ಬಾಕಿ ಉಳಿದಿದೆ..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"ಬಾಕಿ ಉಳಿದಿದೆ..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಮತ್ತೊಮ್ಮೆ ಸೆಟಪ್ ಮಾಡಿ"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> ಅನ್ನು ಇನ್ನು ಮುಂದೆ ಗುರುತಿಸಲಾಗುವುದಿಲ್ಲ."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> ಮತ್ತು <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> ಅನ್ನು ಇನ್ನು ಮುಂದೆ ಗುರುತಿಸಲಾಗುವುದಿಲ್ಲ."</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 393c956c6fc5..a069805148f5 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"방해 금지 모드(<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"모바일 또는 Wi-Fi 네트워크 없이 메시지 주고받기"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"메시지 열기"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"작동 방식"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\'네트워크 자동 선택\' 사용 설정"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"휴대전화에서 위성과 연결되는 네트워크를 찾을 수 있도록 \'설정\'에서 \'네트워크 자동 선택\'을 사용 설정하세요"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"사용"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"뒤로"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"대기 중…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"대기 중…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"지문 잠금 해제 다시 설정"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> 지문을 더 이상 인식할 수 없습니다."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> 및 <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> 지문을 더 이상 인식할 수 없습니다."</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index e44538ba3c9d..ec0059bb31f6 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"Тынчымды алба (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Мобилдик же Wi-Fi тармагына туташпай эле билдирүүлөрдү жөнөтүп, алыңыз"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Жазышуулар колдонмосун ачуу"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Ал кантип иштейт"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"Тармакты автоматтык түрдө тандоо\" параметрин күйгүзүңүз"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Телефонуңуз спутник менен иштеген тармакты табышы үчүн, параметрлерден \"Тармакты автоматтык түрдө тандоону\" күйгүзүңүз"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Күйгүзүү"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Артка кайтуу"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Кезекте турат..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Кезекте турат..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Манжа изи менен ачуу функциясын кайра тууралаңыз"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> мындан ары таанылбайт."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> жана <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> мындан ары таанылбайт."</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index 15138bb10a36..3962f09f0bac 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"ຫ້າມລົບກວນ (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"ຮັບ ແລະ ສົ່ງຂໍ້ຄວາມໂດຍບໍ່ຕ້ອງໃຊ້ເຄືອຂ່າຍໂທລະສັບມືຖື ຫຼື Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"ເປີດ Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"ມັນເຮັດວຽກແນວໃດ"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"ເປີດໃຊ້ \"ເລືອກເຄືອຂ່າຍອັດຕະໂນມັດ\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"ເປີດໃຊ້ \"ເລືອກເຄືອຂ່າຍອັດຕະໂນມັດ\" ໃນການຕັ້ງຄ່າເພື່ອໃຫ້ໂທລະສັບຂອງທ່ານສາມາດຊອກຫາເຄືອຂ່າຍທີ່ໃຊ້ໄດ້ກັບດາວທຽມ"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"ເປີດໃຊ້"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"ກັບຄືນ"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"ລໍຖ້າດຳເນີນການ..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"ລໍຖ້າດຳເນີນການ..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"ຕັ້ງຄ່າການປົດລັອກດ້ວຍລາຍນິ້ວມືຄືນໃໝ່"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"ບໍ່ສາມາດຈຳແນກ <xliff:g id="FINGERPRINT">%s</xliff:g> ໄດ້ອີກຕໍ່ໄປ."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"ບໍ່ສາມາດຈຳແນກ <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> ແລະ <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> ໄດ້ອີກຕໍ່ໄປ."</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 51aa8a19efef..c88b6635fab1 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -1940,13 +1940,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Savaitgalį"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Įvykis"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Miegas"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Netrukdymo režimas („<xliff:g id="APP_NAME">%1$s</xliff:g>“)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"Bet kuris kalendorius"</string> <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> @@ -2428,15 +2428,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Siųskite ir gaukite pranešimus be mobiliojo ryšio ar „Wi-Fi“ tinklo"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Atidaryti programą „Messages“"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Kaip tai veikia"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Parinkties „Automatiškai pasirinkti tinklą“ įjungimas"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Įjunkite „Automatiškai pasirinkti tinklą“ nustatymuose, kad telefonas galėtų rasti su palydovu suderinamą tinklą"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Įjungti"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Grįžti"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Laukiama..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Laukiama..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Atrakinimo piršto atspaudu nustatymas dar kartą"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> nebegalima atpažinti."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> ir <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> nebegalima atpažinti."</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 43de9f54e560..38d1891b13e2 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -1939,13 +1939,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Nedēļas nogalē"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Pasākums"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Gulēšana"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Netraucēt (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"no <xliff:g id="START">%1$s</xliff:g> līdz <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Jebkurš kalendārs"</string> <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> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Sūtiet un saņemiet ziņojumus bez mobilā vai Wi‑Fi tīkla."</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Atvērt lietotni Ziņojumi"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Darbības principi"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Ieslēdziet iestatījumu “Automātiski atlasīt tīklu”"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Iestatījumos ieslēdziet iespēju “Automātiski atlasīt tīklu”, lai tālrunis varētu atrast tīklu, kas ir saderīgs ar satelītu."</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Ieslēgt"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Atpakaļ"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Gaida…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Gaida…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Vēlreiz iestatiet autorizāciju ar pirksta nospiedumu"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Pirksta nospiedumu (<xliff:g id="FINGERPRINT">%s</xliff:g>) vairs nevar atpazīt."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Pirkstu nospiedumus (<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> un <xliff:g id="FINGERPRINT_1">%2$s</xliff:g>) vairs nevar atpazīt."</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index ea380371f083..87fd79928298 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"Не вознемирувај (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Испраќајте и примајте пораки без мобилна или Wi-Fi мрежа"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Отворете ја Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Дознајте како функционира"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Вклучете „Избирај мрежа автоматски“"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Вклучете „Избирај мрежа автоматски“ во „Поставки“ за да може телефонот да најде мрежа што функционира со сателит"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Вклучи"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Врати се назад"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Во фаза на чекање…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Во фаза на чекање…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Поставете „Отклучување со отпечаток“ повторно"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> веќе не може да се препознае."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> и <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> веќе не може да се препознаат."</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index ae6505dbf952..086ebe1fcaa5 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"ശല്യപ്പെടുത്തരുത് (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"മൊബൈൽ അല്ലെങ്കിൽ വൈഫൈ നെറ്റ്വർക്ക് ഇല്ലാതെ സന്ദേശങ്ങൾ അയയ്ക്കുകയും സ്വീകരിക്കുകയും ചെയ്യുക"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages തുറക്കുക"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"ഇത് പ്രവർത്തിക്കുന്നത് എങ്ങനെയാണ്"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"സ്വയമേവ നെറ്റ്വർക്ക് തിരഞ്ഞെടുക്കുക\" ഓണാക്കുക"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"ക്രമീകരണങ്ങളിൽ \"സ്വയമേവ നെറ്റ്വർക്ക് തിരഞ്ഞെടുക്കുക\" ഓണാക്കുക, അതുവഴി നിങ്ങളുടെ ഫോണിന് ഉപഗ്രഹത്തിനൊപ്പം പ്രവർത്തിക്കുന്ന ഒരു നെറ്റ്വർക്ക് കണ്ടെത്താനാകും"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"ഓണാക്കുക"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"മടങ്ങുക"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"തീർപ്പാക്കിയിട്ടില്ല..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"തീർപ്പാക്കിയിട്ടില്ല..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"ഫിംഗർപ്രിന്റ് അൺലോക്ക് വീണ്ടും സജ്ജീകരിക്കുക"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> ഇനി തിരിച്ചറിയാനാകില്ല."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g>, <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> എന്നിവ ഇനി തിരിച്ചറിയാനാകില്ല."</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 3d2eb04b5356..42db4c97ace4 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"Бүү саад бол (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Хөдөлгөөнт холбооны эсвэл Wi-Fi сүлжээгүйгээр мессеж илгээх болон хүлээн авах"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Мессежийг нээх"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Энэ хэрхэн ажилладаг вэ?"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"Сүлжээг автоматаар сонгох\"-ыг асаах"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Тохиргоонд \"Сүлжээг автоматаар сонгох\"-ыг асааснаар таны утас хиймэл дагуултай ажилладаг сүлжээг олох боломжтой"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Асаах"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Буцах"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Хүлээгдэж буй..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Хүлээгдэж буй..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Хурууны хээгээр түгжээ тайлахыг дахин тохируулна уу"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g>-г цаашид таних боломжгүй."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> болон <xliff:g id="FINGERPRINT_1">%2$s</xliff:g>-г цаашид таних боломжгүй."</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 9243f47d9246..2cfeaa2adab9 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"व्यत्यय आणू नका (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"मोबाइल किंवा वाय-फाय नेटवर्कशिवाय मेसेज पाठवणे आणि मिळवणे"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages उघडा"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"ते कसे काम करते"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"नेटवर्क आपोआप निवडा\" सुरू करा"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"सेटिंग्ज मध्ये \"नेटवर्क आपोआप निवडा\" सुरू करा, जेणेकरून तुमचा फोन सॅटेलाइटसोबत काम करणारे नेटवर्क शोधू शकेल"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"सुरू करा"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"मागे जा"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"प्रलंबित आहे..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"प्रलंबित आहे..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"फिंगरप्रिंट अनलॉक पुन्हा सेट करा"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> यापुढे ओळखता येणार नाही."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> आणि <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> यापुढे ओळखता येणार नाहीत."</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 9bda1735561e..6f5d5e7c3658 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Hujung minggu"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Acara"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Tidur"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Jangan Ganggu (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> hingga <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Sebarang kalendar"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Hantar dan terima mesej tanpa rangkaian mudah alih atau Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Buka Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Cara ciri ini berfungsi"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Hidupkan \"Pilih rangkaian secara automatik\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Hidupkan \"Pilih rangkaian secara automatik\" dalam Tetapan supaya telefon anda boleh menemukan rangkaian yang berfungsi dengan satelit"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Hidupkan"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Kembali"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Belum selesai..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Belum selesai..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Sediakan Buka Kunci Cap Jari sekali lagi"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> tidak dapat dicam lagi."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> dan <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> tidak dapat dicam lagi."</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index 2581a74c6b4e..9e7e78f98c64 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"မနှောင့်ယှက်ရ (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"မိုဘိုင်း (သို့) Wi-Fi ကွန်ရက်မရှိဘဲ မက်ဆေ့ဂျ်များ ပို့နိုင်၊ လက်ခံနိုင်သည်"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages ဖွင့်ရန်"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"အလုပ်လုပ်ပုံ"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"“ကွန်ရက် အလိုအလျောက်ရွေးရန်” ကို ဖွင့်ပါ"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"သင့်ဖုန်းက ဂြိုဟ်တုဖြင့် အလုပ်လုပ်သော ကွန်ရက်ကို ရှာနိုင်ရန်အတွက် ဆက်တင်များတွင် “ကွန်ရက် အလိုအလျောက်ရွေးရန်” ကို ဖွင့်ပါ"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"ဖွင့်ရန်"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"နောက်သို့"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"ဆိုင်းငံ့ထားသည်…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"ဆိုင်းငံ့ထားသည်…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ ကို စနစ်ထပ်မံထည့်သွင်းပါ"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> ကို မသိရှိနိုင်တော့ပါ။"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> နှင့် <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> ကို မသိရှိနိုင်တော့ပါ။"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 22288642cb79..683ca2661b6b 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Helg"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Aktivitet"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Sover"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Ikke forstyrr (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> til <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Hvilken som helst kalender"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Send og motta meldinger uten mobil- eller wifi-nettverk"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Åpne Meldinger"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Slik fungerer det"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Slå på «Velg nettverk automatisk»"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Slå på «Velg nettverk automatisk» i innstillingene, slik at telefonen kan finne et nettverk som fungerer med satellitt"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Slå på"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Gå tilbake"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Venter …"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Venter …"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Konfigurer opplåsingen med fingeravtrykk på nytt"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> gjenkjennes ikke lenger."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> og <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> gjenkjennes ikke lenger."</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index 5684d780be8f..ffeecb1cf0ba 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -807,7 +807,7 @@ <string name="permlab_accessNetworkConditions" msgid="1270732533356286514">"सञ्जाल अवस्थाका पर्यवेक्षणका लागि सुन्नुहोस्"</string> <string name="permdesc_accessNetworkConditions" msgid="2959269186741956109">"सञ्जाल अवस्थाका पर्यवेक्षण सुन्नका लागि एपलाई अनुमति दिन्छ।सामान्य एपलाई चाँहिदै नचाँहिन सक्छ।"</string> <string name="permlab_setInputCalibration" msgid="932069700285223434">"इनपुट डिभाइस क्यालिब्रेसन परिवर्तन गर्नुहोस्"</string> - <string name="permdesc_setInputCalibration" msgid="2937872391426631726">"एपलाई टच स्क्रीनको प्यारामिटरहरू क्यालिब्रेसन परिमार्जन गर्न अनुमति दिन्छ। साधारण एपहरूको लागि कहिल्यै आवश्यक पर्दैन।"</string> + <string name="permdesc_setInputCalibration" msgid="2937872391426631726">"एपलाई टच स्क्रिनको प्यारामिटरहरू क्यालिब्रेसन परिमार्जन गर्न अनुमति दिन्छ। साधारण एपहरूको लागि कहिल्यै आवश्यक पर्दैन।"</string> <string name="permlab_accessDrmCertificates" msgid="6473765454472436597">"DRM प्रमाणपत्रको पहुँच"</string> <string name="permdesc_accessDrmCertificates" msgid="6983139753493781941">"DRM प्रमाणपत्रहरू प्रावधान र प्रयोग गर्ने निवेदनको अनुमति दिन्छ। साधारण एपहरूको लागि कहिल्यै पनि आवश्यक पर्दैन।"</string> <string name="permlab_handoverStatus" msgid="7620438488137057281">"Android Beam स्थानान्तरण अवस्था प्राप्त गर्नुहोस्"</string> @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"Do Not Disturb (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"मोबाइल वा Wi-Fi नेटवर्कविनै म्यासेजहरू पठाउनुहोस् र प्राप्त गर्नुहोस्"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages खोल्नुहोस्"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"यसले काम गर्ने तरिका"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"स्वतः नेटवर्क चयन गर्नुहोस्\" अन गर्नुहोस्"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"तपाईंको फोनले स्याटलाइटसँग काम गर्ने नेटवर्क भेट्टाउन सकोस् भन्नका लागि सेटिङमा गई \"स्वतः नेटवर्क चयन गर्नुहोस्\" अन गर्नुहोस्"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"अन गर्नुहोस्"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"पछाडि जानुहोस्"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"विचाराधीन..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"विचाराधीन..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"फिंगरप्रिन्ट अनलक फेरि सेटअप गर्नुहोस्"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> अब पहिचान गर्न सकिँदैन।"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> र <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> अब पहिचान गर्न सकिँदैन।"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index ac18bcf26f10..5f77e7304cdb 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Afspraak"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Slapen"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Niet storen (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> tot <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Elke agenda"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Stuur en krijg berichten zonder mobiel of wifi-netwerk"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Berichten openen"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Hoe het werkt"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Netwerk automatisch selecteren aanzetten"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Zet Netwerk automatisch selecteren aan in Instellingen zodat je telefoon een netwerk kan vinden dat werkt met satellieten"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Aanzetten"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Terug"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"In behandeling…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"In behandeling…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Ontgrendelen met vingerafdruk weer instellen"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> wordt niet meer herkend."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> en <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> worden niet meer herkend."</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index c860657df157..b4f924b7d9db 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -1112,7 +1112,7 @@ <string name="menu_sym_shortcut_label" msgid="4037566049061218776">"Sym+"</string> <string name="menu_function_shortcut_label" msgid="2367112760987662566">"Function+"</string> <string name="menu_space_shortcut_label" msgid="5949311515646872071">"ସ୍ପେସ୍"</string> - <string name="menu_enter_shortcut_label" msgid="6709499510082897320">"ଏଣ୍ଟର୍"</string> + <string name="menu_enter_shortcut_label" msgid="6709499510082897320">"ଏଣ୍ଟର"</string> <string name="menu_delete_shortcut_label" msgid="4365787714477739080">"ଡିଲିଟ କରନ୍ତୁ"</string> <string name="search_go" msgid="2141477624421347086">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string> <string name="search_hint" msgid="455364685740251925">"ସର୍ଚ୍ଚ କରନ୍ତୁ…"</string> @@ -1600,7 +1600,7 @@ <string name="keyboardview_keycode_done" msgid="2524518019001653851">"ହୋଇଗଲା"</string> <string name="keyboardview_keycode_mode_change" msgid="2743735349997999020">"ମୋଡ୍ ପରିବର୍ତ୍ତନ"</string> <string name="keyboardview_keycode_shift" msgid="3026509237043975573">"ଶିଫ୍ଟ"</string> - <string name="keyboardview_keycode_enter" msgid="168054869339091055">"ଏଣ୍ଟର୍"</string> + <string name="keyboardview_keycode_enter" msgid="168054869339091055">"ଏଣ୍ଟର"</string> <string name="activitychooserview_choose_application" msgid="3500574466367891463">"ଗୋଟିଏ ଆପ୍ ବାଛନ୍ତୁ"</string> <string name="activitychooserview_choose_application_error" msgid="6937782107559241734">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ଲଞ୍ଚ କରାଯାଇପାରିଲା ନାହିଁ"</string> <string name="shareactionprovider_share_with" msgid="2753089758467748982">"ଏହାଙ୍କ ସହ ସେୟାର୍ କରନ୍ତୁ"</string> @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"ଏକ ମୋବାଇଲ କିମ୍ବା ୱାଇ-ଫାଇ ନେଟୱାର୍କ ବିନା ମେସେଜ ପଠାନ୍ତୁ ଏବଂ ପାଆନ୍ତୁ"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages ଖୋଲନ୍ତୁ"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"ଏହା କିପରି କାମ କରେ"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"ସ୍ୱତଃ ନେଟୱାର୍କକୁ ଚୟନ କରନ୍ତୁ\"କୁ ଚାଲୁ କରନ୍ତୁ"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"ସେଟିଂସରେ \"ସ୍ୱତଃ ନେଟୱାର୍କକୁ ଚୟନ କରନ୍ତୁ\"କୁ ଚାଲୁ କରନ୍ତୁ, ଯାହା ଫଳରେ ଆପଣଙ୍କ ଫୋନ ସେଟେଲାଇଟ ସହିତ କାର୍ଯ୍ୟ କରୁଥିବା ଏକ ନେଟୱାର୍କକୁ ଖୋଜିପାରିବ"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"ଚାଲୁ କରନ୍ତୁ"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"ପଛକୁ ଫେରନ୍ତୁ"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"ବାକି ଅଛି…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"ବାକି ଅଛି…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ପୁଣି ସେଟ ଅପ କରନ୍ତୁ"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g>କୁ ଆଉ ଚିହ୍ନଟ କରାଯାଇପାରିବ ନାହିଁ।"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> ଏବଂ <xliff:g id="FINGERPRINT_1">%2$s</xliff:g>କୁ ଆଉ ଚିହ୍ନଟ କରାଯାଇପାରିବ ନାହିଁ।"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index 63ebeb8d567d..fae806c4deca 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"ਮੋਬਾਈਲ ਜਾਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਤੋਂ ਬਿਨਾਂ ਸੁਨੇਹੇ ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰੋ"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages ਐਪ ਖੋਲ੍ਹੋ"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"ਇਹ ਕਿਵੇਂ ਕੰਮ ਕਰਦਾ ਹੈ"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਨੈੱਟਵਰਕ ਚੁਣੋ\" ਨੂੰ ਚਾਲੂ ਕਰੋ"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਜਾ ਕੇ \"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਨੈੱਟਵਰਕ ਚੁਣੋ\" ਨੂੰ ਚਾਲੂ ਕਰੋ, ਤਾਂ ਜੋ ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਜਿਹਾ ਨੈੱਟਵਰਕ ਲੱਭ ਸਕੇ ਜੋ ਸੈਟੇਲਾਈਟ ਨਾਲ ਕੰਮ ਕਰਦਾ ਹੋਵੇ"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"ਚਾਲੂ ਕਰੋ"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"ਵਾਪਸ ਜਾਓ"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"ਵਿਚਾਰ-ਅਧੀਨ..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"ਵਿਚਾਰ-ਅਧੀਨ..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਦਾ ਦੁਬਾਰਾ ਸੈੱਟਅੱਪ ਕਰੋ"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> ਦੀ ਹੁਣ ਪਛਾਣ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> ਅਤੇ <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> ਦੀ ਹੁਣ ਪਛਾਣ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index fa2b493f843b..cf758feb97ae 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -1940,13 +1940,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Wydarzenie"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Sen"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Nie przeszkadzać (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"Od <xliff:g id="START">%1$s</xliff:g> do <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Dowolny kalendarz"</string> <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> @@ -2428,15 +2428,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Wysyłaj i odbieraj wiadomości bez sieci komórkowej czy Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Otwórz Wiadomości"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Jak to działa"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Włącz „Automatycznie wybieraj sieć”"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"W Ustawieniach włącz opcję „Automatycznie wybieraj sieć”, aby telefon mógł znaleźć sieć współpracującą z satelitą"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Włącz"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Wróć"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Oczekiwanie…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Oczekiwanie…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Skonfiguruj ponownie odblokowywanie odciskiem palca"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Ten odcisk palca (<xliff:g id="FINGERPRINT">%s</xliff:g>) nie jest już rozpoznawany."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Te odciski palców (<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> i <xliff:g id="FINGERPRINT_1">%2$s</xliff:g>) nie są już rozpoznawane."</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 76a8dc110eac..71b334e89eaf 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -1939,13 +1939,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Fim de semana"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Evento"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Dormir"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Não perturbe (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> a <xliff:g id="END">%2$s</xliff:g>"</string> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Qualquer agenda"</string> <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> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Enviar e receber mensagens sem uma rede móvel ou Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Abrir o app Mensagens"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Como funciona"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Ative a opção \"Selecionar a rede automaticamente\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Ative a opção \"Selecionar a rede automaticamente\" nas configurações para que o smartphone encontre uma rede que funcione com satélite"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Ativar"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Voltar"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pendente…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pendente…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Configurar o Desbloqueio por impressão digital de novo"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"A impressão digital <xliff:g id="FINGERPRINT">%s</xliff:g> não é mais reconhecida."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"As impressões digitais <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> e <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> não são mais reconhecidas."</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 86e0fcdad8a1..4d5ff474c84f 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -1939,6 +1939,7 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Fim de semana"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Evento"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Dormir"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Não incomodar (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> @@ -2431,6 +2432,54 @@ <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Ativar"</string> <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Retroceder"</string> <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pendente…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> + <skip /> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> + <skip /> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> + <skip /> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> + <skip /> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Configure o Desbloqueio por impressão digital novamente"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Já não é possível reconhecer <xliff:g id="FINGERPRINT">%s</xliff:g>."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Já não é possível reconhecer <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> e <xliff:g id="FINGERPRINT_1">%2$s</xliff:g>."</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 76a8dc110eac..71b334e89eaf 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -1939,13 +1939,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Fim de semana"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Evento"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Dormir"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Não perturbe (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> a <xliff:g id="END">%2$s</xliff:g>"</string> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Qualquer agenda"</string> <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> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Enviar e receber mensagens sem uma rede móvel ou Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Abrir o app Mensagens"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Como funciona"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Ative a opção \"Selecionar a rede automaticamente\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Ative a opção \"Selecionar a rede automaticamente\" nas configurações para que o smartphone encontre uma rede que funcione com satélite"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Ativar"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Voltar"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pendente…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Pendente…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Configurar o Desbloqueio por impressão digital de novo"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"A impressão digital <xliff:g id="FINGERPRINT">%s</xliff:g> não é mais reconhecida."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"As impressões digitais <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> e <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> não são mais reconhecidas."</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 384d1b3b22fd..6e43d317e0f0 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -1939,13 +1939,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Eveniment"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Somn"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Nu deranja (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"Orice calendar"</string> <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> @@ -2183,7 +2183,7 @@ <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"Conexiunea Bluetooth va rămâne activată în modul Avion"</string> <string name="car_loading_profile" msgid="8219978381196748070">"Se încarcă"</string> <string name="file_count" msgid="3220018595056126969">"{count,plural, =1{{file_name} + # fișier}few{{file_name} + # fișiere}other{{file_name} + # de fișiere}}"</string> - <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"Nu există persoane recomandate pentru permiterea accesului"</string> + <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"Nu există persoane recomandate pentru trimitere"</string> <string name="chooser_all_apps_button_label" msgid="3230427756238666328">"Lista de aplicații"</string> <string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"Permisiunea de înregistrare nu a fost acordată aplicației, dar aceasta poate să înregistreze conținut audio prin intermediul acestui dispozitiv USB."</string> <string name="accessibility_system_action_home_label" msgid="3234748160850301870">"Pornire"</string> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Trimite și primește mesaje fără o rețea mobilă sau Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Deschide Mesaje"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Cum funcționează"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Activează opțiunea Selectează automat rețeaua"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Activează opțiunea Selectează automat rețeaua în Setări pentru ca telefonul să găsească o rețea compatibilă cu satelitul"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Activează"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Înapoi"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"În așteptare..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"În așteptare..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Configurează din nou Deblocarea cu amprenta"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> nu mai poate fi recunoscută."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> și <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> nu mai pot fi recunoscute."</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index f7e3610a2022..b23a44bcc9fc 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -1940,13 +1940,13 @@ <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_implicit_name" msgid="177586786232302019">"Не беспокоить (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2428,15 +2428,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Отправляйте и получайте сообщения без подключения к мобильной сети или Wi-Fi."</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Открыть Сообщения"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Узнать принцип работы"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Включите автоматический выбор сети"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Чтобы ваш телефон мог найти сеть, которая поддерживает спутниковую связь, включите в настройках параметр \"Выбирать сеть автоматически\"."</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Включить"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Назад"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Обработка…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Обработка…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Настройте разблокировку по отпечатку пальца заново"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Отпечаток \"<xliff:g id="FINGERPRINT">%s</xliff:g>\" больше нельзя распознать."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Отпечатки \"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g>\" и \"<xliff:g id="FINGERPRINT_1">%2$s</xliff:g>\" больше нельзя распознать."</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index ea404f1a6844..db82c6c98fa4 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"බාධා නොකරන්න (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="END">%2$s</xliff:g> සිට <xliff:g id="START">%1$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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"ජංගම හෝ Wi-Fi ජාලයකින් තොරව පණිවිඩ යැවීම සහ ලැබීම"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages විවෘත කරන්න"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"එය ක්රියා කරන ආකාරය"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"ස්වයංක්රීයව ජාලය තෝරන්න\" ක්රියාත්මක කරන්න"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"ඔබේ දුරකථනයට චන්ද්රිකාව සමග ක්රියා කරන ජාලයක් සොයා ගැනීමට හැකි වන පරිදි සැකසීම් තුළ \"ස්වයංක්රීයව ජාලය තෝරන්න\" ක්රියාත්මක කරන්න"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"ක්රියාත්මක කරන්න"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"ආපසු යන්න"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"පොරොත්තුයි..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"පොරොත්තුයි..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"ඇඟිලි සලකුණු අගුලු හැරීම නැවත සකසන්න"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> තවදුරටත් හඳුනා ගත නොහැක."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> සහ <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> තවදුරටත් හඳුනා ගත නොහැක."</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index eeb308187cb6..cbabfb6e1076 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -1940,13 +1940,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Víkend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Udalosť"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Spánok"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Režim bez vyrušení (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"Ľubovoľný kalendár"</string> <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> @@ -2428,15 +2428,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Odosielajte a prijímajte správy bez mobilnej siete či siete Wi‑Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Otvoriť Správy"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Ako to funguje"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Zapnite Vyberať sieť automaticky"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Zapnite v Nastaveniach možnosť Vyberať sieť automaticky, aby telefón mohol nájsť sieť, ktorá spolupracuje so satelitom"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Zapnúť"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Prejsť späť"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Nespracovaná…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Nespracovaná…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Znova nastavte odomknutie odtlačkom prsta"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> sa už nedari rozpoznať."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> a <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> sa už nedari rozpoznať."</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 514ad1656760..d7178c802ec6 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -1940,13 +1940,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Konec tedna"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Dogodek"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Spanje"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Ne moti (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> do <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> @@ -2428,15 +2428,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Pošiljanje in prejemanje sporočil brez mobilnega omrežja ali omrežja Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Odpri Sporočila"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Kako deluje"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Vklopite »Samodejno izberi omrežje«"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"V nastavitvah vklopite možnost »Samodejno izberi omrežje«, da bo telefon lahko našel omrežje, ki deluje s satelitsko povezavo"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Vklopi"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Nazaj"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"V teku …"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"V teku …"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Vnovična nastavitev odklepanja s prstnim odtisom"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Odtisa »<xliff:g id="FINGERPRINT">%s</xliff:g>« ni več mogoče prepoznati."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Odtisov »<xliff:g id="FINGERPRINT_0">%1$s</xliff:g>« in »<xliff:g id="FINGERPRINT_1">%2$s</xliff:g>« ni več mogoče prepoznati."</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index 8d535b9a9b8d..42356bf8cc07 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Fundjava"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Ngjarje"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Në gjumë"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Mos shqetëso (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"Çdo kalendar"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Dërgo dhe merr mesazhe pa një rrjet celular ose Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Hap \"Mesazhet\""</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Si funksionon"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Aktivizo \"Zgjidh automatikisht rrjetin\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Aktivizo \"Zgjidh automatikisht rrjetin\" te \"Cilësimet\" që telefoni yt të mund të gjejë një rrjet që funksionon me satelitin"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Aktivizo"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Kthehu prapa"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Në pritje..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Në pritje..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Konfiguro përsëri \"Shkyçjen me gjurmën e gishtit\""</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> nuk mund të njihet më."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> dhe <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> nuk mund të njihen më."</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index af75a5c135e3..10fa5f831fb4 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -1939,13 +1939,13 @@ <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_implicit_name" msgid="177586786232302019">"Не узнемиравај (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2427,15 +2427,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Шаљите и примајте поруке без мобилне или WiFi мреже"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Отвори Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Принцип рада"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Укључите опцију Аутоматски изабери мрежу"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Укључите опцију Аутоматски изабери мрежу у Подешавањима да би телефон могао да пронађе мрежу која ради са сателитом"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Укључи"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Назад"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"На чекању..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"На чекању..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Поново подесите откључавање отиском прста"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> више не може да се препозна."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> и <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> више не могу да се препознају."</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 0cff2e507710..857b060452ec 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"I helgen"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Händelse"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Sover"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Stör ej (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> till <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Alla kalendrar"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Skicka och ta emot meddelanden utan ett mobil- eller wifi-nätverk"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Öppna Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Så fungerar det"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Aktivera Välj nätverk automatiskt"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Aktivera Välj nätverk automatiskt i inställningarna så att telefonen kan hitta ett nätverk som fungerar med satellit"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Aktivera"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Tillbaka"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Väntar …"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Väntar …"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Konfigurera fingeravtryckslås igen"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Det går inte längre att känna igen <xliff:g id="FINGERPRINT">%s</xliff:g>."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Det går inte längre att känna igen <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> och <xliff:g id="FINGERPRINT_1">%2$s</xliff:g>."</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index bf5189261e8f..d46fa084258b 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Wikendi"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Tukio"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Kulala"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Usinisumbue (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> hadi <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Kalenda yoyote"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Tuma na upokee ujumbe bila kutumia mtandao wa simu wala Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Fungua Programu ya Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Utaratibu wake"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Washa kipengele cha \"Chagua mtandao kiotomatiki\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Washa kipengele cha \"Chagua mtandao kiotomatiki\" katika Mipangilio ili simu yako iweze kupata mtandao unaotumia setilaiti"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Washa"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Rudi nyuma"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Inashughulikiwa..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Inashughulikiwa..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Weka tena mipangilio ya Kufungua kwa Alama ya Kidole"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> haitambuliki tena."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> na <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> havitambuliki tena."</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 8ff19a98f6d8..32fefacb1115 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -1937,14 +1937,14 @@ <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_name" msgid="177586786232302019">"தொந்தரவு செய்ய வேண்டாம் (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"மொபைல்/வைஃபை நெட்வொர்க் இல்லாமல் மெசேஜ்களை அனுப்பலாம், பெறலாம்"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messages ஆப்ஸைத் திறக்கவும்"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"இது செயல்படும் விதம்"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"நெட்வொர்க்கைத் தானாகத் தேர்ந்தெடு\" என்பதை இயக்குங்கள்"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"அமைப்புகளில் \"நெட்வொர்க்கைத் தானாகத் தேர்ந்தெடு\" என்பதை இயக்கினால் செயற்கைக்கோள் மூலம் இயங்கும் நெட்வொர்க்கை உங்கள் மொபைல் கண்டறிய முடியும்"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"இயக்கு"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"பின்செல்"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"நிலுவையிலுள்ளது..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"நிலுவையிலுள்ளது..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"கைரேகை அன்லாக் அம்சத்தை மீண்டும் அமையுங்கள்"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g>ஐ இனி அடையாளம் காண முடியாது."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g>, <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> ஆகியவற்றை இனி அடையாளம் காண முடியாது."</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index 1d9e00c012bb..8500e9dcd0d7 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"అంతరాయం కలిగించవద్దు (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"మొబైల్ లేదా Wi-Fi నెట్వర్క్ లేకుండా మెసేజ్లను పంపండి, స్వీకరించండి"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Messagesను తెరవండి"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"ఇది ఎలా పని చేస్తుంది"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"నెట్వర్క్ను ఆటోమేటిక్గా ఎంచుకోండి\" అనే ఆప్షన్ను ఆన్ చేయండి"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"సెట్టింగ్లలో \"నెట్వర్క్ను ఆటోమేటిక్గా ఎంచుకోండి\" అనే ఆప్షన్ను ఆన్ చేయండి, తద్వారా మీ ఫోన్ శాటిలైట్తో పనిచేసే నెట్వర్క్ను కనుగొనగలదు"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"ఆన్ చేయండి"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"వెనుకకు వెళ్లండి"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"పెండింగ్లో ఉంది..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"పెండింగ్లో ఉంది..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"వేలిముద్ర అన్లాక్ను మళ్లీ సెటప్ చేయండి"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g>ను ఇకపై గుర్తించడం సాధ్యం కాదు."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g>, <xliff:g id="FINGERPRINT_1">%2$s</xliff:g>లను ఇకపై గుర్తించడం సాధ్యం కాదు."</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 90a90ee9ab18..a1c7b4f59608 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"ห้ามรบกวน (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"รับและส่งข้อความโดยไม่ต้องใช้เครือข่ายมือถือหรือ Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"เปิด Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"วิธีการทำงาน"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"เปิด \"เลือกเครือข่ายโดยอัตโนมัติ\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"เปิด \"เลือกเครือข่ายโดยอัตโนมัติ\" ในการตั้งค่าเพื่อให้โทรศัพท์ค้นหาเครือข่ายที่ใช้งานร่วมกับดาวเทียมได้"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"เปิด"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"ย้อนกลับ"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"รอดำเนินการ..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"รอดำเนินการ..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"ตั้งค่าการปลดล็อกด้วยลายนิ้วมืออีกครั้ง"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"ระบบไม่จดจำ <xliff:g id="FINGERPRINT">%s</xliff:g> อีกต่อไป"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"ระบบไม่จดจำ <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> และ <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> อีกต่อไป"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index f4df0e2ed7ae..f15d952db15a 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Event"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Pag-sleep"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Huwag Istorbohin (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> patungong <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Anumang kalendaryo"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Magpadala at tumanggap ng mga mensahe nang walang mobile o Wi-Fi network"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Buksan ang Messages"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Paano ito gumagana"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"I-on ang \"Awtomatikong pumili ng network\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"I-on ang \"Awtomatikong piliin ang network\" sa Mga Setting para mahanap ng iyong telepono ang isang network na gumagana sa satellite"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"I-on"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Bumalik"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Nakabinbin..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Nakabinbin..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"I-set up ulit ang Pag-unlock Gamit ang Fingerprint"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Hindi na makilala ang <xliff:g id="FINGERPRINT">%s</xliff:g>."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Hindi na makilala ang <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> at <xliff:g id="FINGERPRINT_1">%2$s</xliff:g>."</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 77c3ee24ba59..39a005f628f5 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Hafta sonu"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Etkinlik"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Uyku"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Rahatsız Etmeyin (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"Tüm takvimler"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Mobil veya kablosuz ağ kullanmadan mesaj gönderip alın"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Mesajlar\'ı aç"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"İşleyiş şekli"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"Ağı otomatik seç\"i etkinleştirin"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Telefonunuzun uyduyla çalışan bir ağ bulabilmesi için Ayarlar\'da \"Ağı otomatik seç\"i etkinleştirin"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Etkinleştir"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Geri dön"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Bekliyor..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Bekliyor..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Parmak İzi Kilidi\'ni tekrar kurun"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> artık tanınamayacak."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> ve <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> artık tanınamayacak."</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 2f1a1d5987e2..3b9cd192f7a4 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1940,13 +1940,13 @@ <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_implicit_name" msgid="177586786232302019">"Не турбувати (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2428,15 +2428,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Надсилайте й отримуйте текстові повідомлення без мобільної мережі або Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Відкрийте Повідомлення"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Як це працює"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Увімкніть опцію \"Вибирати мережу автоматично\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"У налаштуваннях увімкніть опцію \"Вибирати мережу автоматично\", щоб телефон міг знайти мережу, яка працює через супутник"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Увімкнути"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Назад"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Обробка…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Обробка…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Налаштуйте розблокування відбитком пальця повторно"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Відбиток пальця <xliff:g id="FINGERPRINT">%s</xliff:g> більше не розпізнається."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Відбитки пальців <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> і <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> більше не розпізнаються."</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index 6c78283d9494..679f1026197a 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"ڈسٹرب نہ کریں (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"موبائل یا Wi-Fi نیٹ ورک کے بغیر پیغامات بھیجیں اور موصول کریں"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"پیغامات ایپ کو کھولیں"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"اس کے کام کرنے کا طریقہ"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"\"خودکار طور پر نیٹ ورک منتخب کریں\" کو آن کریں"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"ترتیبات میں \"خودکار طور پر نیٹ ورک منتخب کریں\" کو آن کریں تاکہ آپ کا فون سیٹلائٹ کے ساتھ کام کرنے والے نیٹ ورک کو تلاش کر سکے"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"آن کریں"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"واپس جائیں"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"زیر التواء..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"زیر التواء..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"فنگر پرنٹ اَن لاک کو دوبارہ سیٹ اپ کریں"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> مزید پہچانا نہیں جا سکتا۔"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> اور <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> کو مزید پہچانا نہیں جا سکتا۔"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index ac70b93d2248..d7620e1f3afb 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Dam olish kunlari"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Tadbir"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Uyquda"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Bezovta qilinmasin (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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">"Har qanday taqvim"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Mobil yoki Wi-Fi tarmoq blan aloqa yoʻqligida xabar yuboring va qabul qiling"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Xabarlar ilovasini ochish"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Ishlash tartibi"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"“Tarmoqni avtomatik tanlash” sozlamasini yoqing"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Telefoningiz sputnik bilan ishlaydigan tarmoqni topishi uchun Sozlamalar orqali “Tarmoqni avtomatik tanlash” sozlamasini yoqing"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Yoqish"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Orqaga"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Kutilmoqda..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Kutilmoqda..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Barmoq izi bilan ochish funksiyasini qayta sozlang"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"<xliff:g id="FINGERPRINT">%s</xliff:g> endi tanilmaydi."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> va <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> endi tanilmaydi."</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index d4551b178568..663078b5caf4 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Cuối tuần"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Sự kiện"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Ngủ"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Không làm phiền (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<xliff:g id="START">%1$s</xliff:g> đến <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Bất kỳ lịch nào"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Gửi và nhận tin nhắn mà không cần mạng di động hoặc Wi-Fi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Mở ứng dụng Tin nhắn"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Cách hoạt động"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Bật tính năng \"Tự động chọn mạng\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Bật tính năng \"Tự động chọn mạng\" trong phần Cài đặt để điện thoại có thể tìm thấy mạng hoạt động với vệ tinh"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Bật"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Quay lại"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Đang chờ xử lý..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Đang chờ xử lý..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Thiết lập lại tính năng Mở khoá bằng vân tay"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"Không nhận dạng được <xliff:g id="FINGERPRINT">%s</xliff:g> nữa."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"Không nhận dạng được <xliff:g id="FINGERPRINT_0">%1$s</xliff:g> và <xliff:g id="FINGERPRINT_1">%2$s</xliff:g> nữa."</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 22f80bd2d511..6007d1e5f9c5 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"勿扰 (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"即使没有移动网络或 WLAN 网络，也能收发消息"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"打开“信息”应用"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"运作方式"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"开启“自动选择网络”"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"在“设置”中开启“自动选择网络”，以便手机找到可与卫星配合使用的网络"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"开启"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"返回"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"待归档…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"待归档…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"重新设置指纹解锁功能"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"系统无法再识别<xliff:g id="FINGERPRINT">%s</xliff:g>。"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"系统无法再识别<xliff:g id="FINGERPRINT_0">%1$s</xliff:g>和<xliff:g id="FINGERPRINT_1">%2$s</xliff:g>。"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 3f4c1758b1fb..fcf50e4beec4 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"請勿騷擾 (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"在沒有流動網絡或 Wi-Fi 網絡的情況下收發短訊"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"開啟「訊息」"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"運作方式"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"開啟「自動選取網絡」"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"前往設定開啟「自動選取網絡」，讓手機可以尋找可使用衛星的網絡"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"開啟"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"返回"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"待處理…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"待處理…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"重新設定「指紋解鎖」功能"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"無法再辨識<xliff:g id="FINGERPRINT">%s</xliff:g>。"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"無法再辨識<xliff:g id="FINGERPRINT_0">%1$s</xliff:g>和<xliff:g id="FINGERPRINT_1">%2$s</xliff:g>。"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 90cede80e250..e186e7c908b2 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -1938,13 +1938,13 @@ <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_implicit_name" msgid="177586786232302019">"零打擾 (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"<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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"即使沒有行動或 Wi-Fi 網路，還是可以收發訊息"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"開啟「訊息」應用程式"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"運作方式"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"開啟「自動選取網路」"</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"請前往「設定」開啟「自動選取網路」，讓手機可以找到支援衛星的網路"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"開啟"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"返回"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"待處理…"</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"待處理…"</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"重新設定指紋解鎖"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"系統無法再辨識「<xliff:g id="FINGERPRINT">%s</xliff:g>」。"</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"系統無法再辨識「<xliff:g id="FINGERPRINT_0">%1$s</xliff:g>」和「<xliff:g id="FINGERPRINT_1">%2$s</xliff:g>」。"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 5448fcd98d2b..69ec5edc9004 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -1938,13 +1938,13 @@ <string name="zen_mode_default_weekends_name" msgid="4707200272709377930">"Ngempelasonto"</string> <string name="zen_mode_default_events_name" msgid="2280682960128512257">"Umcimbi"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"Ulele"</string> + <string name="zen_mode_implicit_name" msgid="177586786232302019">"Ungaphazamisi (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string> <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> <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> - <!-- no translation found for zen_mode_trigger_summary_range_words (7228261413029290750) --> - <skip /> + <string name="zen_mode_trigger_summary_range_words" msgid="7228261413029290750">"U-<xliff:g id="START">%1$s</xliff:g> ukuya ku-<xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_trigger_event_calendar_any" msgid="2086784607921121803">"Noma iyiphi ikhalenda"</string> <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> @@ -2426,15 +2426,59 @@ <string name="satellite_notification_manual_summary" msgid="901206289846283445">"Thumela futhi wamukele imilayezo ngaphandle kwenethiwekhi yeselula noma yeWiFi"</string> <string name="satellite_notification_open_message" msgid="4149234979688273729">"Vula Imilayezo"</string> <string name="satellite_notification_how_it_works" msgid="3132069321977520519">"Indlela esebenza ngayo"</string> - <!-- no translation found for satellite_manual_selection_state_popup_title (8545991934926661974) --> + <string name="satellite_manual_selection_state_popup_title" msgid="8545991934926661974">"Vula okuthi \"Khetha inethiwekhi ngokuzenzekela\""</string> + <string name="satellite_manual_selection_state_popup_message" msgid="1928101658551382450">"Vula okuthi \"Khetha inethiwekhi ngokuzenzekela\" kumasethingi ukuze ifoni yakho ithole inethiwekhi esebenza nesathelayithi"</string> + <string name="satellite_manual_selection_state_popup_ok" msgid="2459664752624985095">"Vula"</string> + <string name="satellite_manual_selection_state_popup_cancel" msgid="973605633339469252">"Iya emuva"</string> + <string name="unarchival_session_app_label" msgid="6811856981546348205">"Ilindile..."</string> + <!-- no translation found for satellite_sos_available_notification_title (5396708154268096124) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_message (1928101658551382450) --> + <!-- no translation found for satellite_sos_available_notification_summary (1727088812951848330) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_ok (2459664752624985095) --> + <!-- no translation found for satellite_sos_not_supported_notification_title (2659100983227637285) --> <skip /> - <!-- no translation found for satellite_manual_selection_state_popup_cancel (973605633339469252) --> + <!-- no translation found for satellite_sos_not_supported_notification_summary (1071762454665310549) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_title (8564738683795406715) --> + <skip /> + <!-- no translation found for satellite_sos_not_provisioned_notification_summary (3127320958911180629) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_title (3164093193467075926) --> + <skip /> + <!-- no translation found for satellite_sos_not_in_allowed_region_notification_summary (7686947667515679672) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_title (292528603128702080) --> + <skip /> + <!-- no translation found for satellite_sos_unsupported_default_sms_app_notification_summary (3165168393504548437) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_title (5427987916850950591) --> + <skip /> + <!-- no translation found for satellite_sos_location_disabled_notification_summary (1544937460641058567) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_title (3366657987618784706) --> + <skip /> + <!-- no translation found for satellite_messaging_available_notification_summary (7573949038500243670) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_title (8202139632766878610) --> + <skip /> + <!-- no translation found for satellite_messaging_not_supported_notification_summary (61629858627638545) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_title (961909101918169727) --> + <skip /> + <!-- no translation found for satellite_messaging_not_provisioned_notification_summary (1060961852174442155) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_title (2035303593479031655) --> + <skip /> + <!-- no translation found for satellite_messaging_not_in_allowed_region_notification_summary (5270294879531815854) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_title (1004808759472360189) --> + <skip /> + <!-- no translation found for satellite_messaging_unsupported_default_sms_app_notification_summary (17084124893763593) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_title (7270641894250928494) --> + <skip /> + <!-- no translation found for satellite_messaging_location_disabled_notification_summary (1450824950686221810) --> <skip /> - <string name="unarchival_session_app_label" msgid="6811856981546348205">"Ilindile..."</string> <string name="fingerprint_dangling_notification_title" msgid="7362075195588639989">"Setha Ukuvula ngesigxivizo somunwe futhi"</string> <string name="fingerprint_dangling_notification_msg_1" msgid="5851784577768803510">"I-<xliff:g id="FINGERPRINT">%s</xliff:g> angeke isaziwa."</string> <string name="fingerprint_dangling_notification_msg_2" msgid="7925203589860744456">"I-<xliff:g id="FINGERPRINT_0">%1$s</xliff:g> kanye ne-<xliff:g id="FINGERPRINT_1">%2$s</xliff:g> angeke isaziwa."</string> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index e23e665e7335..c13fdb17dfe3 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1766,6 +1766,11 @@ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=140]--> <string name="permdesc_nearby_wifi_devices">Allows the app to advertise, connect, and determine the relative position of nearby Wi\u2011Fi devices</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=50]--> + <string name="permlab_ranging">determine relative position between nearby devices</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=120]--> + <string name="permdesc_ranging">Allow the app to determine relative position between nearby devices</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_preferredPaymentInfo">Preferred NFC Payment Service Information</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index fec8bbbfeb83..aa08d5e2313e 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -5647,7 +5647,6 @@ <java-symbol type="drawable" name="ic_zen_mode_type_schedule_calendar" /> <java-symbol type="drawable" name="ic_zen_mode_type_schedule_time" /> <java-symbol type="drawable" name="ic_zen_mode_type_theater" /> - <java-symbol type="drawable" name="ic_zen_mode_type_unknown" /> <java-symbol type="drawable" name="ic_zen_mode_type_special_dnd" /> <!-- System notification for background user sound --> diff --git a/core/tests/coretests/src/android/os/PowerManagerTest.java b/core/tests/coretests/src/android/os/PowerManagerTest.java index 3b27fc06352e..e4e965f1cadb 100644 --- a/core/tests/coretests/src/android/os/PowerManagerTest.java +++ b/core/tests/coretests/src/android/os/PowerManagerTest.java @@ -21,6 +21,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.timeout; @@ -61,9 +63,13 @@ public class PowerManagerTest { private UiDevice mUiDevice; private Executor mExec = Executors.newSingleThreadExecutor(); @Mock - private PowerManager.OnThermalStatusChangedListener mListener1; + private PowerManager.OnThermalStatusChangedListener mStatusListener1; @Mock - private PowerManager.OnThermalStatusChangedListener mListener2; + private PowerManager.OnThermalStatusChangedListener mStatusListener2; + @Mock + private PowerManager.OnThermalHeadroomChangedListener mHeadroomListener1; + @Mock + private PowerManager.OnThermalHeadroomChangedListener mHeadroomListener2; private static final long CALLBACK_TIMEOUT_MILLI_SEC = 5000; private native Parcel nativeObtainPowerSaveStateParcel(boolean batterySaverEnabled, boolean globalBatterySaverEnabled, int locationMode, int soundTriggerMode, @@ -245,53 +251,90 @@ public class PowerManagerTest { // Initial override status is THERMAL_STATUS_NONE int status = PowerManager.THERMAL_STATUS_NONE; // Add listener1 - mPm.addThermalStatusListener(mExec, mListener1); - verify(mListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + mPm.addThermalStatusListener(mExec, mStatusListener1); + verify(mStatusListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) .times(1)).onThermalStatusChanged(status); - reset(mListener1); + reset(mStatusListener1); status = PowerManager.THERMAL_STATUS_SEVERE; mUiDevice.executeShellCommand("cmd thermalservice override-status " + Integer.toString(status)); - verify(mListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + verify(mStatusListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) .times(1)).onThermalStatusChanged(status); - reset(mListener1); + reset(mStatusListener1); // Add listener1 again try { - mPm.addThermalStatusListener(mListener1); + mPm.addThermalStatusListener(mStatusListener1); fail("Expected exception not thrown"); } catch (IllegalArgumentException expectedException) { } // Add listener2 on main thread. - mPm.addThermalStatusListener(mListener2); - verify(mListener2, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + mPm.addThermalStatusListener(mStatusListener2); + verify(mStatusListener2, timeout(CALLBACK_TIMEOUT_MILLI_SEC) .times(1)).onThermalStatusChanged(status); - reset(mListener2); + reset(mStatusListener2); status = PowerManager.THERMAL_STATUS_MODERATE; mUiDevice.executeShellCommand("cmd thermalservice override-status " + Integer.toString(status)); - verify(mListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + verify(mStatusListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) .times(1)).onThermalStatusChanged(status); - verify(mListener2, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + verify(mStatusListener2, timeout(CALLBACK_TIMEOUT_MILLI_SEC) .times(1)).onThermalStatusChanged(status); - reset(mListener1); - reset(mListener2); + reset(mStatusListener1); + reset(mStatusListener2); // Remove listener1 - mPm.removeThermalStatusListener(mListener1); + mPm.removeThermalStatusListener(mStatusListener1); // Remove listener1 again try { - mPm.removeThermalStatusListener(mListener1); + mPm.removeThermalStatusListener(mStatusListener1); fail("Expected exception not thrown"); } catch (IllegalArgumentException expectedException) { } status = PowerManager.THERMAL_STATUS_LIGHT; mUiDevice.executeShellCommand("cmd thermalservice override-status " + Integer.toString(status)); - verify(mListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + verify(mStatusListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) .times(0)).onThermalStatusChanged(status); - verify(mListener2, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + verify(mStatusListener2, timeout(CALLBACK_TIMEOUT_MILLI_SEC) .times(1)).onThermalStatusChanged(status); } + /** + * Confirm that we can add/remove thermal headroom listener. + */ + @Test + @RequiresFlagsEnabled(Flags.FLAG_ALLOW_THERMAL_THRESHOLDS_CALLBACK) + public void testThermalHeadroomCallback() throws Exception { + float headroom = mPm.getThermalHeadroom(0); + // If the device doesn't support thermal headroom, return early + if (Float.isNaN(headroom)) { + return; + } + // Add listener1 + mPm.addThermalHeadroomListener(mExec, mHeadroomListener1); + verify(mHeadroomListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(1)).onThermalHeadroomChanged(anyInt(), anyInt(), anyInt(), any()); + reset(mHeadroomListener1); + // Add listener1 again + try { + mPm.addThermalHeadroomListener(mHeadroomListener1); + fail("Expected exception not thrown"); + } catch (IllegalArgumentException expectedException) { + } + // Add listener2 on main thread. + mPm.addThermalHeadroomListener(mHeadroomListener2); + verify(mHeadroomListener2, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(1)).onThermalHeadroomChanged(anyInt(), anyInt(), anyInt(), any()); + reset(mHeadroomListener2); + // Remove listener1 + mPm.removeThermalHeadroomListener(mHeadroomListener1); + // Remove listener1 again + try { + mPm.removeThermalHeadroomListener(mHeadroomListener1); + fail("Expected exception not thrown"); + } catch (IllegalArgumentException expectedException) { + } + } + @Test public void testGetThermalHeadroom() throws Exception { float headroom = mPm.getThermalHeadroom(0); diff --git a/core/tests/coretests/src/android/view/ImeBackAnimationControllerTest.java b/core/tests/coretests/src/android/view/ImeBackAnimationControllerTest.java index 00ffda867d6a..a47a3e0e6c2a 100644 --- a/core/tests/coretests/src/android/view/ImeBackAnimationControllerTest.java +++ b/core/tests/coretests/src/android/view/ImeBackAnimationControllerTest.java @@ -161,7 +161,7 @@ public class ImeBackAnimationControllerTest { mBackAnimationController.onBackInvoked(); // verify that InputMethodManager#notifyImeHidden is called (which is the case whenever // getInputMethodManager is called from ImeBackAnimationController) - verify(mViewRootInsetsControllerHost, times(1)).getInputMethodManager(); + verify(mViewRootInsetsControllerHost, times(2)).getInputMethodManager(); // verify that ImeBackAnimationController does not take control over IME insets verify(mInsetsController, never()).controlWindowInsetsAnimation(anyInt(), any(), any(), anyBoolean(), anyLong(), any(), anyInt(), anyBoolean()); @@ -180,7 +180,7 @@ public class ImeBackAnimationControllerTest { mBackAnimationController.onBackInvoked(); // verify that InputMethodManager#notifyImeHidden is called (which is the case whenever // getInputMethodManager is called from ImeBackAnimationController) - verify(mViewRootInsetsControllerHost, times(1)).getInputMethodManager(); + verify(mViewRootInsetsControllerHost, times(2)).getInputMethodManager(); // verify that ImeBackAnimationController does not take control over IME insets verify(mInsetsController, never()).controlWindowInsetsAnimation(anyInt(), any(), any(), anyBoolean(), anyLong(), any(), anyInt(), anyBoolean()); @@ -300,7 +300,7 @@ public class ImeBackAnimationControllerTest { mBackAnimationController.onBackInvoked(); // verify that InputMethodManager#notifyImeHidden is called (which is the case whenever // getInputMethodManager is called from ImeBackAnimationController) - verify(mViewRootInsetsControllerHost, times(1)).getInputMethodManager(); + verify(mViewRootInsetsControllerHost, times(2)).getInputMethodManager(); }); } diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewTest.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewTest.kt index 08d647de4a51..0d742cc6e382 100644 --- a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewTest.kt +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewTest.kt @@ -47,6 +47,7 @@ import com.android.wm.shell.shared.handles.RegionSamplingHelper import com.android.wm.shell.taskview.TaskView import com.android.wm.shell.taskview.TaskViewTaskController import com.google.common.truth.Truth.assertThat +import com.google.common.truth.Truth.assertWithMessage import com.google.common.util.concurrent.MoreExecutors.directExecutor import java.util.Collections import java.util.concurrent.Executor @@ -147,6 +148,7 @@ class BubbleBarExpandedViewTest { @After fun tearDown() { testableRegionSamplingHelper?.stopAndDestroy() + getInstrumentation().waitForIdleSync() } @Test @@ -218,8 +220,8 @@ class BubbleBarExpandedViewTest { @Test fun testEventLogging_dismissBubbleViaAppMenu() { getInstrumentation().runOnMainSync { bubbleExpandedView.handleView.performClick() } - val dismissMenuItem = - bubbleExpandedView.findViewWithTag<View>(BubbleBarMenuView.DISMISS_ACTION_TAG) + val dismissMenuItem = bubbleExpandedView.menuView() + .actionViewWithText(context.getString(R.string.bubble_dismiss_text)) assertThat(dismissMenuItem).isNotNull() getInstrumentation().runOnMainSync { dismissMenuItem.performClick() } assertThat(uiEventLoggerFake.numLogs()).isEqualTo(1) @@ -228,6 +230,42 @@ class BubbleBarExpandedViewTest { assertThat(uiEventLoggerFake.logs[0]).hasBubbleInfo(bubble) } + @Test + fun testEventLogging_openAppSettings() { + getInstrumentation().runOnMainSync { bubbleExpandedView.handleView.performClick() } + val appMenuItem = bubbleExpandedView.menuView() + .actionViewWithText(context.getString(R.string.bubbles_app_settings, bubble.appName)) + getInstrumentation().runOnMainSync { appMenuItem.performClick() } + assertThat(uiEventLoggerFake.numLogs()).isEqualTo(1) + assertThat(uiEventLoggerFake.logs[0].eventId) + .isEqualTo(BubbleLogger.Event.BUBBLE_BAR_APP_MENU_GO_TO_SETTINGS.id) + assertThat(uiEventLoggerFake.logs[0]).hasBubbleInfo(bubble) + } + + @Test + fun testEventLogging_unBubbleConversation() { + getInstrumentation().runOnMainSync { bubbleExpandedView.handleView.performClick() } + val menuItem = bubbleExpandedView.menuView() + .actionViewWithText(context.getString(R.string.bubbles_dont_bubble_conversation)) + getInstrumentation().runOnMainSync { menuItem.performClick() } + assertThat(uiEventLoggerFake.numLogs()).isEqualTo(1) + assertThat(uiEventLoggerFake.logs[0].eventId) + .isEqualTo(BubbleLogger.Event.BUBBLE_BAR_APP_MENU_OPT_OUT.id) + assertThat(uiEventLoggerFake.logs[0]).hasBubbleInfo(bubble) + } + + private fun BubbleBarExpandedView.menuView(): BubbleBarMenuView { + return findViewByPredicate { it is BubbleBarMenuView } + } + + private fun BubbleBarMenuView.actionViewWithText(text: CharSequence): View { + val views = ArrayList<View>() + findViewsWithText(views, text, View.FIND_VIEWS_WITH_TEXT) + assertWithMessage("Expecting a single action with text '$text'").that(views).hasSize(1) + // findViewsWithText returns the TextView, but the click listener is on the parent container + return views.first().parent as View + } + private inner class FakeBubbleTaskViewFactory : BubbleTaskViewFactory { override fun create(): BubbleTaskView { val taskViewTaskController = mock<TaskViewTaskController>() diff --git a/libs/WindowManager/Shell/res/values-af/strings.xml b/libs/WindowManager/Shell/res/values-af/strings.xml index 95c2bb59d202..c007c6c7cf57 100644 --- a/libs/WindowManager/Shell/res/values-af/strings.xml +++ b/libs/WindowManager/Shell/res/values-af/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Maak in blaaier oop"</string> <string name="new_window_text" msgid="6318648868380652280">"Nuwe venster"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Bestuur vensters"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Maak toe"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Maak kieslys toe"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Maak kieslys oop"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimeer skerm"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Gryp skerm vas"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"App kan nie hierheen geskuif word nie"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Meesleurend"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Stel terug"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maksimeer"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Stel terug"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Spring na links"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"In die app"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"In jou blaaier"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-am/strings.xml b/libs/WindowManager/Shell/res/values-am/strings.xml index ba74e342f353..ef4a47ae6163 100644 --- a/libs/WindowManager/Shell/res/values-am/strings.xml +++ b/libs/WindowManager/Shell/res/values-am/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"በአሳሽ ውስጥ ክፈት"</string> <string name="new_window_text" msgid="6318648868380652280">"አዲስ መስኮት"</string> <string name="manage_windows_text" msgid="5567366688493093920">"መስኮቶችን አስተዳድር"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"ዝጋ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ምናሌ ዝጋ"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"ምናሌን ክፈት"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"የማያ ገጹ መጠን አሳድግ"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"ማያ ገጹን አሳድግ"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"መተግበሪያ ወደዚህ መንቀሳቀስ አይችልም"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"አስማጭ"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"ወደነበረበት መልስ"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"አሳድግ"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"ወደነበረበት መልስ"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"ወደ ግራ አሳድግ"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"በመተግበሪያው ውስጥ"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"በአሳሽዎ ውስጥ"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"እሺ"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ar/strings.xml b/libs/WindowManager/Shell/res/values-ar/strings.xml index a8febc80ffc1..7ddd4d17ec37 100644 --- a/libs/WindowManager/Shell/res/values-ar/strings.xml +++ b/libs/WindowManager/Shell/res/values-ar/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"فتح في المتصفِّح"</string> <string name="new_window_text" msgid="6318648868380652280">"نافذة جديدة"</string> <string name="manage_windows_text" msgid="5567366688493093920">"إدارة النوافذ"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"إغلاق"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"إغلاق القائمة"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"فتح القائمة"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"في التطبيق"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"في المتصفِّح"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"حسنًا"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-as/strings.xml b/libs/WindowManager/Shell/res/values-as/strings.xml index 8c924e342875..85cf31fd4d20 100644 --- a/libs/WindowManager/Shell/res/values-as/strings.xml +++ b/libs/WindowManager/Shell/res/values-as/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"ব্ৰাউজাৰত খোলক"</string> <string name="new_window_text" msgid="6318648868380652280">"নতুন ৱিণ্ড’"</string> <string name="manage_windows_text" msgid="5567366688493093920">"ৱিণ্ড’ পৰিচালনা কৰক"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"বন্ধ কৰক"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"মেনু বন্ধ কৰক"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"মেনু খোলক"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"এপ্টোত"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"আপোনাৰ ব্ৰাউজাৰত"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ঠিক আছে"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-az/strings.xml b/libs/WindowManager/Shell/res/values-az/strings.xml index aa232e330604..d27607a8c8df 100644 --- a/libs/WindowManager/Shell/res/values-az/strings.xml +++ b/libs/WindowManager/Shell/res/values-az/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Brauzerdə açın"</string> <string name="new_window_text" msgid="6318648868380652280">"Yeni pəncərə"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Pəncərələri idarə edin"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Bağlayın"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menyunu bağlayın"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Menyunu açın"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Ekranı maksimum böyüdün"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Ekranı çəkin"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Tətbiqi bura köçürmək mümkün deyil"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"İmmersiv"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Bərpa edin"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Böyüdün"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Bərpa edin"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Sola tərəf çəkin"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Tətbiqdə"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Brauzerinizdə"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml b/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml index 256344a4cb31..f251791538dc 100644 --- a/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml +++ b/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Otvorite u pregledaču"</string> <string name="new_window_text" msgid="6318648868380652280">"Novi prozor"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Upravljajte prozorima"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Zatvorite"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zatvorite meni"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Otvorite meni"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Povećaj ekran"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Uklopi ekran"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplikacija ne može da se premesti ovde"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Imerzivne"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Vrati"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Uvećajte"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Vratite"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Prikačite levo"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"U aplikaciji"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"U pregledaču"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Potvrdi"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-be/strings.xml b/libs/WindowManager/Shell/res/values-be/strings.xml index 701c51091aa4..3393af65f268 100644 --- a/libs/WindowManager/Shell/res/values-be/strings.xml +++ b/libs/WindowManager/Shell/res/values-be/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Адкрыць у браўзеры"</string> <string name="new_window_text" msgid="6318648868380652280">"Новае акно"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Кіраваць вокнамі"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Закрыць"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Закрыць меню"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Адкрыць меню"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Разгарнуць на ўвесь экран"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Размясціць на палавіне экрана"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Нельга перамясціць сюды праграму"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"З эфектам прысутнасці"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Аднавіць"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Разгарнуць"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Аднавіць"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Размясціць злева"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"У праграме"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"У браўзеры"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ОК"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-bg/strings.xml b/libs/WindowManager/Shell/res/values-bg/strings.xml index 9ab86f4cbc56..c2236a0cfe82 100644 --- a/libs/WindowManager/Shell/res/values-bg/strings.xml +++ b/libs/WindowManager/Shell/res/values-bg/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Отваряне в браузър"</string> <string name="new_window_text" msgid="6318648868380652280">"Нов прозорец"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Управление на прозорците"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Затваряне"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Затваряне на менюто"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Отваряне на менюто"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Увеличаване на екрана"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Прилепване на екрана"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Приложението не може да бъде преместено тук"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Реалистично"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Възстановяване"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Увеличаване"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Възстановяване"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Прилепване наляво"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"В приложението"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"В браузъра ви"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-bn/strings.xml b/libs/WindowManager/Shell/res/values-bn/strings.xml index 22a445f1754c..ae302665263c 100644 --- a/libs/WindowManager/Shell/res/values-bn/strings.xml +++ b/libs/WindowManager/Shell/res/values-bn/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"ব্রাউজারে খুলুন"</string> <string name="new_window_text" msgid="6318648868380652280">"নতুন উইন্ডো"</string> <string name="manage_windows_text" msgid="5567366688493093920">"উইন্ডো ম্যানেজ করুন"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"বন্ধ করুন"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"\'মেনু\' বন্ধ করুন"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"মেনু খুলুন"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"অ্যাপের মধ্যে"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"আপনার ব্রাউজারে"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ঠিক আছে"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-bs/strings.xml b/libs/WindowManager/Shell/res/values-bs/strings.xml index 73f30d797883..3a1512f4fa29 100644 --- a/libs/WindowManager/Shell/res/values-bs/strings.xml +++ b/libs/WindowManager/Shell/res/values-bs/strings.xml @@ -127,14 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Otvaranje u pregledniku"</string> <string name="new_window_text" msgid="6318648868380652280">"Novi prozor"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Upravljanje prozorima"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Zatvaranje"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zatvaranje menija"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Otvaranje menija"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimiziraj ekran"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Snimi ekran"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Ne možete premjestiti aplikaciju ovdje"</string> - <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Interaktivno"</string> - <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Vrati"</string> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Uvjerljivo"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Vraćanje"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maksimiziranje"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Vraćanje"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Pomicanje ulijevo"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"U aplikaciji"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"U pregledniku"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Uredu"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ca/strings.xml b/libs/WindowManager/Shell/res/values-ca/strings.xml index 499ed329e511..3992387584ce 100644 --- a/libs/WindowManager/Shell/res/values-ca/strings.xml +++ b/libs/WindowManager/Shell/res/values-ca/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Obre al navegador"</string> <string name="new_window_text" msgid="6318648868380652280">"Finestra nova"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Gestiona les finestres"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Tanca"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Tanca el menú"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Obre el menú"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximitza la pantalla"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Ajusta la pantalla"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"L\'aplicació no es pot moure aquí"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Immersiu"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Restaura"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maximitza"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Restaura"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Ajusta a l\'esquerra"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"A l\'aplicació"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Al navegador"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"D\'acord"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-cs/strings.xml b/libs/WindowManager/Shell/res/values-cs/strings.xml index 6a5780e01822..9d5ec766f67d 100644 --- a/libs/WindowManager/Shell/res/values-cs/strings.xml +++ b/libs/WindowManager/Shell/res/values-cs/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Otevřít v prohlížeči"</string> <string name="new_window_text" msgid="6318648868380652280">"Nové okno"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Spravovat okna"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Zavřít"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zavřít nabídku"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Otevřít nabídku"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"V aplikaci"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"V prohlížeči"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-da/strings.xml b/libs/WindowManager/Shell/res/values-da/strings.xml index 430cf96cd72f..91a294d43dfb 100644 --- a/libs/WindowManager/Shell/res/values-da/strings.xml +++ b/libs/WindowManager/Shell/res/values-da/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Åbn i browser"</string> <string name="new_window_text" msgid="6318648868380652280">"Nyt vindue"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Administrer vinduer"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Luk"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Luk menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Åbn menu"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimér skærm"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Tilpas skærm"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Apps kan ikke flyttes hertil"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Opslugende"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Gendan"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maksimér"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Gendan"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Fastgør til venstre"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"I appen"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"I din browser"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-de/strings.xml b/libs/WindowManager/Shell/res/values-de/strings.xml index cafaa89f57e3..9004b19e7607 100644 --- a/libs/WindowManager/Shell/res/values-de/strings.xml +++ b/libs/WindowManager/Shell/res/values-de/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Im Browser öffnen"</string> <string name="new_window_text" msgid="6318648868380652280">"Neues Fenster"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Fenster verwalten"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Schließen"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menü schließen"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Menü öffnen"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Bildschirm maximieren"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Bildschirm teilen"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Die App kann nicht hierher verschoben werden"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Immersiv"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Wiederherstellen"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maximieren"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Wiederherstellen"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Links andocken"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"In der App"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"In deinem Browser"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Ok"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-el/strings.xml b/libs/WindowManager/Shell/res/values-el/strings.xml index d02fae2a986d..601c0ceee27f 100644 --- a/libs/WindowManager/Shell/res/values-el/strings.xml +++ b/libs/WindowManager/Shell/res/values-el/strings.xml @@ -127,6 +127,7 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Άνοιγμα σε πρόγραμμα περιήγησης"</string> <string name="new_window_text" msgid="6318648868380652280">"Νέο παράθυρο"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Διαχείριση παραθύρων"</string> + <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Αλλαγή λόγου διαστάσεων"</string> <string name="close_text" msgid="4986518933445178928">"Κλείσιμο"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Κλείσιμο μενού"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Άνοιγμα μενού"</string> @@ -144,4 +145,5 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Στην εφαρμογή"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Στο πρόγραμμα περιήγησής σας"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ΟΚ"</string> + <string name="desktop_windowing_app_to_web_education_text" msgid="1599668769538703570">"Ανοίξτε γρήγορα εφαρμογές στο πρόγραμμα περιήγησής σας εδώ"</string> </resources> diff --git a/libs/WindowManager/Shell/res/values-en-rAU/strings.xml b/libs/WindowManager/Shell/res/values-en-rAU/strings.xml index f9911451f4b5..85d5646ca26f 100644 --- a/libs/WindowManager/Shell/res/values-en-rAU/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rAU/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Open in browser"</string> <string name="new_window_text" msgid="6318648868380652280">"New window"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Manage windows"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Open menu"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"In the app"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"In your browser"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-en-rCA/strings.xml b/libs/WindowManager/Shell/res/values-en-rCA/strings.xml index 2d123ec3a3d4..dac1b9a1460d 100644 --- a/libs/WindowManager/Shell/res/values-en-rCA/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rCA/strings.xml @@ -127,6 +127,7 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Open in browser"</string> <string name="new_window_text" msgid="6318648868380652280">"New Window"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Manage Windows"</string> + <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Change aspect ratio"</string> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close Menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Open Menu"</string> @@ -144,4 +145,5 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"In the app"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"In your browser"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <string name="desktop_windowing_app_to_web_education_text" msgid="1599668769538703570">"Quickly open apps in your browser here"</string> </resources> diff --git a/libs/WindowManager/Shell/res/values-en-rGB/strings.xml b/libs/WindowManager/Shell/res/values-en-rGB/strings.xml index f9911451f4b5..85d5646ca26f 100644 --- a/libs/WindowManager/Shell/res/values-en-rGB/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rGB/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Open in browser"</string> <string name="new_window_text" msgid="6318648868380652280">"New window"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Manage windows"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Open menu"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"In the app"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"In your browser"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-en-rIN/strings.xml b/libs/WindowManager/Shell/res/values-en-rIN/strings.xml index f9911451f4b5..85d5646ca26f 100644 --- a/libs/WindowManager/Shell/res/values-en-rIN/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rIN/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Open in browser"</string> <string name="new_window_text" msgid="6318648868380652280">"New window"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Manage windows"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Open menu"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"In the app"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"In your browser"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-es-rUS/strings.xml b/libs/WindowManager/Shell/res/values-es-rUS/strings.xml index 210b708b49af..f6a9b6d8799a 100644 --- a/libs/WindowManager/Shell/res/values-es-rUS/strings.xml +++ b/libs/WindowManager/Shell/res/values-es-rUS/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Abrir en el navegador"</string> <string name="new_window_text" msgid="6318648868380652280">"Nueva ventana"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Administrar ventanas"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Cerrar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Cerrar menú"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Abrir el menú"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximizar pantalla"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Ajustar pantalla"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"No se puede mover la app aquí"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Inmersivo"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Restablecer"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maximizar"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Restablecer"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Ajustar a la izquierda"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"En la app"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"En un navegador"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Aceptar"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-es/strings.xml b/libs/WindowManager/Shell/res/values-es/strings.xml index 3c7bfe5a3cb4..2c902903039c 100644 --- a/libs/WindowManager/Shell/res/values-es/strings.xml +++ b/libs/WindowManager/Shell/res/values-es/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Abrir en el navegador"</string> <string name="new_window_text" msgid="6318648868380652280">"Ventana nueva"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Gestionar ventanas"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Cerrar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Cerrar menú"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Abrir menú"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximizar pantalla"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Ajustar pantalla"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"La aplicación no se puede mover aquí"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Inmersivo"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Restaurar"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maximizar"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Restaurar"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Acoplar a la izquierda"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"En la aplicación"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"En el navegador"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Aceptar"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-et/strings.xml b/libs/WindowManager/Shell/res/values-et/strings.xml index d17ee02a3a7f..3d1977bd12f0 100644 --- a/libs/WindowManager/Shell/res/values-et/strings.xml +++ b/libs/WindowManager/Shell/res/values-et/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Avamine brauseris"</string> <string name="new_window_text" msgid="6318648868380652280">"Uus aken"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Akende haldamine"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Sule"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Sule menüü"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Ava menüü"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Kuva täisekraanil"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Kuva poolel ekraanil"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Rakendust ei saa siia teisaldada"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Kaasahaarav"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Taasta"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maksimeeri"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Taasta"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Tõmmake vasakule"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Rakenduses"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Brauseris"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-eu/strings.xml b/libs/WindowManager/Shell/res/values-eu/strings.xml index f9419bc4614b..2e1822d30ba2 100644 --- a/libs/WindowManager/Shell/res/values-eu/strings.xml +++ b/libs/WindowManager/Shell/res/values-eu/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Ireki arakatzailean"</string> <string name="new_window_text" msgid="6318648868380652280">"Leiho berria"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Kudeatu leihoak"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Itxi"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Itxi menua"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Ireki menua"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Handitu pantaila"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Zatitu pantaila"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplikazioa ezin da hona ekarri"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Murgiltzailea"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Leheneratu"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maximizatu"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Leheneratu"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Ezarri ezkerrean"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Aplikazioan"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Arakatzailean"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Ados"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-fa/strings.xml b/libs/WindowManager/Shell/res/values-fa/strings.xml index a3d3cbc872fd..b14a1fff98a3 100644 --- a/libs/WindowManager/Shell/res/values-fa/strings.xml +++ b/libs/WindowManager/Shell/res/values-fa/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"باز کردن در مرورگر"</string> <string name="new_window_text" msgid="6318648868380652280">"پنجره جدید"</string> <string name="manage_windows_text" msgid="5567366688493093920">"مدیریت کردن پنجرهها"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"بستن"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"بستن منو"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"باز کردن منو"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"بزرگ کردن صفحه"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"بزرگ کردن صفحه"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"برنامه را نمیتوان به اینجا منتقل کرد"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"فراگیر"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"بازیابی"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"بزرگ کردن"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"بازیابی کردن"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"کشیدن بهچپ"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"در برنامه"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"در مرورگر"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"تأیید"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-fi/strings.xml b/libs/WindowManager/Shell/res/values-fi/strings.xml index ee5dd6516098..53b22ab96bf8 100644 --- a/libs/WindowManager/Shell/res/values-fi/strings.xml +++ b/libs/WindowManager/Shell/res/values-fi/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Avaa selaimessa"</string> <string name="new_window_text" msgid="6318648868380652280">"Uusi ikkuna"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Hallinnoi ikkunoita"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Sulje"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Sulje valikko"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Avaa valikko"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Suurenna näyttö"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Jaa näyttö"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Sovellusta ei voi siirtää tänne"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Immersiivinen"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Palauta"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Suurenna"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Palauta"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Siirrä vasemmalle"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Sovelluksessa"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Selaimella"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml b/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml index dc4789169146..36fc2c22c156 100644 --- a/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml +++ b/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Ouvrir dans le navigateur"</string> <string name="new_window_text" msgid="6318648868380652280">"Nouvelle fenêtre"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Gérer les fenêtres"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Fermer"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fermer le menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Ouvrir le menu"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Agrandir l\'écran"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Aligner l\'écran"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Impossible de déplacer l\'appli ici"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Immersif"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Restaurer"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Agrandir"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Restaurer"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Épingler à gauche"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Dans l\'appli"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Dans votre navigateur"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-fr/strings.xml b/libs/WindowManager/Shell/res/values-fr/strings.xml index a52ab49da3ab..6c475a8c9a12 100644 --- a/libs/WindowManager/Shell/res/values-fr/strings.xml +++ b/libs/WindowManager/Shell/res/values-fr/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Ouvrir dans un navigateur"</string> <string name="new_window_text" msgid="6318648868380652280">"Nouvelle fenêtre"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Gérer les fenêtres"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Fermer"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fermer le menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Ouvrir le menu"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Mettre en plein écran"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Fractionner l\'écran"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Impossible de déplacer l\'appli ici"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Immersif"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Restaurer"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Agrandir"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Restaurer"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Ancrer à gauche"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Dans l\'application"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Dans votre navigateur"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-gl/strings.xml b/libs/WindowManager/Shell/res/values-gl/strings.xml index 97d5e51e5b98..c78cba6a0d4e 100644 --- a/libs/WindowManager/Shell/res/values-gl/strings.xml +++ b/libs/WindowManager/Shell/res/values-gl/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Abrir no navegador"</string> <string name="new_window_text" msgid="6318648868380652280">"Ventá nova"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Xestionar as ventás"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Pechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Pechar o menú"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Abrir o menú"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximizar pantalla"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Encaixar pantalla"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Non se pode mover aquí a aplicación"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Envolvente"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Restaurar"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maximizar"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Restaurar"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Axustar á esquerda"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Na aplicación"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"No navegador"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Aceptar"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-gu/strings.xml b/libs/WindowManager/Shell/res/values-gu/strings.xml index 362ff8d874bb..16188cb6e5fb 100644 --- a/libs/WindowManager/Shell/res/values-gu/strings.xml +++ b/libs/WindowManager/Shell/res/values-gu/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"બ્રાઉઝરમાં ખોલો"</string> <string name="new_window_text" msgid="6318648868380652280">"નવી વિન્ડો"</string> <string name="manage_windows_text" msgid="5567366688493093920">"વિન્ડો મેનેજ કરો"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"બંધ કરો"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"મેનૂ બંધ કરો"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"મેનૂ ખોલો"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"સ્ક્રીન કરો મોટી કરો"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"સ્ક્રીન સ્નૅપ કરો"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ઍપ અહીં ખસેડી શકાતી નથી"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"ઇમર્સિવ"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"રિસ્ટોર કરો"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"મોટું કરો"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"રિસ્ટોર કરો"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"ડાબે સ્નૅપ કરો"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"ઍપમાં"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"તમારા બ્રાઉઝરમાં"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ઓકે"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-hi/strings.xml b/libs/WindowManager/Shell/res/values-hi/strings.xml index 527793eac9c3..51ca24cbcfdb 100644 --- a/libs/WindowManager/Shell/res/values-hi/strings.xml +++ b/libs/WindowManager/Shell/res/values-hi/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"ब्राउज़र में खोलें"</string> <string name="new_window_text" msgid="6318648868380652280">"नई विंडो"</string> <string name="manage_windows_text" msgid="5567366688493093920">"विंडो मैनेज करें"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"बंद करें"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"मेन्यू बंद करें"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"मेन्यू खोलें"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"ऐप्लिकेशन में"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"आपके ब्राउज़र में"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ठीक है"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-hr/strings.xml b/libs/WindowManager/Shell/res/values-hr/strings.xml index 659d1ec39b73..70ecca8950d9 100644 --- a/libs/WindowManager/Shell/res/values-hr/strings.xml +++ b/libs/WindowManager/Shell/res/values-hr/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Otvori u pregledniku"</string> <string name="new_window_text" msgid="6318648868380652280">"Novi prozor"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Upravljanje prozorima"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Zatvorite"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zatvorite izbornik"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Otvaranje izbornika"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"U aplikaciji"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"U pregledniku"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"U redu"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-hu/strings.xml b/libs/WindowManager/Shell/res/values-hu/strings.xml index 943b5eb30768..a46c14f6f712 100644 --- a/libs/WindowManager/Shell/res/values-hu/strings.xml +++ b/libs/WindowManager/Shell/res/values-hu/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Megnyitás böngészőben"</string> <string name="new_window_text" msgid="6318648868380652280">"Új ablak"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Ablakok kezelése"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Bezárás"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menü bezárása"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Menü megnyitása"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Képernyő méretének maximalizálása"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Igazodás a képernyő adott részéhez"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Az alkalmazás nem helyezhető át ide"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Magával ragadó"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Visszaállítás"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Teljes méret"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Visszaállítás"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Balra igazítás"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Az alkalmazásban"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"A böngészőben"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-hy/strings.xml b/libs/WindowManager/Shell/res/values-hy/strings.xml index 6bcfc9a22d6e..b7105c989ce4 100644 --- a/libs/WindowManager/Shell/res/values-hy/strings.xml +++ b/libs/WindowManager/Shell/res/values-hy/strings.xml @@ -92,8 +92,8 @@ <string name="bubble_shortcut_label" msgid="666269077944378311">"Ամպիկներ"</string> <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Ցույց տալ ամպիկներ"</string> <string name="restart_button_description" msgid="4564728020654658478">"Հպեք՝ հավելվածը վերագործարկելու և ավելի հարմար տեսք ընտրելու համար"</string> - <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Փոխել հավելվածի կողմերի հարաբերակցությունը Կարգավորումներում"</string> - <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Փոխել չափերի հարաբերակցությունը"</string> + <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Փոխել հավելվածի կողմերի հարաբերությունը Կարգավորումներում"</string> + <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Փոխել չափերի հարաբերությունը"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Տեսախցիկի հետ կապված խնդիրնե՞ր կան։\nՀպեք՝ վերակարգավորելու համար։"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Չհաջողվե՞ց շտկել։\nՀպեք՝ փոփոխությունները չեղարկելու համար։"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Տեսախցիկի հետ կապված խնդիրներ չկա՞ն։ Փակելու համար հպեք։"</string> @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Բացել դիտարկիչում"</string> <string name="new_window_text" msgid="6318648868380652280">"Նոր պատուհան"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Կառավարել պատուհանները"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Փակել"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Փակել ընտրացանկը"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Բացել ընտրացանկը"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Ծավալել էկրանը"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Ծալել էկրանը"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Հավելվածը հնարավոր չէ տեղափոխել այստեղ"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Ներկայության էֆեկտով"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Վերականգնել"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Ծավալել"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Վերականգնել"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Ամրացնել ձախ կողմում"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Հավելվածում"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Ձեր դիտարկիչում"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Եղավ"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-in/strings.xml b/libs/WindowManager/Shell/res/values-in/strings.xml index 96a3ebce9a45..4a40027639fd 100644 --- a/libs/WindowManager/Shell/res/values-in/strings.xml +++ b/libs/WindowManager/Shell/res/values-in/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Buka di browser"</string> <string name="new_window_text" msgid="6318648868380652280">"Jendela Baru"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Kelola Jendela"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Tutup"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Tutup Menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Buka Menu"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Perbesar Layar"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Gabungkan Layar"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplikasi tidak dapat dipindahkan ke sini"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Imersif"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Pulihkan"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maksimalkan"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Pulihkan"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Maksimalkan ke kiri"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Di aplikasi"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Di browser Anda"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Oke"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-is/strings.xml b/libs/WindowManager/Shell/res/values-is/strings.xml index ca1bc15edf33..d3f2c3dff0ee 100644 --- a/libs/WindowManager/Shell/res/values-is/strings.xml +++ b/libs/WindowManager/Shell/res/values-is/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Opna í vafra"</string> <string name="new_window_text" msgid="6318648868380652280">"Nýr gluggi"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Stjórna gluggum"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Loka"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Loka valmynd"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Opna valmynd"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Í forritinu"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Í vafranum"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Í lagi"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-it/strings.xml b/libs/WindowManager/Shell/res/values-it/strings.xml index 87919b5dc1ff..e4f78addf432 100644 --- a/libs/WindowManager/Shell/res/values-it/strings.xml +++ b/libs/WindowManager/Shell/res/values-it/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Apri nel browser"</string> <string name="new_window_text" msgid="6318648868380652280">"Nuova finestra"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Gestisci finestre"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Chiudi"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Chiudi il menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Apri il menu"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"All\'interno dell\'app"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Nel browser"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Ok"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-iw/strings.xml b/libs/WindowManager/Shell/res/values-iw/strings.xml index 17ffe8ee7600..b042ee491860 100644 --- a/libs/WindowManager/Shell/res/values-iw/strings.xml +++ b/libs/WindowManager/Shell/res/values-iw/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"פתיחה בדפדפן"</string> <string name="new_window_text" msgid="6318648868380652280">"חלון חדש"</string> <string name="manage_windows_text" msgid="5567366688493093920">"ניהול החלונות"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"סגירה"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"סגירת התפריט"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"פתיחת התפריט"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"הגדלת המסך"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"כיווץ המסך"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"לא ניתן להעביר את האפליקציה לכאן"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"סוחף"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"שחזור"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"הגדלה"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"שחזור"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"הצמדה לשמאל"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"באפליקציה"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"בדפדפן"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"אישור"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ja/strings.xml b/libs/WindowManager/Shell/res/values-ja/strings.xml index c7a77d9b9214..6d5954f755c4 100644 --- a/libs/WindowManager/Shell/res/values-ja/strings.xml +++ b/libs/WindowManager/Shell/res/values-ja/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"ブラウザで開く"</string> <string name="new_window_text" msgid="6318648868380652280">"新しいウィンドウ"</string> <string name="manage_windows_text" msgid="5567366688493093920">"ウィンドウを管理する"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"閉じる"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"メニューを閉じる"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"メニューを開く"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"アプリ内"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"ブラウザ内"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ka/strings.xml b/libs/WindowManager/Shell/res/values-ka/strings.xml index 39362ef4ca57..f38f68fbc657 100644 --- a/libs/WindowManager/Shell/res/values-ka/strings.xml +++ b/libs/WindowManager/Shell/res/values-ka/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"ბრაუზერში გახსნა"</string> <string name="new_window_text" msgid="6318648868380652280">"ახალი ფანჯარა"</string> <string name="manage_windows_text" msgid="5567366688493093920">"ფანჯრების მართვა"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"დახურვა"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"მენიუს დახურვა"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"მენიუს გახსნა"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"აპში"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"თქვენს ბრაუზერში"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"კარგი"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-kk/strings.xml b/libs/WindowManager/Shell/res/values-kk/strings.xml index 45f85b9e9a70..b4be01ab1933 100644 --- a/libs/WindowManager/Shell/res/values-kk/strings.xml +++ b/libs/WindowManager/Shell/res/values-kk/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Браузерден ашу"</string> <string name="new_window_text" msgid="6318648868380652280">"Жаңа терезе"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Терезелерді басқару"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Жабу"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Мәзірді жабу"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Мәзірді ашу"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Экранды ұлғайту"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Экранды бөлу"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Қолданба бұл жерге қойылмайды."</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Әсерлі"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Қалпына келтіру"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Жаю"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Қалпына келтіру"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Солға тіркеу"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Қолданбада"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Браузерде"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Жарайды"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-km/strings.xml b/libs/WindowManager/Shell/res/values-km/strings.xml index 9c4ae05f3a36..2424a420f375 100644 --- a/libs/WindowManager/Shell/res/values-km/strings.xml +++ b/libs/WindowManager/Shell/res/values-km/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"បើកក្នុងកម្មវិធីរុករកតាមអ៊ីនធឺណិត"</string> <string name="new_window_text" msgid="6318648868380652280">"វិនដូថ្មី"</string> <string name="manage_windows_text" msgid="5567366688493093920">"គ្រប់គ្រងវិនដូ"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"បិទ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"បិទម៉ឺនុយ"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"បើកម៉ឺនុយ"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"នៅក្នុងកម្មវិធី"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"នៅក្នុងកម្មវិធីរុករកតាមអ៊ីនធឺណិតរបស់អ្នក"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"យល់ព្រម"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-kn/strings.xml b/libs/WindowManager/Shell/res/values-kn/strings.xml index f365cfb34412..56a5d641be01 100644 --- a/libs/WindowManager/Shell/res/values-kn/strings.xml +++ b/libs/WindowManager/Shell/res/values-kn/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"ಬ್ರೌಸರ್ನಲ್ಲಿ ತೆರೆಯಿರಿ"</string> <string name="new_window_text" msgid="6318648868380652280">"ಹೊಸ ವಿಂಡೋ"</string> <string name="manage_windows_text" msgid="5567366688493093920">"ವಿಂಡೋಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"ಮುಚ್ಚಿ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ಮೆನು ಮುಚ್ಚಿ"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"ಮೆನು ತೆರೆಯಿರಿ"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"ಆ್ಯಪ್ನಲ್ಲಿ"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"ನಿಮ್ಮ ಬ್ರೌಸರ್ನಲ್ಲಿ"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ಸರಿ"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ko/strings.xml b/libs/WindowManager/Shell/res/values-ko/strings.xml index 2bf1b05a919b..d45d51520192 100644 --- a/libs/WindowManager/Shell/res/values-ko/strings.xml +++ b/libs/WindowManager/Shell/res/values-ko/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"브라우저에서 열기"</string> <string name="new_window_text" msgid="6318648868380652280">"새 창"</string> <string name="manage_windows_text" msgid="5567366688493093920">"창 관리"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"닫기"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"메뉴 닫기"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"메뉴 열기"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"화면 최대화"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"화면 분할"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"앱을 여기로 이동할 수 없음"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"몰입형"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"복원"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"최대화하기"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"복원"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"왼쪽으로 맞추기"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"앱에서"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"브라우저에서"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"확인"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ky/strings.xml b/libs/WindowManager/Shell/res/values-ky/strings.xml index 392ae4cab107..501b2a73351b 100644 --- a/libs/WindowManager/Shell/res/values-ky/strings.xml +++ b/libs/WindowManager/Shell/res/values-ky/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Серепчиден ачуу"</string> <string name="new_window_text" msgid="6318648868380652280">"Жаңы терезе"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Терезелерди тескөө"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Жабуу"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Менюну жабуу"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Менюну ачуу"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Экранды чоңойтуу"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Экранды сүрөткө тартып алуу"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Колдонмону бул жерге жылдырууга болбойт"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Сүңгүтүүчү"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Калыбына келтирүү"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Чоңойтуу"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Калыбына келтирүү"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Солго жылдыруу"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Колдонмодо"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Серепчиңизде"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Жарайт"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-lo/strings.xml b/libs/WindowManager/Shell/res/values-lo/strings.xml index 4e4b678755b2..b48b07067521 100644 --- a/libs/WindowManager/Shell/res/values-lo/strings.xml +++ b/libs/WindowManager/Shell/res/values-lo/strings.xml @@ -127,16 +127,15 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"ເປີດໃນໂປຣແກຣມທ່ອງເວັບ"</string> <string name="new_window_text" msgid="6318648868380652280">"ໜ້າຈໍໃໝ່"</string> <string name="manage_windows_text" msgid="5567366688493093920">"ຈັດການໜ້າຈໍ"</string> + <string name="change_aspect_ratio_text" msgid="9104456064548212806">"ປ່ຽນອັດຕາສ່ວນຮູບ"</string> <string name="close_text" msgid="4986518933445178928">"ປິດ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ປິດເມນູ"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"ເປີດເມນູ"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"ປັບຈໍໃຫຍ່ສຸດ"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"ສະແນັບໜ້າຈໍ"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ບໍ່ສາມາດຍ້າຍແອັບມາບ່ອນນີ້ໄດ້"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"ສົມຈິງ"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"ກູ້ຄືນ"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"ຂະຫຍາຍໃຫຍ່ສຸດ"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"ກູ້ຄືນ"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"ແນບຊ້າຍ"</string> @@ -146,4 +145,5 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"ໃນແອັບ"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"ໃນໂປຣແກຣມທ່ອງເວັບຂອງທ່ານ"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ຕົກລົງ"</string> + <string name="desktop_windowing_app_to_web_education_text" msgid="1599668769538703570">"ເປີດແອັບຢ່າງວ່ອງໄວໃນໂປຣແກຣມທ່ອງເວັບຂອງທ່ານບ່ອນນີ້"</string> </resources> diff --git a/libs/WindowManager/Shell/res/values-lt/strings.xml b/libs/WindowManager/Shell/res/values-lt/strings.xml index 5a7f58e5781a..7e1aac00f404 100644 --- a/libs/WindowManager/Shell/res/values-lt/strings.xml +++ b/libs/WindowManager/Shell/res/values-lt/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Atidaryti naršyklėje"</string> <string name="new_window_text" msgid="6318648868380652280">"Naujas langas"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Tvarkyti langus"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Uždaryti"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Uždaryti meniu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Atidaryti meniu"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Programoje"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Naršyklėje"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Gerai"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-lv/strings.xml b/libs/WindowManager/Shell/res/values-lv/strings.xml index 60912f627841..1ad0454e2931 100644 --- a/libs/WindowManager/Shell/res/values-lv/strings.xml +++ b/libs/WindowManager/Shell/res/values-lv/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Atvērt pārlūkā"</string> <string name="new_window_text" msgid="6318648868380652280">"Jauns logs"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Pārvaldīt logus"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Aizvērt"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Aizvērt izvēlni"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Atvērt izvēlni"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimizēt ekrānu"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Fiksēt ekrānu"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Lietotni nevar pārvietot šeit."</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Iekļaujoši"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Atjaunot"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maksimizēt"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Atjaunot"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Piestiprināt pa kreisi"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Lietotnē"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Pārlūkprogrammā"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Labi"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-mk/strings.xml b/libs/WindowManager/Shell/res/values-mk/strings.xml index 7c0c856ed1a7..444372e00656 100644 --- a/libs/WindowManager/Shell/res/values-mk/strings.xml +++ b/libs/WindowManager/Shell/res/values-mk/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Отвори во прелистувач"</string> <string name="new_window_text" msgid="6318648868380652280">"Нов прозорец"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Управувајте со прозорци"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Затворете"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Затворете го менито"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Отвори го менито"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Максимизирај го екранот"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Подели го екранот на половина"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Апликацијата не може да се премести овде"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Реалистично"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Врати"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Максимизирај"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Врати"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Фотографирај лево"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Во апликацијата"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Во прелистувачот"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Во ред"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ml/strings.xml b/libs/WindowManager/Shell/res/values-ml/strings.xml index e14ab8b0161c..cd2f63543970 100644 --- a/libs/WindowManager/Shell/res/values-ml/strings.xml +++ b/libs/WindowManager/Shell/res/values-ml/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"ബ്രൗസറിൽ തുറക്കുക"</string> <string name="new_window_text" msgid="6318648868380652280">"പുതിയ വിന്ഡോ"</string> <string name="manage_windows_text" msgid="5567366688493093920">"വിൻഡോകൾ മാനേജ് ചെയ്യുക"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"അടയ്ക്കുക"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"മെനു അടയ്ക്കുക"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"മെനു തുറക്കുക"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"സ്ക്രീൻ വലുതാക്കുക"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"സ്ക്രീൻ സ്നാപ്പ് ചെയ്യുക"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ആപ്പ് ഇവിടേക്ക് നീക്കാനാകില്ല"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"ഇമേഴ്സീവ്"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"പുനഃസ്ഥാപിക്കുക"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"വലുതാക്കുക"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"പുനഃസ്ഥാപിക്കുക"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"ഇടതുവശത്തേക്ക് സ്നാപ്പ് ചെയ്യുക"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"ആപ്പിൽ"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"നിങ്ങളുടെ ബ്രൗസറിൽ"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ശരി"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-mn/strings.xml b/libs/WindowManager/Shell/res/values-mn/strings.xml index d406b99e80b3..1bec2870e853 100644 --- a/libs/WindowManager/Shell/res/values-mn/strings.xml +++ b/libs/WindowManager/Shell/res/values-mn/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Хөтчид нээх"</string> <string name="new_window_text" msgid="6318648868380652280">"Шинэ цонх"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Windows-г удирдах"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Хаах"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Цэсийг хаах"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Цэсийг нээх"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Дэлгэцийг томруулах"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Дэлгэцийг таллах"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Аппыг ийш зөөх боломжгүй"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Бодит мэт"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Сэргээх"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Томруулах"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Сэргээх"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Зүүн тийш зэрэгцүүлэх"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Аппад"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Хөтчидөө"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-mr/strings.xml b/libs/WindowManager/Shell/res/values-mr/strings.xml index 871bc3fcc8e7..f36c40fbbe6c 100644 --- a/libs/WindowManager/Shell/res/values-mr/strings.xml +++ b/libs/WindowManager/Shell/res/values-mr/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"ब्राउझरमध्ये उघडा"</string> <string name="new_window_text" msgid="6318648868380652280">"नवीन विंडो"</string> <string name="manage_windows_text" msgid="5567366688493093920">"विंडो व्यवस्थापित करा"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"बंद करा"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"मेनू बंद करा"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"मेनू उघडा"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"ॲपमध्ये"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"तुमच्या ब्राउझरमध्ये"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ओके"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ms/strings.xml b/libs/WindowManager/Shell/res/values-ms/strings.xml index 71666cae93c8..6b4361aa1636 100644 --- a/libs/WindowManager/Shell/res/values-ms/strings.xml +++ b/libs/WindowManager/Shell/res/values-ms/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Buka dalam penyemak imbas"</string> <string name="new_window_text" msgid="6318648868380652280">"Tetingkap Baharu"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Urus Tetingkap"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Tutup"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Tutup Menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Buka Menu"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Pada apl"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Pada penyemak imbas"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-my/strings.xml b/libs/WindowManager/Shell/res/values-my/strings.xml index ae34624c98a0..d47c196ae469 100644 --- a/libs/WindowManager/Shell/res/values-my/strings.xml +++ b/libs/WindowManager/Shell/res/values-my/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"ဘရောင်ဇာတွင် ဖွင့်ရန်"</string> <string name="new_window_text" msgid="6318648868380652280">"ဝင်းဒိုးအသစ်"</string> <string name="manage_windows_text" msgid="5567366688493093920">"ဝင်းဒိုးများ စီမံရန်"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"ပိတ်ရန်"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"မီနူး ပိတ်ရန်"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"မီနူး ဖွင့်ရန်"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"စခရင်ကို ချဲ့မည်"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"စခရင်ကို ချုံ့မည်"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"အက်ပ်ကို ဤနေရာသို့ ရွှေ့၍မရပါ"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"သုံးဘက်မြင်"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"ပြန်ပြောင်းရန်"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"ချဲ့ရန်"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"ပြန်ပြောင်းရန်"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"ဘယ်တွင် ချဲ့ရန်"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"အက်ပ်တွင်"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"သင်၏ဘရောင်ဇာတွင်"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-nb/strings.xml b/libs/WindowManager/Shell/res/values-nb/strings.xml index 9270dc859728..937d6d49c56b 100644 --- a/libs/WindowManager/Shell/res/values-nb/strings.xml +++ b/libs/WindowManager/Shell/res/values-nb/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Åpne i nettleseren"</string> <string name="new_window_text" msgid="6318648868380652280">"Nytt vindu"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Administrer vinduene"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Lukk"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Lukk menyen"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Åpne menyen"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimer skjermen"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Fest skjermen"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Appen kan ikke flyttes hit"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Oppslukende"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Gjenopprett"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maksimer"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Gjenopprett"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Fest til venstre"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"I appen"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"I nettleseren"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ne/strings.xml b/libs/WindowManager/Shell/res/values-ne/strings.xml index 7015b2c11b32..36e54a5ae187 100644 --- a/libs/WindowManager/Shell/res/values-ne/strings.xml +++ b/libs/WindowManager/Shell/res/values-ne/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"ब्राउजरमा खोल्नुहोस्"</string> <string name="new_window_text" msgid="6318648868380652280">"नयाँ विन्डो"</string> <string name="manage_windows_text" msgid="5567366688493093920">"विन्डोहरू व्यवस्थापन गर्नुहोस्"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"बन्द गर्नुहोस्"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"मेनु बन्द गर्नुहोस्"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"मेनु खोल्नुहोस्"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"एपमा"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"तपाईंको ब्राउजरमा"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ठिक छ"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-nl/strings.xml b/libs/WindowManager/Shell/res/values-nl/strings.xml index 45305d62a69b..8db3a0ecfc2f 100644 --- a/libs/WindowManager/Shell/res/values-nl/strings.xml +++ b/libs/WindowManager/Shell/res/values-nl/strings.xml @@ -127,16 +127,15 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Openen in browser"</string> <string name="new_window_text" msgid="6318648868380652280">"Nieuw venster"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Vensters beheren"</string> + <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Beeldverhouding wijzigen"</string> <string name="close_text" msgid="4986518933445178928">"Sluiten"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menu sluiten"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Menu openen"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Scherm maximaliseren"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Scherm halveren"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Kan de app niet hierheen verplaatsen"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Immersief"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Herstellen"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maximaliseren"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Herstellen"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Links uitlijnen"</string> @@ -146,4 +145,5 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"In de app"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"In je browser"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <string name="desktop_windowing_app_to_web_education_text" msgid="1599668769538703570">"Open hier snel apps in je browser"</string> </resources> diff --git a/libs/WindowManager/Shell/res/values-or/strings.xml b/libs/WindowManager/Shell/res/values-or/strings.xml index 2d30441ab6f4..9d9b773634fc 100644 --- a/libs/WindowManager/Shell/res/values-or/strings.xml +++ b/libs/WindowManager/Shell/res/values-or/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"ବ୍ରାଉଜରରେ ଖୋଲନ୍ତୁ"</string> <string name="new_window_text" msgid="6318648868380652280">"ନୂଆ ୱିଣ୍ଡୋ"</string> <string name="manage_windows_text" msgid="5567366688493093920">"ୱିଣ୍ଡୋଗୁଡ଼ିକୁ ପରିଚାଳନା କରନ୍ତୁ"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"ବନ୍ଦ କରନ୍ତୁ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ମେନୁ ବନ୍ଦ କରନ୍ତୁ"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"ମେନୁ ଖୋଲନ୍ତୁ"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"ସ୍କ୍ରିନକୁ ବଡ଼ କରନ୍ତୁ"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"ସ୍କ୍ରିନକୁ ସ୍ନାପ କରନ୍ତୁ"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ଆପକୁ ଏଠାକୁ ମୁଭ କରାଯାଇପାରିବ ନାହିଁ"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"ଇମର୍ସିଭ"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"ରିଷ୍ଟୋର କରନ୍ତୁ"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"ବଡ଼ କରନ୍ତୁ"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"ରିଷ୍ଟୋର କରନ୍ତୁ"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"ବାମରେ ସ୍ନାପ କରନ୍ତୁ"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"ଆପରେ"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"ଆପଣଙ୍କ ବ୍ରାଉଜରରେ"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ଠିକ ଅଛି"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-pa/strings.xml b/libs/WindowManager/Shell/res/values-pa/strings.xml index 26ba461cba5d..af13301fb991 100644 --- a/libs/WindowManager/Shell/res/values-pa/strings.xml +++ b/libs/WindowManager/Shell/res/values-pa/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"ਬ੍ਰਾਊਜ਼ਰ ਵਿੱਚ ਖੋਲ੍ਹੋ"</string> <string name="new_window_text" msgid="6318648868380652280">"ਨਵੀਂ ਵਿੰਡੋ"</string> <string name="manage_windows_text" msgid="5567366688493093920">"ਵਿੰਡੋਆਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"ਬੰਦ ਕਰੋ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ਮੀਨੂ ਬੰਦ ਕਰੋ"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"ਮੀਨੂ ਖੋਲ੍ਹੋ"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"ਸਕ੍ਰੀਨ ਦਾ ਆਕਾਰ ਵਧਾਓ"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"ਸਕ੍ਰੀਨ ਨੂੰ ਸਨੈਪ ਕਰੋ"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ਐਪ ਨੂੰ ਇੱਥੇ ਨਹੀਂ ਲਿਜਾਇਆ ਜਾ ਸਕਦਾ"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"ਇਮਰਸਿਵ"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"ਮੁੜ-ਬਹਾਲ ਕਰੋ"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"ਵੱਡਾ ਕਰੋ"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"ਮੁੜ-ਬਹਾਲ ਕਰੋ"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"ਖੱਬੇ ਪਾਸੇ ਸਨੈਪ ਕਰੋ"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"ਐਪ ਵਿੱਚ"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"ਤੁਹਾਡੇ ਬ੍ਰਾਊਜ਼ਰ ਵਿੱਚ"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ਠੀਕ ਹੈ"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-pl/strings.xml b/libs/WindowManager/Shell/res/values-pl/strings.xml index 5f78b134ad22..27080fb77fe1 100644 --- a/libs/WindowManager/Shell/res/values-pl/strings.xml +++ b/libs/WindowManager/Shell/res/values-pl/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Otwórz w przeglądarce"</string> <string name="new_window_text" msgid="6318648868380652280">"Nowe okno"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Zarządzaj oknami"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Zamknij"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zamknij menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Otwórz menu"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"W aplikacji"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"W przeglądarce"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml index 8c7f9e73296d..9039cc227b30 100644 --- a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Abrir no navegador"</string> <string name="new_window_text" msgid="6318648868380652280">"Nova janela"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Gerenciar janelas"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Fechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fechar menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Abrir o menu"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Ampliar tela"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Ajustar tela"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Não é possível mover o app para cá"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Imersivo"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Restaurar"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maximizar"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Restaurar"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Ajustar à esquerda"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"No app"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"No navegador"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml b/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml index cd78ef95d88e..559eea2d3cab 100644 --- a/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml @@ -127,6 +127,7 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Abrir no navegador"</string> <string name="new_window_text" msgid="6318648868380652280">"Nova janela"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Faça a gestão das janelas"</string> + <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Alterar formato"</string> <string name="close_text" msgid="4986518933445178928">"Fechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fechar menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Abrir menu"</string> @@ -144,4 +145,5 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Na app"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"No navegador"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <string name="desktop_windowing_app_to_web_education_text" msgid="1599668769538703570">"Abra rapidamente apps no navegador aqui"</string> </resources> diff --git a/libs/WindowManager/Shell/res/values-pt/strings.xml b/libs/WindowManager/Shell/res/values-pt/strings.xml index 8c7f9e73296d..9039cc227b30 100644 --- a/libs/WindowManager/Shell/res/values-pt/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Abrir no navegador"</string> <string name="new_window_text" msgid="6318648868380652280">"Nova janela"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Gerenciar janelas"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Fechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fechar menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Abrir o menu"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Ampliar tela"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Ajustar tela"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Não é possível mover o app para cá"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Imersivo"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Restaurar"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maximizar"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Restaurar"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Ajustar à esquerda"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"No app"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"No navegador"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ro/strings.xml b/libs/WindowManager/Shell/res/values-ro/strings.xml index e3fe2804bdcd..52e45bc320fe 100644 --- a/libs/WindowManager/Shell/res/values-ro/strings.xml +++ b/libs/WindowManager/Shell/res/values-ro/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Deschide în browser"</string> <string name="new_window_text" msgid="6318648868380652280">"Fereastră nouă"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Gestionează ferestrele"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Închide"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Închide meniul"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Deschide meniul"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximizează fereastra"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Micșorează fereastra și fixeaz-o"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplicația nu poate fi mutată aici"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Captivant"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Restabilește"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maximizează"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Restabilește"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Trage la stânga"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"În aplicație"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"În browser"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ru/strings.xml b/libs/WindowManager/Shell/res/values-ru/strings.xml index 442fca3ef0a7..6d32b648acc4 100644 --- a/libs/WindowManager/Shell/res/values-ru/strings.xml +++ b/libs/WindowManager/Shell/res/values-ru/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Открыть в браузере"</string> <string name="new_window_text" msgid="6318648868380652280">"Новое окно"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Управление окнами"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Закрыть"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Закрыть меню"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Открыть меню"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Развернуть на весь экран"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Свернуть"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Приложение нельзя сюда переместить"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Погружение"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Восстановить"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Развернуть"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Восстановить"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Привязать слева"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"В приложении"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"В браузере"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ОК"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-si/strings.xml b/libs/WindowManager/Shell/res/values-si/strings.xml index 8a7ad3b9f80c..7c7f85dee51b 100644 --- a/libs/WindowManager/Shell/res/values-si/strings.xml +++ b/libs/WindowManager/Shell/res/values-si/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"බ්රව්සරයේ විවෘත කරන්න"</string> <string name="new_window_text" msgid="6318648868380652280">"නව කවුළුව"</string> <string name="manage_windows_text" msgid="5567366688493093920">"කවුළු කළමනාකරණය කරන්න"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"වසන්න"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"මෙනුව වසන්න"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"මෙනුව විවෘත කරන්න"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"තිරය උපරිම කරන්න"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"ස්නැප් තිරය"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"යෙදුම මෙතැනට ගෙන යා නොහැක"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"ගිලෙන සුළු"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"ප්රතිසාධනය කරන්න"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"විහිදන්න"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"ප්රතිසාධනය කරන්න"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"වමට ස්නැප් කරන්න"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"යෙදුම තුළ"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"ඔබේ බ්රව්සරය තුළ"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"හරි"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-sk/strings.xml b/libs/WindowManager/Shell/res/values-sk/strings.xml index 4234e8073bc8..c89f6990ee75 100644 --- a/libs/WindowManager/Shell/res/values-sk/strings.xml +++ b/libs/WindowManager/Shell/res/values-sk/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Otvoriť v prehliadači"</string> <string name="new_window_text" msgid="6318648868380652280">"Nové okno"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Správa okien"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Zavrieť"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zavrieť ponuku"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Otvoriť ponuku"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximalizovať obrazovku"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Zobraziť polovicu obrazovky"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplikácia sa sem nedá presunúť"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Pútavé"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Obnoviť"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maximalizovať"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Obnoviť"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Prichytiť vľavo"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"V aplikácii"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"V prehliadači"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-sl/strings.xml b/libs/WindowManager/Shell/res/values-sl/strings.xml index ae7e524da6cc..b064ce5038c1 100644 --- a/libs/WindowManager/Shell/res/values-sl/strings.xml +++ b/libs/WindowManager/Shell/res/values-sl/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Odpri v brskalniku"</string> <string name="new_window_text" msgid="6318648868380652280">"Novo okno"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Upravljanje oken"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Zapri"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zapri meni"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Odpri meni"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"V aplikaciji"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"V brskalniku"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"V redu"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-sq/strings.xml b/libs/WindowManager/Shell/res/values-sq/strings.xml index de6f681cfe74..b1de743f7b61 100644 --- a/libs/WindowManager/Shell/res/values-sq/strings.xml +++ b/libs/WindowManager/Shell/res/values-sq/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Hape në shfletues"</string> <string name="new_window_text" msgid="6318648868380652280">"Dritare e re"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Menaxho dritaret"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Mbyll"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Mbyll menynë"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Hap menynë"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimizo ekranin"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Regjistro ekranin"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplikacioni nuk mund të zhvendoset këtu"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Përfshirës"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Restauro"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Maksimizo"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Restauro"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Zhvendos majtas"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Në aplikacion"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Në shfletuesin tënd"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Në rregull"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-sr/strings.xml b/libs/WindowManager/Shell/res/values-sr/strings.xml index 901d6d967a7d..50faf80190ea 100644 --- a/libs/WindowManager/Shell/res/values-sr/strings.xml +++ b/libs/WindowManager/Shell/res/values-sr/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Отворите у прегледачу"</string> <string name="new_window_text" msgid="6318648868380652280">"Нови прозор"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Управљајте прозорима"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Затворите"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Затворите мени"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Отворите мени"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Повећај екран"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Уклопи екран"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Апликација не може да се премести овде"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Имерзивне"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Врати"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Увећајте"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Вратите"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Прикачите лево"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"У апликацији"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"У прегледачу"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Потврди"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-sv/strings.xml b/libs/WindowManager/Shell/res/values-sv/strings.xml index 6566801b7c63..51ef239ec2e9 100644 --- a/libs/WindowManager/Shell/res/values-sv/strings.xml +++ b/libs/WindowManager/Shell/res/values-sv/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Öppna i webbläsaren"</string> <string name="new_window_text" msgid="6318648868380652280">"Nytt fönster"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Hantera fönster"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Stäng"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Stäng menyn"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Öppna menyn"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximera skärmen"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Fäst skärmen"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Det går inte att flytta appen hit"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Uppslukande"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Återställ"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Utöka"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Återställ"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Fäst till vänster"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"I appen"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"I webbläsaren"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-sw/strings.xml b/libs/WindowManager/Shell/res/values-sw/strings.xml index a952011385de..ff5d423170c2 100644 --- a/libs/WindowManager/Shell/res/values-sw/strings.xml +++ b/libs/WindowManager/Shell/res/values-sw/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Fungua katika kivinjari"</string> <string name="new_window_text" msgid="6318648868380652280">"Dirisha Jipya"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Dhibiti Windows"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Funga"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Funga Menyu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Fungua Menyu"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Panua Dirisha kwenye Skrini"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Panga Madirisha kwenye Skrini"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Imeshindwa kuhamishia programu hapa"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Shirikishi"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Rejesha"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Panua"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Rejesha"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Telezesha kushoto"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Kwenye programu"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Kwenye kivinjari chako"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Sawa"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ta/strings.xml b/libs/WindowManager/Shell/res/values-ta/strings.xml index 2c73d3a14620..953c64d67106 100644 --- a/libs/WindowManager/Shell/res/values-ta/strings.xml +++ b/libs/WindowManager/Shell/res/values-ta/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"உலாவியில் திறக்கும்"</string> <string name="new_window_text" msgid="6318648868380652280">"புதிய சாளரம்"</string> <string name="manage_windows_text" msgid="5567366688493093920">"சாளரங்களை நிர்வகிக்கலாம்"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"மூடும்"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"மெனுவை மூடும்"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"மெனுவைத் திறக்கும்"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"ஆப்ஸில்"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"உங்கள் பிரவுசரில்"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"சரி"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-te/strings.xml b/libs/WindowManager/Shell/res/values-te/strings.xml index b17d4d1afaf7..2efb0ba55970 100644 --- a/libs/WindowManager/Shell/res/values-te/strings.xml +++ b/libs/WindowManager/Shell/res/values-te/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"బ్రౌజర్లో తెరవండి"</string> <string name="new_window_text" msgid="6318648868380652280">"కొత్త విండో"</string> <string name="manage_windows_text" msgid="5567366688493093920">"విండోలను మేనేజ్ చేయండి"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"మూసివేయండి"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"మెనూను మూసివేయండి"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"మెనూను తెరవండి"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"యాప్లో"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"మీ బ్రౌజర్లో"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"సరే"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-th/strings.xml b/libs/WindowManager/Shell/res/values-th/strings.xml index 43cee41f5a15..3d775d2ee8af 100644 --- a/libs/WindowManager/Shell/res/values-th/strings.xml +++ b/libs/WindowManager/Shell/res/values-th/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"เปิดในเบราว์เซอร์"</string> <string name="new_window_text" msgid="6318648868380652280">"หน้าต่างใหม่"</string> <string name="manage_windows_text" msgid="5567366688493093920">"จัดการหน้าต่าง"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"ปิด"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ปิดเมนู"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"เปิดเมนู"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"ในแอป"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"ในเบราว์เซอร์"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ตกลง"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-tl/strings.xml b/libs/WindowManager/Shell/res/values-tl/strings.xml index 428499532005..a57cb8b087a0 100644 --- a/libs/WindowManager/Shell/res/values-tl/strings.xml +++ b/libs/WindowManager/Shell/res/values-tl/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Buksan sa browser"</string> <string name="new_window_text" msgid="6318648868380652280">"Bagong Window"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Pamahalaan ang Mga Window"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Isara"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Isara ang Menu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Buksan ang Menu"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Sa app"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Sa iyong browser"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-tr/strings.xml b/libs/WindowManager/Shell/res/values-tr/strings.xml index 7eac4a8e4ffb..bea4a3513c0f 100644 --- a/libs/WindowManager/Shell/res/values-tr/strings.xml +++ b/libs/WindowManager/Shell/res/values-tr/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Tarayıcıda aç"</string> <string name="new_window_text" msgid="6318648868380652280">"Yeni Pencere"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Pencereleri yönet"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Kapat"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menüyü kapat"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Menüyü aç"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Ekranı Büyüt"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Ekranın Yarısına Tuttur"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Uygulama buraya taşınamıyor"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Etkileyici"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Geri yükle"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Ekranı kapla"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Geri yükle"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Sola tuttur"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Uygulamada"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Tarayıcınızda"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"Tamam"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-uk/strings.xml b/libs/WindowManager/Shell/res/values-uk/strings.xml index 5fb14bf50e10..91f665e04178 100644 --- a/libs/WindowManager/Shell/res/values-uk/strings.xml +++ b/libs/WindowManager/Shell/res/values-uk/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Відкрити у вебпереглядачі"</string> <string name="new_window_text" msgid="6318648868380652280">"Нове вікно"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Керувати вікнами"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Закрити"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Закрити меню"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Відкрити меню"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Розгорнути екран"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Зафіксувати екран"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Сюди не можна перемістити додаток"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Реалістичність"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Відновити"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Розгорнути"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Відновити"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Закріпити ліворуч"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"У додатку"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"У вебпереглядачі"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-ur/strings.xml b/libs/WindowManager/Shell/res/values-ur/strings.xml index bb0358f12b7a..6125bfde56ed 100644 --- a/libs/WindowManager/Shell/res/values-ur/strings.xml +++ b/libs/WindowManager/Shell/res/values-ur/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"براؤزر میں کھولیں"</string> <string name="new_window_text" msgid="6318648868380652280">"نئی ونڈو"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Windows کا نظم کریں"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"بند کریں"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"مینیو بند کریں"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"مینو کھولیں"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"اسکرین کو بڑا کریں"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"اسکرین کا اسناپ شاٹ لیں"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ایپ کو یہاں منتقل نہیں کیا جا سکتا"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"عمیق"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"بحال کریں"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"بڑا کریں"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"بحال کریں"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"دائیں منتقل کریں"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"ایپ میں"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"آپ کے براؤزر میں"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"ٹھیک ہے"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-uz/strings.xml b/libs/WindowManager/Shell/res/values-uz/strings.xml index 0648dd1c1bb8..63e818ca0512 100644 --- a/libs/WindowManager/Shell/res/values-uz/strings.xml +++ b/libs/WindowManager/Shell/res/values-uz/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Brauzerda ochish"</string> <string name="new_window_text" msgid="6318648868380652280">"Yangi oyna"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Oynalarni boshqarish"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Yopish"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menyuni yopish"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Menyuni ochish"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Ekranni yoyish"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Ekranni biriktirish"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Ilova bu yerga surilmaydi"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Immersiv"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Tiklash"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Yoyish"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Tiklash"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Chapga tortish"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Ilovada"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Brauzerda"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-vi/strings.xml b/libs/WindowManager/Shell/res/values-vi/strings.xml index dda2225b5f3e..7114f1d36b7d 100644 --- a/libs/WindowManager/Shell/res/values-vi/strings.xml +++ b/libs/WindowManager/Shell/res/values-vi/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Mở trong trình duyệt"</string> <string name="new_window_text" msgid="6318648868380652280">"Cửa sổ mới"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Quản lý cửa sổ"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Đóng"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Đóng trình đơn"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Mở Trình đơn"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Mở rộng màn hình"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Điều chỉnh kích thước màn hình"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Không di chuyển được ứng dụng đến đây"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Hiển thị tối đa"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Khôi phục"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Phóng to tối đa"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Khôi phục"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Di chuyển nhanh sang trái"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Trong ứng dụng"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Trên trình duyệt"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"OK"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml index 2fb3f5ab5ea4..15c45d9f678c 100644 --- a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml @@ -127,6 +127,8 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"在浏览器中打开"</string> <string name="new_window_text" msgid="6318648868380652280">"新窗口"</string> <string name="manage_windows_text" msgid="5567366688493093920">"管理窗口"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"关闭"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"关闭菜单"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"打开菜单"</string> @@ -144,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"在此应用内"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"在浏览器中"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"确定"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml b/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml index 1d7fb4c4c6e2..f7f4a2ad08b5 100644 --- a/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"在瀏覽器中開啟"</string> <string name="new_window_text" msgid="6318648868380652280">"新視窗"</string> <string name="manage_windows_text" msgid="5567366688493093920">"管理視窗"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"關閉"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"關閉選單"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"打開選單"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"畫面最大化"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"貼齊畫面"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"應用程式無法移至這裡"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"身歷其境"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"還原"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"最大化"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"還原"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"貼齊左邊"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"在應用程式內"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"在瀏覽器中"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"確定"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml b/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml index 8083e378bf29..000944b210b0 100644 --- a/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"在瀏覽器中開啟"</string> <string name="new_window_text" msgid="6318648868380652280">"新視窗"</string> <string name="manage_windows_text" msgid="5567366688493093920">"管理視窗"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"關閉"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"關閉選單"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"開啟選單"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"畫面最大化"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"貼齊畫面"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"應用程式無法移至此處"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"沉浸"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"還原"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"最大化"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"還原"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"靠左對齊"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"使用應用程式"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"使用瀏覽器"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"確定"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/res/values-zu/strings.xml b/libs/WindowManager/Shell/res/values-zu/strings.xml index 092efd6593fc..63eeb5f1d3d7 100644 --- a/libs/WindowManager/Shell/res/values-zu/strings.xml +++ b/libs/WindowManager/Shell/res/values-zu/strings.xml @@ -127,16 +127,16 @@ <string name="open_in_browser_text" msgid="9181692926376072904">"Vula kubhrawuza"</string> <string name="new_window_text" msgid="6318648868380652280">"Iwindi Elisha"</string> <string name="manage_windows_text" msgid="5567366688493093920">"Phatha Amawindi"</string> + <!-- no translation found for change_aspect_ratio_text (9104456064548212806) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Vala"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Vala Imenyu"</string> <string name="desktop_mode_app_header_chip_text" msgid="6366422614991687237">"Vula Imenyu"</string> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Khulisa Isikrini Sifike Ekugcineni"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="2065251022783880154">"Thwebula Isikrini"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"I-app ayikwazi ukuhanjiswa lapha"</string> - <!-- no translation found for desktop_mode_maximize_menu_immersive_button_text (559492223133829481) --> - <skip /> - <!-- no translation found for desktop_mode_maximize_menu_immersive_restore_button_text (4900114367354709257) --> - <skip /> + <string name="desktop_mode_maximize_menu_immersive_button_text" msgid="559492223133829481">"Okugxilile"</string> + <string name="desktop_mode_maximize_menu_immersive_restore_button_text" msgid="4900114367354709257">"Buyisela"</string> <string name="desktop_mode_maximize_menu_maximize_button_text" msgid="3090199175564175845">"Khulisa"</string> <string name="desktop_mode_maximize_menu_restore_button_text" msgid="4234449220944704387">"Buyisela"</string> <string name="desktop_mode_maximize_menu_snap_left_button_text" msgid="8077452201179893424">"Chofoza kwesobunxele"</string> @@ -146,4 +146,6 @@ <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"Ku-app"</string> <string name="open_by_default_dialog_in_browser_text" msgid="8042769465958497081">"Kubhrawuza yakho"</string> <string name="open_by_default_dialog_dismiss_button_text" msgid="3487238795534582291">"KULUNGILE"</string> + <!-- no translation found for desktop_windowing_app_to_web_education_text (1599668769538703570) --> + <skip /> </resources> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java index 0ce651c3f1fe..2a50e4d0d74b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java @@ -241,12 +241,14 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView if (mListener != null) { mListener.onUnBubbleConversation(bubble.getKey()); } + mBubbleLogger.log(bubble, BubbleLogger.Event.BUBBLE_BAR_APP_MENU_OPT_OUT); } @Override public void onOpenAppSettings(Bubble bubble) { mManager.collapseStack(); mContext.startActivityAsUser(bubble.getSettingsIntent(mContext), bubble.getUser()); + mBubbleLogger.log(bubble, BubbleLogger.Event.BUBBLE_BAR_APP_MENU_GO_TO_SETTINGS); } @Override diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuView.java index 52b807abddd6..0ee20ef1731f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuView.java @@ -16,7 +16,6 @@ package com.android.wm.shell.bubbles.bar; import android.annotation.ColorInt; -import android.annotation.Nullable; import android.content.Context; import android.content.res.ColorStateList; import android.content.res.TypedArray; @@ -43,8 +42,6 @@ import java.util.ArrayList; */ public class BubbleBarMenuView extends LinearLayout { - public static final Object DISMISS_ACTION_TAG = new Object(); - private ViewGroup mBubbleSectionView; private ViewGroup mActionsSectionView; private ImageView mBubbleIconView; @@ -123,9 +120,6 @@ public class BubbleBarMenuView extends LinearLayout { R.layout.bubble_bar_menu_item, mActionsSectionView, false); itemView.update(action.mIcon, action.mTitle, action.mTint); itemView.setOnClickListener(action.mOnClick); - if (action.mTag != null) { - itemView.setTag(action.mTag); - } mActionsSectionView.addView(itemView); } } @@ -166,8 +160,6 @@ public class BubbleBarMenuView extends LinearLayout { private Icon mIcon; private @ColorInt int mTint; private String mTitle; - @Nullable - private Object mTag; private OnClickListener mOnClick; MenuAction(Icon icon, String title, OnClickListener onClick) { @@ -180,14 +172,5 @@ public class BubbleBarMenuView extends LinearLayout { this.mTint = tint; this.mOnClick = onClick; } - - MenuAction(Icon icon, String title, @ColorInt int tint, @Nullable Object tag, - OnClickListener onClick) { - this.mIcon = icon; - this.mTitle = title; - this.mTint = tint; - this.mTag = tag; - this.mOnClick = onClick; - } } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuViewController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuViewController.java index 5ed01b66ec67..514810745e10 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuViewController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuViewController.java @@ -212,7 +212,6 @@ class BubbleBarMenuViewController { Icon.createWithResource(resources, R.drawable.ic_remove_no_shadow), resources.getString(R.string.bubble_dismiss_text), tintColor, - BubbleBarMenuView.DISMISS_ACTION_TAG, view -> { hideMenu(true /* animated */); if (mListener != null) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PhonePipMenuController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PhonePipMenuController.java index 58d2a8577d8c..44900ce1db8a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PhonePipMenuController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PhonePipMenuController.java @@ -573,7 +573,7 @@ public class PhonePipMenuController implements PipMenuController, @PipTransitionState.TransitionState int newState, Bundle extra) { switch (newState) { case PipTransitionState.ENTERED_PIP: - attach(mPipTransitionState.mPinnedTaskLeash); + attach(mPipTransitionState.getPinnedTaskLeash()); break; case PipTransitionState.EXITED_PIP: detach(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipMotionHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipMotionHelper.java index 17392bc521d8..3738353dd0a3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipMotionHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipMotionHelper.java @@ -785,7 +785,7 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, private void handleFlingTransition(SurfaceControl.Transaction startTx, SurfaceControl.Transaction finishTx, Rect destinationBounds) { - startTx.setPosition(mPipTransitionState.mPinnedTaskLeash, + startTx.setPosition(mPipTransitionState.getPinnedTaskLeash(), destinationBounds.left, destinationBounds.top); startTx.apply(); @@ -799,7 +799,7 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, private void startResizeAnimation(SurfaceControl.Transaction startTx, SurfaceControl.Transaction finishTx, Rect destinationBounds, int duration) { - SurfaceControl pipLeash = mPipTransitionState.mPinnedTaskLeash; + SurfaceControl pipLeash = mPipTransitionState.getPinnedTaskLeash(); Preconditions.checkState(pipLeash != null, "No leash cached by mPipTransitionState=" + mPipTransitionState); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipResizeGestureHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipResizeGestureHandler.java index 751175f0f3e9..d98be55f28e1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipResizeGestureHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipResizeGestureHandler.java @@ -531,7 +531,7 @@ public class PipResizeGestureHandler implements // If resize transition was scheduled from this component, handle leash updates. mWaitingForBoundsChangeTransition = false; - SurfaceControl pipLeash = mPipTransitionState.mPinnedTaskLeash; + SurfaceControl pipLeash = mPipTransitionState.getPinnedTaskLeash(); Preconditions.checkState(pipLeash != null, "No leash cached by mPipTransitionState=" + mPipTransitionState); 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 8b25b11e3a47..607de0eccd77 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 @@ -118,7 +118,7 @@ public class PipScheduler { public void removePipAfterAnimation() { SurfaceControl.Transaction tx = mSurfaceControlTransactionFactory.getTransaction(); PipAlphaAnimator animator = new PipAlphaAnimator(mContext, - mPipTransitionState.mPinnedTaskLeash, tx, PipAlphaAnimator.FADE_OUT); + mPipTransitionState.getPinnedTaskLeash(), tx, PipAlphaAnimator.FADE_OUT); animator.setAnimationEndCallback(this::scheduleRemovePipImmediately); animator.start(); } @@ -203,7 +203,7 @@ public class PipScheduler { "%s: Attempted to user resize PIP to empty bounds, aborting.", TAG); return; } - SurfaceControl leash = mPipTransitionState.mPinnedTaskLeash; + SurfaceControl leash = mPipTransitionState.getPinnedTaskLeash(); final SurfaceControl.Transaction tx = new SurfaceControl.Transaction(); Matrix transformTensor = new Matrix(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTaskListener.java index 1b5eebaa8aa1..2f9371536a16 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTaskListener.java @@ -29,6 +29,7 @@ import android.view.SurfaceControl; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.protolog.ProtoLog; import com.android.internal.util.Preconditions; import com.android.wm.shell.ShellTaskOrganizer; @@ -51,7 +52,8 @@ import java.util.List; public class PipTaskListener implements ShellTaskOrganizer.TaskListener, PipTransitionState.PipTransitionStateChangedListener { private static final int ASPECT_RATIO_CHANGE_DURATION = 250; - private static final String ANIMATING_ASPECT_RATIO_CHANGE = "animating_aspect_ratio_change"; + @VisibleForTesting + static final String ANIMATING_ASPECT_RATIO_CHANGE = "animating_aspect_ratio_change"; private final Context mContext; private final PipTransitionState mPipTransitionState; @@ -65,6 +67,8 @@ public class PipTaskListener implements ShellTaskOrganizer.TaskListener, private boolean mWaitingForAspectRatioChange = false; private final List<PipParamsChangedCallback> mPipParamsChangedListeners = new ArrayList<>(); + private PipResizeAnimatorSupplier mPipResizeAnimatorSupplier; + public PipTaskListener(Context context, ShellTaskOrganizer shellTaskOrganizer, PipTransitionState pipTransitionState, @@ -86,6 +90,7 @@ public class PipTaskListener implements ShellTaskOrganizer.TaskListener, ShellTaskOrganizer.TASK_LISTENER_TYPE_PIP); }); } + mPipResizeAnimatorSupplier = PipResizeAnimator::new; } void setPictureInPictureParams(@Nullable PictureInPictureParams params) { @@ -172,19 +177,18 @@ public class PipTaskListener implements ShellTaskOrganizer.TaskListener, final int duration = extra.getInt(ANIMATING_BOUNDS_CHANGE_DURATION, PipTransition.BOUNDS_CHANGE_JUMPCUT_DURATION); - Preconditions.checkNotNull(mPipTransitionState.mPinnedTaskLeash, + Preconditions.checkNotNull(mPipTransitionState.getPinnedTaskLeash(), "Leash is null for bounds transition."); if (mWaitingForAspectRatioChange) { mWaitingForAspectRatioChange = false; - PipResizeAnimator animator = new PipResizeAnimator(mContext, - mPipTransitionState.mPinnedTaskLeash, startTx, finishTx, + PipResizeAnimator animator = mPipResizeAnimatorSupplier.get(mContext, + mPipTransitionState.getPinnedTaskLeash(), startTx, finishTx, destinationBounds, mPipBoundsState.getBounds(), destinationBounds, duration, 0f /* delta */); - animator.setAnimationEndCallback(() -> { - mPipScheduler.scheduleFinishResizePip(destinationBounds); - }); + animator.setAnimationEndCallback( + () -> mPipScheduler.scheduleFinishResizePip(destinationBounds)); animator.start(); } break; @@ -198,4 +202,22 @@ public class PipTaskListener implements ShellTaskOrganizer.TaskListener, default void onActionsChanged(List<RemoteAction> actions, RemoteAction closeAction) { } } + + @VisibleForTesting + interface PipResizeAnimatorSupplier { + PipResizeAnimator get(@NonNull Context context, + @NonNull SurfaceControl leash, + @Nullable SurfaceControl.Transaction startTx, + @Nullable SurfaceControl.Transaction finishTx, + @NonNull Rect baseBounds, + @NonNull Rect startBounds, + @NonNull Rect endBounds, + int duration, + float delta); + } + + @VisibleForTesting + void setPipResizeAnimatorSupplier(@NonNull PipResizeAnimatorSupplier supplier) { + mPipResizeAnimatorSupplier = supplier; + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java index 9af1aba51c57..65972fb7df48 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java @@ -875,7 +875,7 @@ public class PipTouchHandler implements PipTransitionState.PipTransitionStateCha mMovementWithinDismiss = touchState.getDownTouchPosition().y >= mPipBoundsState.getMovementBounds().bottom; mMotionHelper.setSpringingToTouch(false); - mPipDismissTargetHandler.setTaskLeash(mPipTransitionState.mPinnedTaskLeash); + mPipDismissTargetHandler.setTaskLeash(mPipTransitionState.getPinnedTaskLeash()); // If the menu is still visible then just poke the menu // so that it will timeout after the user stops touching it 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 3930b423d8a1..ea783e9cadb6 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 @@ -397,7 +397,7 @@ public class PipTransition extends PipTransitionController implements final Rect adjustedSourceRectHint = sourceRectHint != null ? new Rect(sourceRectHint) : PipUtils.getEnterPipWithOverlaySrcRectHint(startBounds, aspectRatio); - final SurfaceControl pipLeash = mPipTransitionState.mPinnedTaskLeash; + final SurfaceControl pipLeash = mPipTransitionState.getPinnedTaskLeash(); // For opening type transitions, if there is a change of mode TO_FRONT/OPEN, // make sure that change has alpha of 1f, since it's init state might be set to alpha=0f @@ -521,7 +521,7 @@ public class PipTransition extends PipTransitionController implements } Rect destinationBounds = pipChange.getEndAbsBounds(); - SurfaceControl pipLeash = mPipTransitionState.mPinnedTaskLeash; + SurfaceControl pipLeash = mPipTransitionState.getPinnedTaskLeash(); Preconditions.checkNotNull(pipLeash, "Leash is null for alpha transition."); // Start transition with 0 alpha at the entry bounds. @@ -797,17 +797,17 @@ public class PipTransition extends PipTransitionController implements mPipTransitionState.mPipTaskToken = extra.getParcelable( PIP_TASK_TOKEN, WindowContainerToken.class); - mPipTransitionState.mPinnedTaskLeash = extra.getParcelable( - PIP_TASK_LEASH, SurfaceControl.class); + mPipTransitionState.setPinnedTaskLeash(extra.getParcelable( + PIP_TASK_LEASH, SurfaceControl.class)); boolean hasValidTokenAndLeash = mPipTransitionState.mPipTaskToken != null - && mPipTransitionState.mPinnedTaskLeash != null; + && mPipTransitionState.getPinnedTaskLeash() != null; Preconditions.checkState(hasValidTokenAndLeash, "Unexpected bundle for " + mPipTransitionState); break; case PipTransitionState.EXITED_PIP: mPipTransitionState.mPipTaskToken = null; - mPipTransitionState.mPinnedTaskLeash = null; + mPipTransitionState.setPinnedTaskLeash(null); break; } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransitionState.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransitionState.java index ccdd66b5d1a8..03e06f906015 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransitionState.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransitionState.java @@ -142,7 +142,7 @@ public class PipTransitionState { // pinned PiP task's leash @Nullable - SurfaceControl mPinnedTaskLeash; + private SurfaceControl mPinnedTaskLeash; // Overlay leash potentially used during swipe PiP to home transition; // if null while mInSwipePipToHomeTransition is true, then srcRectHint was invalid. @@ -304,6 +304,14 @@ public class PipTransitionState { mSwipePipToHomeAppBounds.setEmpty(); } + @Nullable SurfaceControl getPinnedTaskLeash() { + return mPinnedTaskLeash; + } + + void setPinnedTaskLeash(@Nullable SurfaceControl leash) { + mPinnedTaskLeash = leash; + } + /** * @return true if either in swipe or button-nav fixed rotation. */ diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java index ec58292b352c..29e4b5bca5cc 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java @@ -395,10 +395,17 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { continue; } // No default animation for this, so just update bounds/position. - final int rootIdx = TransitionUtil.rootIndexFor(change, info); - startTransaction.setPosition(change.getLeash(), - change.getEndAbsBounds().left - info.getRoot(rootIdx).getOffset().x, - change.getEndAbsBounds().top - info.getRoot(rootIdx).getOffset().y); + if (change.getParent() == null) { + // For independent change without a parent, we have reparented it to the root + // leash in Transitions#setupAnimHierarchy. + final int rootIdx = TransitionUtil.rootIndexFor(change, info); + startTransaction.setPosition(change.getLeash(), + change.getEndAbsBounds().left - info.getRoot(rootIdx).getOffset().x, + change.getEndAbsBounds().top - info.getRoot(rootIdx).getOffset().y); + } else { + startTransaction.setPosition(change.getLeash(), + change.getEndRelOffset().x, change.getEndRelOffset().y); + } // Seamless display transition doesn't need to animate. if (isSeamlessDisplayChange) continue; if (isTask || (change.hasFlags(FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY) diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip2/phone/PipTaskListenerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip2/phone/PipTaskListenerTest.java new file mode 100644 index 000000000000..89cb729d17b5 --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip2/phone/PipTaskListenerTest.java @@ -0,0 +1,331 @@ +/* + * 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.pip2.phone; + +import static com.android.wm.shell.pip2.phone.PipTaskListener.ANIMATING_ASPECT_RATIO_CHANGE; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.when; +import static org.mockito.kotlin.MatchersKt.eq; +import static org.mockito.kotlin.VerificationKt.clearInvocations; +import static org.mockito.kotlin.VerificationKt.times; +import static org.mockito.kotlin.VerificationKt.verify; +import static org.mockito.kotlin.VerificationKt.verifyZeroInteractions; + +import android.app.ActivityManager; +import android.app.PendingIntent; +import android.app.PictureInPictureParams; +import android.app.RemoteAction; +import android.content.Context; +import android.graphics.Rect; +import android.graphics.drawable.Icon; +import android.os.Bundle; +import android.testing.AndroidTestingRunner; +import android.testing.TestableLooper; +import android.util.Rational; +import android.view.SurfaceControl; + +import androidx.test.filters.SmallTest; + +import com.android.wm.shell.ShellTaskOrganizer; +import com.android.wm.shell.common.ShellExecutor; +import com.android.wm.shell.common.pip.PipBoundsAlgorithm; +import com.android.wm.shell.common.pip.PipBoundsState; +import com.android.wm.shell.pip2.animation.PipResizeAnimator; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.ArrayList; +import java.util.List; + +/** + * Unit test against {@link PipTaskListener}. + */ +@SmallTest +@TestableLooper.RunWithLooper +@RunWith(AndroidTestingRunner.class) +public class PipTaskListenerTest { + + @Mock private Context mMockContext; + @Mock private ShellTaskOrganizer mMockShellTaskOrganizer; + @Mock private PipTransitionState mMockPipTransitionState; + @Mock private SurfaceControl mMockLeash; + @Mock private PipScheduler mMockPipScheduler; + @Mock private PipBoundsState mMockPipBoundsState; + @Mock private PipBoundsAlgorithm mMockPipBoundsAlgorithm; + @Mock private ShellExecutor mMockShellExecutor; + + @Mock private Icon mMockIcon; + @Mock private PendingIntent mMockPendingIntent; + + @Mock private PipTaskListener.PipParamsChangedCallback mMockPipParamsChangedCallback; + + @Mock private PipResizeAnimator mMockPipResizeAnimator; + + private ArgumentCaptor<List<RemoteAction>> mRemoteActionListCaptor; + + private PipTaskListener mPipTaskListener; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mRemoteActionListCaptor = ArgumentCaptor.forClass(List.class); + when(mMockPipTransitionState.getPinnedTaskLeash()).thenReturn(mMockLeash); + } + + @Test + public void constructor_addPipTransitionStateChangedListener() { + mPipTaskListener = new PipTaskListener(mMockContext, mMockShellTaskOrganizer, + mMockPipTransitionState, mMockPipScheduler, mMockPipBoundsState, + mMockPipBoundsAlgorithm, mMockShellExecutor); + + verify(mMockPipTransitionState).addPipTransitionStateChangedListener(eq(mPipTaskListener)); + } + + @Test + public void setPictureInPictureParams_updatePictureInPictureParams() { + mPipTaskListener = new PipTaskListener(mMockContext, mMockShellTaskOrganizer, + mMockPipTransitionState, mMockPipScheduler, mMockPipBoundsState, + mMockPipBoundsAlgorithm, mMockShellExecutor); + Rational aspectRatio = new Rational(4, 3); + String action1 = "action1"; + + mPipTaskListener.setPictureInPictureParams(getPictureInPictureParams( + aspectRatio, action1)); + + PictureInPictureParams params = mPipTaskListener.getPictureInPictureParams(); + assertEquals(aspectRatio, params.getAspectRatio()); + assertTrue(params.hasSetActions()); + assertEquals(1, params.getActions().size()); + assertEquals(action1, params.getActions().get(0).getTitle()); + } + + @Test + public void setPictureInPictureParams_withActionsChanged_callbackActionsChanged() { + mPipTaskListener = new PipTaskListener(mMockContext, mMockShellTaskOrganizer, + mMockPipTransitionState, mMockPipScheduler, mMockPipBoundsState, + mMockPipBoundsAlgorithm, mMockShellExecutor); + mPipTaskListener.addParamsChangedListener(mMockPipParamsChangedCallback); + Rational aspectRatio = new Rational(4, 3); + String action1 = "action1"; + mPipTaskListener.setPictureInPictureParams(getPictureInPictureParams( + aspectRatio, action1)); + + clearInvocations(mMockPipParamsChangedCallback); + action1 = "modified action1"; + mPipTaskListener.setPictureInPictureParams(getPictureInPictureParams( + aspectRatio, action1)); + + verify(mMockPipParamsChangedCallback).onActionsChanged( + mRemoteActionListCaptor.capture(), any()); + assertEquals(1, mRemoteActionListCaptor.getValue().size()); + assertEquals(action1, mRemoteActionListCaptor.getValue().get(0).getTitle()); + } + + @Test + public void setPictureInPictureParams_withoutActionsChanged_doesNotCallbackActionsChanged() { + mPipTaskListener = new PipTaskListener(mMockContext, mMockShellTaskOrganizer, + mMockPipTransitionState, mMockPipScheduler, mMockPipBoundsState, + mMockPipBoundsAlgorithm, mMockShellExecutor); + mPipTaskListener.addParamsChangedListener(mMockPipParamsChangedCallback); + Rational aspectRatio = new Rational(4, 3); + String action1 = "action1"; + mPipTaskListener.setPictureInPictureParams(getPictureInPictureParams( + aspectRatio, action1)); + + clearInvocations(mMockPipParamsChangedCallback); + mPipTaskListener.setPictureInPictureParams(getPictureInPictureParams( + aspectRatio, action1)); + + verifyZeroInteractions(mMockPipParamsChangedCallback); + } + + @Test + public void onTaskInfoChanged_withActionsChanged_callbackActionsChanged() { + mPipTaskListener = new PipTaskListener(mMockContext, mMockShellTaskOrganizer, + mMockPipTransitionState, mMockPipScheduler, mMockPipBoundsState, + mMockPipBoundsAlgorithm, mMockShellExecutor); + mPipTaskListener.addParamsChangedListener(mMockPipParamsChangedCallback); + Rational aspectRatio = new Rational(4, 3); + when(mMockPipBoundsState.getAspectRatio()).thenReturn(aspectRatio.toFloat()); + String action1 = "action1"; + mPipTaskListener.onTaskInfoChanged(getTaskInfo(aspectRatio, action1)); + + clearInvocations(mMockPipParamsChangedCallback); + clearInvocations(mMockPipBoundsState); + action1 = "modified action1"; + mPipTaskListener.onTaskInfoChanged(getTaskInfo(aspectRatio, action1)); + + verify(mMockPipTransitionState, times(0)) + .setOnIdlePipTransitionStateRunnable(any(Runnable.class)); + verify(mMockPipParamsChangedCallback).onActionsChanged( + mRemoteActionListCaptor.capture(), any()); + assertEquals(1, mRemoteActionListCaptor.getValue().size()); + assertEquals(action1, mRemoteActionListCaptor.getValue().get(0).getTitle()); + } + + @Test + public void onTaskInfoChanged_withAspectRatioChanged_callbackAspectRatioChanged() { + mPipTaskListener = new PipTaskListener(mMockContext, mMockShellTaskOrganizer, + mMockPipTransitionState, mMockPipScheduler, mMockPipBoundsState, + mMockPipBoundsAlgorithm, mMockShellExecutor); + mPipTaskListener.addParamsChangedListener(mMockPipParamsChangedCallback); + Rational aspectRatio = new Rational(4, 3); + when(mMockPipBoundsState.getAspectRatio()).thenReturn(aspectRatio.toFloat()); + String action1 = "action1"; + mPipTaskListener.onTaskInfoChanged(getTaskInfo(aspectRatio, action1)); + + clearInvocations(mMockPipParamsChangedCallback); + clearInvocations(mMockPipBoundsState); + aspectRatio = new Rational(16, 9); + mPipTaskListener.onTaskInfoChanged(getTaskInfo(aspectRatio, action1)); + + verify(mMockPipTransitionState).setOnIdlePipTransitionStateRunnable(any(Runnable.class)); + verifyZeroInteractions(mMockPipParamsChangedCallback); + } + + @Test + public void onTaskInfoChanged_withoutParamsChanged_doesNotCallbackAspectRatioChanged() { + mPipTaskListener = new PipTaskListener(mMockContext, mMockShellTaskOrganizer, + mMockPipTransitionState, mMockPipScheduler, mMockPipBoundsState, + mMockPipBoundsAlgorithm, mMockShellExecutor); + mPipTaskListener.addParamsChangedListener(mMockPipParamsChangedCallback); + Rational aspectRatio = new Rational(4, 3); + when(mMockPipBoundsState.getAspectRatio()).thenReturn(aspectRatio.toFloat()); + String action1 = "action1"; + mPipTaskListener.onTaskInfoChanged(getTaskInfo(aspectRatio, action1)); + + clearInvocations(mMockPipParamsChangedCallback); + mPipTaskListener.onTaskInfoChanged(getTaskInfo(aspectRatio, action1)); + + verifyZeroInteractions(mMockPipParamsChangedCallback); + verify(mMockPipTransitionState, times(0)) + .setOnIdlePipTransitionStateRunnable(any(Runnable.class)); + } + + @Test + public void onPipTransitionStateChanged_scheduledBoundsChangeWithAspectRatioChange_schedule() { + mPipTaskListener = new PipTaskListener(mMockContext, mMockShellTaskOrganizer, + mMockPipTransitionState, mMockPipScheduler, mMockPipBoundsState, + mMockPipBoundsAlgorithm, mMockShellExecutor); + Bundle extras = new Bundle(); + extras.putBoolean(ANIMATING_ASPECT_RATIO_CHANGE, true); + + mPipTaskListener.onPipTransitionStateChanged( + PipTransitionState.UNDEFINED, PipTransitionState.SCHEDULED_BOUNDS_CHANGE, extras); + + verify(mMockPipScheduler).scheduleAnimateResizePip(any(), anyBoolean(), anyInt()); + } + + @Test + public void onPipTransitionStateChanged_scheduledBoundsChangeWithoutAspectRatioChange_noop() { + mPipTaskListener = new PipTaskListener(mMockContext, mMockShellTaskOrganizer, + mMockPipTransitionState, mMockPipScheduler, mMockPipBoundsState, + mMockPipBoundsAlgorithm, mMockShellExecutor); + Bundle extras = new Bundle(); + extras.putBoolean(ANIMATING_ASPECT_RATIO_CHANGE, false); + + mPipTaskListener.onPipTransitionStateChanged( + PipTransitionState.UNDEFINED, + PipTransitionState.SCHEDULED_BOUNDS_CHANGE, + extras); + + verifyZeroInteractions(mMockPipScheduler); + } + + @Test + public void onPipTransitionStateChanged_changingPipBoundsWaitAspectRatioChange_animate() { + mPipTaskListener = new PipTaskListener(mMockContext, mMockShellTaskOrganizer, + mMockPipTransitionState, mMockPipScheduler, mMockPipBoundsState, + mMockPipBoundsAlgorithm, mMockShellExecutor); + Bundle extras = new Bundle(); + extras.putBoolean(ANIMATING_ASPECT_RATIO_CHANGE, true); + extras.putParcelable(PipTransition.PIP_DESTINATION_BOUNDS, + new Rect(0, 0, 100, 100)); + when(mMockPipBoundsState.getBounds()).thenReturn(new Rect(0, 0, 200, 200)); + + mPipTaskListener.onPipTransitionStateChanged( + PipTransitionState.UNDEFINED, + PipTransitionState.SCHEDULED_BOUNDS_CHANGE, + extras); + mPipTaskListener.setPipResizeAnimatorSupplier( + (context, leash, startTx, finishTx, baseBounds, startBounds, endBounds, + duration, delta) -> mMockPipResizeAnimator); + mPipTaskListener.onPipTransitionStateChanged( + PipTransitionState.SCHEDULED_BOUNDS_CHANGE, + PipTransitionState.CHANGING_PIP_BOUNDS, + extras); + + verify(mMockPipResizeAnimator, times(1)).start(); + } + + @Test + public void onPipTransitionStateChanged_changingPipBoundsNotAspectRatioChange_noop() { + mPipTaskListener = new PipTaskListener(mMockContext, mMockShellTaskOrganizer, + mMockPipTransitionState, mMockPipScheduler, mMockPipBoundsState, + mMockPipBoundsAlgorithm, mMockShellExecutor); + Bundle extras = new Bundle(); + extras.putBoolean(ANIMATING_ASPECT_RATIO_CHANGE, false); + extras.putParcelable(PipTransition.PIP_DESTINATION_BOUNDS, + new Rect(0, 0, 100, 100)); + when(mMockPipBoundsState.getBounds()).thenReturn(new Rect(0, 0, 200, 200)); + + mPipTaskListener.onPipTransitionStateChanged( + PipTransitionState.UNDEFINED, + PipTransitionState.SCHEDULED_BOUNDS_CHANGE, + extras); + mPipTaskListener.setPipResizeAnimatorSupplier( + (context, leash, startTx, finishTx, baseBounds, startBounds, endBounds, + duration, delta) -> mMockPipResizeAnimator); + mPipTaskListener.onPipTransitionStateChanged( + PipTransitionState.SCHEDULED_BOUNDS_CHANGE, + PipTransitionState.CHANGING_PIP_BOUNDS, + extras); + + verify(mMockPipResizeAnimator, times(0)).start(); + } + + private PictureInPictureParams getPictureInPictureParams(Rational aspectRatio, + String... actions) { + final PictureInPictureParams.Builder builder = new PictureInPictureParams.Builder(); + builder.setAspectRatio(aspectRatio); + final List<RemoteAction> remoteActions = new ArrayList<>(); + for (String action : actions) { + remoteActions.add(new RemoteAction(mMockIcon, action, action, mMockPendingIntent)); + } + if (!remoteActions.isEmpty()) { + builder.setActions(remoteActions); + } + return builder.build(); + } + + private ActivityManager.RunningTaskInfo getTaskInfo(Rational aspectRatio, + String... actions) { + final ActivityManager.RunningTaskInfo taskInfo = new ActivityManager.RunningTaskInfo(); + taskInfo.pictureInPictureParams = getPictureInPictureParams(aspectRatio, actions); + return taskInfo; + } +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/ShellTransitionTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/ShellTransitionTests.java index 6cde0569796d..2442a55d78d0 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/ShellTransitionTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/ShellTransitionTests.java @@ -19,6 +19,7 @@ package com.android.wm.shell.transition; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; +import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; @@ -363,6 +364,25 @@ public class ShellTransitionTests extends ShellTestCase { } @Test + public void testTransitionFilterWindowingMode() { + TransitionFilter filter = new TransitionFilter(); + filter.mRequirements = + new TransitionFilter.Requirement[]{new TransitionFilter.Requirement()}; + filter.mRequirements[0].mWindowingMode = WINDOWING_MODE_FREEFORM; + filter.mRequirements[0].mModes = new int[]{TRANSIT_OPEN, TRANSIT_TO_FRONT}; + + final TransitionInfo fullscreenStd = new TransitionInfoBuilder(TRANSIT_OPEN) + .addChange(TRANSIT_OPEN, createTaskInfo( + 1, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD)).build(); + assertFalse(filter.matches(fullscreenStd)); + + final TransitionInfo freeformStd = new TransitionInfoBuilder(TRANSIT_OPEN) + .addChange(TRANSIT_OPEN, createTaskInfo( + 1, WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD)).build(); + assertTrue(filter.matches(freeformStd)); + } + + @Test public void testTransitionFilterMultiRequirement() { // filter that requires at-least one opening and one closing app TransitionFilter filter = new TransitionFilter(); diff --git a/media/java/android/media/tv/TvInputServiceExtensionManager.java b/media/java/android/media/tv/TvInputServiceExtensionManager.java index 0e98488c93c0..c514f6ed04ef 100644 --- a/media/java/android/media/tv/TvInputServiceExtensionManager.java +++ b/media/java/android/media/tv/TvInputServiceExtensionManager.java @@ -17,13 +17,17 @@ package android.media.tv; import android.annotation.FlaggedApi; +import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.StringDef; import android.media.tv.flags.Flags; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -33,10 +37,14 @@ import java.util.Set; /** + * This class provides a list of available standardized TvInputService extension interface names + * and a container storing IBinder objects that implement these interfaces created by SoC/OEMs. + * It also provides an API for SoC/OEMs to register implemented IBinder objects. + * * @hide */ @FlaggedApi(Flags.FLAG_TIF_EXTENSION_STANDARDIZATION) -public class TvInputServiceExtensionManager { +public final class TvInputServiceExtensionManager { private static final String TAG = "TvInputServiceExtensionManager"; private static final String SCAN_PACKAGE = "android.media.tv.extension.scan."; private static final String OAD_PACKAGE = "android.media.tv.extension.oad."; @@ -54,404 +62,608 @@ public class TvInputServiceExtensionManager { private static final String ANALOG_PACKAGE = "android.media.tv.extension.analog."; private static final String TUNE_PACKAGE = "android.media.tv.extension.tune."; - /** Register binder returns success when it abides standardized interface structure */ + /** @hide */ + @IntDef(prefix = {"REGISTER_"}, value = { + REGISTER_SUCCESS, + REGISTER_FAIL_NAME_NOT_STANDARDIZED, + REGISTER_FAIL_IMPLEMENTATION_NOT_STANDARDIZED, + REGISTER_FAIL_REMOTE_EXCEPTION + }) + @Retention(RetentionPolicy.SOURCE) + public @interface RegisterResult {} + + /** + * Registering binder returns success when it abides standardized interface structure + */ public static final int REGISTER_SUCCESS = 0; - /** Register binder returns fail when the extension name is not in the standardization list */ + /** + * Registering binder returns failure when the extension name is not in the standardization + * list + */ public static final int REGISTER_FAIL_NAME_NOT_STANDARDIZED = 1; - /** Register binder returns fail when the IBinder does not implement standardized interface */ + /** + * Registering binder returns failure when the IBinder does not implement standardized interface + */ public static final int REGISTER_FAIL_IMPLEMENTATION_NOT_STANDARDIZED = 2; - /** Register binder returns fail when remote server not available */ + /** + * Registering binder returns failure when remote server is not available + */ public static final int REGISTER_FAIL_REMOTE_EXCEPTION = 3; + /** @hide */ + @StringDef({ + ISCAN_INTERFACE, + ISCAN_SESSION, + ISCAN_LISTENER, + IHDPLUS_INFO, + IOPERATOR_DETECTION, + IOPERATOR_DETECTION_LISTENER, + IREGION_CHANNEL_LIST, + IREGION_CHANNEL_LIST_LISTENER, + ITARGET_REGION, + ITARGET_REGION_LISTENER, + ILCN_CONFLICT, + ILCN_CONFLICT_LISTENER, + ILCNV2_CHANNEL_LIST, + ILCNV2_CHANNEL_LIST_LISTENER, + IFAVORITE_NETWORK, + IFAVORITE_NETWORK_LISTENER, + ITKGS_INFO, + ITKGS_INFO_LISTENER, + ISCAN_SAT_SEARCH, + IOAD_UPDATE_INTERFACE, + ICAM_APP_INFO_SERVICE, + ICAM_APP_INFO_LISTENER, + ICAM_MONITORING_SERVICE, + ICAM_INFO_LISTENER, + ICI_OPERATOR_INTERFACE, + ICI_OPERATOR_LISTENER, + ICAM_PROFILE_INTERFACE, + ICONTENT_CONTROL_SERVICE, + ICAM_DRM_INFO_LISTENER, + ICAM_PIN_SERVICE, + ICAM_PIN_CAPABILITY_LISTENER, + ICAM_PIN_STATUS_LISTENER, + ICAM_HOST_CONTROL_SERVICE, + ICAM_HOST_CONTROL_ASK_RELEASE_REPLY_CALLBACK, + ICAM_HOST_CONTROL_INFO_LISTENER, + ICAM_HOST_CONTROL_TUNE_QUIETLY_FLAG, + ICAM_HOST_CONTROL_TUNE_QUIETLY_FLAG_LISTENER, + IMMI_INTERFACE, + IMMI_SESSION, + IMMI_STATUS_CALLBACK, + IENTER_MENU_ERROR_CALLBACK, + IDOWNLOADABLE_RATING_TABLE_MONITOR, + IRATING_INTERFACE, + IPMT_RATING_INTERFACE, + IPMT_RATING_LISTENER, + IVBI_RATING_INTERFACE, + IVBI_RATING_LISTENER, + IPROGRAM_INFO, + IPROGRAM_INFO_LISTENER, + IBROADCAST_TIME, + IDATA_SERVICE_SIGNAL_INFO, + IDATA_SERVICE_SIGNAL_INFO_LISTENER, + ITELETEXT_PAGE_SUB_CODE, + ISCAN_BACKGROUND_SERVICE_UPDATE, + ISCAN_BACKGROUND_SERVICE_UPDATE_LISTENER, + ICLIENT_TOKEN, + ISCREEN_MODE_SETTINGS, + IHDMI_SIGNAL_INTERFACE, + IHDMI_SIGNAL_INFO_LISTENER, + IAUDIO_SIGNAL_INFO, + IANALOG_AUDIO_INFO, + IAUDIO_SIGNAL_INFO_LISTENER, + IVIDEO_SIGNAL_INFO, + IVIDEO_SIGNAL_INFO_LISTENER, + ISERVICE_LIST_EDIT, + ISERVICE_LIST_EDIT_LISTENER, + ISERVICE_LIST, + ISERVICE_LIST_TRANSFER_INTERFACE, + ISERVICE_LIST_EXPORT_SESSION, + ISERVICE_LIST_EXPORT_LISTENER, + ISERVICE_LIST_IMPORT_SESSION, + ISERVICE_LIST_IMPORT_LISTENER, + ISERVICE_LIST_SET_CHANNEL_LIST_SESSION, + ISERVICE_LIST_SET_CHANNEL_LIST_LISTENER, + ICHANNEL_LIST_TRANSFER, + IRECORDED_CONTENTS, + IDELETE_RECORDED_CONTENTS_CALLBACK, + IGET_INFO_RECORDED_CONTENTS_CALLBACK, + IEVENT_MONITOR, + IEVENT_MONITOR_LISTENER, + IEVENT_DOWNLOAD, + IEVENT_DOWNLOAD_LISTENER, + IEVENT_DOWNLOAD_SESSION, + IANALOG_ATTRIBUTE_INTERFACE, + ICHANNEL_TUNED_INTERFACE, + ICHANNEL_TUNED_LISTENER, + ITUNER_FRONTEND_SIGNAL_INFO_INTERFACE, + ITUNER_FRONTEND_SIGNAL_INFO_LISTENER, + IMUX_TUNE_SESSION, + IMUX_TUNE + }) + @Retention(RetentionPolicy.SOURCE) + public @interface StandardizedExtensionName {} /** * Interface responsible for creating scan session and obtain parameters. + * @hide */ public static final String ISCAN_INTERFACE = SCAN_PACKAGE + "IScanInterface"; /** * Interface that handles scan session and get/store related information. + * @hide */ public static final String ISCAN_SESSION = SCAN_PACKAGE + "IScanSession"; /** * Interface that notifies changes related to scan session. + * @hide */ public static final String ISCAN_LISTENER = SCAN_PACKAGE + "IScanListener"; /** * Interface for setting HDPlus information. + * @hide */ public static final String IHDPLUS_INFO = SCAN_PACKAGE + "IHDPlusInfo"; /** * Interface for handling operator detection for scanning. + * @hide */ public static final String IOPERATOR_DETECTION = SCAN_PACKAGE + "IOperatorDetection"; /** * Interface for changes related to operator detection searches. + * @hide */ public static final String IOPERATOR_DETECTION_LISTENER = SCAN_PACKAGE + "IOperatorDetectionListener"; /** * Interface for handling region channel list for scanning. + * @hide */ public static final String IREGION_CHANNEL_LIST = SCAN_PACKAGE + "IRegionChannelList"; /** * Interface for changes related to changes in region channel list search. + * @hide */ public static final String IREGION_CHANNEL_LIST_LISTENER = SCAN_PACKAGE + "IRegionChannelListListener"; /** * Interface for handling target region information. + * @hide */ public static final String ITARGET_REGION = SCAN_PACKAGE + "ITargetRegion"; /** * Interface for changes related to target regions during scanning. + * @hide */ public static final String ITARGET_REGION_LISTENER = SCAN_PACKAGE + "ITargetRegionListener"; /** * Interface for handling LCN conflict groups. + * @hide */ public static final String ILCN_CONFLICT = SCAN_PACKAGE + "ILcnConflict"; /** * Interface for detecting LCN conflicts during scanning. + * @hide */ public static final String ILCN_CONFLICT_LISTENER = SCAN_PACKAGE + "ILcnConflictListener"; /** * Interface for handling LCN V2 channel list information. + * @hide */ public static final String ILCNV2_CHANNEL_LIST = SCAN_PACKAGE + "ILcnV2ChannelList"; /** * Interface for detecting LCN V2 channel list during scanning. + * @hide */ public static final String ILCNV2_CHANNEL_LIST_LISTENER = SCAN_PACKAGE + "ILcnV2ChannelListListener"; /** * Interface for handling favorite network related information. + * @hide */ public static final String IFAVORITE_NETWORK = SCAN_PACKAGE + "IFavoriteNetwork"; /** * Interface for detecting favorite network during scanning. + * @hide */ public static final String IFAVORITE_NETWORK_LISTENER = SCAN_PACKAGE + "IFavoriteNetworkListener"; /** * Interface for handling Turksat channel update system service. + * @hide */ public static final String ITKGS_INFO = SCAN_PACKAGE + "ITkgsInfo"; /** * Interface for changes related to TKGS information. + * @hide */ public static final String ITKGS_INFO_LISTENER = SCAN_PACKAGE + "ITkgsInfoListener"; /** * Interface for satellite search related to low noise block downconverter. + * @hide */ public static final String ISCAN_SAT_SEARCH = SCAN_PACKAGE + "IScanSatSearch"; /** * Interface for Over-the-Air Download. + * @hide */ public static final String IOAD_UPDATE_INTERFACE = OAD_PACKAGE + "IOadUpdateInterface"; /** * Interface for handling conditional access module app related information. + * @hide */ public static final String ICAM_APP_INFO_SERVICE = CAM_PACKAGE + "ICamAppInfoService"; /** * Interface for changes on conditional access module app related information. + * @hide */ public static final String ICAM_APP_INFO_LISTENER = CAM_PACKAGE + "ICamAppInfoListener"; /** * Interface for handling conditional access module related information. + * @hide */ public static final String ICAM_MONITORING_SERVICE = CAM_PACKAGE + "ICamMonitoringService"; /** * Interface for changes on conditional access module related information. + * @hide */ public static final String ICAM_INFO_LISTENER = CAM_PACKAGE + "ICamInfoListener"; /** * Interface for handling control of CI+ operations. + * @hide */ public static final String ICI_OPERATOR_INTERFACE = CAM_PACKAGE + "ICiOperatorInterface"; /** * Interfaces for changes on CI+ operations. + * @hide */ public static final String ICI_OPERATOR_LISTENER = CAM_PACKAGE + "ICiOperatorListener"; /** * Interface for handling conditional access module profile related information. + * @hide */ public static final String ICAM_PROFILE_INTERFACE = CAM_PACKAGE + "ICamProfileInterface"; /** * Interface for handling conditional access module DRM related information. + * @hide */ public static final String ICONTENT_CONTROL_SERVICE = CAM_PACKAGE + "IContentControlService"; /** * Interface for changes on DRM. + * @hide */ public static final String ICAM_DRM_INFO_LISTENER = CAM_PACKAGE + "ICamDrmInfoListener"; /** * Interface for handling conditional access module pin related information. + * @hide */ public static final String ICAM_PIN_SERVICE = CAM_PACKAGE + "ICamPinService"; /** * Interface for changes on conditional access module pin capability. + * @hide */ public static final String ICAM_PIN_CAPABILITY_LISTENER = CAM_PACKAGE + "ICamPinCapabilityListener"; /** * Interface for changes on conditional access module pin status. + * @hide */ public static final String ICAM_PIN_STATUS_LISTENER = CAM_PACKAGE + "ICamPinStatusListener"; /** * Interface for handling conditional access module host control service. + * @hide */ public static final String ICAM_HOST_CONTROL_SERVICE = CAM_PACKAGE + "ICamHostControlService"; /** * Interface for handling conditional access module ask release reply. + * @hide */ public static final String ICAM_HOST_CONTROL_ASK_RELEASE_REPLY_CALLBACK = CAM_PACKAGE + "ICamHostControlAskReleaseReplyCallback"; /** * Interface for changes on conditional access module host control service. + * @hide */ public static final String ICAM_HOST_CONTROL_INFO_LISTENER = CAM_PACKAGE + "ICamHostControlInfoListener"; /** * Interface for handling conditional access module host control service tune_quietly_flag. + * @hide */ public static final String ICAM_HOST_CONTROL_TUNE_QUIETLY_FLAG = CAM_PACKAGE + "ICamHostControlTuneQuietlyFlag"; /** * Interface for changes on conditional access module host control service tune_quietly_flag. + * @hide */ public static final String ICAM_HOST_CONTROL_TUNE_QUIETLY_FLAG_LISTENER = CAM_PACKAGE + "ICamHostControlTuneQuietlyFlagListener"; /** * Interface for handling conditional access module multi media interface. + * @hide */ public static final String IMMI_INTERFACE = CAM_PACKAGE + "IMmiInterface"; /** * Interface for controlling conditional access module multi media session. + * @hide */ public static final String IMMI_SESSION = CAM_PACKAGE + "IMmiSession"; /** * Interface for changes on conditional access module multi media session status. + * @hide */ public static final String IMMI_STATUS_CALLBACK = CAM_PACKAGE + "IMmiStatusCallback"; /** * Interface for changes on conditional access app info related to entering menu. + * @hide */ public static final String IENTER_MENU_ERROR_CALLBACK = CAM_PACKAGE + "IEnterMenuErrorCallback"; /** * Interface for handling RRT downloadable rating data. + * @hide */ public static final String IDOWNLOADABLE_RATING_TABLE_MONITOR = RATING_PACKAGE + "IDownloadableRatingTableMonitor"; /** * Interface for handling RRT rating related information. + * @hide */ public static final String IRATING_INTERFACE = RATING_PACKAGE + "IRatingInterface"; /** * Interface for handling PMT rating related information. + * @hide */ public static final String IPMT_RATING_INTERFACE = RATING_PACKAGE + "IPmtRatingInterface"; /** * Interface for changes on PMT rating related information. + * @hide */ public static final String IPMT_RATING_LISTENER = RATING_PACKAGE + "IPmtRatingListener"; /** * Interface for handling IVBI rating related information. + * @hide */ public static final String IVBI_RATING_INTERFACE = RATING_PACKAGE + "IVbiRatingInterface"; /** * Interface for changes on IVBI rating related information. + * @hide */ public static final String IVBI_RATING_LISTENER = RATING_PACKAGE + "IVbiRatingListener"; /** * Interface for handling program rating related information. + * @hide */ public static final String IPROGRAM_INFO = RATING_PACKAGE + "IProgramInfo"; /** * Interface for changes on program rating related information. + * @hide */ public static final String IPROGRAM_INFO_LISTENER = RATING_PACKAGE + "IProgramInfoListener"; /** * Interface for getting broadcast time related information. + * @hide */ - public static final String BROADCAST_TIME = TIME_PACKAGE + "BroadcastTime"; + public static final String IBROADCAST_TIME = TIME_PACKAGE + "BroadcastTime"; /** * Interface for handling data service signal information on teletext. + * @hide */ public static final String IDATA_SERVICE_SIGNAL_INFO = TELETEXT_PACKAGE + "IDataServiceSignalInfo"; /** * Interface for changes on data service signal information on teletext. + * @hide */ public static final String IDATA_SERVICE_SIGNAL_INFO_LISTENER = TELETEXT_PACKAGE + "IDataServiceSignalInfoListener"; /** * Interface for handling teletext page information. + * @hide */ public static final String ITELETEXT_PAGE_SUB_CODE = TELETEXT_PACKAGE + "ITeletextPageSubCode"; /** * Interface for handling scan background service update. + * @hide */ public static final String ISCAN_BACKGROUND_SERVICE_UPDATE = SCAN_BSU_PACKAGE + "IScanBackgroundServiceUpdate"; /** * Interface for changes on background service update + * @hide */ public static final String ISCAN_BACKGROUND_SERVICE_UPDATE_LISTENER = SCAN_BSU_PACKAGE + "IScanBackgroundServiceUpdateListener"; /** * Interface for generating client token. + * @hide */ public static final String ICLIENT_TOKEN = CLIENT_TOKEN_PACKAGE + "IClientToken"; /** * Interfaces for handling screen mode information. + * @hide */ public static final String ISCREEN_MODE_SETTINGS = SCREEN_MODE_PACKAGE + "IScreenModeSettings"; /** * Interfaces for handling HDMI signal information update. + * @hide */ public static final String IHDMI_SIGNAL_INTERFACE = SIGNAL_PACKAGE + "IHdmiSignalInterface"; /** * Interfaces for changes on HDMI signal information update. + * @hide */ public static final String IHDMI_SIGNAL_INFO_LISTENER = SIGNAL_PACKAGE + "IHdmiSignalInfoListener"; /** * Interfaces for handling audio signal information update. + * @hide */ public static final String IAUDIO_SIGNAL_INFO = SIGNAL_PACKAGE + "IAudioSignalInfo"; /** * Interfaces for handling analog audio signal information update. + * @hide */ public static final String IANALOG_AUDIO_INFO = SIGNAL_PACKAGE + "IAnalogAudioInfo"; /** * Interfaces for change on audio signal information update. + * @hide */ public static final String IAUDIO_SIGNAL_INFO_LISTENER = SIGNAL_PACKAGE + "IAudioSignalInfoListener"; /** * Interfaces for handling video signal information update. + * @hide */ public static final String IVIDEO_SIGNAL_INFO = SIGNAL_PACKAGE + "IVideoSignalInfo"; /** * Interfaces for changes on video signal information update. + * @hide */ public static final String IVIDEO_SIGNAL_INFO_LISTENER = SIGNAL_PACKAGE + "IVideoSignalInfoListener"; /** * Interfaces for handling service database updates. + * @hide */ public static final String ISERVICE_LIST_EDIT = SERVICE_DATABASE_PACKAGE + "IServiceListEdit"; /** * Interfaces for changes on service database updates. + * @hide */ public static final String ISERVICE_LIST_EDIT_LISTENER = SERVICE_DATABASE_PACKAGE + "IServiceListEditListener"; /** * Interfaces for getting service database related information. + * @hide */ public static final String ISERVICE_LIST = SERVICE_DATABASE_PACKAGE + "IServiceList"; /** * Interfaces for transferring service database related information. + * @hide */ public static final String ISERVICE_LIST_TRANSFER_INTERFACE = SERVICE_DATABASE_PACKAGE + "IServiceListTransferInterface"; /** * Interfaces for exporting service database session. + * @hide */ public static final String ISERVICE_LIST_EXPORT_SESSION = SERVICE_DATABASE_PACKAGE + "IServiceListExportSession"; /** * Interfaces for changes on exporting service database session. + * @hide */ public static final String ISERVICE_LIST_EXPORT_LISTENER = SERVICE_DATABASE_PACKAGE + "IServiceListExportListener"; /** * Interfaces for importing service database session. + * @hide */ public static final String ISERVICE_LIST_IMPORT_SESSION = SERVICE_DATABASE_PACKAGE + "IServiceListImportSession"; /** * Interfaces for changes on importing service database session. + * @hide */ public static final String ISERVICE_LIST_IMPORT_LISTENER = SERVICE_DATABASE_PACKAGE + "IServiceListImportListener"; /** * Interfaces for setting channel list resources. + * @hide */ public static final String ISERVICE_LIST_SET_CHANNEL_LIST_SESSION = SERVICE_DATABASE_PACKAGE + "IServiceListSetChannelListSession"; /** * Interfaces for changes on setting channel list resources. + * @hide */ public static final String ISERVICE_LIST_SET_CHANNEL_LIST_LISTENER = SERVICE_DATABASE_PACKAGE + "IServiceListSetChannelListListener"; /** * Interfaces for transferring channel list resources. + * @hide */ public static final String ICHANNEL_LIST_TRANSFER = SERVICE_DATABASE_PACKAGE + "IChannelListTransfer"; /** * Interfaces for record contents updates. + * @hide */ public static final String IRECORDED_CONTENTS = PVR_PACKAGE + "IRecordedContents"; /** * Interfaces for changes on deleting record contents. + * @hide */ public static final String IDELETE_RECORDED_CONTENTS_CALLBACK = PVR_PACKAGE + "IDeleteRecordedContentsCallback"; /** * Interfaces for changes on getting record contents. + * @hide */ public static final String IGET_INFO_RECORDED_CONTENTS_CALLBACK = PVR_PACKAGE + "IGetInfoRecordedContentsCallback"; /** * Interfaces for monitoring present event information. + * @hide */ public static final String IEVENT_MONITOR = EVENT_PACKAGE + "IEventMonitor"; /** * Interfaces for changes on present event information. + * @hide */ public static final String IEVENT_MONITOR_LISTENER = EVENT_PACKAGE + "IEventMonitorListener"; /** * Interfaces for handling download event information. + * @hide */ public static final String IEVENT_DOWNLOAD = EVENT_PACKAGE + "IEventDownload"; /** * Interfaces for changes on downloading event information. + * @hide */ public static final String IEVENT_DOWNLOAD_LISTENER = EVENT_PACKAGE + "IEventDownloadListener"; /** * Interfaces for handling download event information for DVB and DTMB. + * @hide */ public static final String IEVENT_DOWNLOAD_SESSION = EVENT_PACKAGE + "IEventDownloadSession"; /** * Interfaces for handling analog color system. + * @hide */ public static final String IANALOG_ATTRIBUTE_INTERFACE = ANALOG_PACKAGE + "IAnalogAttributeInterface"; /** * Interfaces for monitoring channel tuned information. + * @hide */ public static final String ICHANNEL_TUNED_INTERFACE = TUNE_PACKAGE + "IChannelTunedInterface"; /** * Interfaces for changes on channel tuned information. + * @hide */ public static final String ICHANNEL_TUNED_LISTENER = TUNE_PACKAGE + "IChannelTunedListener"; /** * Interfaces for handling tuner frontend signal info. + * @hide */ public static final String ITUNER_FRONTEND_SIGNAL_INFO_INTERFACE = SIGNAL_PACKAGE + "ITunerFrontendSignalInfoInterface"; /** * Interfaces for changes on tuner frontend signal info. + * @hide */ public static final String ITUNER_FRONTEND_SIGNAL_INFO_LISTENER = SIGNAL_PACKAGE + "ITunerFrontendSignalInfoListener"; /** * Interfaces for handling mux tune operations. + * @hide */ public static final String IMUX_TUNE_SESSION = TUNE_PACKAGE + "IMuxTuneSession"; /** * Interfaces for initing mux tune session. + * @hide */ public static final String IMUX_TUNE = TUNE_PACKAGE + "IMuxTune"; @@ -506,7 +718,7 @@ public class TvInputServiceExtensionManager { IVBI_RATING_LISTENER, IPROGRAM_INFO, IPROGRAM_INFO_LISTENER, - BROADCAST_TIME, + IBROADCAST_TIME, IDATA_SERVICE_SIGNAL_INFO, IDATA_SERVICE_SIGNAL_INFO_LISTENER, ITELETEXT_PAGE_SUB_CODE, @@ -586,7 +798,8 @@ public class TvInputServiceExtensionManager { * * @hide */ - public int registerExtensionIBinder(@NonNull String extensionName, + @RegisterResult + public int registerExtensionIBinder(@StandardizedExtensionName @NonNull String extensionName, @NonNull IBinder binder) { if (!checkIsStandardizedInterfaces(extensionName)) { return REGISTER_FAIL_NAME_NOT_STANDARDIZED; diff --git a/native/android/tests/thermal/NativeThermalUnitTest.cpp b/native/android/tests/thermal/NativeThermalUnitTest.cpp index 6d6861a3026a..4e319fc41d7c 100644 --- a/native/android/tests/thermal/NativeThermalUnitTest.cpp +++ b/native/android/tests/thermal/NativeThermalUnitTest.cpp @@ -67,6 +67,14 @@ public: MOCK_METHOD(Status, getThermalHeadroomThresholds, (::std::vector<float> * _aidl_return), (override)); MOCK_METHOD(IBinder*, onAsBinder, (), (override)); + MOCK_METHOD(Status, registerThermalHeadroomListener, + (const ::android::sp<::android::os::IThermalHeadroomListener>& listener, + bool* _aidl_return), + (override)); + MOCK_METHOD(Status, unregisterThermalHeadroomListener, + (const ::android::sp<::android::os::IThermalHeadroomListener>& listener, + bool* _aidl_return), + (override)); }; class NativeThermalUnitTest : public Test { diff --git a/nfc/api/system-current.txt b/nfc/api/system-current.txt index 6aa8a2b73f2c..675c8f80add2 100644 --- a/nfc/api/system-current.txt +++ b/nfc/api/system-current.txt @@ -59,6 +59,7 @@ package android.nfc { method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void clearPreference(); method @FlaggedApi("android.nfc.nfc_oem_extension") @NonNull public java.util.List<java.lang.String> getActiveNfceeList(); method @FlaggedApi("android.nfc.nfc_oem_extension") @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public android.nfc.RoutingStatus getRoutingStatus(); + method @FlaggedApi("android.nfc.nfc_oem_extension") @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public java.util.List<android.nfc.NfcRoutingTableEntry> getRoutingTable(); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean hasUserEnabledNfc(); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean isAutoChangeEnabled(); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean isTagPresent(); @@ -110,12 +111,46 @@ package android.nfc { method public void onTagDispatch(@NonNull java.util.function.Consumer<java.lang.Boolean>); } + @FlaggedApi("android.nfc.nfc_oem_extension") public abstract class NfcRoutingTableEntry { + method public int getNfceeId(); + } + @FlaggedApi("android.nfc.nfc_oem_extension") public class RoutingStatus { method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int getDefaultIsoDepRoute(); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int getDefaultOffHostRoute(); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int getDefaultRoute(); } + @FlaggedApi("android.nfc.nfc_oem_extension") public class RoutingTableAidEntry extends android.nfc.NfcRoutingTableEntry { + method @FlaggedApi("android.nfc.nfc_oem_extension") @NonNull public String getAid(); + } + + @FlaggedApi("android.nfc.nfc_oem_extension") public class RoutingTableProtocolEntry extends android.nfc.NfcRoutingTableEntry { + method @FlaggedApi("android.nfc.nfc_oem_extension") public int getProtocol(); + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_ISO_DEP = 4; // 0x4 + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_NDEF = 7; // 0x7 + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_NFC_DEP = 5; // 0x5 + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_T1T = 1; // 0x1 + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_T2T = 2; // 0x2 + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_T3T = 3; // 0x3 + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_T5T = 6; // 0x6 + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_UNDETERMINED = 0; // 0x0 + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_UNSUPPORTED = -1; // 0xffffffff + } + + @FlaggedApi("android.nfc.nfc_oem_extension") public class RoutingTableSystemCodeEntry extends android.nfc.NfcRoutingTableEntry { + method @FlaggedApi("android.nfc.nfc_oem_extension") @NonNull public byte[] getSystemCode(); + } + + @FlaggedApi("android.nfc.nfc_oem_extension") public class RoutingTableTechnologyEntry extends android.nfc.NfcRoutingTableEntry { + method @FlaggedApi("android.nfc.nfc_oem_extension") public int getTechnology(); + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int TECHNOLOGY_A = 0; // 0x0 + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int TECHNOLOGY_B = 1; // 0x1 + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int TECHNOLOGY_F = 2; // 0x2 + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int TECHNOLOGY_UNSUPPORTED = -1; // 0xffffffff + field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int TECHNOLOGY_V = 3; // 0x3 + } + } package android.nfc.cardemulation { diff --git a/nfc/java/android/nfc/Entry.aidl b/nfc/java/android/nfc/Entry.aidl new file mode 100644 index 000000000000..148c4ec86845 --- /dev/null +++ b/nfc/java/android/nfc/Entry.aidl @@ -0,0 +1,18 @@ +/* + * 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 android.nfc; + +parcelable Entry;
\ No newline at end of file diff --git a/nfc/java/android/nfc/Entry.java b/nfc/java/android/nfc/Entry.java new file mode 100644 index 000000000000..49d0f10dbfce --- /dev/null +++ b/nfc/java/android/nfc/Entry.java @@ -0,0 +1,77 @@ +/* + * 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 android.nfc; + +import android.annotation.NonNull; +import android.os.Parcel; +import android.os.Parcelable; + + +/** @hide */ +public final class Entry implements Parcelable { + private final byte mType; + private final byte mNfceeId; + private final String mEntry; + + public Entry(String entry, byte type, byte nfceeId) { + mEntry = entry; + mType = type; + mNfceeId = nfceeId; + } + + public byte getType() { + return mType; + } + + public byte getNfceeId() { + return mNfceeId; + } + + public String getEntry() { + return mEntry; + } + + @Override + public int describeContents() { + return 0; + } + + private Entry(Parcel in) { + this.mEntry = in.readString(); + this.mNfceeId = in.readByte(); + this.mType = in.readByte(); + } + + public static final @NonNull Parcelable.Creator<Entry> CREATOR = + new Parcelable.Creator<Entry>() { + @Override + public Entry createFromParcel(Parcel in) { + return new Entry(in); + } + + @Override + public Entry[] newArray(int size) { + return new Entry[size]; + } + }; + + @Override + public void writeToParcel(@NonNull Parcel dest, int flags) { + dest.writeString(mEntry); + dest.writeByte(mNfceeId); + dest.writeByte(mType); + } +} diff --git a/nfc/java/android/nfc/INfcAdapter.aidl b/nfc/java/android/nfc/INfcAdapter.aidl index a166b283f55b..1346bd34e760 100644 --- a/nfc/java/android/nfc/INfcAdapter.aidl +++ b/nfc/java/android/nfc/INfcAdapter.aidl @@ -18,6 +18,7 @@ package android.nfc; import android.app.PendingIntent; import android.content.IntentFilter; +import android.nfc.Entry; import android.nfc.NdefMessage; import android.nfc.Tag; import android.nfc.TechListParcel; @@ -117,4 +118,5 @@ interface INfcAdapter void triggerInitialization(); boolean getSettingStatus(); boolean isTagPresent(); + List<Entry> getRoutingTableEntryList(); } diff --git a/nfc/java/android/nfc/NfcOemExtension.java b/nfc/java/android/nfc/NfcOemExtension.java index 1d2085c88213..1bfe71461ac3 100644 --- a/nfc/java/android/nfc/NfcOemExtension.java +++ b/nfc/java/android/nfc/NfcOemExtension.java @@ -43,6 +43,7 @@ import android.util.Log; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -71,6 +72,11 @@ import java.util.function.Supplier; public final class NfcOemExtension { private static final String TAG = "NfcOemExtension"; private static final int OEM_EXTENSION_RESPONSE_THRESHOLD_MS = 2000; + private static final int TYPE_TECHNOLOGY = 0; + private static final int TYPE_PROTOCOL = 1; + private static final int TYPE_AID = 2; + private static final int TYPE_SYSTEMCODE = 3; + private final NfcAdapter mAdapter; private final NfcOemExtensionCallback mOemNfcExtensionCallback; private boolean mIsRegistered = false; @@ -689,6 +695,39 @@ public final class NfcOemExtension { )); } + /** + * Gets current routing table entries. + * @return List of {@link NfcRoutingTableEntry} representing current routing table + */ + @NonNull + @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS) + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public List<NfcRoutingTableEntry> getRoutingTable() { + List<Entry> entryList = NfcAdapter.callServiceReturn(() -> + NfcAdapter.sService.getRoutingTableEntryList(), null); + List<NfcRoutingTableEntry> result = new ArrayList<>(); + for (Entry entry : entryList) { + switch (entry.getType()) { + case TYPE_TECHNOLOGY -> result.add( + new RoutingTableTechnologyEntry(entry.getNfceeId(), + RoutingTableTechnologyEntry.techStringToInt(entry.getEntry())) + ); + case TYPE_PROTOCOL -> result.add( + new RoutingTableProtocolEntry(entry.getNfceeId(), + RoutingTableProtocolEntry.protocolStringToInt(entry.getEntry())) + ); + case TYPE_AID -> result.add( + new RoutingTableAidEntry(entry.getNfceeId(), entry.getEntry()) + ); + case TYPE_SYSTEMCODE -> result.add( + new RoutingTableSystemCodeEntry(entry.getNfceeId(), + entry.getEntry().getBytes(StandardCharsets.UTF_8)) + ); + } + } + return result; + } + private final class NfcOemExtensionCallback extends INfcOemExtensionCallback.Stub { @Override diff --git a/nfc/java/android/nfc/NfcRoutingTableEntry.java b/nfc/java/android/nfc/NfcRoutingTableEntry.java new file mode 100644 index 000000000000..4e913776a030 --- /dev/null +++ b/nfc/java/android/nfc/NfcRoutingTableEntry.java @@ -0,0 +1,46 @@ +/* + * 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 android.nfc; + + +import android.annotation.FlaggedApi; +import android.annotation.SystemApi; + +/** + * Class to represent an entry of routing table. This class is abstract and extended by + * {@link RoutingTableTechnologyEntry}, {@link RoutingTableProtocolEntry}, + * {@link RoutingTableAidEntry} and {@link RoutingTableSystemCodeEntry}. + * + * @hide + */ +@FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) +@SystemApi +public abstract class NfcRoutingTableEntry { + private final int mNfceeId; + + /** @hide */ + protected NfcRoutingTableEntry(int nfceeId) { + mNfceeId = nfceeId; + } + + /** + * Gets the NFCEE Id of this entry. + * @return an integer of NFCEE Id. + */ + public int getNfceeId() { + return mNfceeId; + } +} diff --git a/nfc/java/android/nfc/RoutingTableAidEntry.java b/nfc/java/android/nfc/RoutingTableAidEntry.java new file mode 100644 index 000000000000..7634fe342ab9 --- /dev/null +++ b/nfc/java/android/nfc/RoutingTableAidEntry.java @@ -0,0 +1,46 @@ +/* + * 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 android.nfc; + +import android.annotation.FlaggedApi; +import android.annotation.NonNull; +import android.annotation.SystemApi; + +/** + * Represents an AID entry in current routing table. + * @hide + */ +@FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) +@SystemApi +public class RoutingTableAidEntry extends NfcRoutingTableEntry { + private final String mValue; + + /** @hide */ + public RoutingTableAidEntry(int nfceeId, String value) { + super(nfceeId); + this.mValue = value; + } + + /** + * Gets AID value. + * @return String of AID + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + @NonNull + public String getAid() { + return mValue; + } +} diff --git a/nfc/java/android/nfc/RoutingTableProtocolEntry.java b/nfc/java/android/nfc/RoutingTableProtocolEntry.java new file mode 100644 index 000000000000..0c5be7dd9d97 --- /dev/null +++ b/nfc/java/android/nfc/RoutingTableProtocolEntry.java @@ -0,0 +1,129 @@ +/* + * 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 android.nfc; + +import android.annotation.FlaggedApi; +import android.annotation.IntDef; +import android.annotation.SystemApi; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * Represents a protocol entry in current routing table. + * @hide + */ +@FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) +@SystemApi +public class RoutingTableProtocolEntry extends NfcRoutingTableEntry { + /** + * Protocol undetermined. + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int PROTOCOL_UNDETERMINED = 0; + /** + * T1T Protocol + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int PROTOCOL_T1T = 1; + /** + * T2T Protocol + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int PROTOCOL_T2T = 2; + /** + * T3T Protocol + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int PROTOCOL_T3T = 3; + /** + * ISO-DEP Protocol + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int PROTOCOL_ISO_DEP = 4; + /** + * DEP Protocol + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int PROTOCOL_NFC_DEP = 5; + /** + * T5T Protocol + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int PROTOCOL_T5T = 6; + /** + * NDEF Protocol + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int PROTOCOL_NDEF = 7; + /** + * Unsupported Protocol + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int PROTOCOL_UNSUPPORTED = -1; + + /** + * + * @hide + */ + @IntDef(prefix = { "PROTOCOL_" }, value = { + PROTOCOL_UNDETERMINED, + PROTOCOL_T1T, + PROTOCOL_T2T, + PROTOCOL_T3T, + PROTOCOL_ISO_DEP, + PROTOCOL_NFC_DEP, + PROTOCOL_T5T, + PROTOCOL_NDEF, + PROTOCOL_UNSUPPORTED + }) + @Retention(RetentionPolicy.SOURCE) + public @interface ProtocolValue {} + + private final @ProtocolValue int mValue; + + /** @hide */ + public RoutingTableProtocolEntry(int nfceeId, @ProtocolValue int value) { + super(nfceeId); + this.mValue = value; + } + + /** + * Gets Protocol value. + * @return Protocol defined in {@link ProtocolValue} + */ + @ProtocolValue + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public int getProtocol() { + return mValue; + } + + /** @hide */ + @ProtocolValue + public static int protocolStringToInt(String protocolString) { + return switch (protocolString) { + case "PROTOCOL_T1T" -> PROTOCOL_T1T; + case "PROTOCOL_T2T" -> PROTOCOL_T2T; + case "PROTOCOL_T3T" -> PROTOCOL_T3T; + case "PROTOCOL_ISO_DEP" -> PROTOCOL_ISO_DEP; + case "PROTOCOL_NFC_DEP" -> PROTOCOL_NFC_DEP; + case "PROTOCOL_T5T" -> PROTOCOL_T5T; + case "PROTOCOL_NDEF" -> PROTOCOL_NDEF; + case "PROTOCOL_UNDETERMINED" -> PROTOCOL_UNDETERMINED; + default -> PROTOCOL_UNSUPPORTED; + }; + } +} diff --git a/nfc/java/android/nfc/RoutingTableSystemCodeEntry.java b/nfc/java/android/nfc/RoutingTableSystemCodeEntry.java new file mode 100644 index 000000000000..f87ad5f95195 --- /dev/null +++ b/nfc/java/android/nfc/RoutingTableSystemCodeEntry.java @@ -0,0 +1,46 @@ +/* + * 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 android.nfc; + +import android.annotation.FlaggedApi; +import android.annotation.NonNull; +import android.annotation.SystemApi; + +/** + * Represents a system code entry in current routing table. + * @hide + */ +@FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) +@SystemApi +public class RoutingTableSystemCodeEntry extends NfcRoutingTableEntry { + private final byte[] mValue; + + /** @hide */ + public RoutingTableSystemCodeEntry(int nfceeId, byte[] value) { + super(nfceeId); + this.mValue = value; + } + + /** + * Gets system code value. + * @return Byte array of system code + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + @NonNull + public byte[] getSystemCode() { + return mValue; + } +} diff --git a/nfc/java/android/nfc/RoutingTableTechnologyEntry.java b/nfc/java/android/nfc/RoutingTableTechnologyEntry.java new file mode 100644 index 000000000000..f51a5299be11 --- /dev/null +++ b/nfc/java/android/nfc/RoutingTableTechnologyEntry.java @@ -0,0 +1,101 @@ +/* + * 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 android.nfc; + +import android.annotation.FlaggedApi; +import android.annotation.IntDef; +import android.annotation.SystemApi; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * Represents a technology entry in current routing table. + * @hide + */ +@FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) +@SystemApi +public class RoutingTableTechnologyEntry extends NfcRoutingTableEntry { + /** + * Technology-A + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int TECHNOLOGY_A = 0; + /** + * Technology-B + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int TECHNOLOGY_B = 1; + /** + * Technology-F + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int TECHNOLOGY_F = 2; + /** + * Technology-V + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int TECHNOLOGY_V = 3; + /** + * Unsupported technology + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public static final int TECHNOLOGY_UNSUPPORTED = -1; + + /** + * + * @hide + */ + @IntDef(prefix = { "TECHNOLOGY_" }, value = { + TECHNOLOGY_A, + TECHNOLOGY_B, + TECHNOLOGY_F, + TECHNOLOGY_V, + TECHNOLOGY_UNSUPPORTED + }) + @Retention(RetentionPolicy.SOURCE) + public @interface TechnologyValue{} + + private final @TechnologyValue int mValue; + + /** @hide */ + public RoutingTableTechnologyEntry(int nfceeId, @TechnologyValue int value) { + super(nfceeId); + this.mValue = value; + } + + /** + * Gets technology value. + * @return technology value + */ + @TechnologyValue + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public int getTechnology() { + return mValue; + } + + /** @hide */ + @TechnologyValue + public static int techStringToInt(String tech) { + return switch (tech) { + case "TECHNOLOGY_A" -> TECHNOLOGY_A; + case "TECHNOLOGY_B" -> TECHNOLOGY_B; + case "TECHNOLOGY_F" -> TECHNOLOGY_F; + case "TECHNOLOGY_V" -> TECHNOLOGY_V; + default -> TECHNOLOGY_UNSUPPORTED; + }; + } +} diff --git a/packages/CarrierDefaultApp/res/values-bs/strings.xml b/packages/CarrierDefaultApp/res/values-bs/strings.xml index bc725fee2d83..50b7312b2dbb 100644 --- a/packages/CarrierDefaultApp/res/values-bs/strings.xml +++ b/packages/CarrierDefaultApp/res/values-bs/strings.xml @@ -7,9 +7,9 @@ <string name="no_data_notification_id" msgid="668400731803969521">"Prijenos podataka na mobilnoj mreži je deaktiviran"</string> <string name="portal_notification_detail" msgid="2295729385924660881">"Dodirnite da posjetite %s web lokaciju"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"Obratite se pružaocu usluga %s"</string> - <string name="no_mobile_data_connection_title" msgid="7449525772416200578">"Nema veze za prijenos podataka na mobilnoj mreži"</string> - <string name="no_mobile_data_connection" msgid="544980465184147010">"Dodajte plan prijenosa podataka ili rominga putem operatera %s"</string> - <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"Status prijenosa podataka na mobilnoj mreži"</string> + <string name="no_mobile_data_connection_title" msgid="7449525772416200578">"Nema veze za prenos podataka na mobilnoj mreži"</string> + <string name="no_mobile_data_connection" msgid="544980465184147010">"Dodajte plan prenosa podataka ili rominga putem operatera %s"</string> + <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"Status prenosa podataka na mobilnoj mreži"</string> <string name="action_bar_label" msgid="4290345990334377177">"Prijava na mobilnu mrežu"</string> <string name="ssl_error_warning" msgid="3127935140338254180">"Mreža kojoj pokušavate pristupiti ima sigurnosnih problema."</string> <string name="ssl_error_example" msgid="6188711843183058764">"Naprimjer, stranica za prijavljivanje možda ne pripada prikazanoj organizaciji."</string> diff --git a/packages/CompanionDeviceManager/res/values-in/strings.xml b/packages/CompanionDeviceManager/res/values-in/strings.xml index abb02992fc40..86e891899268 100644 --- a/packages/CompanionDeviceManager/res/values-in/strings.xml +++ b/packages/CompanionDeviceManager/res/values-in/strings.xml @@ -40,7 +40,7 @@ <string name="summary_generic" msgid="1761976003668044801">"Aplikasi ini akan dapat menyinkronkan info, seperti nama penelepon, antara ponsel dan perangkat yang dipilih"</string> <string name="consent_yes" msgid="8344487259618762872">"Izinkan"</string> <string name="consent_no" msgid="2640796915611404382">"Jangan izinkan"</string> - <string name="consent_cancel" msgid="5655005528379285841">"Batalkan"</string> + <string name="consent_cancel" msgid="5655005528379285841">"Batal"</string> <string name="consent_back" msgid="2560683030046918882">"Kembali"</string> <string name="permission_expand" msgid="893185038020887411">"Luaskan <xliff:g id="PERMISSION_TYPE">%1$s</xliff:g>"</string> <string name="permission_collapse" msgid="3320833884220844084">"Ciutkan <xliff:g id="PERMISSION_TYPE">%1$s</xliff:g>"</string> diff --git a/packages/CompanionDeviceManager/res/values-mr/strings.xml b/packages/CompanionDeviceManager/res/values-mr/strings.xml index 5ac1e56e4331..9520a328d9a2 100644 --- a/packages/CompanionDeviceManager/res/values-mr/strings.xml +++ b/packages/CompanionDeviceManager/res/values-mr/strings.xml @@ -56,7 +56,7 @@ <string name="permission_nearby_devices" msgid="7530973297737123481">"जवळपासची डिव्हाइस"</string> <string name="permission_media_routing_control" msgid="5498639511586715253">"मीडिया आउटपुट बदला"</string> <string name="permission_storage" msgid="6831099350839392343">"फोटो आणि मीडिया"</string> - <string name="permission_notifications" msgid="4099418516590632909">"सूचना"</string> + <string name="permission_notifications" msgid="4099418516590632909">"नोटिफिकेशन"</string> <string name="permission_phone_summary" msgid="8246321093970051702">"फोन कॉल करणे आणि ते व्यवस्थापित करणे"</string> <string name="permission_call_logs_summary" msgid="7545243592757693321">"फोन कॉल लॉग रीड अँड राइट करणे"</string> <string name="permission_sms_summary" msgid="8499509535410068616">"एसएमएस पाठवणे आणि पाहणे"</string> diff --git a/packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java b/packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java index be339cdb75ab..129e47f22f38 100644 --- a/packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java +++ b/packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java @@ -383,7 +383,7 @@ public class PackageWatchdog { * * <p>If monitoring a package supporting explicit health check, at the end of the monitoring * duration if {@link #onHealthCheckPassed} was never called, - * {@link PackageHealthObserver#execute} will be called as if the package failed. + * {@link PackageHealthObserver#onExecuteHealthCheckMitigation} will be called as if the package failed. * * <p>If {@code observer} is already monitoring a package in {@code packageNames}, * the monitoring window of that package will be reset to {@code durationMs} and the health @@ -546,8 +546,8 @@ public class PackageWatchdog { maybeExecute(currentObserverToNotify, versionedPackage, failureReason, currentObserverImpact, mitigationCount); } else { - currentObserverToNotify.execute(versionedPackage, - failureReason, mitigationCount); + currentObserverToNotify.onExecuteHealthCheckMitigation( + versionedPackage, failureReason, mitigationCount); } } } @@ -582,7 +582,8 @@ public class PackageWatchdog { maybeExecute(currentObserverToNotify, failingPackage, failureReason, currentObserverImpact, /*mitigationCount=*/ 1); } else { - currentObserverToNotify.execute(failingPackage, failureReason, 1); + currentObserverToNotify.onExecuteHealthCheckMitigation(failingPackage, + failureReason, 1); } } } @@ -596,7 +597,8 @@ public class PackageWatchdog { synchronized (mLock) { mLastMitigation = mSystemClock.uptimeMillis(); } - currentObserverToNotify.execute(versionedPackage, failureReason, mitigationCount); + currentObserverToNotify.onExecuteHealthCheckMitigation(versionedPackage, failureReason, + mitigationCount); } } @@ -658,12 +660,12 @@ public class PackageWatchdog { currentObserverInternal.setBootMitigationCount( currentObserverMitigationCount); saveAllObserversBootMitigationCountToMetadata(METADATA_FILE); - currentObserverToNotify.executeBootLoopMitigation( + currentObserverToNotify.onExecuteBootLoopMitigation( currentObserverMitigationCount); } else { mBootThreshold.setMitigationCount(mitigationCount); mBootThreshold.saveMitigationCountToMetadata(); - currentObserverToNotify.executeBootLoopMitigation(mitigationCount); + currentObserverToNotify.onExecuteBootLoopMitigation(mitigationCount); } } } @@ -749,7 +751,8 @@ public class PackageWatchdog { return mPackagesExemptFromImpactLevelThreshold; } - /** Possible severity values of the user impact of a {@link PackageHealthObserver#execute}. + /** Possible severity values of the user impact of a + * {@link PackageHealthObserver#onExecuteHealthCheckMitigation}. * @hide */ @Retention(SOURCE) @@ -797,7 +800,7 @@ public class PackageWatchdog { * * * @return any one of {@link PackageHealthObserverImpact} to express the impact - * to the user on {@link #execute} + * to the user on {@link #onExecuteHealthCheckMitigation} */ @PackageHealthObserverImpact int onHealthCheckFailed( @Nullable VersionedPackage versionedPackage, @@ -814,7 +817,7 @@ public class PackageWatchdog { * (including this time). * @return {@code true} if action was executed successfully, {@code false} otherwise */ - boolean execute(@Nullable VersionedPackage versionedPackage, + boolean onExecuteHealthCheckMitigation(@Nullable VersionedPackage versionedPackage, @FailureReasons int failureReason, int mitigationCount); @@ -834,7 +837,7 @@ public class PackageWatchdog { * @param mitigationCount the number of times mitigation has been attempted for this * boot loop (including this time). */ - default boolean executeBootLoopMitigation(int mitigationCount) { + default boolean onExecuteBootLoopMitigation(int mitigationCount) { return false; } @@ -1115,7 +1118,7 @@ public class PackageWatchdog { if (versionedPkg != null) { Slog.i(TAG, "Explicit health check failed for package " + versionedPkg); - registeredObserver.execute(versionedPkg, + registeredObserver.onExecuteHealthCheckMitigation(versionedPkg, PackageWatchdog.FAILURE_REASON_EXPLICIT_HEALTH_CHECK, 1); } } diff --git a/packages/CrashRecovery/services/platform/java/com/android/server/RescueParty.java b/packages/CrashRecovery/services/platform/java/com/android/server/RescueParty.java index feb5775e5aac..f757236613d1 100644 --- a/packages/CrashRecovery/services/platform/java/com/android/server/RescueParty.java +++ b/packages/CrashRecovery/services/platform/java/com/android/server/RescueParty.java @@ -859,7 +859,7 @@ public class RescueParty { } @Override - public boolean execute(@Nullable VersionedPackage failedPackage, + public boolean onExecuteHealthCheckMitigation(@Nullable VersionedPackage failedPackage, @FailureReasons int failureReason, int mitigationCount) { if (isDisabled()) { return false; @@ -927,7 +927,7 @@ public class RescueParty { } @Override - public boolean executeBootLoopMitigation(int mitigationCount) { + public boolean onExecuteBootLoopMitigation(int mitigationCount) { if (isDisabled()) { return false; } diff --git a/packages/CrashRecovery/services/platform/java/com/android/server/rollback/RollbackPackageHealthObserver.java b/packages/CrashRecovery/services/platform/java/com/android/server/rollback/RollbackPackageHealthObserver.java index d206c66ed09a..7445534e95bf 100644 --- a/packages/CrashRecovery/services/platform/java/com/android/server/rollback/RollbackPackageHealthObserver.java +++ b/packages/CrashRecovery/services/platform/java/com/android/server/rollback/RollbackPackageHealthObserver.java @@ -158,7 +158,7 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve // Note: For non-native crashes the rollback-all step has higher impact impact = PackageHealthObserverImpact.USER_IMPACT_LEVEL_30; } else if (getAvailableRollback(failedPackage) != null) { - // Rollback is available, we may get a callback into #execute + // Rollback is available, we may get a callback into #onExecuteHealthCheckMitigation impact = PackageHealthObserverImpact.USER_IMPACT_LEVEL_30; } else if (anyRollbackAvailable) { // If any rollbacks are available, we will commit them @@ -175,7 +175,7 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve } @Override - public boolean execute(@Nullable VersionedPackage failedPackage, + public boolean onExecuteHealthCheckMitigation(@Nullable VersionedPackage failedPackage, @FailureReasons int rollbackReason, int mitigationCount) { Slog.i(TAG, "Executing remediation." + " failedPackage: " @@ -229,7 +229,7 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve } @Override - public boolean executeBootLoopMitigation(int mitigationCount) { + public boolean onExecuteBootLoopMitigation(int mitigationCount) { if (Flags.recoverabilityDetection()) { List<RollbackInfo> availableRollbacks = getAvailableRollbacks(); diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/EdgeToEdgeUtils.java b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/EdgeToEdgeUtils.java index 062e9b8ed032..42ffa67d5b1e 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/EdgeToEdgeUtils.java +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/EdgeToEdgeUtils.java @@ -17,6 +17,7 @@ package com.android.settingslib.collapsingtoolbar; import android.os.Build; +import android.view.ViewGroup; import androidx.activity.ComponentActivity; import androidx.activity.EdgeToEdge; @@ -53,6 +54,8 @@ public class EdgeToEdgeUtils { .getInsets(WindowInsetsCompat.Type.statusBars()).top; // Apply the insets paddings to the view. v.setPadding(insets.left, statusBarHeight, insets.right, insets.bottom); + ((ViewGroup)v).setClipToPadding(false); + ((ViewGroup)v).setClipChildren(false); // Return CONSUMED if you don't want the window insets to keep being // passed down to descendant views. diff --git a/packages/SettingsLib/HelpUtils/res/values-en-rGB/strings.xml b/packages/SettingsLib/HelpUtils/res/values-en-rGB/strings.xml index 759da1d0b021..150020cb17c5 100644 --- a/packages/SettingsLib/HelpUtils/res/values-en-rGB/strings.xml +++ b/packages/SettingsLib/HelpUtils/res/values-en-rGB/strings.xml @@ -17,5 +17,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="help_feedback_label" msgid="7106780063063027882">"Help & feedback"</string> + <string name="help_feedback_label" msgid="7106780063063027882">"Help and feedback"</string> </resources> diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt index 72cf40387a25..49acc1d44144 100644 --- a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt +++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt @@ -115,7 +115,7 @@ interface PreferenceScreenCreator : PreferenceScreenMetadata, PreferenceScreenPr fun isFlagEnabled(context: Context): Boolean = true val preferenceBindingFactory: PreferenceBindingFactory - get() = DefaultPreferenceBindingFactory + get() = PreferenceBindingFactory.defaultFactory override fun createPreferenceScreen(factory: PreferenceScreenFactory) = factory.getOrCreatePreferenceScreen().apply { diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindingFactory.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindingFactory.kt index 87c289f48ff0..51b9aac029a5 100644 --- a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindingFactory.kt +++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindingFactory.kt @@ -45,10 +45,15 @@ interface PreferenceBindingFactory { /** Returns the [PreferenceBinding] associated with the [PreferenceMetadata]. */ fun getPreferenceBinding(metadata: PreferenceMetadata): PreferenceBinding? + + companion object { + /** Default preference binding factory. */ + @JvmStatic var defaultFactory: PreferenceBindingFactory = DefaultPreferenceBindingFactory() + } } /** Default [PreferenceBindingFactory]. */ -object DefaultPreferenceBindingFactory : PreferenceBindingFactory { +open class DefaultPreferenceBindingFactory : PreferenceBindingFactory { override fun getPreferenceBinding(metadata: PreferenceMetadata) = metadata as? PreferenceBinding @@ -66,5 +71,6 @@ class KeyedPreferenceBindingFactory(private val bindings: Map<String, Preference PreferenceBindingFactory { override fun getPreferenceBinding(metadata: PreferenceMetadata) = - bindings[metadata.key] ?: DefaultPreferenceBindingFactory.getPreferenceBinding(metadata) + bindings[metadata.key] + ?: PreferenceBindingFactory.defaultFactory.getPreferenceBinding(metadata) } diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceFragment.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceFragment.kt index 5f4b88f81de6..41a626fe8efa 100644 --- a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceFragment.kt +++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceFragment.kt @@ -21,16 +21,16 @@ import android.content.Intent import android.os.Bundle import android.util.Log import androidx.annotation.XmlRes -import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceScreen import com.android.settingslib.metadata.EXTRA_BINDING_SCREEN_KEY import com.android.settingslib.metadata.PreferenceScreenBindingKeyProvider import com.android.settingslib.metadata.PreferenceScreenRegistry import com.android.settingslib.preference.PreferenceScreenBindingHelper.Companion.bindRecursively +import com.android.settingslib.widget.SettingsBasePreferenceFragment /** Fragment to display a preference screen. */ open class PreferenceFragment : - PreferenceFragmentCompat(), PreferenceScreenProvider, PreferenceScreenBindingKeyProvider { + SettingsBasePreferenceFragment(), PreferenceScreenProvider, PreferenceScreenBindingKeyProvider { private var preferenceScreenBindingHelper: PreferenceScreenBindingHelper? = null diff --git a/packages/SettingsLib/Preference/testutils/com/android/settingslib/preference/PreferenceBindingTestUtils.kt b/packages/SettingsLib/Preference/testutils/com/android/settingslib/preference/PreferenceBindingTestUtils.kt index f3142d031aa9..00bad5203f07 100644 --- a/packages/SettingsLib/Preference/testutils/com/android/settingslib/preference/PreferenceBindingTestUtils.kt +++ b/packages/SettingsLib/Preference/testutils/com/android/settingslib/preference/PreferenceBindingTestUtils.kt @@ -25,7 +25,7 @@ import com.android.settingslib.metadata.PreferenceMetadata /** Creates [Preference] widget and binds with metadata. */ @VisibleForTesting fun <P : Preference> PreferenceMetadata.createAndBindWidget(context: Context): P { - val binding = DefaultPreferenceBindingFactory.getPreferenceBinding(this) + val binding = PreferenceBindingFactory.defaultFactory.getPreferenceBinding(this)!! return (binding.createWidget(context) as P).also { if (this is PersistentPreference<*>) { storage(context)?.let { keyValueStore -> diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_bottom_highlighted.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_bottom_highlighted.xml new file mode 100644 index 000000000000..c0c08699cc2a --- /dev/null +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_bottom_highlighted.xml @@ -0,0 +1,36 @@ +<?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. + --> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:colorControlHighlight"> + <item + android:bottom="16dp" + android:end="?android:attr/listPreferredItemPaddingEnd" + android:start="?android:attr/listPreferredItemPaddingStart" + android:top="2dp"> + <shape + android:shape="rectangle" + android:tint="?android:attr/colorAccent"> + <corners + android:bottomLeftRadius="@dimen/settingslib_preference_corner_radius" + android:bottomRightRadius="@dimen/settingslib_preference_corner_radius" + android:topLeftRadius="4dp" + android:topRightRadius="4dp" /> + <padding android:bottom="16dp" /> + <solid android:color="#42000000" /> + </shape> + </item> +</ripple>
\ No newline at end of file diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_center_highlighted.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_center_highlighted.xml new file mode 100644 index 000000000000..8099d9b3d7f7 --- /dev/null +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_center_highlighted.xml @@ -0,0 +1,30 @@ +<?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. + --> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:colorControlHighlight"> + <item + android:end="?android:attr/listPreferredItemPaddingEnd" + android:start="?android:attr/listPreferredItemPaddingStart" + android:top="2dp"> + <shape + android:shape="rectangle" + android:tint="?android:attr/colorAccent"> + <corners android:radius="4dp" /> + <solid android:color="#42000000" /> + </shape> + </item> +</ripple>
\ No newline at end of file diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_highlighted.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_highlighted.xml new file mode 100644 index 000000000000..a119a4ae083f --- /dev/null +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_highlighted.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. + --> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:colorControlHighlight"> + <item + android:bottom="16dp" + android:end="?android:attr/listPreferredItemPaddingEnd" + android:start="?android:attr/listPreferredItemPaddingStart" + android:top="2dp"> + <shape + android:shape="rectangle" + android:tint="?android:attr/colorAccent"> + <corners android:radius="@dimen/settingslib_preference_corner_radius" /> + <padding android:bottom="16dp" /> + <solid android:color="#42000000" /> + </shape> + </item> +</ripple>
\ No newline at end of file diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_top_highlighted.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_top_highlighted.xml new file mode 100644 index 000000000000..052eb01cab8d --- /dev/null +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_top_highlighted.xml @@ -0,0 +1,35 @@ +<?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. + --> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:colorControlHighlight"> + <item + android:color="?android:attr/colorAccent" + android:end="?android:attr/listPreferredItemPaddingEnd" + android:start="?android:attr/listPreferredItemPaddingStart" + android:top="2dp"> + <shape + android:shape="rectangle" + android:tint="?android:attr/colorAccent"> + <corners + android:bottomLeftRadius="4dp" + android:bottomRightRadius="4dp" + android:topLeftRadius="@dimen/settingslib_preference_corner_radius" + android:topRightRadius="@dimen/settingslib_preference_corner_radius" /> + <solid android:color="#42000000" /> + </shape> + </item> +</ripple>
\ No newline at end of file diff --git a/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt index 535d80f609fb..265c065e924e 100644 --- a/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt +++ b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt @@ -21,7 +21,7 @@ import androidx.preference.PreferenceScreen import androidx.recyclerview.widget.RecyclerView /** Base class for Settings to use PreferenceFragmentCompat */ -open abstract class SettingsBasePreferenceFragment : PreferenceFragmentCompat() { +abstract class SettingsBasePreferenceFragment : PreferenceFragmentCompat() { override fun onCreateAdapter(preferenceScreen: PreferenceScreen): RecyclerView.Adapter<*> { if (SettingsThemeHelper.isExpressiveTheme(requireContext())) diff --git a/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsPreferenceGroupAdapter.kt b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsPreferenceGroupAdapter.kt index 98b7f7664b1b..6a0632073de9 100644 --- a/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsPreferenceGroupAdapter.kt +++ b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsPreferenceGroupAdapter.kt @@ -16,8 +16,10 @@ package com.android.settingslib.widget +import android.annotation.SuppressLint import android.os.Handler import android.os.Looper +import android.util.TypedValue import androidx.annotation.DrawableRes import androidx.preference.Preference import androidx.preference.PreferenceCategory @@ -27,12 +29,12 @@ import androidx.preference.PreferenceViewHolder import com.android.settingslib.widget.theme.R /** - * A custom adapter for displaying settings preferences in a list, handling rounded corners - * for preference items within a group. + * A custom adapter for displaying settings preferences in a list, handling rounded corners for + * preference items within a group. */ -open class SettingsPreferenceGroupAdapter @JvmOverloads constructor( - preferenceGroup: PreferenceGroup -) : PreferenceGroupAdapter(preferenceGroup) { +@SuppressLint("RestrictedApi") +open class SettingsPreferenceGroupAdapter(preferenceGroup: PreferenceGroup) : + PreferenceGroupAdapter(preferenceGroup) { private val mPreferenceGroup = preferenceGroup private var mRoundCornerMappingList: ArrayList<Int> = ArrayList() @@ -41,6 +43,7 @@ open class SettingsPreferenceGroupAdapter @JvmOverloads constructor( private var mGroupPaddingStart = 0 private var mNormalPaddingEnd = 0 private var mGroupPaddingEnd = 0 + @DrawableRes private var mLegacyBackgroundRes: Int private val mHandler = Handler(Looper.getMainLooper()) @@ -54,9 +57,17 @@ open class SettingsPreferenceGroupAdapter @JvmOverloads constructor( mNormalPaddingEnd = context.resources.getDimensionPixelSize(R.dimen.settingslib_expressive_space_small1) mGroupPaddingEnd = mNormalPaddingEnd * 2 + val outValue = TypedValue() + context.theme.resolveAttribute( + android.R.attr.selectableItemBackground, + outValue, + true, /* resolveRefs */ + ) + mLegacyBackgroundRes = outValue.resourceId updatePreferences() } + @SuppressLint("RestrictedApi") override fun onPreferenceHierarchyChange(preference: Preference) { super.onPreferenceHierarchyChange(preference) @@ -65,6 +76,7 @@ open class SettingsPreferenceGroupAdapter @JvmOverloads constructor( mHandler.post(syncRunnable) } + @SuppressLint("RestrictedApi") override fun onBindViewHolder(holder: PreferenceViewHolder, position: Int) { super.onBindViewHolder(holder, position) updateBackground(holder, position) @@ -79,6 +91,7 @@ open class SettingsPreferenceGroupAdapter @JvmOverloads constructor( } } + @SuppressLint("RestrictedApi") private fun mappingPreferenceGroup(cornerStyles: MutableList<Int>, group: PreferenceGroup) { cornerStyles.clear() cornerStyles.addAll(MutableList(itemCount) { 0 }) @@ -151,20 +164,38 @@ open class SettingsPreferenceGroupAdapter @JvmOverloads constructor( } } - /** handle roundCorner background */ + /** handle roundCorner background */ private fun updateBackground(holder: PreferenceViewHolder, position: Int) { - @DrawableRes val backgroundRes = getRoundCornerDrawableRes(position, false /* isSelected*/) + val context = holder.itemView.context + @DrawableRes + val backgroundRes = + when (SettingsThemeHelper.isExpressiveTheme(context)) { + true -> getRoundCornerDrawableRes(position, isSelected = false) + else -> mLegacyBackgroundRes + } val v = holder.itemView - val paddingStart = if (backgroundRes == 0) mNormalPaddingStart else mGroupPaddingStart - val paddingEnd = if (backgroundRes == 0) mNormalPaddingEnd else mGroupPaddingEnd - - v.setPaddingRelative(paddingStart, v.paddingTop, paddingEnd, v.paddingBottom) + // Update padding + if (SettingsThemeHelper.isExpressiveTheme(context)) { + val paddingStart = if (backgroundRes == 0) mNormalPaddingStart else mGroupPaddingStart + val paddingEnd = if (backgroundRes == 0) mNormalPaddingEnd else mGroupPaddingEnd + v.setPaddingRelative(paddingStart, v.paddingTop, paddingEnd, v.paddingBottom) + } + // Update background v.setBackgroundResource(backgroundRes) } @DrawableRes protected fun getRoundCornerDrawableRes(position: Int, isSelected: Boolean): Int { + return getRoundCornerDrawableRes(position, isSelected, false) + } + + @DrawableRes + protected fun getRoundCornerDrawableRes( + position: Int, + isSelected: Boolean, + isHighlighted: Boolean, + ): Int { val cornerType = mRoundCornerMappingList[position] if ((cornerType and ROUND_CORNER_CENTER) == 0) { @@ -175,24 +206,28 @@ open class SettingsPreferenceGroupAdapter @JvmOverloads constructor( (cornerType and ROUND_CORNER_TOP) != 0 && (cornerType and ROUND_CORNER_BOTTOM) == 0 -> { // the first if (isSelected) R.drawable.settingslib_round_background_top_selected + else if (isHighlighted) R.drawable.settingslib_round_background_top_highlighted else R.drawable.settingslib_round_background_top } (cornerType and ROUND_CORNER_BOTTOM) != 0 && (cornerType and ROUND_CORNER_TOP) == 0 -> { // the last if (isSelected) R.drawable.settingslib_round_background_bottom_selected + else if (isHighlighted) R.drawable.settingslib_round_background_bottom_highlighted else R.drawable.settingslib_round_background_bottom } (cornerType and ROUND_CORNER_TOP) != 0 && (cornerType and ROUND_CORNER_BOTTOM) != 0 -> { // the only one preference if (isSelected) R.drawable.settingslib_round_background_selected + else if (isHighlighted) R.drawable.settingslib_round_background_highlighted else R.drawable.settingslib_round_background } else -> { // in the center if (isSelected) R.drawable.settingslib_round_background_center_selected + else if (isHighlighted) R.drawable.settingslib_round_background_center_highlighted else R.drawable.settingslib_round_background_center } } @@ -203,4 +238,4 @@ open class SettingsPreferenceGroupAdapter @JvmOverloads constructor( private const val ROUND_CORNER_TOP: Int = 1 shl 1 private const val ROUND_CORNER_BOTTOM: Int = 1 shl 2 } -}
\ No newline at end of file +} diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedDropDownPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedDropDownPreference.java index 6578eb7d50a6..c36ade979d47 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedDropDownPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedDropDownPreference.java @@ -22,14 +22,20 @@ import androidx.annotation.NonNull; import androidx.preference.DropDownPreference; import androidx.preference.PreferenceViewHolder; -public class RestrictedDropDownPreference extends DropDownPreference { - RestrictedPreferenceHelper mHelper; +public class RestrictedDropDownPreference extends DropDownPreference implements + RestrictedPreferenceHelperProvider { + private final RestrictedPreferenceHelper mHelper; public RestrictedDropDownPreference(@NonNull Context context) { super(context); mHelper = new RestrictedPreferenceHelper(context, this, null); } + @Override + public @NonNull RestrictedPreferenceHelper getRestrictedPreferenceHelper() { + return mHelper; + } + /** * Checks if the given setting is subject to Enhanced Confirmation Mode restrictions for this * package. Marks the preference as disabled if so. diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedInterface.kt b/packages/SettingsLib/src/com/android/settingslib/RestrictedInterface.kt deleted file mode 100644 index 14f9a19ee753..000000000000 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedInterface.kt +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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 com.android.settingslib.RestrictedLockUtils.EnforcedAdmin - -interface RestrictedInterface { - fun useAdminDisabledSummary(useSummary: Boolean) - - fun checkRestrictionAndSetDisabled(userRestriction: String) - - fun checkRestrictionAndSetDisabled(userRestriction: String, userId: Int) - - /** - * 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 - */ - fun checkEcmRestrictionAndSetDisabled( - settingIdentifier: String, - packageName: String - ) - - val isDisabledByAdmin: Boolean - - fun setDisabledByAdmin(admin: EnforcedAdmin?) - - val isDisabledByEcm: Boolean - - val uid: Int - - val packageName: String? -} diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java index 495410b0a8ae..332042a5c4f9 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java @@ -34,7 +34,9 @@ import com.android.settingslib.widget.TwoTargetPreference; * Preference class that supports being disabled by a user restriction * set by a device admin. */ -public class RestrictedPreference extends TwoTargetPreference { +public class RestrictedPreference extends TwoTargetPreference implements + RestrictedPreferenceHelperProvider { + RestrictedPreferenceHelper mHelper; public RestrictedPreference(Context context, AttributeSet attrs, @@ -67,6 +69,11 @@ public class RestrictedPreference extends TwoTargetPreference { } @Override + public @NonNull RestrictedPreferenceHelper getRestrictedPreferenceHelper() { + return mHelper; + } + + @Override public void onBindViewHolder(PreferenceViewHolder holder) { super.onBindViewHolder(holder); mHelper.onBindViewHolder(holder); diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttFlags.kt b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelperProvider.kt index 03bc9350674b..f2860845e3d3 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttFlags.kt +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelperProvider.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 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. @@ -14,16 +14,11 @@ * limitations under the License. */ -package com.android.systemui.media.taptotransfer +package com.android.settingslib -import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.flags.FeatureFlags -import com.android.systemui.flags.Flags -import javax.inject.Inject +/** Provider of [RestrictedPreferenceHelper]. */ +interface RestrictedPreferenceHelperProvider { -/** Flags related to media tap-to-transfer. */ -@SysUISingleton -class MediaTttFlags @Inject constructor(private val featureFlags: FeatureFlags) { - /** */ - fun isMediaTttEnabled(): Boolean = featureFlags.isEnabled(Flags.MEDIA_TAP_TO_TRANSFER) + /** Returns the [RestrictedPreferenceHelper] applied to the preference. */ + fun getRestrictedPreferenceHelper(): RestrictedPreferenceHelper } diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedSelectorWithWidgetPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedSelectorWithWidgetPreference.java index c52c7ea7328b..573869db5073 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedSelectorWithWidgetPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedSelectorWithWidgetPreference.java @@ -32,8 +32,9 @@ 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; +public class RestrictedSelectorWithWidgetPreference extends SelectorWithWidgetPreference implements + RestrictedPreferenceHelperProvider { + private final RestrictedPreferenceHelper mHelper; /** * Perform inflation from XML and apply a class-specific base style. @@ -82,8 +83,11 @@ public class RestrictedSelectorWithWidgetPreference extends SelectorWithWidgetPr */ public RestrictedSelectorWithWidgetPreference(@NonNull Context context) { this(context, null); - mHelper = - new RestrictedPreferenceHelper(context, /* preference= */ this, /* attrs= */ null); + } + + @Override + public @NonNull RestrictedPreferenceHelper getRestrictedPreferenceHelper() { + return mHelper; } @Override diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedSliderPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedSliderPreference.java index 1dc5281c266c..b690816a6fb6 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedSliderPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedSliderPreference.java @@ -19,7 +19,6 @@ package com.android.settingslib; import android.annotation.SuppressLint; import android.content.Context; import android.os.Process; -import android.os.UserHandle; import android.util.AttributeSet; import androidx.annotation.NonNull; @@ -34,8 +33,10 @@ import com.android.settingslib.widget.SliderPreference; * Slide Preference that supports being disabled by a user restriction * set by a device admin. */ -public class RestrictedSliderPreference extends SliderPreference implements RestrictedInterface { - RestrictedPreferenceHelper mHelper; +public class RestrictedSliderPreference extends SliderPreference implements + RestrictedPreferenceHelperProvider { + + private final RestrictedPreferenceHelper mHelper; public RestrictedSliderPreference(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, @Nullable String packageName, int uid) { @@ -66,6 +67,11 @@ public class RestrictedSliderPreference extends SliderPreference implements Rest } @Override + public @NonNull RestrictedPreferenceHelper getRestrictedPreferenceHelper() { + return mHelper; + } + + @Override public void onBindViewHolder(@NonNull PreferenceViewHolder holder) { super.onBindViewHolder(holder); mHelper.onBindViewHolder(holder); @@ -81,12 +87,12 @@ public class RestrictedSliderPreference extends SliderPreference implements Rest @Override public void setEnabled(boolean enabled) { - if (enabled && isDisabledByAdmin()) { + if (enabled && mHelper.isDisabledByAdmin()) { mHelper.setDisabledByAdmin(null); return; } - if (enabled && isDisabledByEcm()) { + if (enabled && mHelper.isDisabledByEcm()) { mHelper.setDisabledByEcm(null); return; } @@ -95,55 +101,6 @@ public class RestrictedSliderPreference extends SliderPreference implements Rest } @Override - public void useAdminDisabledSummary(boolean useSummary) { - mHelper.useAdminDisabledSummary(useSummary); - } - - @Override - public void checkRestrictionAndSetDisabled(@NonNull String userRestriction) { - mHelper.checkRestrictionAndSetDisabled(userRestriction, UserHandle.myUserId()); - } - - @Override - public void checkRestrictionAndSetDisabled(@NonNull String userRestriction, int userId) { - mHelper.checkRestrictionAndSetDisabled(userRestriction, userId); - } - - @Override - public void checkEcmRestrictionAndSetDisabled(@NonNull String settingIdentifier, - @NonNull String packageName) { - mHelper.checkEcmRestrictionAndSetDisabled(settingIdentifier, packageName); - } - - @Override - public void setDisabledByAdmin(@Nullable RestrictedLockUtils.EnforcedAdmin admin) { - if (mHelper.setDisabledByAdmin(admin)) { - notifyChanged(); - } - } - - @Override - public boolean isDisabledByAdmin() { - return mHelper.isDisabledByAdmin(); - } - - @Override - public boolean isDisabledByEcm() { - return mHelper.isDisabledByEcm(); - } - - @Override - public int getUid() { - return mHelper != null ? mHelper.uid : Process.INVALID_UID; - } - - @Override - @Nullable - public String getPackageName() { - return mHelper != null ? mHelper.packageName : null; - } - - @Override protected void onAttachedToHierarchy(@NonNull PreferenceManager preferenceManager) { mHelper.onAttachedToHierarchy(); super.onAttachedToHierarchy(preferenceManager); diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java index fffbb547c662..727dbe1019ae 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java @@ -45,8 +45,9 @@ import androidx.preference.SwitchPreferenceCompat; * Version of SwitchPreferenceCompat that can be disabled by a device admin * using a user restriction. */ -public class RestrictedSwitchPreference extends SwitchPreferenceCompat { - RestrictedPreferenceHelper mHelper; +public class RestrictedSwitchPreference extends SwitchPreferenceCompat implements + RestrictedPreferenceHelperProvider { + private final RestrictedPreferenceHelper mHelper; AppOpsManager mAppOpsManager; boolean mUseAdditionalSummary = false; CharSequence mRestrictedSwitchSummary; @@ -98,6 +99,11 @@ public class RestrictedSwitchPreference extends SwitchPreferenceCompat { this(context, null); } + @Override + public @NonNull RestrictedPreferenceHelper getRestrictedPreferenceHelper() { + return mHelper; + } + @VisibleForTesting public void setAppOps(AppOpsManager appOps) { mAppOpsManager = appOps; diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedTopLevelPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedTopLevelPreference.java index 0096015aa875..34e4d8f7346f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedTopLevelPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedTopLevelPreference.java @@ -22,14 +22,16 @@ import android.content.Context; import android.os.UserHandle; import android.util.AttributeSet; +import androidx.annotation.NonNull; import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceViewHolder; /** Top level preference that can be disabled by a device admin using a user restriction. */ -public class RestrictedTopLevelPreference extends Preference { - private RestrictedPreferenceHelper mHelper; +public class RestrictedTopLevelPreference extends Preference implements + RestrictedPreferenceHelperProvider { + private final RestrictedPreferenceHelper mHelper; public RestrictedTopLevelPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { @@ -51,6 +53,11 @@ public class RestrictedTopLevelPreference extends Preference { } @Override + public @NonNull RestrictedPreferenceHelper getRestrictedPreferenceHelper() { + return mHelper; + } + + @Override public void onBindViewHolder(PreferenceViewHolder holder) { super.onBindViewHolder(holder); mHelper.onBindViewHolder(holder); diff --git a/packages/SettingsLib/src/com/android/settingslib/notification/modes/ZenIconKeys.java b/packages/SettingsLib/src/com/android/settingslib/notification/modes/ZenIconKeys.java index 79dabf029c49..5d2a1669e24a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/notification/modes/ZenIconKeys.java +++ b/packages/SettingsLib/src/com/android/settingslib/notification/modes/ZenIconKeys.java @@ -41,7 +41,7 @@ class ZenIconKeys { private static final ImmutableMap<Integer, ZenIcon.Key> TYPE_DEFAULTS = ImmutableMap.of( AutomaticZenRule.TYPE_UNKNOWN, - ZenIcon.Key.forSystemResource(R.drawable.ic_zen_mode_type_unknown), + ZenIcon.Key.forSystemResource(R.drawable.ic_zen_mode_type_special_dnd), AutomaticZenRule.TYPE_OTHER, ZenIcon.Key.forSystemResource(R.drawable.ic_zen_mode_type_other), AutomaticZenRule.TYPE_SCHEDULE_TIME, @@ -61,7 +61,7 @@ class ZenIconKeys { ); private static final ZenIcon.Key FOR_UNEXPECTED_TYPE = - ZenIcon.Key.forSystemResource(R.drawable.ic_zen_mode_type_unknown); + ZenIcon.Key.forSystemResource(R.drawable.ic_zen_mode_type_special_dnd); /** Default icon descriptors per mode {@link AutomaticZenRule.Type}. */ static ZenIcon.Key forType(@AutomaticZenRule.Type int ruleType) { diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 1919572ff571..2c8c261fa8f8 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -715,6 +715,9 @@ <uses-permission android:name="android.permission.UWB_PRIVILEGED" /> <uses-permission android:name="android.permission.UWB_RANGING" /> + <!-- Permission required for CTS test - CtsRangingTestCases --> + <uses-permission android:name="android.permission.RANGING" /> + <!-- Permission required for CTS test - CtsAlarmManagerTestCases --> <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" /> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-uk/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-uk/strings.xml index ee02b4a0e33a..ba38023ed951 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-uk/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-uk/strings.xml @@ -21,7 +21,7 @@ <string name="previous_button_content_description" msgid="840869171117765966">"Перейти на попередній екран"</string> <string name="next_button_content_description" msgid="6810058269847364406">"Перейти на наступний екран"</string> <string name="accessibility_menu_description" msgid="4458354794093858297">"За допомогою великого екранного меню функцій доступності можна блокувати пристрій, змінювати гучність і яскравість, робити знімки екрана й багато іншого."</string> - <string name="accessibility_menu_summary" msgid="340071398148208130">"Керування пристроєм за допомогою великого меню"</string> + <string name="accessibility_menu_summary" msgid="340071398148208130">"Керувати пристроєм за допомогою великого меню"</string> <string name="accessibility_menu_settings_name" msgid="1716888058785672611">"Налаштування меню функцій доступності"</string> <string name="accessibility_menu_large_buttons_title" msgid="8978499601044961736">"Великі кнопки"</string> <string name="accessibility_menu_large_buttons_summary" msgid="236873938502785311">"Збільшити розмір кнопок у меню функцій доступності"</string> diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java b/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java index 0b15d230dee2..cbe11a3f2f60 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java @@ -268,7 +268,8 @@ public abstract class RemoteAnimationRunnerCompat extends IRemoteAnimationRunner // skip changes that we didn't wrap if (!leashMap.containsKey(change.getLeash())) continue; // Only make the update if we are closing Desktop tasks. - if (change.getTaskInfo().isFreeform() && isClosingMode(change.getMode())) { + if (change.getTaskInfo() != null && change.getTaskInfo().isFreeform() + && isClosingMode(change.getMode())) { startTransaction.setAlpha(leashMap.get(launcherChange.getLeash()), 0f); return; } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt index 6d3039855077..87e9c427d695 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt @@ -42,7 +42,6 @@ import com.android.compose.animation.scene.SceneKey import com.android.compose.animation.scene.SceneScope import com.android.compose.animation.scene.SceneTransitionLayout import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.observableTransitionState import com.android.compose.animation.scene.transitions import com.android.systemui.communal.shared.model.CommunalBackgroundType @@ -124,7 +123,7 @@ val sceneTransitions = transitions { } timestampRange( startMillis = TransitionDuration.EDIT_MODE_TO_HUB_GRID_DELAY_MS, - endMillis = TransitionDuration.EDIT_MODE_TO_HUB_GRID_END_MS + endMillis = TransitionDuration.EDIT_MODE_TO_HUB_GRID_END_MS, ) { fade(Communal.Elements.Grid) } @@ -187,14 +186,13 @@ fun CommunalContainer( ) { scene( CommunalScenes.Blank, - userActions = - mapOf(Swipe(SwipeDirection.Start, fromSource = Edge.End) to CommunalScenes.Communal) + userActions = mapOf(Swipe.Start(fromSource = Edge.End) to CommunalScenes.Communal), ) { // This scene shows nothing only allowing for transitions to the communal scene. Box(modifier = Modifier.fillMaxSize()) } - val userActions = mapOf(Swipe(SwipeDirection.End) to CommunalScenes.Blank) + val userActions = mapOf(Swipe.End to CommunalScenes.Blank) scene(CommunalScenes.Communal, userActions = userActions) { CommunalScene( @@ -257,13 +255,9 @@ fun SceneScope.CommunalScene( /** Default background of the hub, a single color */ @Composable -private fun BoxScope.DefaultBackground( - colors: CommunalColors, -) { +private fun BoxScope.DefaultBackground(colors: CommunalColors) { val backgroundColor by colors.backgroundColor.collectAsStateWithLifecycle() - Box( - modifier = Modifier.matchParentSize().background(Color(backgroundColor.toArgb())), - ) + Box(modifier = Modifier.matchParentSize().background(Color(backgroundColor.toArgb()))) } /** Experimental hub background, static linear gradient */ @@ -273,7 +267,7 @@ private fun BoxScope.StaticLinearGradient() { Box( Modifier.matchParentSize() .background( - Brush.linearGradient(colors = listOf(colors.primary, colors.primaryContainer)), + Brush.linearGradient(colors = listOf(colors.primary, colors.primaryContainer)) ) ) BackgroundTopScrim() @@ -288,7 +282,7 @@ private fun BoxScope.AnimatedLinearGradient() { .background(colors.primary) .animatedRadialGradientBackground( toColor = colors.primary, - fromColor = colors.primaryContainer.copy(alpha = 0.6f) + fromColor = colors.primaryContainer.copy(alpha = 0.6f), ) ) BackgroundTopScrim() @@ -324,9 +318,9 @@ fun Modifier.animatedRadialGradientBackground(toColor: Color, fromColor: Color): durationMillis = ANIMATION_DURATION_MS, easing = CubicBezierEasing(0.33f, 0f, 0.67f, 1f), ), - repeatMode = RepeatMode.Reverse + repeatMode = RepeatMode.Reverse, ), - label = "radial gradient center fraction" + label = "radial gradient center fraction", ) // Offset to place the center of the gradients offscreen. This is applied to both the @@ -337,16 +331,9 @@ fun Modifier.animatedRadialGradientBackground(toColor: Color, fromColor: Color): val gradientRadius = (size.width / 2) + offsetPx val totalHeight = size.height + 2 * offsetPx - val leftCenter = - Offset( - x = -offsetPx, - y = totalHeight * centerFraction - offsetPx, - ) + val leftCenter = Offset(x = -offsetPx, y = totalHeight * centerFraction - offsetPx) val rightCenter = - Offset( - x = offsetPx + size.width, - y = totalHeight * (1f - centerFraction) - offsetPx, - ) + Offset(x = offsetPx + size.width, y = totalHeight * (1f - centerFraction) - offsetPx) // Right gradient drawCircle( @@ -354,7 +341,7 @@ fun Modifier.animatedRadialGradientBackground(toColor: Color, fromColor: Color): Brush.radialGradient( colors = listOf(fromColor, toColor), center = rightCenter, - radius = gradientRadius + radius = gradientRadius, ), center = rightCenter, radius = gradientRadius, @@ -367,7 +354,7 @@ fun Modifier.animatedRadialGradientBackground(toColor: Color, fromColor: Color): Brush.radialGradient( colors = listOf(fromColor, toColor), center = leftCenter, - radius = gradientRadius + radius = gradientRadius, ), center = leftCenter, radius = gradientRadius, diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/DragAndDropTargetState.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/DragAndDropTargetState.kt index f2f7c872b71c..0aef7f2c7063 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/DragAndDropTargetState.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/DragAndDropTargetState.kt @@ -36,6 +36,7 @@ import androidx.compose.ui.draganddrop.toAndroidDragEvent import androidx.compose.ui.geometry.Offset import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.dp +import com.android.systemui.Flags.communalWidgetResizing import com.android.systemui.communal.domain.model.CommunalContentModel import com.android.systemui.communal.ui.compose.extensions.firstItemAtOffset import com.android.systemui.communal.util.WidgetPickerIntentUtils @@ -82,9 +83,7 @@ internal fun rememberDragAndDropTargetState( * @see DragEvent */ @Composable -internal fun Modifier.dragAndDropTarget( - dragDropTargetState: DragAndDropTargetState, -): Modifier { +internal fun Modifier.dragAndDropTarget(dragDropTargetState: DragAndDropTargetState): Modifier { val state by rememberUpdatedState(dragDropTargetState) return this then @@ -113,7 +112,7 @@ internal fun Modifier.dragAndDropTarget( override fun onEnded(event: DragAndDropEvent) { state.onEnded() } - } + }, ) } @@ -146,6 +145,7 @@ internal class DragAndDropTargetState( */ private var placeHolder = CommunalContentModel.WidgetPlaceholder() private var placeHolderIndex: Int? = null + private var previousTargetItemKey: Any? = null internal val scrollChannel = Channel<Float>() @@ -164,7 +164,19 @@ internal class DragAndDropTargetState( .filter { item -> contentListState.isItemEditable(item.index) } .firstItemAtOffset(dragOffset - contentOffset) - if (targetItem != null) { + if ( + targetItem != null && + (!communalWidgetResizing() || targetItem.key != previousTargetItemKey) + ) { + if (communalWidgetResizing()) { + // Keep track of the previous target item, to avoid rapidly oscillating between + // items if the target item doesn't visually move as a result of the index change. + // In this case, even after the index changes, we'd still be colliding with the + // element, so it would be selected as the target item the next time this function + // runs again, which would trigger us to revert the index change we recently made. + previousTargetItemKey = targetItem.key + } + var scrollIndex: Int? = null var scrollOffset: Int? = null if (placeHolderIndex == state.firstVisibleItemIndex) { @@ -183,8 +195,9 @@ internal class DragAndDropTargetState( // this is needed to neutralize automatic keeping the first item first. scope.launch { state.scrollToItem(scrollIndex, scrollOffset) } } - } else { + } else if (targetItem == null) { computeAutoscroll(dragOffset).takeIf { it != 0f }?.let { scrollChannel.trySend(it) } + previousTargetItemKey = null } } @@ -198,7 +211,7 @@ internal class DragAndDropTargetState( contentListState.onSaveList( newItemComponentName = componentName, newItemUser = user, - newItemIndex = dropIndex + newItemIndex = dropIndex, ) return@let true } @@ -208,6 +221,7 @@ internal class DragAndDropTargetState( fun onEnded() { placeHolderIndex = null + previousTargetItemKey = null contentListState.list.remove(placeHolder) } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationsShadeOverlay.kt b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationsShadeOverlay.kt index 5b996704eb12..2af5ffaee7ed 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationsShadeOverlay.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationsShadeOverlay.kt @@ -18,23 +18,27 @@ package com.android.systemui.notifications.ui.composable import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp +import androidx.compose.ui.layout.layoutId import com.android.compose.animation.scene.ContentScope +import com.android.compose.animation.scene.ElementKey import com.android.compose.animation.scene.UserAction import com.android.compose.animation.scene.UserActionResult import com.android.systemui.battery.BatteryMeterViewController import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor +import com.android.systemui.keyguard.ui.composable.blueprint.rememberBurnIn +import com.android.systemui.keyguard.ui.composable.section.DefaultClockSection import com.android.systemui.lifecycle.rememberViewModel import com.android.systemui.notifications.ui.viewmodel.NotificationsShadeOverlayActionsViewModel import com.android.systemui.notifications.ui.viewmodel.NotificationsShadeOverlayContentViewModel import com.android.systemui.scene.session.ui.composable.SaveableSession import com.android.systemui.scene.shared.model.Overlays import com.android.systemui.scene.ui.composable.Overlay -import com.android.systemui.shade.ui.composable.ExpandedShadeHeader +import com.android.systemui.shade.ui.composable.CollapsedShadeHeader import com.android.systemui.shade.ui.composable.OverlayShade +import com.android.systemui.shade.ui.composable.SingleShadeMeasurePolicy import com.android.systemui.statusbar.notification.stack.ui.view.NotificationScrollView import com.android.systemui.statusbar.phone.ui.StatusBarIconController import com.android.systemui.statusbar.phone.ui.TintedIconManager @@ -53,6 +57,8 @@ constructor( private val statusBarIconController: StatusBarIconController, private val shadeSession: SaveableSession, private val stackScrollView: Lazy<NotificationScrollView>, + private val clockSection: DefaultClockSection, + private val clockInteractor: KeyguardClockInteractor, ) : Overlay { override val key = Overlays.NotificationsShade @@ -80,13 +86,28 @@ constructor( OverlayShade(modifier = modifier, onScrimClicked = viewModel::onScrimClicked) { Column { - ExpandedShadeHeader( - viewModelFactory = viewModel.shadeHeaderViewModelFactory, - createTintedIconManager = tintedIconManagerFactory::create, - createBatteryMeterViewController = batteryMeterViewControllerFactory::create, - statusBarIconController = statusBarIconController, - modifier = Modifier.padding(horizontal = 16.dp), - ) + if (viewModel.showHeader) { + val burnIn = rememberBurnIn(clockInteractor) + + CollapsedShadeHeader( + viewModelFactory = viewModel.shadeHeaderViewModelFactory, + createTintedIconManager = tintedIconManagerFactory::create, + createBatteryMeterViewController = + batteryMeterViewControllerFactory::create, + statusBarIconController = statusBarIconController, + modifier = + Modifier.element(NotificationsShade.Elements.StatusBar) + .layoutId(SingleShadeMeasurePolicy.LayoutId.ShadeHeader), + ) + + with(clockSection) { + SmallClock( + burnInParams = burnIn.parameters, + onTopChanged = burnIn.onSmallClockTopChanged, + modifier = Modifier.fillMaxWidth(), + ) + } + } NotificationScrollingStack( shadeSession = shadeSession, @@ -110,3 +131,9 @@ constructor( } } } + +object NotificationsShade { + object Elements { + val StatusBar = ElementKey("NotificationsShadeStatusBar") + } +} diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt index 67f412ed27ac..2cde6787f730 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt @@ -105,13 +105,17 @@ val SceneContainerTransitions = transitions { // Overlay transitions + // TODO(b/376659778): Remove this transition once nested STLs are supported. + from(Scenes.Gone, to = Overlays.NotificationsShade) { + toNotificationsShadeTransition(translateClock = true) + } to(Overlays.NotificationsShade) { toNotificationsShadeTransition() } to(Overlays.QuickSettingsShade) { toQuickSettingsShadeTransition() } from(Overlays.NotificationsShade, to = Overlays.QuickSettingsShade) { notificationsShadeToQuickSettingsShadeTransition() } from(Scenes.Gone, to = Overlays.NotificationsShade, key = SlightlyFasterShadeCollapse) { - toNotificationsShadeTransition(durationScale = 0.9) + toNotificationsShadeTransition(translateClock = true, durationScale = 0.9) } from(Scenes.Gone, to = Overlays.QuickSettingsShade, key = SlightlyFasterShadeCollapse) { toQuickSettingsShadeTransition(durationScale = 0.9) diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToNotificationsShadeTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToNotificationsShadeTransition.kt index 23c4f12cb0ae..6bdb36331709 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToNotificationsShadeTransition.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToNotificationsShadeTransition.kt @@ -21,30 +21,42 @@ import androidx.compose.animation.core.spring import androidx.compose.animation.core.tween import com.android.compose.animation.scene.Edge import com.android.compose.animation.scene.TransitionBuilder +import com.android.systemui.keyguard.ui.composable.blueprint.ClockElementKeys import com.android.systemui.notifications.ui.composable.Notifications +import com.android.systemui.notifications.ui.composable.NotificationsShade +import com.android.systemui.scene.shared.model.Overlays import com.android.systemui.shade.ui.composable.OverlayShade import com.android.systemui.shade.ui.composable.Shade -import com.android.systemui.shade.ui.composable.ShadeHeader import kotlin.time.Duration.Companion.milliseconds -fun TransitionBuilder.toNotificationsShadeTransition(durationScale: Double = 1.0) { +fun TransitionBuilder.toNotificationsShadeTransition( + translateClock: Boolean = false, + durationScale: Double = 1.0, +) { spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt()) swipeSpec = spring( stiffness = Spring.StiffnessMediumLow, visibilityThreshold = Shade.Dimensions.ScrimVisibilityThreshold, ) + // Ensure the clock isn't clipped by the shade outline during the transition from lockscreen. + sharedElement( + ClockElementKeys.smallClockElementKey, + elevateInContent = Overlays.NotificationsShade, + ) scaleSize(OverlayShade.Elements.Panel, height = 0f) + // TODO(b/376659778): This is a temporary hack to have a shared element transition with the + // lockscreen clock. Remove once nested STLs are supported. + if (!translateClock) { + translate(ClockElementKeys.smallClockElementKey) + } + // Avoid translating the status bar with the shade panel. + translate(NotificationsShade.Elements.StatusBar) + // Slide in the shade panel from the top edge. translate(OverlayShade.Elements.Panel, Edge.Top) fractionRange(end = .5f) { fade(OverlayShade.Elements.Scrim) } - - fractionRange(start = .5f) { - fade(ShadeHeader.Elements.Clock) - fade(ShadeHeader.Elements.ExpandedContent) - fade(ShadeHeader.Elements.PrivacyChip) - fade(Notifications.Elements.NotificationScrim) - } + fractionRange(start = .5f) { fade(Notifications.Elements.NotificationScrim) } } private val DefaultDuration = 300.milliseconds diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt index 21d87e173728..dbf7d7b29834 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt @@ -405,7 +405,8 @@ data object Back : UserAction() { } /** The user swiped on the container. */ -data class Swipe( +data class Swipe +private constructor( val direction: SwipeDirection, val pointerCount: Int = 1, val pointersType: PointerType? = null, @@ -418,6 +419,42 @@ data class Swipe( val Down = Swipe(SwipeDirection.Down) val Start = Swipe(SwipeDirection.Start) val End = Swipe(SwipeDirection.End) + + fun Left( + pointerCount: Int = 1, + pointersType: PointerType? = null, + fromSource: SwipeSource? = null, + ) = Swipe(SwipeDirection.Left, pointerCount, pointersType, fromSource) + + fun Up( + pointerCount: Int = 1, + pointersType: PointerType? = null, + fromSource: SwipeSource? = null, + ) = Swipe(SwipeDirection.Up, pointerCount, pointersType, fromSource) + + fun Right( + pointerCount: Int = 1, + pointersType: PointerType? = null, + fromSource: SwipeSource? = null, + ) = Swipe(SwipeDirection.Right, pointerCount, pointersType, fromSource) + + fun Down( + pointerCount: Int = 1, + pointersType: PointerType? = null, + fromSource: SwipeSource? = null, + ) = Swipe(SwipeDirection.Down, pointerCount, pointersType, fromSource) + + fun Start( + pointerCount: Int = 1, + pointersType: PointerType? = null, + fromSource: SwipeSource? = null, + ) = Swipe(SwipeDirection.Start, pointerCount, pointersType, fromSource) + + fun End( + pointerCount: Int = 1, + pointersType: PointerType? = null, + fromSource: SwipeSource? = null, + ) = Swipe(SwipeDirection.End, pointerCount, pointersType, fromSource) } override fun resolve(layoutDirection: LayoutDirection): UserAction.Resolved { diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/nestedscroll/PriorityNestedScrollConnection.kt b/packages/SystemUI/compose/scene/src/com/android/compose/nestedscroll/PriorityNestedScrollConnection.kt index e924ebfd2a8d..20a0b390a037 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/nestedscroll/PriorityNestedScrollConnection.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/nestedscroll/PriorityNestedScrollConnection.kt @@ -207,6 +207,9 @@ class PriorityNestedScrollConnection( } override suspend fun onPreFling(available: Velocity): Velocity { + // Note: This method may be called multiple times. Due to NestedScrollDispatcher, the order + // of method calls (pre/post scroll/fling) cannot be guaranteed. + if (isStopping) return Velocity.Zero val controller = currentController ?: return Velocity.Zero // If in priority mode and can stop on pre-fling phase, stop the scroll. @@ -219,6 +222,9 @@ class PriorityNestedScrollConnection( } override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity { + // Note: This method may be called multiple times. Due to NestedScrollDispatcher, the order + // of method calls (pre/post scroll/fling) cannot be guaranteed. + if (isStopping) return Velocity.Zero val availableFloat = available.toFloat() val controller = currentController @@ -315,6 +321,7 @@ class PriorityNestedScrollConnection( * @return The consumed velocity. */ suspend fun stop(velocity: Float): Velocity { + if (isStopping) return Velocity.Zero val controller = requireController(isStopping = false) return coroutineScope { try { diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt index 5dad0d75cfc5..098673e5d186 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt @@ -101,10 +101,7 @@ class DraggableHandlerTest { scene( key = SceneC, userActions = - mapOf( - Swipe.Up to SceneB, - Swipe(SwipeDirection.Up, fromSource = Edge.Bottom) to SceneA, - ), + mapOf(Swipe.Up to SceneB, Swipe.Up(fromSource = Edge.Bottom) to SceneA), ) { Text("SceneC") } @@ -1231,7 +1228,7 @@ class DraggableHandlerTest { assertTransition( currentScene = SceneC, fromScene = SceneC, - // userAction: Swipe(SwipeDirection.Up, fromSource = Edge.Bottom) to SceneA + // userAction: Swipe.Up(fromSource = Edge.Bottom) to SceneA toScene = SceneA, progress = 0.1f, ) diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/ElementTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/ElementTest.kt index ee807e6a7ede..4a9051598ddc 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/ElementTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/ElementTest.kt @@ -869,10 +869,7 @@ class ElementTest { state = state, modifier = Modifier.size(layoutWidth, layoutHeight), ) { - scene( - SceneA, - userActions = mapOf(Swipe(SwipeDirection.Down, pointerCount = 2) to SceneB), - ) { + scene(SceneA, userActions = mapOf(Swipe.Down(pointerCount = 2) to SceneB)) { Box( Modifier // A scrollable that does not consume the scroll gesture diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SwipeToSceneTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SwipeToSceneTest.kt index aaeaba93304d..3b2ee98a2a93 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SwipeToSceneTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SwipeToSceneTest.kt @@ -128,10 +128,10 @@ class SwipeToSceneTest { if (swipesEnabled()) mapOf( Swipe.Down to SceneA, - Swipe(SwipeDirection.Down, pointerCount = 2) to SceneB, - Swipe(SwipeDirection.Down, pointersType = PointerType.Mouse) to SceneD, - Swipe(SwipeDirection.Right, fromSource = Edge.Left) to SceneB, - Swipe(SwipeDirection.Down, fromSource = Edge.Top) to SceneB, + Swipe.Down(pointerCount = 2) to SceneB, + Swipe.Down(pointersType = PointerType.Mouse) to SceneD, + Swipe.Down(fromSource = Edge.Top) to SceneB, + Swipe.Right(fromSource = Edge.Left) to SceneB, ) else emptyMap(), ) { diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/nestedscroll/PriorityNestedScrollConnectionTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/nestedscroll/PriorityNestedScrollConnectionTest.kt index 54428404bd0c..91079b89a56c 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/nestedscroll/PriorityNestedScrollConnectionTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/nestedscroll/PriorityNestedScrollConnectionTest.kt @@ -29,6 +29,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.compose.test.runMonotonicClockTest import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.launch import kotlinx.coroutines.test.runTest import org.junit.Test import org.junit.runner.RunWith @@ -262,4 +264,16 @@ class PriorityNestedScrollConnectionTest { scrollConnection.onPostFling(consumed = Velocity.Zero, available = Velocity.Zero) assertThat(isStarted).isEqualTo(true) } + + @Test + fun handleMultipleOnPreFlingCalls() = runTest { + startPriorityModePostScroll() + + coroutineScope { + launch { scrollConnection.onPreFling(available = Velocity.Zero) } + launch { scrollConnection.onPreFling(available = Velocity.Zero) } + } + + assertThat(lastStop).isEqualTo(0f) + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerUserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerUserActionsViewModelTest.kt index f58bbc3cf0cf..d3715926932c 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerUserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerUserActionsViewModelTest.kt @@ -20,7 +20,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.compose.animation.scene.Back import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.UserActionResult import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue @@ -71,7 +70,7 @@ class BouncerUserActionsViewModelTest : SysuiTestCase() { assertThat(actions) .containsEntriesExactly( Back to UserActionResult(Scenes.QuickSettings), - Swipe(SwipeDirection.Down) to UserActionResult(Scenes.QuickSettings), + Swipe.Down to UserActionResult(Scenes.QuickSettings), ) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelTest.kt index 6397979d9627..5c4b7432e18d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelTest.kt @@ -25,7 +25,6 @@ import androidx.test.filters.SmallTest import com.android.compose.animation.scene.Edge import com.android.compose.animation.scene.SceneKey import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.TransitionKey import com.android.compose.animation.scene.UserActionResult import com.android.compose.animation.scene.UserActionResult.ShowOverlay @@ -201,8 +200,7 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { val userActions by collectLastValue(underTest.actions) val downDestination = userActions?.get( - Swipe( - SwipeDirection.Down, + Swipe.Down( fromSource = Edge.Top.takeIf { downFromEdge }, pointerCount = if (downWithTwoPointers) 2 else 1, ) @@ -292,8 +290,7 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { val downDestination = userActions?.get( - Swipe( - SwipeDirection.Down, + Swipe.Down( fromSource = Edge.Top.takeIf { downFromEdge }, pointerCount = if (downWithTwoPointers) 2 else 1, ) @@ -310,8 +307,7 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { val downFromTopRightDestination = userActions?.get( - Swipe( - SwipeDirection.Down, + Swipe.Down( fromSource = SceneContainerEdge.TopRight, pointerCount = if (downWithTwoPointers) 2 else 1, ) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/pipeline/Media3ActionFactoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/pipeline/Media3ActionFactoryTest.kt index 9e3fdf377b83..8e67e602abd9 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/pipeline/Media3ActionFactoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/pipeline/Media3ActionFactoryTest.kt @@ -20,7 +20,6 @@ import android.media.session.MediaSession import android.os.Bundle import android.os.Handler import android.os.looper -import android.testing.TestableLooper import android.testing.TestableLooper.RunWithLooper import androidx.media.utils.MediaConstants import androidx.media3.common.Player @@ -69,10 +68,9 @@ class Media3ActionFactoryTest : SysuiTestCase() { private val testScope = kosmos.testScope private val controllerFactory = kosmos.fakeMediaControllerFactory private val tokenFactory = kosmos.fakeSessionTokenFactory - private lateinit var testableLooper: TestableLooper - private var commandCaptor = argumentCaptor<SessionCommand>() - private var runnableCaptor = argumentCaptor<Runnable>() + private val commandCaptor = argumentCaptor<SessionCommand>() + private val runnableCaptor = argumentCaptor<Runnable>() private val legacyToken = MediaSession.Token(1, null) private val token = mock<SessionToken>() @@ -97,8 +95,6 @@ class Media3ActionFactoryTest : SysuiTestCase() { @Before fun setup() { - testableLooper = TestableLooper.get(this) - underTest = Media3ActionFactory( context, @@ -246,7 +242,6 @@ class Media3ActionFactoryTest : SysuiTestCase() { assertThat(actions.custom0!!.contentDescription).isEqualTo("$CUSTOM_ACTION_NAME 2") actions.custom0!!.action!!.run() runCurrent() - testableLooper.processAllMessages() verify(media3Controller).sendCustomCommand(commandCaptor.capture(), any<Bundle>()) assertThat(commandCaptor.lastValue.customAction).isEqualTo("$CUSTOM_ACTION_COMMAND 2") verify(media3Controller).release() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoaderTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoaderTest.kt index 1a7265b09aae..cf503bbf1310 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoaderTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoaderTest.kt @@ -82,7 +82,7 @@ class MediaDataLoaderTest : SysuiTestCase() { private val fakeFeatureFlags = kosmos.fakeFeatureFlagsClassic private val mediaFlags = kosmos.mediaFlags private val mediaControllerFactory = kosmos.fakeMediaControllerFactory - private val media3ActionFactory = kosmos.media3ActionFactory + private lateinit var media3ActionFactory: Media3ActionFactory private val session = MediaSession(context, "MediaDataLoaderTestSession") private val metadataBuilder = MediaMetadata.Builder().apply { @@ -94,6 +94,7 @@ class MediaDataLoaderTest : SysuiTestCase() { @Before fun setUp() { + media3ActionFactory = kosmos.media3ActionFactory mediaControllerFactory.setControllerForToken(session.sessionToken, mediaController) whenever(mediaController.sessionToken).thenReturn(session.sessionToken) whenever(mediaController.metadata).then { metadataBuilder.build() } @@ -311,7 +312,6 @@ class MediaDataLoaderTest : SysuiTestCase() { } build() } - val result = underTest.loadMediaData(KEY, mediaNotification) assertThat(result).isNotNull() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayActionsViewModelTest.kt index 642d9a0b1e9d..855931c32671 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayActionsViewModelTest.kt @@ -21,7 +21,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.compose.animation.scene.Back import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.UserActionResult import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue @@ -76,12 +75,8 @@ class NotificationsShadeOverlayActionsViewModelTest : SysuiTestCase() { underTest.activateIn(this) assertThat( - (actions?.get( - Swipe( - direction = SwipeDirection.Down, - fromSource = SceneContainerEdge.TopRight, - ) - ) as? UserActionResult.ReplaceByOverlay) + (actions?.get(Swipe.Down(fromSource = SceneContainerEdge.TopRight)) + as? UserActionResult.ReplaceByOverlay) ?.overlay ) .isEqualTo(Overlays.QuickSettingsShade) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayContentViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayContentViewModelTest.kt index ada2138d4d52..b30313e07012 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayContentViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayContentViewModelTest.kt @@ -35,9 +35,12 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.domain.startable.sceneContainerStartable import com.android.systemui.scene.shared.model.Overlays import com.android.systemui.scene.shared.model.Scenes +import com.android.systemui.shade.data.repository.shadeRepository import com.android.systemui.shade.domain.interactor.shadeInteractor import com.android.systemui.shade.shared.flag.DualShade import com.android.systemui.shade.ui.viewmodel.notificationsShadeOverlayContentViewModel +import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository +import com.android.systemui.statusbar.notification.data.repository.setActiveNotifs import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -121,6 +124,38 @@ class NotificationsShadeOverlayContentViewModelTest : SysuiTestCase() { assertThat(currentOverlays).doesNotContain(Overlays.NotificationsShade) } + @Test + fun showHeader_showsOnNarrowScreen() = + testScope.runTest { + kosmos.shadeRepository.setShadeLayoutWide(false) + + // Shown when notifications are present. + kosmos.activeNotificationListRepository.setActiveNotifs(1) + runCurrent() + assertThat(underTest.showHeader).isTrue() + + // Hidden when notifications are not present. + kosmos.activeNotificationListRepository.setActiveNotifs(0) + runCurrent() + assertThat(underTest.showHeader).isFalse() + } + + @Test + fun showHeader_hidesOnWideScreen() = + testScope.runTest { + kosmos.shadeRepository.setShadeLayoutWide(true) + + // Hidden when notifications are present. + kosmos.activeNotificationListRepository.setActiveNotifs(1) + runCurrent() + assertThat(underTest.showHeader).isFalse() + + // Hidden when notifications are not present. + kosmos.activeNotificationListRepository.setActiveNotifs(0) + runCurrent() + assertThat(underTest.showHeader).isFalse() + } + private fun TestScope.lockDevice() { val currentScene by collectLastValue(sceneInteractor.currentScene) kosmos.powerInteractor.setAsleepForTest() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelTest.kt index 9fe9ed2bf47a..5cba325450e6 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelTest.kt @@ -36,6 +36,7 @@ import com.android.systemui.qs.composefragment.viewmodel.MediaState.ANY_MEDIA import com.android.systemui.qs.composefragment.viewmodel.MediaState.NO_MEDIA import com.android.systemui.qs.fgsManagerController import com.android.systemui.qs.panels.domain.interactor.tileSquishinessInteractor +import com.android.systemui.qs.panels.ui.viewmodel.setConfigurationForMediaInRow import com.android.systemui.res.R import com.android.systemui.shade.largeScreenHeaderHelper import com.android.systemui.statusbar.StatusBarState @@ -269,6 +270,54 @@ class QSFragmentComposeViewModelTest : AbstractQSFragmentComposeViewModelTest() } } + @Test + fun mediaNotInRow() = + with(kosmos) { + testScope.testWithinLifecycle { + setConfigurationForMediaInRow(mediaInRow = false) + setMediaState(ACTIVE_MEDIA) + + assertThat(underTest.qqsMediaInRow).isFalse() + assertThat(underTest.qsMediaInRow).isFalse() + } + } + + @Test + fun mediaInRow_mediaActive_bothInRow() = + with(kosmos) { + testScope.testWithinLifecycle { + setConfigurationForMediaInRow(mediaInRow = true) + setMediaState(ACTIVE_MEDIA) + + assertThat(underTest.qqsMediaInRow).isTrue() + assertThat(underTest.qsMediaInRow).isTrue() + } + } + + @Test + fun mediaInRow_mediaRecommendation_onlyQSInRow() = + with(kosmos) { + testScope.testWithinLifecycle { + setConfigurationForMediaInRow(mediaInRow = true) + setMediaState(ANY_MEDIA) + + assertThat(underTest.qqsMediaInRow).isFalse() + assertThat(underTest.qsMediaInRow).isTrue() + } + } + + @Test + fun mediaInRow_correctConfig_noMediaVisible_noMediaInRow() = + with(kosmos) { + testScope.testWithinLifecycle { + setConfigurationForMediaInRow(mediaInRow = true) + setMediaState(NO_MEDIA) + + assertThat(underTest.qqsMediaInRow).isFalse() + assertThat(underTest.qsMediaInRow).isFalse() + } + } + private fun TestScope.setMediaState(state: MediaState) { with(kosmos) { val activeMedia = state == ACTIVE_MEDIA diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/QSFragmentComposeTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/QSFragmentComposeTest.kt new file mode 100644 index 000000000000..ab78029684d4 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/QSFragmentComposeTest.kt @@ -0,0 +1,182 @@ +/* + * 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.ui + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.test.getBoundsInRoot +import androidx.compose.ui.test.junit4.createComposeRule +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.DpRect +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.width +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.qs.composefragment.QuickQuickSettingsLayout +import com.android.systemui.qs.composefragment.QuickSettingsLayout +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +@SmallTest +class QSFragmentComposeTest : SysuiTestCase() { + + @get:Rule val composeTestRule = createComposeRule() + + @Test + fun portraitLayout_qqs() { + composeTestRule.setContent { + QuickQuickSettingsLayout( + tiles = { Tiles(TILES_HEIGHT_PORTRAIT) }, + media = { Media() }, + mediaInRow = false, + ) + } + + composeTestRule.waitForIdle() + + val tilesBounds = composeTestRule.onNodeWithTag(TILES).getBoundsInRoot() + val mediaBounds = composeTestRule.onNodeWithTag(MEDIA).getBoundsInRoot() + + // All nodes aligned in a column + assertThat(tilesBounds.left).isEqualTo(mediaBounds.left) + assertThat(tilesBounds.right).isEqualTo(mediaBounds.right) + assertThat(tilesBounds.bottom).isLessThan(mediaBounds.top) + } + + @Test + fun landscapeLayout_qqs() { + composeTestRule.setContent { + QuickQuickSettingsLayout( + tiles = { Tiles(TILES_HEIGHT_LANDSCAPE) }, + media = { Media() }, + mediaInRow = true, + ) + } + + composeTestRule.waitForIdle() + + val tilesBounds = composeTestRule.onNodeWithTag(TILES).getBoundsInRoot() + val mediaBounds = composeTestRule.onNodeWithTag(MEDIA).getBoundsInRoot() + + // Media to the right of tiles + assertThat(tilesBounds.right).isLessThan(mediaBounds.left) + // "Same" width + assertThat((tilesBounds.width - mediaBounds.width).abs()).isAtMost(1.dp) + // Vertically centered + assertThat((tilesBounds.centerY - mediaBounds.centerY).abs()).isAtMost(1.dp) + } + + @Test + fun portraitLayout_qs() { + composeTestRule.setContent { + QuickSettingsLayout( + brightness = { Brightness() }, + tiles = { Tiles(TILES_HEIGHT_PORTRAIT) }, + media = { Media() }, + mediaInRow = false, + ) + } + + composeTestRule.waitForIdle() + + val brightnessBounds = composeTestRule.onNodeWithTag(BRIGHTNESS).getBoundsInRoot() + val tilesBounds = composeTestRule.onNodeWithTag(TILES).getBoundsInRoot() + val mediaBounds = composeTestRule.onNodeWithTag(MEDIA).getBoundsInRoot() + + assertThat(brightnessBounds.left).isEqualTo(tilesBounds.left) + assertThat(tilesBounds.left).isEqualTo(mediaBounds.left) + + assertThat(brightnessBounds.right).isEqualTo(tilesBounds.right) + assertThat(tilesBounds.right).isEqualTo(mediaBounds.right) + + assertThat(brightnessBounds.bottom).isLessThan(tilesBounds.top) + assertThat(tilesBounds.bottom).isLessThan(mediaBounds.top) + } + + @Test + fun landscapeLayout_qs() { + composeTestRule.setContent { + QuickSettingsLayout( + brightness = { Brightness() }, + tiles = { Tiles(TILES_HEIGHT_PORTRAIT) }, + media = { Media() }, + mediaInRow = true, + ) + } + + composeTestRule.waitForIdle() + + val brightnessBounds = composeTestRule.onNodeWithTag(BRIGHTNESS).getBoundsInRoot() + val tilesBounds = composeTestRule.onNodeWithTag(TILES).getBoundsInRoot() + val mediaBounds = composeTestRule.onNodeWithTag(MEDIA).getBoundsInRoot() + + // Brightness takes full width, with left end aligned with tiles and right end aligned with + // media + assertThat(brightnessBounds.left).isEqualTo(tilesBounds.left) + assertThat(brightnessBounds.right).isEqualTo(mediaBounds.right) + + // Brightness above tiles and media + assertThat(brightnessBounds.bottom).isLessThan(tilesBounds.top) + assertThat(brightnessBounds.bottom).isLessThan(mediaBounds.top) + + // Media to the right of tiles + assertThat(tilesBounds.right).isLessThan(mediaBounds.left) + // "Same" width + assertThat((tilesBounds.width - mediaBounds.width).abs()).isAtMost(1.dp) + // Vertically centered + assertThat((tilesBounds.centerY - mediaBounds.centerY).abs()).isAtMost(1.dp) + } + + private companion object { + const val BRIGHTNESS = "brightness" + const val TILES = "tiles" + const val MEDIA = "media" + val TILES_HEIGHT_PORTRAIT = 300.dp + val TILES_HEIGHT_LANDSCAPE = 150.dp + val MEDIA_HEIGHT = 100.dp + val BRIGHTNESS_HEIGHT = 64.dp + + @Composable + fun Brightness() { + Box(modifier = Modifier.testTag(BRIGHTNESS).height(BRIGHTNESS_HEIGHT).fillMaxWidth()) + } + + @Composable + fun Tiles(height: Dp) { + Box(modifier = Modifier.testTag(TILES).height(height).fillMaxWidth()) + } + + @Composable + fun Media() { + Box(modifier = Modifier.testTag(MEDIA).height(MEDIA_HEIGHT).fillMaxWidth()) + } + + val DpRect.centerY: Dp + get() = (top + bottom) / 2 + + fun Dp.abs() = if (this > 0.dp) this else -this + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModelTest.kt new file mode 100644 index 000000000000..635badac04f5 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModelTest.kt @@ -0,0 +1,142 @@ +/* + * 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.ui.viewmodel + +import android.content.res.Configuration +import android.content.res.mainResources +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.common.ui.data.repository.fakeConfigurationRepository +import com.android.systemui.flags.setFlagValue +import com.android.systemui.kosmos.testScope +import com.android.systemui.lifecycle.activateIn +import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.Companion.LOCATION_QQS +import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.Companion.LOCATION_QS +import com.android.systemui.media.controls.ui.controller.MediaLocation +import com.android.systemui.media.controls.ui.controller.mediaHostStatesManager +import com.android.systemui.media.controls.ui.view.MediaHost +import com.android.systemui.qs.composefragment.dagger.usingMediaInComposeFragment +import com.android.systemui.shade.data.repository.shadeRepository +import com.android.systemui.shade.shared.flag.DualShade +import com.android.systemui.shade.shared.model.ShadeMode +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import kotlin.test.Test +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.runner.RunWith +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters + +@OptIn(ExperimentalCoroutinesApi::class) +@RunWith(ParameterizedAndroidJunit4::class) +@SmallTest +class MediaInRowInLandscapeViewModelTest(private val testData: TestData) : SysuiTestCase() { + + private val kosmos = testKosmos().apply { usingMediaInComposeFragment = testData.usingMedia } + + private val underTest by lazy { + kosmos.mediaInRowInLandscapeViewModelFactory.create(TESTED_MEDIA_LOCATION) + } + + @Before + fun setUp() { + mSetFlagsRule.setFlagValue(DualShade.FLAG_NAME, testData.shadeMode == ShadeMode.Dual) + } + + @Test + fun shouldMediaShowInRow() = + with(kosmos) { + testScope.runTest { + underTest.activateIn(testScope) + + shadeRepository.setShadeLayoutWide(testData.shadeMode != ShadeMode.Single) + val config = + Configuration(mainResources.configuration).apply { + orientation = testData.orientation + screenLayout = testData.screenLayoutLong + } + fakeConfigurationRepository.onConfigurationChange(config) + mainResources.configuration.updateFrom(config) + mediaHostStatesManager.updateHostState( + testData.mediaLocation, + MediaHost.MediaHostStateHolder().apply { visible = testData.mediaVisible }, + ) + runCurrent() + + assertThat(underTest.shouldMediaShowInRow).isEqualTo(testData.mediaInRowExpected) + } + } + + data class TestData( + val usingMedia: Boolean, + val shadeMode: ShadeMode, + val orientation: Int, + val screenLayoutLong: Int, + val mediaVisible: Boolean, + @MediaLocation val mediaLocation: Int, + ) { + val mediaInRowExpected: Boolean + get() = + usingMedia && + shadeMode == ShadeMode.Single && + orientation == Configuration.ORIENTATION_LANDSCAPE && + screenLayoutLong == Configuration.SCREENLAYOUT_LONG_YES && + mediaVisible && + mediaLocation == TESTED_MEDIA_LOCATION + } + + companion object { + private const val TESTED_MEDIA_LOCATION = LOCATION_QS + + @JvmStatic + @Parameters(name = "{0}") + fun data(): Collection<TestData> { + val usingMediaValues = setOf(true, false) + val shadeModeValues = setOf(ShadeMode.Single, ShadeMode.Split, ShadeMode.Dual) + val orientationValues = + setOf(Configuration.ORIENTATION_LANDSCAPE, Configuration.ORIENTATION_PORTRAIT) + val screenLayoutLongValues = + setOf(Configuration.SCREENLAYOUT_LONG_YES, Configuration.SCREENLAYOUT_LONG_NO) + val mediaVisibleValues = setOf(true, false) + val mediaLocationsValues = setOf(LOCATION_QS, LOCATION_QQS) + + return usingMediaValues.flatMap { usingMedia -> + shadeModeValues.flatMap { shadeMode -> + orientationValues.flatMap { orientation -> + screenLayoutLongValues.flatMap { screenLayoutLong -> + mediaVisibleValues.flatMap { mediaVisible -> + mediaLocationsValues.map { mediaLocation -> + TestData( + usingMedia, + shadeMode, + orientation, + screenLayoutLong, + mediaVisible, + mediaLocation, + ) + } + } + } + } + } + } + } + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModelTest.kt new file mode 100644 index 000000000000..4ae8589de87b --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModelTest.kt @@ -0,0 +1,219 @@ +/* + * 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.ui.viewmodel + +import android.content.res.mainResources +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.common.ui.data.repository.configurationRepository +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.runCurrent +import com.android.systemui.kosmos.testCase +import com.android.systemui.kosmos.testScope +import com.android.systemui.lifecycle.activateIn +import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.Companion.LOCATION_QQS +import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.Companion.LOCATION_QS +import com.android.systemui.media.controls.ui.controller.MediaLocation +import com.android.systemui.media.controls.ui.controller.mediaHostStatesManager +import com.android.systemui.media.controls.ui.view.MediaHost +import com.android.systemui.qs.composefragment.dagger.usingMediaInComposeFragment +import com.android.systemui.qs.panels.data.repository.QSColumnsRepository +import com.android.systemui.qs.panels.data.repository.qsColumnsRepository +import com.android.systemui.res.R +import com.android.systemui.shade.shared.flag.DualShade +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +@SmallTest +class QSColumnsViewModelTest : SysuiTestCase() { + private val kosmos = + testKosmos().apply { + usingMediaInComposeFragment = true + testCase.context.orCreateTestableResources.addOverride( + R.integer.quick_settings_infinite_grid_num_columns, + SINGLE_SPLIT_SHADE_COLUMNS, + ) + testCase.context.orCreateTestableResources.addOverride( + R.integer.quick_settings_dual_shade_num_columns, + DUAL_SHADE_COLUMNS, + ) + testCase.context.orCreateTestableResources.addOverride( + R.integer.quick_settings_split_shade_num_columns, + SINGLE_SPLIT_SHADE_COLUMNS, + ) + qsColumnsRepository = QSColumnsRepository(mainResources, configurationRepository) + } + + @Test + @DisableFlags(DualShade.FLAG_NAME) + fun mediaLocationNull_singleOrSplit_alwaysSingleShadeColumns() = + with(kosmos) { + testScope.runTest { + val underTest = qsColumnsViewModelFactory.create(null) + underTest.activateIn(testScope) + + setConfigurationForMediaInRow(mediaInRow = false) + + makeMediaVisible(LOCATION_QQS, visible = true) + makeMediaVisible(LOCATION_QS, visible = true) + runCurrent() + + assertThat(underTest.columns).isEqualTo(SINGLE_SPLIT_SHADE_COLUMNS) + + setConfigurationForMediaInRow(mediaInRow = true) + runCurrent() + + assertThat(underTest.columns).isEqualTo(SINGLE_SPLIT_SHADE_COLUMNS) + } + } + + @Test + @EnableFlags(DualShade.FLAG_NAME) + fun mediaLocationNull_dualShade_alwaysDualShadeColumns() = + with(kosmos) { + testScope.runTest { + val underTest = qsColumnsViewModelFactory.create(null) + underTest.activateIn(testScope) + + setConfigurationForMediaInRow(mediaInRow = false) + + makeMediaVisible(LOCATION_QQS, visible = true) + makeMediaVisible(LOCATION_QS, visible = true) + runCurrent() + + assertThat(underTest.columns).isEqualTo(DUAL_SHADE_COLUMNS) + + setConfigurationForMediaInRow(mediaInRow = true) + runCurrent() + + assertThat(underTest.columns).isEqualTo(DUAL_SHADE_COLUMNS) + } + } + + @Test + @EnableFlags(DualShade.FLAG_NAME) + fun mediaLocationQS_dualShade_alwaysDualShadeColumns() = + with(kosmos) { + testScope.runTest { + val underTest = qsColumnsViewModelFactory.create(LOCATION_QS) + underTest.activateIn(testScope) + + setConfigurationForMediaInRow(mediaInRow = false) + + makeMediaVisible(LOCATION_QS, visible = true) + runCurrent() + + assertThat(underTest.columns).isEqualTo(DUAL_SHADE_COLUMNS) + + setConfigurationForMediaInRow(mediaInRow = true) + runCurrent() + + assertThat(underTest.columns).isEqualTo(DUAL_SHADE_COLUMNS) + } + } + + @Test + @EnableFlags(DualShade.FLAG_NAME) + fun mediaLocationQQS_dualShade_alwaysDualShadeColumns() = + with(kosmos) { + testScope.runTest { + val underTest = qsColumnsViewModelFactory.create(LOCATION_QQS) + underTest.activateIn(testScope) + + setConfigurationForMediaInRow(mediaInRow = false) + + makeMediaVisible(LOCATION_QQS, visible = true) + runCurrent() + + assertThat(underTest.columns).isEqualTo(DUAL_SHADE_COLUMNS) + + setConfigurationForMediaInRow(mediaInRow = true) + runCurrent() + + assertThat(underTest.columns).isEqualTo(DUAL_SHADE_COLUMNS) + } + } + + @Test + @DisableFlags(DualShade.FLAG_NAME) + fun mediaLocationQS_singleOrSplit_halfColumnsOnCorrectConfigurationAndVisible() = + with(kosmos) { + testScope.runTest { + val underTest = qsColumnsViewModelFactory.create(LOCATION_QS) + underTest.activateIn(testScope) + + setConfigurationForMediaInRow(mediaInRow = false) + runCurrent() + + assertThat(underTest.columns).isEqualTo(SINGLE_SPLIT_SHADE_COLUMNS) + + setConfigurationForMediaInRow(mediaInRow = true) + runCurrent() + + assertThat(underTest.columns).isEqualTo(SINGLE_SPLIT_SHADE_COLUMNS) + + makeMediaVisible(LOCATION_QS, visible = true) + runCurrent() + + assertThat(underTest.columns).isEqualTo(SINGLE_SPLIT_SHADE_COLUMNS / 2) + } + } + + @Test + @DisableFlags(DualShade.FLAG_NAME) + fun mediaLocationQQS_singleOrSplit_halfColumnsOnCorrectConfigurationAndVisible() = + with(kosmos) { + testScope.runTest { + val underTest = qsColumnsViewModelFactory.create(LOCATION_QQS) + underTest.activateIn(testScope) + + setConfigurationForMediaInRow(mediaInRow = false) + runCurrent() + + assertThat(underTest.columns).isEqualTo(SINGLE_SPLIT_SHADE_COLUMNS) + + setConfigurationForMediaInRow(mediaInRow = true) + runCurrent() + + assertThat(underTest.columns).isEqualTo(SINGLE_SPLIT_SHADE_COLUMNS) + + makeMediaVisible(LOCATION_QQS, visible = true) + runCurrent() + + assertThat(underTest.columns).isEqualTo(SINGLE_SPLIT_SHADE_COLUMNS / 2) + } + } + + companion object { + private const val SINGLE_SPLIT_SHADE_COLUMNS = 4 + private const val DUAL_SHADE_COLUMNS = 2 + + private fun Kosmos.makeMediaVisible(@MediaLocation location: Int, visible: Boolean) { + mediaHostStatesManager.updateHostState( + location, + MediaHost.MediaHostStateHolder().apply { this.visible = visible }, + ) + } + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModelTest.kt index ab5a049c91f1..3d1265aec45e 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModelTest.kt @@ -24,6 +24,11 @@ import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.testCase import com.android.systemui.kosmos.testScope import com.android.systemui.lifecycle.activateIn +import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.Companion.LOCATION_QQS +import com.android.systemui.media.controls.ui.controller.MediaLocation +import com.android.systemui.media.controls.ui.controller.mediaHostStatesManager +import com.android.systemui.media.controls.ui.view.MediaHost +import com.android.systemui.qs.composefragment.dagger.usingMediaInComposeFragment import com.android.systemui.qs.panels.domain.interactor.qsPreferencesInteractor import com.android.systemui.qs.pipeline.domain.interactor.currentTilesInteractor import com.android.systemui.qs.pipeline.shared.TileSpec @@ -67,6 +72,7 @@ class QuickQuickSettingsViewModelTest : SysuiTestCase() { 4, ) fakeConfigurationRepository.onConfigurationChange() + usingMediaInComposeFragment = true } private val underTest = @@ -145,6 +151,33 @@ class QuickQuickSettingsViewModelTest : SysuiTestCase() { } } + @Test + fun mediaVisibleInLandscape_doubleRows_halfColumns() = + with(kosmos) { + testScope.runTest { + setRows(1) + assertThat(underTest.columns).isEqualTo(4) + // All tiles in 4 columns (but we only show the first 3 tiles) + // [1] [2] [3 3] + // [4] [5 5] + // [6 6] [7] [8] + // [9 9] + + runCurrent() + assertThat(underTest.tileViewModels.map { it.tile.spec }).isEqualTo(tiles.take(3)) + + makeMediaVisible(LOCATION_QQS, visible = true) + setConfigurationForMediaInRow(mediaInRow = true) + runCurrent() + + assertThat(underTest.columns).isEqualTo(2) + // Tiles in 4 columns + // [1] [2] + // [3 3] + assertThat(underTest.tileViewModels.map { it.tile.spec }).isEqualTo(tiles.take(3)) + } + } + private fun Kosmos.setTiles(tiles: List<TileSpec>) { currentTilesInteractor.setTiles(tiles) } @@ -163,5 +196,12 @@ class QuickQuickSettingsViewModelTest : SysuiTestCase() { private companion object { const val PREFIX_SMALL = "small" const val PREFIX_LARGE = "large" + + private fun Kosmos.makeMediaVisible(@MediaLocation location: Int, visible: Boolean) { + mediaHostStatesManager.updateHostState( + location, + MediaHost.MediaHostStateHolder().apply { this.visible = visible }, + ) + } } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java index 0d12483bad0a..53708fd417e1 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java @@ -23,7 +23,6 @@ import static junit.framework.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -160,9 +159,7 @@ public class ScreenRecordTileTest extends SysuiTestCase { mTestableLooper.processAllMessages(); ArgumentCaptor<Runnable> onStartRecordingClicked = ArgumentCaptor.forClass(Runnable.class); - verify(mController).createScreenRecordDialog(any(), eq(mFeatureFlags), - eq(mDialogTransitionAnimator), eq(mActivityStarter), - onStartRecordingClicked.capture()); + verify(mController).createScreenRecordDialog(onStartRecordingClicked.capture()); // When starting the recording, we collapse the shade and disable the dialog animation. assertNotNull(onStartRecordingClicked.getValue()); @@ -298,14 +295,13 @@ public class ScreenRecordTileTest extends SysuiTestCase { public void showingDialogPrompt_logsMediaProjectionPermissionRequested() { when(mController.isStarting()).thenReturn(false); when(mController.isRecording()).thenReturn(false); - when(mController.createScreenRecordDialog(any(), any(), any(), any(), any())) + when(mController.createScreenRecordDialog(any())) .thenReturn(mPermissionDialogPrompt); mTile.handleClick(null /* view */); mTestableLooper.processAllMessages(); - verify(mController).createScreenRecordDialog(any(), eq(mFeatureFlags), - eq(mDialogTransitionAnimator), eq(mActivityStarter), any()); + verify(mController).createScreenRecordDialog(any()); var onDismissAction = ArgumentCaptor.forClass(ActivityStarter.OnDismissAction.class); verify(mKeyguardDismissUtil).executeWhenUnlocked( onDismissAction.capture(), anyBoolean(), anyBoolean()); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/notes/domain/NotesTileMapperTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/notes/domain/NotesTileMapperTest.kt new file mode 100644 index 000000000000..2ac3e081b8f4 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/notes/domain/NotesTileMapperTest.kt @@ -0,0 +1,73 @@ +/* + * 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.tiles.impl.notes.domain + +import android.graphics.drawable.TestStubDrawable +import android.widget.Button +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.common.shared.model.Icon +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.qs.tiles.impl.custom.QSTileStateSubject +import com.android.systemui.qs.tiles.impl.notes.domain.model.NotesTileModel +import com.android.systemui.qs.tiles.impl.notes.qsNotesTileConfig +import com.android.systemui.qs.tiles.viewmodel.QSTileState +import com.android.systemui.res.R +import kotlin.test.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class NotesTileMapperTest : SysuiTestCase() { + private val kosmos = Kosmos() + private val qsTileConfig = kosmos.qsNotesTileConfig + + private val mapper by lazy { + NotesTileMapper( + context.orCreateTestableResources + .apply { addOverride(R.drawable.ic_qs_notes, TestStubDrawable()) } + .resources, + context.theme, + ) + } + + @Test + fun mappedStateMatchesModel() { + val inputModel = NotesTileModel + + val outputState = mapper.map(qsTileConfig, inputModel) + + val expectedState = createNotesTileState() + QSTileStateSubject.assertThat(outputState).isEqualTo(expectedState) + } + + private fun createNotesTileState(): QSTileState = + QSTileState( + Icon.Loaded(context.getDrawable(R.drawable.ic_qs_notes)!!, null), + R.drawable.ic_qs_notes, + context.getString(R.string.quick_settings_notes_label), + QSTileState.ActivationState.INACTIVE, + /* secondaryLabel= */ null, + setOf(QSTileState.UserAction.CLICK, QSTileState.UserAction.LONG_CLICK), + context.getString(R.string.quick_settings_notes_label), + /* stateDescription= */ null, + QSTileState.SideViewIcon.Chevron, + QSTileState.EnabledState.ENABLED, + Button::class.qualifiedName, + ) +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/notes/domain/interactor/NotesTileDataInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/notes/domain/interactor/NotesTileDataInteractorTest.kt new file mode 100644 index 000000000000..35d6d5adc3f4 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/notes/domain/interactor/NotesTileDataInteractorTest.kt @@ -0,0 +1,103 @@ +/* + * 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.tiles.impl.notes.domain.interactor + +import android.os.UserHandle +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.Flags +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testScope +import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.toCollection +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith + +@OptIn(ExperimentalCoroutinesApi::class) +@SmallTest +@RunWith(AndroidJUnit4::class) +class NotesTileDataInteractorTest : SysuiTestCase() { + private val kosmos = Kosmos() + private val testScope = kosmos.testScope + private val testUser = UserHandle.of(1) + private lateinit var underTest: NotesTileDataInteractor + + + @EnableFlags(Flags.FLAG_NOTES_ROLE_QS_TILE) + @Test + fun availability_qsFlagEnabled_notesRoleEnabled_returnTrue() = + testScope.runTest { + underTest = NotesTileDataInteractor(isNoteTaskEnabled = true) + + val availability = underTest.availability(testUser).toCollection(mutableListOf()) + + assertThat(availability).containsExactly(true) + } + + @DisableFlags(Flags.FLAG_NOTES_ROLE_QS_TILE) + @Test + fun availability_qsFlagDisabled_notesRoleEnabled_returnFalse() = + testScope.runTest { + underTest = NotesTileDataInteractor(isNoteTaskEnabled = true) + + val availability = underTest.availability(testUser).toCollection(mutableListOf()) + + assertThat(availability).containsExactly(false) + } + + @EnableFlags(Flags.FLAG_NOTES_ROLE_QS_TILE) + @Test + fun availability_qsFlagEnabled_notesRoleDisabled_returnFalse() = + testScope.runTest { + underTest = NotesTileDataInteractor(isNoteTaskEnabled = false) + + val availability = underTest.availability(testUser).toCollection(mutableListOf()) + + assertThat(availability).containsExactly(false) + } + + @DisableFlags(Flags.FLAG_NOTES_ROLE_QS_TILE) + @Test + fun availability_qsFlagDisabled_notesRoleDisabled_returnFalse() = + testScope.runTest { + underTest = NotesTileDataInteractor(isNoteTaskEnabled = false) + + val availability = underTest.availability(testUser).toCollection(mutableListOf()) + + assertThat(availability).containsExactly(false) + } + + @Test + fun tileData_notEmpty() = runTest { + underTest = NotesTileDataInteractor(isNoteTaskEnabled = true) + val flowValue by + collectLastValue(underTest.tileData(testUser, flowOf(DataUpdateTrigger.InitialRequest))) + + runCurrent() + + assertThat(flowValue).isNotNull() + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/notes/domain/interactor/NotesTileUserActionInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/notes/domain/interactor/NotesTileUserActionInteractorTest.kt new file mode 100644 index 000000000000..54911e612291 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/notes/domain/interactor/NotesTileUserActionInteractorTest.kt @@ -0,0 +1,73 @@ +/* + * 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.tiles.impl.notes.domain.interactor + +import android.content.Intent +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testScope +import com.android.systemui.notetask.NoteTaskController +import com.android.systemui.notetask.NoteTaskEntryPoint +import com.android.systemui.qs.pipeline.domain.interactor.PanelInteractor +import com.android.systemui.qs.tiles.base.actions.FakeQSTileIntentUserInputHandler +import com.android.systemui.qs.tiles.base.actions.QSTileIntentUserInputHandlerSubject +import com.android.systemui.qs.tiles.base.interactor.QSTileInputTestKtx +import com.android.systemui.qs.tiles.impl.notes.domain.model.NotesTileModel +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock +import org.mockito.Mockito.verify + +@SmallTest +@RunWith(AndroidJUnit4::class) +class NotesTileUserActionInteractorTest : SysuiTestCase() { + private val kosmos = Kosmos() + private val testScope = kosmos.testScope + private val inputHandler = FakeQSTileIntentUserInputHandler() + private val panelInteractor = mock<PanelInteractor>() + private val noteTaskController = mock<NoteTaskController>() + + private lateinit var underTest: NotesTileUserActionInteractor + + @Before + fun setUp() { + underTest = NotesTileUserActionInteractor(inputHandler, panelInteractor, noteTaskController) + } + + @Test + fun handleClick_launchDefaultNotesApp() = + testScope.runTest { + underTest.handleInput(QSTileInputTestKtx.click(NotesTileModel)) + + verify(noteTaskController).showNoteTask(NoteTaskEntryPoint.QS_NOTES_TILE) + } + + @Test + fun handleLongClick_launchSettings() = + testScope.runTest { + underTest.handleInput(QSTileInputTestKtx.longClick(NotesTileModel)) + + QSTileIntentUserInputHandlerSubject.assertThat(inputHandler).handledOneIntentInput { + assertThat(it.intent.action).isEqualTo(Intent.ACTION_MANAGE_DEFAULT_APP) + } + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractorTest.kt index 899122d4dd45..0b56d7b64aab 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractorTest.kt @@ -23,29 +23,27 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable -import com.android.systemui.flags.featureFlagsClassic import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository import com.android.systemui.keyguard.domain.interactor.keyguardInteractor import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.testScope import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger import com.android.systemui.plugins.ActivityStarter.OnDismissAction -import com.android.systemui.plugins.activityStarter import com.android.systemui.qs.pipeline.domain.interactor.PanelInteractor import com.android.systemui.qs.tiles.base.interactor.QSTileInputTestKtx import com.android.systemui.screenrecord.RecordingController import com.android.systemui.screenrecord.data.model.ScreenRecordModel import com.android.systemui.screenrecord.data.repository.ScreenRecordRepositoryImpl import com.android.systemui.statusbar.phone.KeyguardDismissUtil -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.argumentCaptor -import com.android.systemui.util.mockito.eq -import com.android.systemui.util.mockito.mock -import com.android.systemui.util.mockito.whenever import kotlinx.coroutines.test.runTest import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock @SmallTest @RunWith(AndroidJUnit4::class) @@ -54,24 +52,11 @@ class ScreenRecordTileUserActionInteractorTest : SysuiTestCase() { private val testScope = kosmos.testScope private val keyguardInteractor = kosmos.keyguardInteractor private val dialogTransitionAnimator = mock<DialogTransitionAnimator>() - private val featureFlags = kosmos.featureFlagsClassic - private val activityStarter = kosmos.activityStarter private val keyguardDismissUtil = mock<KeyguardDismissUtil>() private val panelInteractor = mock<PanelInteractor>() private val dialog = mock<Dialog>() private val recordingController = - mock<RecordingController> { - whenever( - createScreenRecordDialog( - eq(context), - eq(featureFlags), - eq(dialogTransitionAnimator), - eq(activityStarter), - any() - ) - ) - .thenReturn(dialog) - } + mock<RecordingController> { on { createScreenRecordDialog(any()) } doReturn dialog } private val screenRecordRepository = ScreenRecordRepositoryImpl( @@ -81,7 +66,6 @@ class ScreenRecordTileUserActionInteractorTest : SysuiTestCase() { private val underTest = ScreenRecordTileUserActionInteractor( - context, testScope.testScheduler, testScope.testScheduler, screenRecordRepository, @@ -91,8 +75,6 @@ class ScreenRecordTileUserActionInteractorTest : SysuiTestCase() { dialogTransitionAnimator, panelInteractor, mock<MediaProjectionMetricsLogger>(), - featureFlags, - activityStarter, ) @Test @@ -120,22 +102,16 @@ class ScreenRecordTileUserActionInteractorTest : SysuiTestCase() { underTest.handleInput(QSTileInputTestKtx.click(recordingModel)) val onStartRecordingClickedCaptor = argumentCaptor<Runnable>() verify(recordingController) - .createScreenRecordDialog( - eq(context), - eq(featureFlags), - eq(dialogTransitionAnimator), - eq(activityStarter), - onStartRecordingClickedCaptor.capture() - ) + .createScreenRecordDialog(onStartRecordingClickedCaptor.capture()) val onDismissActionCaptor = argumentCaptor<OnDismissAction>() verify(keyguardDismissUtil) .executeWhenUnlocked(onDismissActionCaptor.capture(), eq(false), eq(true)) - onDismissActionCaptor.value.onDismiss() + onDismissActionCaptor.lastValue.onDismiss() verify(dialog).show() // because the view was null // When starting the recording, we collapse the shade and disable the dialog animation. - onStartRecordingClickedCaptor.value.run() + onStartRecordingClickedCaptor.lastValue.run() verify(dialogTransitionAnimator).disableAllCurrentDialogsExitAnimations() verify(panelInteractor).collapsePanels() } @@ -145,9 +121,9 @@ class ScreenRecordTileUserActionInteractorTest : SysuiTestCase() { */ @Test fun handleClickFromView_whenDoingNothing_whenKeyguardNotShowing_showDialogFromView() = runTest { - val expandable = mock<Expandable>() val controller = mock<DialogTransitionAnimator.Controller>() - whenever(expandable.dialogTransitionController(any())).thenReturn(controller) + val expandable = + mock<Expandable> { on { dialogTransitionController(any()) } doReturn controller } kosmos.fakeKeyguardRepository.setKeyguardShowing(false) @@ -158,18 +134,12 @@ class ScreenRecordTileUserActionInteractorTest : SysuiTestCase() { ) val onStartRecordingClickedCaptor = argumentCaptor<Runnable>() verify(recordingController) - .createScreenRecordDialog( - eq(context), - eq(featureFlags), - eq(dialogTransitionAnimator), - eq(activityStarter), - onStartRecordingClickedCaptor.capture() - ) + .createScreenRecordDialog(onStartRecordingClickedCaptor.capture()) val onDismissActionCaptor = argumentCaptor<OnDismissAction>() verify(keyguardDismissUtil) .executeWhenUnlocked(onDismissActionCaptor.capture(), eq(false), eq(true)) - onDismissActionCaptor.value.onDismiss() + onDismissActionCaptor.lastValue.onDismiss() verify(dialogTransitionAnimator).show(eq(dialog), eq(controller), eq(true)) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayActionsViewModelTest.kt index c3a777cc3e44..939644594d31 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayActionsViewModelTest.kt @@ -21,7 +21,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.compose.animation.scene.Back import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.UserActionResult import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue @@ -89,12 +88,8 @@ class QuickSettingsShadeOverlayActionsViewModelTest : SysuiTestCase() { underTest.activateIn(this) assertThat( - (actions?.get( - Swipe( - direction = SwipeDirection.Down, - fromSource = SceneContainerEdge.TopLeft, - ) - ) as? UserActionResult.ReplaceByOverlay) + (actions?.get(Swipe.Down(fromSource = SceneContainerEdge.TopLeft)) + as? UserActionResult.ReplaceByOverlay) ?.overlay ) .isEqualTo(Overlays.NotificationsShade) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayContentViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayContentViewModelTest.kt index f32894dfd383..24f6b6d8566b 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayContentViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayContentViewModelTest.kt @@ -31,6 +31,7 @@ import com.android.systemui.lifecycle.activateIn import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.setAsleepForTest import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.setAwakeForTest import com.android.systemui.power.domain.interactor.powerInteractor +import com.android.systemui.qs.composefragment.dagger.usingMediaInComposeFragment import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.domain.startable.sceneContainerStartable import com.android.systemui.scene.shared.model.Overlays @@ -55,7 +56,10 @@ import org.junit.runner.RunWith @EnableFlags(DualShade.FLAG_NAME) class QuickSettingsShadeOverlayContentViewModelTest : SysuiTestCase() { - private val kosmos = testKosmos() + private val kosmos = + testKosmos().apply { + usingMediaInComposeFragment = false // This is not for the compose fragment + } private val testScope = kosmos.testScope private val sceneInteractor = kosmos.sceneInteractor diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModelTest.kt index 62b6391ca54c..d5fbe49a153b 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModelTest.kt @@ -22,7 +22,6 @@ import androidx.test.filters.SmallTest import com.android.compose.animation.scene.Back import com.android.compose.animation.scene.Edge import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.UserActionResult import com.android.systemui.SysuiTestCase import com.android.systemui.authentication.data.repository.fakeAuthenticationRepository @@ -98,9 +97,8 @@ class QuickSettingsUserActionsViewModelTest : SysuiTestCase() { .isEqualTo( mapOf( Back to UserActionResult(Scenes.Shade), - Swipe(SwipeDirection.Up) to UserActionResult(Scenes.Shade), - Swipe(fromSource = Edge.Bottom, direction = SwipeDirection.Up) to - UserActionResult(SceneFamilies.Home), + Swipe.Up to UserActionResult(Scenes.Shade), + Swipe.Up(fromSource = Edge.Bottom) to UserActionResult(SceneFamilies.Home), ) ) assertThat(homeScene).isEqualTo(Scenes.Gone) @@ -125,9 +123,8 @@ class QuickSettingsUserActionsViewModelTest : SysuiTestCase() { .isEqualTo( mapOf( Back to UserActionResult(Scenes.Lockscreen), - Swipe(SwipeDirection.Up) to UserActionResult(Scenes.Lockscreen), - Swipe(fromSource = Edge.Bottom, direction = SwipeDirection.Up) to - UserActionResult(SceneFamilies.Home), + Swipe.Up to UserActionResult(Scenes.Lockscreen), + Swipe.Up(fromSource = Edge.Bottom) to UserActionResult(SceneFamilies.Home), ) ) assertThat(homeScene).isEqualTo(Scenes.Lockscreen) @@ -154,9 +151,8 @@ class QuickSettingsUserActionsViewModelTest : SysuiTestCase() { .isEqualTo( mapOf( Back to UserActionResult(Scenes.Shade), - Swipe(SwipeDirection.Up) to UserActionResult(Scenes.Shade), - Swipe(fromSource = Edge.Bottom, direction = SwipeDirection.Up) to - UserActionResult(SceneFamilies.Home), + Swipe.Up to UserActionResult(Scenes.Shade), + Swipe.Up(fromSource = Edge.Bottom) to UserActionResult(SceneFamilies.Home), ) ) assertThat(homeScene).isEqualTo(Scenes.Gone) @@ -178,9 +174,8 @@ class QuickSettingsUserActionsViewModelTest : SysuiTestCase() { .isEqualTo( mapOf( Back to UserActionResult(Scenes.Shade), - Swipe(SwipeDirection.Up) to UserActionResult(Scenes.Shade), - Swipe(fromSource = Edge.Bottom, direction = SwipeDirection.Up) to - UserActionResult(SceneFamilies.Home), + Swipe.Up to UserActionResult(Scenes.Shade), + Swipe.Up(fromSource = Edge.Bottom) to UserActionResult(SceneFamilies.Home), ) ) assertThat(homeScene).isEqualTo(Scenes.Lockscreen) @@ -214,9 +209,8 @@ class QuickSettingsUserActionsViewModelTest : SysuiTestCase() { .isEqualTo( mapOf( Back to UserActionResult(Scenes.Shade), - Swipe(SwipeDirection.Up) to UserActionResult(Scenes.Shade), - Swipe(fromSource = Edge.Bottom, direction = SwipeDirection.Up) to - UserActionResult(SceneFamilies.Home), + Swipe.Up to UserActionResult(Scenes.Shade), + Swipe.Up(fromSource = Edge.Bottom) to UserActionResult(SceneFamilies.Home), ) ) assertThat(homeScene).isEqualTo(Scenes.Gone) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/GoneUserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/GoneUserActionsViewModelTest.kt index 47fae9f0629f..bb2e9417ecef 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/GoneUserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/GoneUserActionsViewModelTest.kt @@ -23,7 +23,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.compose.animation.scene.Edge import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.UserAction import com.android.compose.animation.scene.UserActionResult import com.android.systemui.SysuiTestCase @@ -71,8 +70,7 @@ class GoneUserActionsViewModelTest : SysuiTestCase() { shadeRepository.setShadeLayoutWide(true) runCurrent() - assertThat(userActions?.get(Swipe(SwipeDirection.Down))?.transitionKey) - .isEqualTo(ToSplitShade) + assertThat(userActions?.get(Swipe.Down)?.transitionKey).isEqualTo(ToSplitShade) } @Test @@ -83,7 +81,7 @@ class GoneUserActionsViewModelTest : SysuiTestCase() { shadeRepository.setShadeLayoutWide(false) runCurrent() - assertThat(userActions?.get(Swipe(SwipeDirection.Down))?.transitionKey).isNull() + assertThat(userActions?.get(Swipe.Down)?.transitionKey).isNull() } @Test @@ -94,7 +92,7 @@ class GoneUserActionsViewModelTest : SysuiTestCase() { shadeRepository.setShadeLayoutWide(true) runCurrent() - assertThat(userActions?.get(Swipe(SwipeDirection.Down))?.transitionKey).isNull() + assertThat(userActions?.get(Swipe.Down)?.transitionKey).isNull() } @Test @@ -132,6 +130,6 @@ class GoneUserActionsViewModelTest : SysuiTestCase() { } private fun swipeDownFromTopWithTwoFingers(): UserAction { - return Swipe(direction = SwipeDirection.Down, pointerCount = 2, fromSource = Edge.Top) + return Swipe.Down(pointerCount = 2, fromSource = Edge.Top) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/UserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/UserActionsViewModelTest.kt index 972afb58352d..d5f57da40e5a 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/UserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/UserActionsViewModelTest.kt @@ -22,7 +22,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.compose.animation.scene.Back import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.UserAction import com.android.compose.animation.scene.UserActionResult import com.android.systemui.SysuiTestCase @@ -77,7 +76,7 @@ class UserActionsViewModelTest : SysuiTestCase() { val expected1 = mapOf( Back to UserActionResult(toScene = Scenes.Gone), - Swipe(SwipeDirection.Up) to UserActionResult(toScene = Scenes.Shade) + Swipe.Up to UserActionResult(toScene = Scenes.Shade), ) underTest.upstream.value = expected1 runCurrent() @@ -86,7 +85,7 @@ class UserActionsViewModelTest : SysuiTestCase() { val expected2 = mapOf( Back to UserActionResult(toScene = Scenes.Lockscreen), - Swipe(SwipeDirection.Down) to UserActionResult(toScene = Scenes.Shade) + Swipe.Down to UserActionResult(toScene = Scenes.Shade), ) underTest.upstream.value = expected2 runCurrent() @@ -104,7 +103,7 @@ class UserActionsViewModelTest : SysuiTestCase() { val expected = mapOf( Back to UserActionResult(toScene = Scenes.Lockscreen), - Swipe(SwipeDirection.Down) to UserActionResult(toScene = Scenes.Shade) + Swipe.Down to UserActionResult(toScene = Scenes.Shade), ) underTest.upstream.value = expected runCurrent() @@ -120,7 +119,7 @@ class UserActionsViewModelTest : SysuiTestCase() { val upstream = MutableStateFlow<Map<UserAction, UserActionResult>>(emptyMap()) override suspend fun hydrateActions( - setActions: (Map<UserAction, UserActionResult>) -> Unit, + setActions: (Map<UserAction, UserActionResult>) -> Unit ) { upstream.collect { setActions(it) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModelTest.kt index fcb366bfd8ee..bbfc66a8d8e5 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModelTest.kt @@ -92,10 +92,7 @@ class ShadeUserActionsViewModelTest : SysuiTestCase() { AuthenticationMethodModel.Pin ) - assertThat( - (actions?.get(Swipe(SwipeDirection.Up)) as? UserActionResult.ChangeScene) - ?.toScene - ) + assertThat((actions?.get(Swipe.Up) as? UserActionResult.ChangeScene)?.toScene) .isEqualTo(SceneFamilies.Home) assertThat(homeScene).isEqualTo(Scenes.Lockscreen) } @@ -110,10 +107,7 @@ class ShadeUserActionsViewModelTest : SysuiTestCase() { ) setDeviceEntered(true) - assertThat( - (actions?.get(Swipe(SwipeDirection.Up)) as? UserActionResult.ChangeScene) - ?.toScene - ) + assertThat((actions?.get(Swipe.Up) as? UserActionResult.ChangeScene)?.toScene) .isEqualTo(SceneFamilies.Home) assertThat(homeScene).isEqualTo(Scenes.Gone) } @@ -128,10 +122,7 @@ class ShadeUserActionsViewModelTest : SysuiTestCase() { ) kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(false) - assertThat( - (actions?.get(Swipe(SwipeDirection.Up)) as? UserActionResult.ChangeScene) - ?.toScene - ) + assertThat((actions?.get(Swipe.Up) as? UserActionResult.ChangeScene)?.toScene) .isEqualTo(SceneFamilies.Home) assertThat(homeScene).isEqualTo(Scenes.Gone) } @@ -147,10 +138,7 @@ class ShadeUserActionsViewModelTest : SysuiTestCase() { ) sceneInteractor.changeScene(Scenes.Lockscreen, "reason") - assertThat( - (actions?.get(Swipe(SwipeDirection.Up)) as? UserActionResult.ChangeScene) - ?.toScene - ) + assertThat((actions?.get(Swipe.Up) as? UserActionResult.ChangeScene)?.toScene) .isEqualTo(SceneFamilies.Home) assertThat(homeScene).isEqualTo(Scenes.Lockscreen) } @@ -167,10 +155,7 @@ class ShadeUserActionsViewModelTest : SysuiTestCase() { runCurrent() sceneInteractor.changeScene(Scenes.Gone, "reason") - assertThat( - (actions?.get(Swipe(SwipeDirection.Up)) as? UserActionResult.ChangeScene) - ?.toScene - ) + assertThat((actions?.get(Swipe.Up) as? UserActionResult.ChangeScene)?.toScene) .isEqualTo(SceneFamilies.Home) assertThat(homeScene).isEqualTo(Scenes.Gone) } @@ -182,8 +167,7 @@ class ShadeUserActionsViewModelTest : SysuiTestCase() { shadeRepository.setShadeLayoutWide(true) runCurrent() - assertThat(actions?.get(Swipe(SwipeDirection.Up))?.transitionKey) - .isEqualTo(ToSplitShade) + assertThat(actions?.get(Swipe.Up)?.transitionKey).isEqualTo(ToSplitShade) } @Test @@ -193,7 +177,7 @@ class ShadeUserActionsViewModelTest : SysuiTestCase() { shadeRepository.setShadeLayoutWide(false) runCurrent() - assertThat(actions?.get(Swipe(SwipeDirection.Up))?.transitionKey).isNull() + assertThat(actions?.get(Swipe.Up)?.transitionKey).isNull() } @Test @@ -202,10 +186,7 @@ class ShadeUserActionsViewModelTest : SysuiTestCase() { overrideResource(R.bool.config_use_split_notification_shade, true) kosmos.shadeStartable.start() val actions by collectLastValue(underTest.actions) - assertThat( - (actions?.get(Swipe(SwipeDirection.Down)) as? UserActionResult.ChangeScene) - ?.toScene - ) + assertThat((actions?.get(Swipe.Down) as? UserActionResult.ChangeScene)?.toScene) .isNull() } @@ -215,10 +196,7 @@ class ShadeUserActionsViewModelTest : SysuiTestCase() { overrideResource(R.bool.config_use_split_notification_shade, false) kosmos.shadeStartable.start() val actions by collectLastValue(underTest.actions) - assertThat( - (actions?.get(Swipe(SwipeDirection.Down)) as? UserActionResult.ChangeScene) - ?.toScene - ) + assertThat((actions?.get(Swipe.Down) as? UserActionResult.ChangeScene)?.toScene) .isEqualTo(Scenes.QuickSettings) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/OperatorNameViewControllerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/OperatorNameViewControllerTest.kt index d6b3b919913f..72a2ce50ed9c 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/OperatorNameViewControllerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/OperatorNameViewControllerTest.kt @@ -85,7 +85,6 @@ class OperatorNameViewControllerTest : SysuiTestCase() { underTest = OperatorNameViewController.Factory( - darkIconDispatcher, tunerService, telephonyManager, keyguardUpdateMonitor, @@ -94,7 +93,7 @@ class OperatorNameViewControllerTest : SysuiTestCase() { subscriptionManagerProxy, javaAdapter, ) - .create(view) + .create(view, darkIconDispatcher) } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java index 60a185537b0d..fb7252b24295 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java @@ -16,6 +16,8 @@ package com.android.systemui.statusbar; +import static android.app.Notification.CATEGORY_CALL; + import static com.google.common.truth.Truth.assertThat; import static junit.framework.Assert.assertEquals; @@ -197,6 +199,19 @@ public class StatusBarIconViewTest extends SysuiTestCase { } @Test + public void testContentDescForNotification_noNotifContent() { + Notification n = new Notification.Builder(mContext, "test") + .setSmallIcon(0) + .setContentTitle("hello") + .setCategory(CATEGORY_CALL) + .build(); + assertThat(NotificationContentDescription.contentDescForNotification(mContext, n) + .toString()).startsWith("com.android.systemui.tests notification"); + assertThat(NotificationContentDescription.contentDescForNotification(mContext, n) + .toString()).doesNotContain("hello"); + } + + @Test @EnableFlags({Flags.FLAG_MODES_UI, Flags.FLAG_MODES_UI_ICONS}) public void setIcon_withPreloaded_usesPreloaded() { Icon mockIcon = mock(Icon.class); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt index 32f4164d509f..1b4132910555 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt @@ -97,7 +97,7 @@ class NotifChipsViewModelTest : SysuiTestCase() { assertThat(latest).hasSize(1) val chip = latest!![0] - assertThat(chip).isInstanceOf(OngoingActivityChipModel.Shown.ShortTimeDelta::class.java) + assertThat(chip).isInstanceOf(OngoingActivityChipModel.Shown.IconOnly::class.java) assertThat(chip.icon).isEqualTo(OngoingActivityChipModel.ChipIcon.StatusBarView(icon)) } @@ -168,8 +168,7 @@ class NotifChipsViewModelTest : SysuiTestCase() { companion object { fun assertIsNotifChip(latest: OngoingActivityChipModel?, expectedIcon: StatusBarIconView) { - assertThat(latest) - .isInstanceOf(OngoingActivityChipModel.Shown.ShortTimeDelta::class.java) + assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown.IconOnly::class.java) assertThat((latest as OngoingActivityChipModel.Shown).icon) .isEqualTo(OngoingActivityChipModel.ChipIcon.StatusBarView(expectedIcon)) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/MultiDisplayStatusBarStarterTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/MultiDisplayStatusBarStarterTest.kt index 5be5fb4aa9ba..c06da4bc5080 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/MultiDisplayStatusBarStarterTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/MultiDisplayStatusBarStarterTest.kt @@ -23,9 +23,11 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.display.data.repository.displayRepository import com.android.systemui.kosmos.testScope +import com.android.systemui.statusbar.data.repository.fakeLightBarControllerStore import com.android.systemui.statusbar.data.repository.fakePrivacyDotWindowControllerStore import com.android.systemui.testKosmos import com.google.common.truth.Expect +import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest @@ -48,6 +50,7 @@ class MultiDisplayStatusBarStarterTest : SysuiTestCase() { private val fakeOrchestratorFactory = kosmos.fakeStatusBarOrchestratorFactory private val fakeInitializerStore = kosmos.fakeStatusBarInitializerStore private val fakePrivacyDotStore = kosmos.fakePrivacyDotWindowControllerStore + private val fakeLightBarStore = kosmos.fakeLightBarControllerStore // Lazy, so that @EnableFlags is set before initializer is instantiated. private val underTest by lazy { kosmos.multiDisplayStatusBarStarter } @@ -95,6 +98,31 @@ class MultiDisplayStatusBarStarterTest : SysuiTestCase() { } @Test + fun start_doesNotStartLightBarControllerForCurrentDisplays() = + testScope.runTest { + fakeDisplayRepository.addDisplay(displayId = 1) + fakeDisplayRepository.addDisplay(displayId = 2) + + underTest.start() + runCurrent() + + verify(fakeLightBarStore.forDisplay(displayId = 1), never()).start() + verify(fakeLightBarStore.forDisplay(displayId = 2), never()).start() + } + + @Test + fun start_createsLightBarControllerForCurrentDisplays() = + testScope.runTest { + fakeDisplayRepository.addDisplay(displayId = 1) + fakeDisplayRepository.addDisplay(displayId = 2) + + underTest.start() + runCurrent() + + assertThat(fakeLightBarStore.perDisplayMocks.keys).containsExactly(1, 2) + } + + @Test fun start_doesNotStartPrivacyDotForDefaultDisplay() = testScope.runTest { fakeDisplayRepository.addDisplay(displayId = Display.DEFAULT_DISPLAY) @@ -145,6 +173,30 @@ class MultiDisplayStatusBarStarterTest : SysuiTestCase() { } @Test + fun displayAdded_lightBarForNewDisplayIsCreated() = + testScope.runTest { + underTest.start() + runCurrent() + + fakeDisplayRepository.addDisplay(displayId = 3) + runCurrent() + + assertThat(fakeLightBarStore.perDisplayMocks.keys).containsExactly(3) + } + + @Test + fun displayAdded_lightBarForNewDisplayIsNotStarted() = + testScope.runTest { + underTest.start() + runCurrent() + + fakeDisplayRepository.addDisplay(displayId = 3) + runCurrent() + + verify(fakeLightBarStore.forDisplay(displayId = 3), never()).start() + } + + @Test fun displayAddedDuringStart_initializerForNewDisplayIsStarted() = testScope.runTest { underTest.start() @@ -178,4 +230,26 @@ class MultiDisplayStatusBarStarterTest : SysuiTestCase() { verify(fakePrivacyDotStore.forDisplay(displayId = 3)).start() } + + @Test + fun displayAddedDuringStart_lightBarForNewDisplayIsCreated() = + testScope.runTest { + underTest.start() + + fakeDisplayRepository.addDisplay(displayId = 3) + runCurrent() + + assertThat(fakeLightBarStore.perDisplayMocks.keys).containsExactly(3) + } + + @Test + fun displayAddedDuringStart_lightBarForNewDisplayIsNotStarted() = + testScope.runTest { + underTest.start() + + fakeDisplayRepository.addDisplay(displayId = 3) + runCurrent() + + verify(fakeLightBarStore.forDisplay(displayId = 3), never()).start() + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/data/repository/MultiDisplayDarkIconDispatcherStoreTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/data/repository/MultiDisplayDarkIconDispatcherStoreTest.kt new file mode 100644 index 000000000000..a2c3c66f4448 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/data/repository/MultiDisplayDarkIconDispatcherStoreTest.kt @@ -0,0 +1,73 @@ +/* + * 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.data.repository + +import android.platform.test.annotations.EnableFlags +import android.view.Display.DEFAULT_DISPLAY +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.display.data.repository.displayRepository +import com.android.systemui.kosmos.testScope +import com.android.systemui.kosmos.useUnconfinedTestDispatcher +import com.android.systemui.statusbar.core.StatusBarConnectedDisplays +import com.android.systemui.testKosmos +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.never +import org.mockito.kotlin.verify + +@SmallTest +@RunWith(AndroidJUnit4::class) +@EnableFlags(StatusBarConnectedDisplays.FLAG_NAME) +class MultiDisplayDarkIconDispatcherStoreTest : SysuiTestCase() { + + private val kosmos = testKosmos().useUnconfinedTestDispatcher() + private val testScope = kosmos.testScope + private val fakeDisplayRepository = kosmos.displayRepository + + // Lazy so that @EnableFlags has time to run before underTest is instantiated. + private val underTest by lazy { kosmos.multiDisplayDarkIconDispatcherStore } + + @Before + fun start() { + underTest.start() + } + + @Before fun addDisplays() = runBlocking { fakeDisplayRepository.addDisplay(DEFAULT_DISPLAY) } + + @Test + fun beforeDisplayRemoved_doesNotStopInstances() = + testScope.runTest { + val instance = underTest.forDisplay(DEFAULT_DISPLAY) + + verify(instance, never()).stop() + } + + @Test + fun displayRemoved_stopsInstance() = + testScope.runTest { + val instance = underTest.forDisplay(DEFAULT_DISPLAY) + + fakeDisplayRepository.removeDisplay(DEFAULT_DISPLAY) + + verify(instance).stop() + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationContentDescriptionTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationContentDescriptionTest.kt index 12473cb46793..896f940f8a60 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationContentDescriptionTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationContentDescriptionTest.kt @@ -34,31 +34,9 @@ class NotificationContentDescriptionTest : SysuiTestCase() { private val TICKER = "this is a ticker" @Test - fun notificationWithAllDifferentFields_descriptionIsTitle() { + fun notificationWithAllDifferentFields_descriptionIsAppName() { val n = createNotification(TITLE, TEXT, TICKER) val description = contentDescForNotification(context, n) - assertThat(description).isEqualTo(createDescriptionText(n, TITLE)) - } - - @Test - fun notificationWithAllDifferentFields_titleMatchesAppName_descriptionIsText() { - val n = createNotification(getTestAppName(), TEXT, TICKER) - val description = contentDescForNotification(context, n) - assertThat(description).isEqualTo(createDescriptionText(n, TEXT)) - } - - @Test - fun notificationWithAllDifferentFields_titleMatchesAppNameNoText_descriptionIsTicker() { - val n = createNotification(getTestAppName(), null, TICKER) - val description = contentDescForNotification(context, n) - assertThat(description).isEqualTo(createDescriptionText(n, TICKER)) - } - - @Test - fun notificationWithAllDifferentFields_titleMatchesAppNameNoTextNoTicker_descriptionEmpty() { - val appName = getTestAppName() - val n = createNotification(appName, null, null) - val description = contentDescForNotification(context, n) assertThat(description).isEqualTo(createDescriptionText(n, "")) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerStatusBarViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerStatusBarViewModelTest.kt index 9367a93a2890..46c360aecd48 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerStatusBarViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerStatusBarViewModelTest.kt @@ -110,14 +110,10 @@ class NotificationIconContainerStatusBarViewModelTest(flags: FlagsParameterizati lastSleepReason = WakeSleepReason.OTHER, ) keyguardTransitionRepository.sendTransitionStep( - TransitionStep( - transitionState = TransitionState.STARTED, - ) + TransitionStep(transitionState = TransitionState.STARTED) ) keyguardRepository.setDozeTransitionModel( - DozeTransitionModel( - to = DozeStateModel.DOZE_AOD, - ) + DozeTransitionModel(to = DozeStateModel.DOZE_AOD) ) val animationsEnabled by collectLastValue(underTest.animationsEnabled) runCurrent() @@ -133,14 +129,10 @@ class NotificationIconContainerStatusBarViewModelTest(flags: FlagsParameterizati lastSleepReason = WakeSleepReason.OTHER, ) keyguardTransitionRepository.sendTransitionStep( - TransitionStep( - transitionState = TransitionState.STARTED, - ) + TransitionStep(transitionState = TransitionState.STARTED) ) keyguardRepository.setDozeTransitionModel( - DozeTransitionModel( - to = DozeStateModel.DOZE_PULSING, - ) + DozeTransitionModel(to = DozeStateModel.DOZE_PULSING) ) val animationsEnabled by collectLastValue(underTest.animationsEnabled) runCurrent() @@ -201,9 +193,7 @@ class NotificationIconContainerStatusBarViewModelTest(flags: FlagsParameterizati lastSleepReason = WakeSleepReason.OTHER, ) keyguardTransitionRepository.sendTransitionStep( - TransitionStep( - transitionState = TransitionState.STARTED, - ) + TransitionStep(transitionState = TransitionState.STARTED) ) val animationsEnabled by collectLastValue(underTest.animationsEnabled) runCurrent() @@ -216,9 +206,7 @@ class NotificationIconContainerStatusBarViewModelTest(flags: FlagsParameterizati val animationsEnabled by collectLastValue(underTest.animationsEnabled) keyguardTransitionRepository.sendTransitionStep( - TransitionStep( - transitionState = TransitionState.STARTED, - ) + TransitionStep(transitionState = TransitionState.STARTED) ) keyguardRepository.setKeyguardShowing(true) runCurrent() @@ -234,13 +222,10 @@ class NotificationIconContainerStatusBarViewModelTest(flags: FlagsParameterizati @Test fun iconColors_testsDarkBounds() = testScope.runTest { - darkIconRepository.darkState.value = - SysuiDarkIconDispatcher.DarkChange( - emptyList(), - 0f, - 0xAABBCC, - ) - val iconColorsLookup by collectLastValue(underTest.iconColors) + val displayId = 123 + darkIconRepository.darkState(displayId).value = + SysuiDarkIconDispatcher.DarkChange(emptyList(), 0f, 0xAABBCC) + val iconColorsLookup by collectLastValue(underTest.iconColors(displayId)) assertThat(iconColorsLookup).isNotNull() val iconColors = iconColorsLookup?.iconColors(Rect()) @@ -257,13 +242,10 @@ class NotificationIconContainerStatusBarViewModelTest(flags: FlagsParameterizati @Test fun iconColors_staticDrawableColor_notInDarkTintArea() = testScope.runTest { - darkIconRepository.darkState.value = - SysuiDarkIconDispatcher.DarkChange( - listOf(Rect(0, 0, 5, 5)), - 0f, - 0xAABBCC, - ) - val iconColorsLookup by collectLastValue(underTest.iconColors) + val displayId = 321 + darkIconRepository.darkState(displayId).value = + SysuiDarkIconDispatcher.DarkChange(listOf(Rect(0, 0, 5, 5)), 0f, 0xAABBCC) + val iconColorsLookup by collectLastValue(underTest.iconColors(displayId)) val iconColors = iconColorsLookup?.iconColors(Rect(1, 1, 4, 4)) val staticDrawableColor = iconColors?.staticDrawableColor(Rect(6, 6, 7, 7)) assertThat(staticDrawableColor).isEqualTo(DarkIconDispatcher.DEFAULT_ICON_TINT) @@ -272,13 +254,10 @@ class NotificationIconContainerStatusBarViewModelTest(flags: FlagsParameterizati @Test fun iconColors_notInDarkTintArea() = testScope.runTest { - darkIconRepository.darkState.value = - SysuiDarkIconDispatcher.DarkChange( - listOf(Rect(0, 0, 5, 5)), - 0f, - 0xAABBCC, - ) - val iconColorsLookup by collectLastValue(underTest.iconColors) + val displayId = 987 + darkIconRepository.darkState(displayId).value = + SysuiDarkIconDispatcher.DarkChange(listOf(Rect(0, 0, 5, 5)), 0f, 0xAABBCC) + val iconColorsLookup by collectLastValue(underTest.iconColors(displayId)) val iconColors = iconColorsLookup?.iconColors(Rect(6, 6, 7, 7)) assertThat(iconColors).isNull() } @@ -295,7 +274,7 @@ class NotificationIconContainerStatusBarViewModelTest(flags: FlagsParameterizati activeNotificationModel( key = "notif1", groupKey = "group", - statusBarIcon = icon + statusBarIcon = icon, ) ) } @@ -322,7 +301,7 @@ class NotificationIconContainerStatusBarViewModelTest(flags: FlagsParameterizati activeNotificationModel( key = "notif1", groupKey = "group", - statusBarIcon = icon + statusBarIcon = icon, ) ) } @@ -354,7 +333,7 @@ class NotificationIconContainerStatusBarViewModelTest(flags: FlagsParameterizati activeNotificationModel( key = "notif1", groupKey = "group", - statusBarIcon = icon + statusBarIcon = icon, ) ) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.kt new file mode 100644 index 000000000000..a1b63b159277 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.kt @@ -0,0 +1,648 @@ +/* + * 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 + */ +@file:OptIn(ExperimentalCoroutinesApi::class) + +package com.android.systemui.statusbar.notification.row + +import android.R +import android.app.AppOpsManager +import android.app.INotificationManager +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.content.Intent +import android.content.pm.LauncherApps +import android.content.pm.PackageManager +import android.content.pm.ShortcutManager +import android.graphics.Color +import android.os.Binder +import android.os.UserManager +import android.os.fakeExecutorHandler +import android.platform.test.flag.junit.FlagsParameterization +import android.provider.Settings +import android.service.notification.NotificationListenerService +import android.testing.TestableLooper.RunWithLooper +import android.util.ArraySet +import android.view.View +import android.view.accessibility.AccessibilityManager +import androidx.test.filters.SmallTest +import com.android.internal.logging.MetricsLogger +import com.android.internal.logging.UiEventLogger +import com.android.internal.logging.testing.UiEventLoggerFake +import com.android.internal.statusbar.IStatusBarService +import com.android.systemui.SysuiTestCase +import com.android.systemui.concurrency.fakeExecutor +import com.android.systemui.flags.DisableSceneContainer +import com.android.systemui.flags.EnableSceneContainer +import com.android.systemui.flags.andSceneContainer +import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository +import com.android.systemui.kosmos.testScope +import com.android.systemui.people.widget.PeopleSpaceWidgetManager +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin +import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin.MenuItem +import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.power.domain.interactor.PowerInteractorFactory.create +import com.android.systemui.scene.data.repository.Idle +import com.android.systemui.scene.data.repository.WindowRootViewVisibilityRepository +import com.android.systemui.scene.data.repository.setSceneTransition +import com.android.systemui.scene.domain.interactor.WindowRootViewVisibilityInteractor +import com.android.systemui.scene.domain.interactor.sceneInteractor +import com.android.systemui.scene.shared.model.Scenes +import com.android.systemui.settings.UserContextProvider +import com.android.systemui.shade.ShadeController +import com.android.systemui.statusbar.NotificationEntryHelper +import com.android.systemui.statusbar.NotificationLockscreenUserManager +import com.android.systemui.statusbar.NotificationPresenter +import com.android.systemui.statusbar.notification.AssistantFeedbackController +import com.android.systemui.statusbar.notification.NotificationActivityStarter +import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider +import com.android.systemui.statusbar.notification.domain.interactor.activeNotificationsInteractor +import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier +import com.android.systemui.statusbar.notification.stack.NotificationListContainer +import com.android.systemui.statusbar.policy.DeviceProvisionedController +import com.android.systemui.statusbar.policy.HeadsUpManager +import com.android.systemui.testKosmos +import com.android.systemui.util.kotlin.JavaAdapter +import com.android.systemui.wmshell.BubblesManager +import java.util.Optional +import kotlin.test.assertNotNull +import kotlin.test.fail +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Assert.assertEquals +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.ArgumentMatchers.anyBoolean +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.Mock +import org.mockito.invocation.InvocationOnMock +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.clearInvocations +import org.mockito.kotlin.doNothing +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.spy +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters + +/** Tests for [NotificationGutsManager]. */ +@SmallTest +@RunWith(ParameterizedAndroidJunit4::class) +@RunWithLooper +class NotificationGutsManagerTest(flags: FlagsParameterization) : SysuiTestCase() { + private val testNotificationChannel = + NotificationChannel( + TEST_CHANNEL_ID, + TEST_CHANNEL_ID, + NotificationManager.IMPORTANCE_DEFAULT, + ) + + private val kosmos = testKosmos() + + private val testScope = kosmos.testScope + private val javaAdapter = JavaAdapter(testScope.backgroundScope) + private val executor = kosmos.fakeExecutor + private val handler = kosmos.fakeExecutorHandler + private lateinit var helper: NotificationTestHelper + private lateinit var gutsManager: NotificationGutsManager + + @get:Rule val rule: MockitoRule = MockitoJUnit.rule() + + @Mock private lateinit var metricsLogger: MetricsLogger + @Mock private lateinit var onUserInteractionCallback: OnUserInteractionCallback + @Mock private lateinit var presenter: NotificationPresenter + @Mock private lateinit var notificationActivityStarter: NotificationActivityStarter + @Mock private lateinit var notificationListContainer: NotificationListContainer + @Mock + private lateinit var onSettingsClickListener: NotificationGutsManager.OnSettingsClickListener + @Mock private lateinit var deviceProvisionedController: DeviceProvisionedController + @Mock private lateinit var accessibilityManager: AccessibilityManager + @Mock private lateinit var highPriorityProvider: HighPriorityProvider + @Mock private lateinit var iNotificationManager: INotificationManager + @Mock private lateinit var barService: IStatusBarService + @Mock private lateinit var launcherApps: LauncherApps + @Mock private lateinit var shortcutManager: ShortcutManager + @Mock private lateinit var channelEditorDialogController: ChannelEditorDialogController + @Mock private lateinit var peopleNotificationIdentifier: PeopleNotificationIdentifier + @Mock private lateinit var contextTracker: UserContextProvider + @Mock private lateinit var bubblesManager: BubblesManager + @Mock private lateinit var shadeController: ShadeController + @Mock private lateinit var peopleSpaceWidgetManager: PeopleSpaceWidgetManager + @Mock private lateinit var assistantFeedbackController: AssistantFeedbackController + @Mock private lateinit var notificationLockscreenUserManager: NotificationLockscreenUserManager + @Mock private lateinit var statusBarStateController: StatusBarStateController + @Mock private lateinit var headsUpManager: HeadsUpManager + @Mock private lateinit var activityStarter: ActivityStarter + @Mock private lateinit var userManager: UserManager + + private lateinit var windowRootViewVisibilityInteractor: WindowRootViewVisibilityInteractor + + companion object { + private const val TEST_CHANNEL_ID = "NotificationManagerServiceTestChannelId" + + @JvmStatic + @Parameters(name = "{0}") + fun getParams(): List<FlagsParameterization> { + return FlagsParameterization.allCombinationsOf().andSceneContainer() + } + } + + init { + mSetFlagsRule.setFlagsParameterization(flags) + } + + @Before + fun setUp() { + allowTestableLooperAsMainThread() + helper = NotificationTestHelper(mContext, mDependency) + whenever(accessibilityManager.isTouchExplorationEnabled).thenReturn(false) + + windowRootViewVisibilityInteractor = + WindowRootViewVisibilityInteractor( + testScope.backgroundScope, + WindowRootViewVisibilityRepository(barService, executor), + FakeKeyguardRepository(), + headsUpManager, + create().powerInteractor, + kosmos.activeNotificationsInteractor, + ) { + kosmos.sceneInteractor + } + + gutsManager = + NotificationGutsManager( + mContext, + handler, + handler, + javaAdapter, + accessibilityManager, + highPriorityProvider, + iNotificationManager, + userManager, + peopleSpaceWidgetManager, + launcherApps, + shortcutManager, + channelEditorDialogController, + contextTracker, + assistantFeedbackController, + Optional.of(bubblesManager), + UiEventLoggerFake(), + onUserInteractionCallback, + shadeController, + windowRootViewVisibilityInteractor, + notificationLockscreenUserManager, + statusBarStateController, + barService, + deviceProvisionedController, + metricsLogger, + headsUpManager, + activityStarter, + ) + gutsManager.setUpWithPresenter( + presenter, + notificationListContainer, + onSettingsClickListener, + ) + gutsManager.setNotificationActivityStarter(notificationActivityStarter) + gutsManager.start() + } + + @Test + fun testOpenAndCloseGuts() { + val guts = spy(NotificationGuts(mContext)) + whenever(guts.post(any())).thenAnswer { invocation: InvocationOnMock -> + handler.post(((invocation.arguments[0] as Runnable))) + null + } + + // Test doesn't support animation since the guts view is not attached. + doNothing().whenever(guts).openControls(anyInt(), anyInt(), anyBoolean(), any()) + + val realRow = createTestNotificationRow() + val menuItem = createTestMenuItem(realRow) + + val row = spy(realRow) + whenever(row.windowToken).thenReturn(Binder()) + whenever(row.guts).thenReturn(guts) + + assertTrue(gutsManager.openGutsInternal(row, 0, 0, menuItem)) + assertEquals(View.INVISIBLE.toLong(), guts.visibility.toLong()) + executor.runAllReady() + verify(guts).openControls(anyInt(), anyInt(), anyBoolean(), any<Runnable>()) + verify(headsUpManager).setGutsShown(realRow.entry, true) + + assertEquals(View.VISIBLE.toLong(), guts.visibility.toLong()) + gutsManager.closeAndSaveGuts(false, false, true, 0, 0, false) + + verify(guts).closeControls(anyBoolean(), anyBoolean(), anyInt(), anyInt(), anyBoolean()) + verify(row, times(1)).setGutsView(any<MenuItem>()) + executor.runAllReady() + verify(headsUpManager).setGutsShown(realRow.entry, false) + } + + @Test + fun testLockscreenShadeVisible_visible_gutsNotClosed() = + testScope.runTest { + // First, start out lockscreen or shade as not visible + windowRootViewVisibilityInteractor.setIsLockscreenOrShadeVisible(false) + runCurrent() + + val guts: NotificationGuts = mock() + gutsManager.exposedGuts = guts + + // WHEN the lockscreen or shade becomes visible + windowRootViewVisibilityInteractor.setIsLockscreenOrShadeVisible(true) + runCurrent() + + // THEN the guts are not closed + verify(guts, never()).removeCallbacks(any()) + verify(guts, never()) + .closeControls(anyBoolean(), anyBoolean(), anyInt(), anyInt(), anyBoolean()) + } + + @Test + @DisableSceneContainer + fun testLockscreenShadeVisible_notVisible_gutsClosed() = + testScope.runTest { + // First, start out lockscreen or shade as visible + windowRootViewVisibilityInteractor.setIsLockscreenOrShadeVisible(true) + runCurrent() + + val guts: NotificationGuts = mock() + gutsManager.exposedGuts = guts + + // WHEN the lockscreen or shade is no longer visible + windowRootViewVisibilityInteractor.setIsLockscreenOrShadeVisible(false) + runCurrent() + + // THEN the guts are closed + verify(guts).removeCallbacks(null) + verify(guts) + .closeControls( + /* leavebehinds = */ eq(true), + /* controls = */ eq(true), + /* x = */ anyInt(), + /* y = */ anyInt(), + /* force = */ eq(true), + ) + } + + @Test + @EnableSceneContainer + fun testShadeVisible_notVisible_gutsClosed() = + testScope.runTest { + // First, start with shade as visible + kosmos.setSceneTransition(Idle(Scenes.Shade)) + runCurrent() + + val guts: NotificationGuts = mock() + gutsManager.exposedGuts = guts + + // WHEN the shade is no longer visible + kosmos.setSceneTransition(Idle(Scenes.Gone)) + runCurrent() + + // THEN the guts are closed + verify(guts).removeCallbacks(null) + verify(guts) + .closeControls( + /* leavebehinds = */ eq(true), + /* controls = */ eq(true), + /* x = */ anyInt(), + /* y = */ anyInt(), + /* force = */ eq(true), + ) + } + + @Test + @DisableSceneContainer + fun testLockscreenShadeVisible_notVisible_listContainerReset() = + testScope.runTest { + // First, start out lockscreen or shade as visible + windowRootViewVisibilityInteractor.setIsLockscreenOrShadeVisible(true) + runCurrent() + clearInvocations(notificationListContainer) + + // WHEN the lockscreen or shade is no longer visible + windowRootViewVisibilityInteractor.setIsLockscreenOrShadeVisible(false) + runCurrent() + + // THEN the list container is reset + verify(notificationListContainer).resetExposedMenuView(anyBoolean(), anyBoolean()) + } + + @Test + @EnableSceneContainer + fun testShadeVisible_notVisible_listContainerReset() = + testScope.runTest { + // First, start with shade as visible + kosmos.setSceneTransition(Idle(Scenes.Shade)) + runCurrent() + clearInvocations(notificationListContainer) + + // WHEN the shade is no longer visible + kosmos.setSceneTransition(Idle(Scenes.Gone)) + runCurrent() + + // THEN the list container is reset + verify(notificationListContainer).resetExposedMenuView(anyBoolean(), anyBoolean()) + } + + @Test + fun testChangeDensityOrFontScale() { + val guts = spy(NotificationGuts(mContext)) + whenever(guts.post(any())).thenAnswer { invocation: InvocationOnMock -> + handler.post(((invocation.arguments[0] as Runnable))) + null + } + + // Test doesn't support animation since the guts view is not attached. + doNothing().whenever(guts).openControls(anyInt(), anyInt(), anyBoolean(), any<Runnable>()) + + val realRow = createTestNotificationRow() + val menuItem = createTestMenuItem(realRow) + + val row = spy(realRow) + + whenever(row.windowToken).thenReturn(Binder()) + whenever(row.guts).thenReturn(guts) + doNothing().whenever(row).ensureGutsInflated() + + val realEntry = realRow.entry + val entry = spy(realEntry) + + whenever(entry.row).thenReturn(row) + whenever(entry.guts).thenReturn(guts) + + assertTrue(gutsManager.openGutsInternal(row, 0, 0, menuItem)) + executor.runAllReady() + verify(guts).openControls(anyInt(), anyInt(), anyBoolean(), any<Runnable>()) + + // called once by mGutsManager.bindGuts() in mGutsManager.openGuts() + verify(row).setGutsView(any<MenuItem>()) + + row.onDensityOrFontScaleChanged() + gutsManager.onDensityOrFontScaleChanged(entry) + + executor.runAllReady() + + gutsManager.closeAndSaveGuts(false, false, false, 0, 0, false) + + verify(guts).closeControls(anyBoolean(), anyBoolean(), anyInt(), anyInt(), anyBoolean()) + + // called again by mGutsManager.bindGuts(), in mGutsManager.onDensityOrFontScaleChanged() + verify(row, times(2)).setGutsView(any<MenuItem>()) + } + + @Test + fun testAppOpsSettingsIntent_camera() { + val row = createTestNotificationRow() + val ops = ArraySet<Int>() + ops.add(AppOpsManager.OP_CAMERA) + gutsManager.startAppOpsSettingsActivity("", 0, ops, row) + val captor = argumentCaptor<Intent>() + verify(notificationActivityStarter, times(1)) + .startNotificationGutsIntent(captor.capture(), anyInt(), eq(row)) + assertEquals(Intent.ACTION_MANAGE_APP_PERMISSIONS, captor.lastValue.action) + } + + @Test + fun testAppOpsSettingsIntent_mic() { + val row = createTestNotificationRow() + val ops = ArraySet<Int>() + ops.add(AppOpsManager.OP_RECORD_AUDIO) + gutsManager.startAppOpsSettingsActivity("", 0, ops, row) + val captor = argumentCaptor<Intent>() + verify(notificationActivityStarter, times(1)) + .startNotificationGutsIntent(captor.capture(), anyInt(), eq(row)) + assertEquals(Intent.ACTION_MANAGE_APP_PERMISSIONS, captor.lastValue.action) + } + + @Test + fun testAppOpsSettingsIntent_camera_mic() { + val row = createTestNotificationRow() + val ops = ArraySet<Int>() + ops.add(AppOpsManager.OP_CAMERA) + ops.add(AppOpsManager.OP_RECORD_AUDIO) + gutsManager.startAppOpsSettingsActivity("", 0, ops, row) + val captor = argumentCaptor<Intent>() + verify(notificationActivityStarter, times(1)) + .startNotificationGutsIntent(captor.capture(), anyInt(), eq(row)) + assertEquals(Intent.ACTION_MANAGE_APP_PERMISSIONS, captor.lastValue.action) + } + + @Test + fun testAppOpsSettingsIntent_overlay() { + val row = createTestNotificationRow() + val ops = ArraySet<Int>() + ops.add(AppOpsManager.OP_SYSTEM_ALERT_WINDOW) + gutsManager.startAppOpsSettingsActivity("", 0, ops, row) + val captor = argumentCaptor<Intent>() + verify(notificationActivityStarter, times(1)) + .startNotificationGutsIntent(captor.capture(), anyInt(), eq(row)) + assertEquals(Settings.ACTION_MANAGE_APP_OVERLAY_PERMISSION, captor.lastValue.action) + } + + @Test + fun testAppOpsSettingsIntent_camera_mic_overlay() { + val row = createTestNotificationRow() + val ops = ArraySet<Int>() + ops.add(AppOpsManager.OP_CAMERA) + ops.add(AppOpsManager.OP_RECORD_AUDIO) + ops.add(AppOpsManager.OP_SYSTEM_ALERT_WINDOW) + gutsManager.startAppOpsSettingsActivity("", 0, ops, row) + val captor = argumentCaptor<Intent>() + verify(notificationActivityStarter, times(1)) + .startNotificationGutsIntent(captor.capture(), anyInt(), eq(row)) + assertEquals(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, captor.lastValue.action) + } + + @Test + fun testAppOpsSettingsIntent_camera_overlay() { + val row = createTestNotificationRow() + val ops = ArraySet<Int>() + ops.add(AppOpsManager.OP_CAMERA) + ops.add(AppOpsManager.OP_SYSTEM_ALERT_WINDOW) + gutsManager.startAppOpsSettingsActivity("", 0, ops, row) + val captor = argumentCaptor<Intent>() + verify(notificationActivityStarter, times(1)) + .startNotificationGutsIntent(captor.capture(), anyInt(), eq(row)) + assertEquals(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, captor.lastValue.action) + } + + @Test + fun testAppOpsSettingsIntent_mic_overlay() { + val row = createTestNotificationRow() + val ops = ArraySet<Int>() + ops.add(AppOpsManager.OP_RECORD_AUDIO) + ops.add(AppOpsManager.OP_SYSTEM_ALERT_WINDOW) + gutsManager.startAppOpsSettingsActivity("", 0, ops, row) + val captor = argumentCaptor<Intent>() + verify(notificationActivityStarter, times(1)) + .startNotificationGutsIntent(captor.capture(), anyInt(), eq(row)) + assertEquals(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, captor.lastValue.action) + } + + @Test + @Throws(Exception::class) + fun testInitializeNotificationInfoView_highPriority() { + val notificationInfoView: NotificationInfo = mock() + val row = spy(helper.createRow()) + val entry = row.entry + NotificationEntryHelper.modifyRanking(entry) + .setUserSentiment(NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE) + .setImportance(NotificationManager.IMPORTANCE_HIGH) + .build() + + whenever(row.isNonblockable).thenReturn(false) + whenever(highPriorityProvider.isHighPriority(entry)).thenReturn(true) + val statusBarNotification = entry.sbn + gutsManager.initializeNotificationInfo(row, notificationInfoView) + + verify(notificationInfoView) + .bindNotification( + any<PackageManager>(), + any<INotificationManager>(), + eq(onUserInteractionCallback), + eq(channelEditorDialogController), + eq(statusBarNotification.packageName), + any<NotificationChannel>(), + eq(entry), + any<NotificationInfo.OnSettingsClickListener>(), + any<NotificationInfo.OnAppSettingsClickListener>(), + any<UiEventLogger>(), + /* isDeviceProvisioned = */ eq(false), + /* isNonblockable = */ eq(false), + /* wasShownHighPriority = */ eq(true), + eq(assistantFeedbackController), + eq(metricsLogger), + ) + } + + @Test + @Throws(Exception::class) + fun testInitializeNotificationInfoView_PassesAlongProvisionedState() { + val notificationInfoView: NotificationInfo = mock() + val row = spy(helper.createRow()) + NotificationEntryHelper.modifyRanking(row.entry) + .setUserSentiment(NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE) + .build() + whenever(row.isNonblockable).thenReturn(false) + val statusBarNotification = row.entry.sbn + val entry = row.entry + + whenever(deviceProvisionedController.isDeviceProvisioned).thenReturn(true) + + gutsManager.initializeNotificationInfo(row, notificationInfoView) + + verify(notificationInfoView) + .bindNotification( + any<PackageManager>(), + any<INotificationManager>(), + eq(onUserInteractionCallback), + eq(channelEditorDialogController), + eq(statusBarNotification.packageName), + any<NotificationChannel>(), + eq(entry), + any<NotificationInfo.OnSettingsClickListener>(), + any<NotificationInfo.OnAppSettingsClickListener>(), + any<UiEventLogger>(), + /* isDeviceProvisioned = */ eq(true), + /* isNonblockable = */ eq(false), + /* wasShownHighPriority = */ eq(false), + eq(assistantFeedbackController), + eq(metricsLogger), + ) + } + + @Test + @Throws(Exception::class) + fun testInitializeNotificationInfoView_withInitialAction() { + val notificationInfoView: NotificationInfo = mock() + val row = spy(helper.createRow()) + NotificationEntryHelper.modifyRanking(row.entry) + .setUserSentiment(NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE) + .build() + whenever(row.isNonblockable).thenReturn(false) + val statusBarNotification = row.entry.sbn + val entry = row.entry + + gutsManager.initializeNotificationInfo(row, notificationInfoView) + + verify(notificationInfoView) + .bindNotification( + any<PackageManager>(), + any<INotificationManager>(), + eq(onUserInteractionCallback), + eq(channelEditorDialogController), + eq(statusBarNotification.packageName), + any<NotificationChannel>(), + eq(entry), + any<NotificationInfo.OnSettingsClickListener>(), + any<NotificationInfo.OnAppSettingsClickListener>(), + any<UiEventLogger>(), + /* isDeviceProvisioned = */ eq(false), + /* isNonblockable = */ eq(false), + /* wasShownHighPriority = */ eq(false), + eq(assistantFeedbackController), + eq(metricsLogger), + ) + } + + private fun createTestNotificationRow(): ExpandableNotificationRow { + val nb = + Notification.Builder(mContext, testNotificationChannel.id) + .setContentTitle("foo") + .setColorized(true) + .setColor(Color.RED) + .setFlag(Notification.FLAG_CAN_COLORIZE, true) + .setSmallIcon(R.drawable.sym_def_app_icon) + + try { + val row = helper.createRow(nb.build()) + NotificationEntryHelper.modifyRanking(row.entry) + .setChannel(testNotificationChannel) + .build() + return row + } catch (e: Exception) { + fail() + } + } + + private fun createTestMenuItem( + row: ExpandableNotificationRow + ): NotificationMenuRowPlugin.MenuItem { + val menuRow: NotificationMenuRowPlugin = + NotificationMenuRow(mContext, peopleNotificationIdentifier) + menuRow.createMenu(row, row.entry.sbn) + + val menuItem = menuRow.getLongpressMenuItem(mContext) + assertNotNull(menuItem) + return menuItem + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/domain/interactor/SharedNotificationContainerInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/domain/interactor/SharedNotificationContainerInteractorTest.kt index 327a07d6179f..4176d1c1f6fd 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/domain/interactor/SharedNotificationContainerInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/domain/interactor/SharedNotificationContainerInteractorTest.kt @@ -15,35 +15,55 @@ * */ +@file:OptIn(ExperimentalCoroutinesApi::class) + package com.android.systemui.statusbar.notification.stack.domain.interactor -import androidx.test.ext.junit.runners.AndroidJUnit4 +import android.platform.test.flag.junit.FlagsParameterization import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.biometrics.data.repository.fingerprintPropertyRepository import com.android.systemui.common.ui.data.repository.fakeConfigurationRepository import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.flags.DisableSceneContainer +import com.android.systemui.flags.andSceneContainer import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository import com.android.systemui.kosmos.testScope import com.android.systemui.res.R import com.android.systemui.testKosmos 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 platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters @SmallTest -@RunWith(AndroidJUnit4::class) -class SharedNotificationContainerInteractorTest : SysuiTestCase() { +@RunWith(ParameterizedAndroidJunit4::class) +class SharedNotificationContainerInteractorTest(flags: FlagsParameterization) : SysuiTestCase() { private val kosmos = testKosmos() private val testScope = kosmos.testScope private val keyguardRepository = kosmos.fakeKeyguardRepository private val configurationRepository = kosmos.fakeConfigurationRepository private val fingerprintPropertyRepository = kosmos.fingerprintPropertyRepository - private val underTest = kosmos.sharedNotificationContainerInteractor + private val underTest by lazy { kosmos.sharedNotificationContainerInteractor } + + companion object { + @JvmStatic + @Parameters(name = "{0}") + fun getParams(): List<FlagsParameterization> { + return FlagsParameterization.allCombinationsOf().andSceneContainer() + } + } + + init { + mSetFlagsRule.setFlagsParameterization(flags) + } @Test + @DisableSceneContainer fun validateConfigValues() = testScope.runTest { overrideResource(R.bool.config_use_split_notification_shade, true) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/StatusOverlayHoverListenerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/StatusOverlayHoverListenerTest.kt index 11dd587a04ad..cae990769444 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/StatusOverlayHoverListenerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/StatusOverlayHoverListenerTest.kt @@ -31,10 +31,13 @@ import android.widget.LinearLayout import androidx.annotation.ColorInt import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest -import com.android.systemui.res.R import com.android.systemui.SysuiTestCase +import com.android.systemui.res.R +import com.android.systemui.statusbar.data.repository.statusBarConfigurationControllerStore +import com.android.systemui.statusbar.data.repository.sysUiDarkIconDispatcherStore import com.android.systemui.statusbar.phone.SysuiDarkIconDispatcher.DarkChange import com.android.systemui.statusbar.policy.FakeConfigurationController +import com.android.systemui.testKosmos import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever @@ -50,16 +53,18 @@ import org.mockito.Mockito.verify @SmallTest class StatusOverlayHoverListenerTest : SysuiTestCase() { + private val kosmos = testKosmos() private val viewOverlay = mock<ViewGroupOverlay>() private val overlayCaptor = argumentCaptor<Drawable>() - private val darkDispatcher = mock<SysuiDarkIconDispatcher>() private val darkChange: MutableStateFlow<DarkChange> = MutableStateFlow(DarkChange.EMPTY) + private val darkDispatcher = kosmos.sysUiDarkIconDispatcherStore.forDisplay(context.displayId) private val factory = StatusOverlayHoverListenerFactory( context.resources, FakeConfigurationController(), - darkDispatcher + kosmos.sysUiDarkIconDispatcherStore, + kosmos.statusBarConfigurationControllerStore, ) private val view = TestableStatusContainer(context, viewOverlay) @@ -186,7 +191,7 @@ class StatusOverlayHoverListenerTest : SysuiTestCase() { /* action= */ action, /* x= */ 0f, /* y= */ 0f, - /* metaState= */ 0 + /* metaState= */ 0, ) } } diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/DarkIconDispatcher.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/DarkIconDispatcher.java index 403c7c500426..43185fd08613 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/DarkIconDispatcher.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/DarkIconDispatcher.java @@ -36,6 +36,9 @@ import java.util.Collection; public interface DarkIconDispatcher { int VERSION = 2; + /** Called when work should stop and resources should be cleaned up. */ + default void stop() {} + /** * Sets the dark area so {@link #applyDark} only affects the icons in the specified area. * diff --git a/packages/SystemUI/res-keyguard/values-or/strings.xml b/packages/SystemUI/res-keyguard/values-or/strings.xml index bb3da3ac26e6..ef629961c988 100644 --- a/packages/SystemUI/res-keyguard/values-or/strings.xml +++ b/packages/SystemUI/res-keyguard/values-or/strings.xml @@ -49,7 +49,7 @@ <string name="disable_carrier_button_text" msgid="7153361131709275746">"eSIM ଅକ୍ଷମ କରନ୍ତୁ"</string> <string name="error_disable_esim_title" msgid="3802652622784813119">"eSIMକୁ ଅକ୍ଷମ କରାଯାଇପାରିବ ନାହିଁ"</string> <string name="error_disable_esim_msg" msgid="2441188596467999327">"ଗୋଟିଏ ତ୍ରୁଟି କାରଣରୁ eSIMକୁ ଅକ୍ଷମ କରାଯାଇପାରିବ ନାହିଁ।"</string> - <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"ଏଣ୍ଟର୍"</string> + <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"ଏଣ୍ଟର"</string> <string name="kg_wrong_pattern" msgid="5907301342430102842">"ଭୁଲ ପାଟର୍ନ"</string> <string name="kg_wrong_pattern_try_again" msgid="3603524940234151881">"ଭୁଲ ପାଟର୍ନ। ପୁଣିଚେଷ୍ଟା କର।"</string> <string name="kg_wrong_password" msgid="4143127991071670512">"ଭୁଲ ପାସ୍ୱର୍ଡ"</string> diff --git a/packages/SystemUI/res/drawable/ic_qs_notes.xml b/packages/SystemUI/res/drawable/ic_qs_notes.xml new file mode 100644 index 000000000000..6c1d2e49369c --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_notes.xml @@ -0,0 +1,23 @@ +<!-- + 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 Lice/packages/SystemUI/res/drawable/ic_qs_notes.xmlnse. + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960" + android:tint="?attr/colorControlNormal"> + <path android:fillColor="@android:color/white" android:pathData="M499,673L834,338Q834,338 834,338Q834,338 834,338L782,286Q782,286 782,286Q782,286 782,286L447,621L499,673ZM238,760Q138,755 89,718Q40,681 40,611Q40,546 93.5,505.5Q147,465 242,457Q281,454 300.5,444.5Q320,435 320,418Q320,392 290.5,379Q261,366 193,360L200,280Q303,288 351.5,321.5Q400,355 400,418Q400,471 361.5,501Q323,531 248,537Q184,542 152,560.5Q120,579 120,611Q120,646 148,661.5Q176,677 242,680L238,760ZM518,767L353,602L735,220Q755,200 782.5,200Q810,200 830,220L900,290Q920,310 920,337.5Q920,365 900,385L518,767ZM359,800Q342,804 329,791Q316,778 320,761L353,602L518,767L359,800Z"/> +</vector> diff --git a/packages/SystemUI/res/layout/screen_record_dialog.xml b/packages/SystemUI/res/layout/screen_record_dialog.xml deleted file mode 100644 index dc560bf2fab7..000000000000 --- a/packages/SystemUI/res/layout/screen_record_dialog.xml +++ /dev/null @@ -1,164 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2020 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <!-- Scrollview is necessary to fit everything in landscape layout --> - <ScrollView - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="@dimen/dialog_side_padding" - android:paddingEnd="@dimen/dialog_side_padding" - android:paddingTop="@dimen/dialog_top_padding" - android:paddingBottom="@dimen/dialog_bottom_padding" - android:orientation="vertical"> - - <!-- Header --> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:gravity="center"> - <ImageView - android:layout_width="@dimen/screenrecord_logo_size" - android:layout_height="@dimen/screenrecord_logo_size" - android:src="@drawable/ic_screenrecord" - android:tint="@color/screenrecord_icon_color"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="@style/TextAppearance.Dialog.Title" - android:fontFamily="@*android:string/config_headlineFontFamily" - android:text="@string/screenrecord_permission_dialog_title" - android:layout_marginTop="22dp" - android:layout_marginBottom="15dp"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/screenrecord_permission_dialog_warning_entire_screen" - android:textAppearance="@style/TextAppearance.Dialog.Body.Message" - android:gravity="center" - android:layout_marginBottom="20dp"/> - - <!-- Options --> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <ImageView - android:layout_width="@dimen/screenrecord_option_icon_size" - android:layout_height="@dimen/screenrecord_option_icon_size" - android:src="@drawable/ic_mic_26dp" - android:tint="?android:attr/textColorSecondary" - android:layout_gravity="center" - android:layout_weight="0" - android:layout_marginEnd="@dimen/screenrecord_option_padding"/> - <Spinner - android:id="@+id/screen_recording_options" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:minHeight="48dp" - android:layout_weight="1" - android:popupBackground="@drawable/screenrecord_spinner_background" - android:textColor="?androidprv:attr/materialColorOnSurface" - android:dropDownWidth="274dp" - android:prompt="@string/screenrecord_audio_label"/> - <Switch - android:layout_width="wrap_content" - android:minWidth="48dp" - android:layout_height="48dp" - android:layout_weight="0" - android:layout_gravity="end" - android:contentDescription="@string/screenrecord_audio_label" - android:id="@+id/screenrecord_audio_switch" - style="@style/ScreenRecord.Switch"/> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginTop="@dimen/screenrecord_option_padding"> - <ImageView - android:layout_width="@dimen/screenrecord_option_icon_size" - android:layout_height="@dimen/screenrecord_option_icon_size" - android:layout_weight="0" - android:src="@drawable/ic_touch" - android:tint="?android:attr/textColorSecondary" - android:layout_gravity="center" - android:layout_marginEnd="@dimen/screenrecord_option_padding"/> - <TextView - android:layout_width="0dp" - android:layout_height="wrap_content" - android:minHeight="48dp" - android:layout_weight="1" - android:layout_gravity="fill_vertical" - android:gravity="center_vertical" - android:text="@string/screenrecord_taps_label" - android:textAppearance="?android:attr/textAppearanceMedium" - android:fontFamily="@*android:string/config_headlineFontFamily" - android:textColor="?androidprv:attr/materialColorOnSurface" - android:importantForAccessibility="no"/> - <Switch - android:layout_width="wrap_content" - android:minWidth="48dp" - android:layout_height="48dp" - android:layout_weight="0" - android:id="@+id/screenrecord_taps_switch" - android:contentDescription="@string/screenrecord_taps_label" - style="@style/ScreenRecord.Switch"/> - </LinearLayout> - </LinearLayout> - - <!-- Buttons --> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginTop="36dp"> - <TextView - android:id="@+id/button_cancel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_gravity="start" - android:text="@string/cancel" - style="@style/Widget.Dialog.Button.BorderButton" /> - <Space - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1"/> - - <TextView - android:id="@+id/button_start" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_gravity="end" - android:text="@string/screenrecord_continue" - style="@style/Widget.Dialog.Button" /> - </LinearLayout> - </LinearLayout> - </ScrollView> -</LinearLayout>
\ 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 c091cbf6c062..2f2981b33fec 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Neem jou skerm op?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Neem een app op"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Neem hele skerm op"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Neem hele skerm op: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Wanneer jy jou hele skerm opneem, word enigiets wat op jou skerm wys, opgeneem. Wees dus versigtig met dinge soos wagwoorde, betalingbesonderhede, boodskappe, foto’s, en oudio en video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Wanneer jy ’n app opneem, word enigiets wat in daardie app gewys of gespeel word, opgeneem. Wees dus versigtig met dinge soos wagwoorde, betalingbesonderhede, boodskappe, foto’s, en oudio en video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Neem skerm op"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Jy neem tans <xliff:g id="APP_NAME">%1$s</xliff:g> op"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Stop opname"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Deel tans skerm"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Inhoud word gedeel"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Hou op om skerm te deel?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Hou op deel?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Jy deel tans jou hele skerm met <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Jy deel tans jou hele skerm met ’n app"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Jy deel tans <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Jy deel tans ’n app"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Jy deel tans met ’n app"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Hou op deel"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Skerm word tans uitgesaai"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Hou op uitsaai?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Sluitskermlegstukke"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Enigiemand kan legstukke op jou sluitskerm sien, selfs al is jou tablet gesluit."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ontkies legstuk"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Verminder hoogte"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Vermeerder hoogte"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Sluitskermlegstukke"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Om ’n app met ’n legstuk oop te maak, sal jy moet verifieer dat dit jy is. Hou ook in gedagte dat enigeen dit kan bekyk, selfs wanneer jou tablet gesluit is. Sommige legstukke is moontlik nie vir jou sluitskerm bedoel nie en dit kan onveilig wees om dit hier by te voeg."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Het dit"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Vee alles uit"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Bestuur"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Geskiedenis"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Kennisgewinginstellings"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Kennisgewinggeskiedenis"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Nuut"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Stil"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Kennisgewings"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Begin nou"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Geen kennisgewings nie"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Geen nuwe kennisgewings nie"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Kennisgewingdemping is aan"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Jou toestelvolume en -waarskuwings word outomaties vir tot 2 minute lank verminder wanneer jy te veel kennisgewings op een slag kry."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Skakel af"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Ontsluit om ouer kennisgewings te sien"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Vasgestel"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Kopnasporing"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Tik om luiermodus te verander"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"demp"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"ontdemp"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibreer"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Huidige app"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Toeganklikheid"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Kortpadsleutels"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Pasmaak kortpadsleutels"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Soekkortpaaie"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Geen soekresultate nie"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Vou ikoon in"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Pasmaak"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Klaar"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Vou ikoon uit"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"of"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Sleephandvatsel"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Verskaf deur apps"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Vertoon"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Onbekend"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Stel teëls terug"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Stel teëls terug na hul oorspronklike volgorde en groottes?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Stel alle teëls terug?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Alle Kitsinstellingsteëls sal na die toestel se oorspronklike instellings teruggestel word"</string> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index af2971b2ec81..129c908ab539 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"ማያ ገፅዎን ይቀዳሉ?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"አንድ መተግበሪያ ቅዳ"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"መላው ማያ ገፅን ቅረጽ"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"ሙሉ ማያ ገፅን ቅዳ፦ %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"መላው ማያ ገፅዎን በሚቀዱበት ጊዜ፣ በማያ ገፅዎ ላይ የሚታየው ማንኛውም ነገር ይቀዳል። ስለዚህ እንደ የይለፍ ቃላት፣ የክፍያ ዝርዝሮች፣ መልዕክቶች፣ ፎቶዎች እና ኦዲዮ እና ቪድዮ ላሉ ነገሮች ጥንቃቄ ያድርጉ።"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"መተግበሪያን ሲቀዱ በዚያ መተግበሪያ ውስጥ የሚታይ ወይም የሚጫወት ማንኛውም ነገር ይቀዳል። ስለዚህ እንደ የይለፍ ቃላት፣ የክፍያ ዝርዝሮች፣ መልዕክቶች፣ ፎቶዎች እና ኦዲዮ እና ቪድዮ ላሉ ነገሮች ጥንቃቄ ያድርጉ።"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"ማያ ገፅን ቅረጽ"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"በአሁኑ ጊዜ <xliff:g id="APP_NAME">%1$s</xliff:g> በመቅዳት ላይ ነዎት"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"መቅረጽ አቁም"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"ማያ ገፅን በማጋራት ላይ"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"ይዘት በማጋራት ላይ"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"ማያ ገፅን ማጋራት ይቁም?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"ማጋራት ይቁም?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"በአሁኑ ጊዜ ሙሉ ማያ ገፅዎን ከ<xliff:g id="HOST_APP_NAME">%1$s</xliff:g> ጋር በማጋራት ላይ ነዎት"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"በአሁኑ ጊዜ መሉ ማያ ገፅዎን ከመተግበሪያ ጋር በማጋራት ላይ ነዎት"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"በአሁኑ ጊዜ <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> በማጋራት ላይ ነዎት"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"በአሁኑ ጊዜ መተግበሪያ በማጋራት ላይ ነዎት"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"በአሁኑ ጊዜ በመተግበሪያ በማጋራት ላይ ነዎት"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"ማጋራት አቁም"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"ማያ ገፅን cast በማድረግ ላይ"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"cast ማድረግ ይቁም?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"የማያ ገፅ ቁልፍ ምግብሮች"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"የእርስዎ ጡባዊ ቁልፍ ተቆልፎ ቢሆን እንኳን ማንኛውም ሰው በማያ ገፅ ቁልፍዎ ላይ ምግብሮችን ማየት ይችላል።"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ምግብር አትምረጥ"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"ቁመት ቀንስ"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"ቁመት ጨምር"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"የማያ ገፅ ቁልፍ ምግብሮች"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ምግብር በመጠቀም መተግበሪያ ለመክፈት እርስዎ መሆንዎን ማረጋገጥ አለብዎት። እንዲሁም የእርስዎ ጡባዊ በተቆለፈበት ጊዜ እንኳን ማንኛውም ሰው እነሱን ማየት እንደሚችል ከግምት ውስጥ ያስገቡ። አንዳንድ ምግብሮች ለማያ ገፅ ቁልፍዎ የታሰቡ ላይሆኑ ይችላሉ እና እዚህ ለማከል አስተማማኝ ላይሆኑ ይችላሉ።"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ገባኝ"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"ሁሉንም አጽዳ"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"ያቀናብሩ"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"ታሪክ"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"የማሳወቂያ ቅንብሮች"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"የማሳወቂያ ታሪክ"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"አዲስ"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"ጸጥ ያለ"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"ማሳወቂያዎች"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"አሁን ጀምር"</string> <string name="empty_shade_text" msgid="8935967157319717412">"ምንም ማሳወቂያ የለም"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"ምንም አዲስ ማሳወቂያዎች የሉም"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"የማሳወቂያ ረጋ ማለት በርቷል"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"በአንድ ጊዜ ብዙ ማሳወቂያዎችን ሲያገኙ የመሣሪያዎ ድምፅ እና ማንቂያዎች እስከ 2 ደቂቃዎች ድረስ በራስ-ሰር ይቀንሳሉ።"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"አጥፋ"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"የቆዩ ማሳወቂያዎችን ለማየት ይክፈቱ"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"ቋሚ"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"የጭንቅላት ክትትል"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"የደዋይ ሁነታን ለመቀየር መታ ያድርጉ"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"ድምጸ-ከል አድርግ"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"ድምጸ-ከልን አንሳ"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"ንዘር"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"የአሁን መተግበሪያ"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ተደራሽነት"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"የቁልፍ ሰሌዳ አቋራጮች"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"የቁልፍ ሰሌዳ አቋራጮችን ያብጁ"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"የፍለጋ አቋራጮች"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ምንም የፍለጋ ውጤቶች የሉም"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"መሰብሰቢያ አዶ"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"አብጅ"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ተከናውኗል"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"መዘርጊያ አዶ"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ወይም"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"መያዣ ይጎትቱ"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"በመተግበሪያዎች የቀረበ"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ማሳያ"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"ያልታወቀ"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"ሰቆችን ዳግም ያስጀምሩ"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"ሰቆችን ወደ የመጀመሪያው ቅደም ተከተል እና መጠኖቻቸው ይመለሱ?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"ሁሉም ሰቆች ዳግም ይጀምሩ?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"ሁሉም የፈጣን ቅንብሮች ሰቆች ወደ የመሣሪያው የመጀመሪያ ቅንብሮች ዳግም ይጀምራሉ"</string> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 4ebac5a86ec1..48fc91377a17 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"هل تريد تسجيل محتوى الشاشة؟"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"تسجيل محتوى تطبيق واحد"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"تسجيل محتوى الشاشة بالكامل"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"تسجيل محتوى الشاشة بالكامل: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"أثناء تسجيل محتوى الشاشة بالكامل، يتم تسجيل كل المحتوى المعروض على شاشتك. لذا يُرجى توخي الحذر بشأن المعلومات، مثل كلمات المرور وتفاصيل الدفع والرسائل والصور وملفات الصوت والفيديو."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"أثناء تسجيل محتوى تطبيق، يتم تسجيل أي محتوى يتم عرضه أو تشغيله في ذلك التطبيق. لذا يُرجى توخي الحذر بشأن المعلومات، مثل كلمات المرور وتفاصيل الدفع والرسائل والصور وملفات الصوت والفيديو."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"تسجيل محتوى الشاشة"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"يتم حاليًا تسجيل محتوى \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"إيقاف التسجيل"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"جارِ مشاركة محتوى الشاشة"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"مشاركة المحتوى"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"هل تريد إيقاف مشاركة الشاشة؟"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"هل تريد إيقاف المشاركة؟"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"تتم حاليًا مشاركة محتوى الشاشة بأكمله مع \"<xliff:g id="HOST_APP_NAME">%1$s</xliff:g>\""</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"تتم حاليًا مشاركة محتوى الشاشة بأكمله مع تطبيق"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"تتم حاليًا مشاركة محتوى \"<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>\""</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"تتم حاليًا مشاركة محتوى تطبيق"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"تتم حاليًا مشاركة المحتوى مع تطبيق"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"إيقاف المشاركة"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"جارٍ بث محتوى الشاشة"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"هل تريد إيقاف البث؟"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"التطبيقات المصغّرة المصمَّمة لشاشة القفل"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"يمكن للجميع رؤية التطبيقات المصغّرة على شاشة القفل، حتى في حال قفل الجهاز اللوحي."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"إلغاء اختيار التطبيق المصغّر"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"تقليل الارتفاع"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"زيادة الارتفاع"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"التطبيقات المصغّرة المصمَّمة لشاشة القفل"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"لفتح تطبيق باستخدام تطبيق مصغَّر، عليك إثبات هويتك. يُرجى ملاحظة أنّ أي شخص يمكنه الاطّلاع محتوى التطبيقات المصغَّرة، حتى وإن كان جهازك اللوحي مُقفلاً. بعض التطبيقات المصغّرة قد لا تكون مُصمَّمة لإضافتها إلى شاشة القفل، وقد يكون هذا الإجراء غير آمن."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"حسنًا"</string> @@ -583,12 +577,10 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"محو الكل"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"إدارة"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"السجلّ"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"إعدادات الإشعارات"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"سجلّ الإشعارات"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"الإشعارات الجديدة"</string> - <string name="notification_section_header_gentle" msgid="6804099527336337197">"صامتة"</string> + <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> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"البدء الآن"</string> <string name="empty_shade_text" msgid="8935967157319717412">"ما مِن إشعارات"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"ما مِن إشعارات جديدة"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"ميزة \"تخفيض الإشعارات الصوتية والاهتزاز\" مُفعَّلة"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"يتم تلقائيًا خفض مستوى صوت جهازك والتنبيهات لمدة تصل إلى دقيقتين عند تلقّي إشعارات كثيرة في آنٍ واحد."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"إيقاف"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"افتَح قفل الشاشة لعرض الإشعارات الأقدم."</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"تفعيل"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"تتبُّع حركة الرأس"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"انقر لتغيير وضع الرنين."</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"كتم الصوت"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"إعادة الصوت"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"اهتزاز"</string> @@ -765,7 +760,7 @@ <string name="inline_done_button" msgid="6043094985588909584">"تمّ"</string> <string name="inline_ok_button" msgid="603075490581280343">"تطبيق"</string> <string name="inline_turn_off_notifications" msgid="8543989584403106071">"إيقاف الإشعارات"</string> - <string name="notification_silence_title" msgid="8608090968400832335">"صامتة"</string> + <string name="notification_silence_title" msgid="8608090968400832335">"إشعارات صامتة"</string> <string name="notification_alert_title" msgid="3656229781017543655">"تلقائية"</string> <string name="notification_automatic_title" msgid="3745465364578762652">"تلقائي"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"بدون صوت أو اهتزاز"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"التطبيق الحالي"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"تسهيل الاستخدام"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"اختصارات لوحة المفاتيح"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"اختصارات طلبات البحث"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"تخصيص اختصارات لوحة المفاتيح"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"البحث في الاختصارات"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ما مِن نتائج بحث"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"رمز التصغير"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"تخصيص"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"تم"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"رمز التوسيع"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"أو"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"مقبض السحب"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"مقدَّمة من التطبيقات"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"العرض"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"غير معروفة"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"إعادة ضبط المربّعات"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"هل تريد إعادة ضبط المربّعات إلى ترتيبها وحجمها الأصليَّين؟"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"هل تريد إعادة ضبط كل المربّعات؟"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"ستتم إعادة ضبط جميع مربّعات \"الإعدادات السريعة\" إلى الإعدادات الأصلية للجهاز"</string> </resources> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index 85517f3865d2..96446c545561 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"আপোনাৰ স্ক্ৰীনখন ৰেকৰ্ড কৰিবনে?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"এটা এপ্ ৰেকৰ্ড কৰক"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"গোটেই স্ক্ৰীনখন ৰেকৰ্ড কৰক"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"গোটেই স্ক্ৰীনখন ৰেকৰ্ড কৰক: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"আপুনি গোটেই স্ক্ৰীনখন ৰেকৰ্ডিং কৰিলে, আপোনাৰ স্ক্ৰীনখনত দেখুওৱা যিকোনো বস্তু ৰেকৰ্ড কৰা হয়। গতিকে, পাছৱৰ্ড, পৰিশোধৰ সবিশেষ, বাৰ্তা, ফট’ আৰু অডিঅ’ আৰু ভিডিঅ’ৰ ক্ষেত্ৰত সাৱধান হওক।"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"আপুনি কোনো এপ্ ৰেকৰ্ড কৰিলে, সেই এপত দেখুওৱা বা প্লে’ কৰা যিকোনো বস্তু ৰেকৰ্ড কৰা হয়। গতিকে, পাছৱৰ্ড, পৰিশোধৰ সবিশেষ, বাৰ্তা, ফট’ আৰু অডিঅ’ আৰু ভিডিঅ’ৰ ক্ষেত্ৰত সাৱধান হওক।"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"স্ক্ৰীনখন ৰেকৰ্ড কৰক"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"বৰ্তমান আপুনি <xliff:g id="APP_NAME">%1$s</xliff:g> ৰেকৰ্ড কৰি আছে"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"ৰেকৰ্ডিং বন্ধ কৰক"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"স্ক্ৰীন শ্বেয়াৰ কৰি থকা হৈছে"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"সমল শ্বেয়াৰ কৰি থকা হৈছে"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"স্ক্ৰীন শ্বেয়াৰ কৰা বন্ধ কৰিবনে?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"শ্বেয়াৰ কৰাটো বন্ধ কৰিবনে?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"বৰ্তমান আপুনি আপোনাৰ গোটেই স্ক্ৰীনখন <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>ৰ সৈতে শ্বেয়াৰ কৰি আছে"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"বৰ্তমান আপুনি আপোনাৰ গোটেই স্ক্ৰীনখন এটা এপৰ সৈতে শ্বেয়াৰ কৰি আছে"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"বৰ্তমান আপুনি <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> শ্বেয়াৰ কৰি আছে"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"বৰ্তমান আপুনি এটা এপ্ শ্বেয়াৰ কৰি আছে"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"বৰ্তমান আপুনি এটা এপৰ সৈতে শ্বেয়াৰ কৰি আছে"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"শ্বেয়াৰ কৰা বন্ধ কৰক"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"স্ক্ৰীন কাষ্ট কৰি থকা হৈছে"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"কাষ্ট কৰা বন্ধ কৰিবনে?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"লক স্ক্ৰীনৰ ৱিজেট"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"আপোনাৰ টেবলেটটো লক কৰি ৰাখিলেও যিকোনো লোকে আপোনাৰ লক স্ক্ৰীনত ৱিজেট চাব পাৰে।"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ৱিজেট বাছনিৰ পৰা আঁতৰাওক"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"উচ্চতা হ্ৰাস কৰক"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"উচ্চতা বৃদ্ধি কৰক"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"লক স্ক্ৰীন ৱিজেট"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"এটা ৱিজেট ব্যৱহাৰ কৰি কোনো এপ্ খুলিবলৈ, এয়া আপুনিয়েই বুলি সত্যাপন পৰীক্ষা কৰিব লাগিব। লগতে, মনত ৰাখিব যে যিকোনো লোকেই সেইবোৰ চাব পাৰে, আনকি আপোনাৰ টেবলেটটো লক হৈ থাকিলেও। কিছুমান ৱিজেট হয়তো আপোনাৰ লক স্ক্ৰীনৰ বাবে কৰা হোৱা নাই আৰু ইয়াত যোগ কৰাটো অসুৰক্ষিত হ’ব পাৰে।"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"বুজি পালোঁ"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"এতিয়াই আৰম্ভ কৰক"</string> <string name="empty_shade_text" msgid="8935967157319717412">"কোনো জাননী নাই"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"কোনো নতুন জাননী নাই"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"জাননী কুলডাউন কৰাটো অন আছে"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"আপুনি একেলগে বহুতো জাননী পালে আপোনাৰ ডিভাইচটোৰ ভলিউম আৰু সতৰ্কবাৰ্তা স্বয়ংক্ৰিয়ভাৱে ২ মিনিটলৈকে কমোৱা হয়।"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"অফ কৰক"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"পুৰণি জাননী চবলৈ আনলক কৰক"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"নিৰ্ধাৰিত"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"হে’ড ট্ৰেকিং"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"ৰিংগাৰ ম’ড সলনি কৰিবলৈ টিপক"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"মিউট কৰক"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"আনমিউট কৰক"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"কম্পন কৰক"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"বৰ্তমানৰ এপ্"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"সাধ্য সুবিধা"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"কীব’ৰ্ডৰ শ্বৰ্টকাট"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"কীব’ৰ্ডৰ শ্বৰ্টকাট কাষ্টমাইজ কৰক"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"সন্ধানৰ শ্বৰ্টকাট"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"সন্ধানৰ কোনো ফলাফল নাই"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"সংকোচন কৰাৰ চিহ্ন"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"কাষ্টমাইজ কৰক"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"হ’ল"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"বিস্তাৰ কৰাৰ চিহ্ন"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"অথবা"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ড্ৰেগ হেণ্ডেল"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"এপে প্ৰদান কৰা"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ডিছপ্লে’"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"অজ্ঞাত"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"টাইল ৰিছেট কৰক"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"টাইলসমূহ সেইসমূহৰ মূল ক্ৰম আৰু আকাৰলৈ ৰিছেট কৰিবনে?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"আটাইবোৰ টাইল ৰিছেট কৰিবনে?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"আটাইবোৰ ক্ষিপ্ৰ ছেটিঙৰ টাইল ডিভাইচৰ মূল ছেটিংছলৈ ৰিছেট হ’ব"</string> </resources> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index f08724a81449..2932b1950909 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Ekran qeydə alınsın?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Bir tətbiqi qeydə alın"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Bütün ekranı qeydə alın"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Bütün ekranı qeydə alın: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Bütün ekranı qeydə alarkən ekranda göstərilən bütün kontent qeydə alınır. Parol, ödəniş detalları, mesaj, foto, habelə audio və video kimi məlumatlarla bağlı diqqətli olun."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Tətbiq qeydə aldıqda həmin tətbiqdə göstərilən və ya işə salınan bütün kontent qeydə alınır. Parol, ödəniş detalları, mesaj, foto, habelə audio və video kimi məlumatlarla bağlı diqqətli olun."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Ekranı qeydə alın"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Hazırda <xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqini çəkirsiniz"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Qeydəalmanı dayandırın"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Ekran paylaşılır"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Kontent paylaşmaq"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Ekran paylaşımı dayandırılsın?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Paylaşım dayandırılsın?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Hazırda bütün ekranı <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> ilə paylaşırsınız"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Hazırda bütün ekranı tətbiq ilə paylaşırsınız"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Hazırda <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> paylaşırsınız"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Hazırda tətbiq paylaşırsınız"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Hazırda tətbiqlə paylaşırsınız"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Paylaşımı dayandırın"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Ekran yayımlanır"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Yayım dayandırılsın?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Kilid ekranı vidcetləri"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Planşet kilidli olsa belə, hər kəs kilid ekranınızdakı vidcetlərə baxa bilər."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"vidcet seçimini silin"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Hündürlüyü azaldın"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Hündürlüyü artırın"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Kilid ekranı vidcetləri"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Vidcetdən istifadə edərək tətbiqi açmaq üçün kimliyi doğrulamalısınız. Planşet kilidli olsa da, hər kəs vidcetlərə baxa bilər. Bəzi vidcetlər kilid ekranı üçün nəzərdə tutulmayıb və bura əlavə etmək təhlükəli ola bilər."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Anladım"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Hamısını silin"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"İdarə edin"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Tarixçə"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Bildiriş ayarları"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Bildiriş tarixçəsi"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Yeni"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Səssiz"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Bildirişlər"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"İndi başlayın"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Heç bir bildiriş yoxdur"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Yeni bildiriş yoxdur"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Bildiriş gözləmə müddəti yanılıdır"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Eyni anda çox bildiriş aldıqda cihazın səs və xəbərdarlıqları avtomatik 2 dəqiqəyə qədər azalır."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Deaktiv edin"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Köhnə bildirişləri görmək üçün kilidi açın"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Sabit"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Baş izləməsi"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Zəng rejimini dəyişmək üçün toxunun"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"susdurun"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"səssiz rejimdən çıxarın"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrasiya"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Cari tətbiq"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Xüsusi imkanlar"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Klaviatura qısayolları"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Klaviatura qısayollarını fərdiləşdirin"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Axtarış qısayolları"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Axtarış nəticəsi yoxdur"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"İkonanı yığcamlaşdırın"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Fərdiləşdirin"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Hazırdır"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"İkonanı genişləndirin"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"və ya"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Dəstəyi çəkin"</string> @@ -1435,14 +1427,14 @@ <string name="launch_keyboard_touchpad_tutorial_notification_title" msgid="1940023776496198762">"Klaviatura və taçpeddən istifadə edərək hərəkət edin"</string> <string name="launch_keyboard_touchpad_tutorial_notification_content" msgid="1780725168171929365">"Taçped jestləri, klaviatura qısayolları və s. haqqında öyrənin"</string> <string name="touchpad_tutorial_back_gesture_button" msgid="3104716365403620315">"Geri qayıdın"</string> - <string name="touchpad_tutorial_home_gesture_button" msgid="8023973153559885624">"Əsas səhifəyə qayıdın"</string> + <string name="touchpad_tutorial_home_gesture_button" msgid="8023973153559885624">"Əsas səhifəyə keçin"</string> <string name="touchpad_tutorial_recent_apps_gesture_button" msgid="8919227647650347359">"Son tətbiqlərə baxın"</string> <string name="touchpad_tutorial_done_button" msgid="176168488821755503">"Hazırdır"</string> <string name="touchpad_back_gesture_action_title" msgid="7199067250654332735">"Geri qayıdın"</string> <string name="touchpad_back_gesture_guidance" msgid="5352221087725906542">"Taçpeddə üç barmaqla sola və ya sağa sürüşdürün"</string> <string name="touchpad_back_gesture_success_title" msgid="7370719098633023496">"Əla!"</string> <string name="touchpad_back_gesture_success_body" msgid="2324724953720741719">"Geri getmə jestini tamamladınız."</string> - <string name="touchpad_home_gesture_action_title" msgid="8885107349719257882">"Ana ekrana qayıdın"</string> + <string name="touchpad_home_gesture_action_title" msgid="8885107349719257882">"Əsas səhifəyə keçin"</string> <string name="touchpad_home_gesture_guidance" msgid="4178219118381915899">"Taçpeddə üç barmaqla yuxarı sürüşdürün"</string> <string name="touchpad_home_gesture_success_title" msgid="3648264553645798470">"Əla!"</string> <string name="touchpad_home_gesture_success_body" msgid="2590690589194027059">"Əsas səhifəyə keçid jestini tamamladınız"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Tətbiqlər tərəfindən təmin edilir"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Displey"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Naməlum"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Mozaikləri sıfırlayın"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Mozaiklər orijinal sıra və ölçülərinə sıfırlansın?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Bütün mozaiklər sıfırlansın?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Bütün Sürətli Ayarlar mozaiki cihazın orijinal ayarlarına sıfırlanacaq"</string> </resources> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index f5096915e261..7b571b93f1ad 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Želite da snimite ekran?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Snimi jednu aplikaciju"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Snimi ceo ekran"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Snimite ceo ekran: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Kada snimate ceo ekran, snima se sve što je na njemu. Zato pazite na lozinke, informacije o plaćanju, poruke, slike, audio i video sadržaj."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Kada snimate aplikaciju, snima se sav sadržaj koji se prikazuje ili pušta u njoj. Zato pazite na lozinke, informacije o plaćanju, poruke, slike, audio i video sadržaj."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Snimi ekran"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Trenutno snimate: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Zaustavi snimanje"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Ekran se deli"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Deljenje sadržaja"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Želite da zaustavite deljenje ekrana?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Želite da zaustavite deljenje?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Trenutno delite ceo ekran sa: <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Trenutno delite ceo ekran sa aplikacijom"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Trenutno delite: <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Trenutno delite aplikaciju"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Trenutno delite sa aplikacijom"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Zaustavi deljenje"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Prebacuje se ekran"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Želite da zaustavite prebacivanje?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Vidžeti za zaključani ekran"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Svi mogu da vide vidžete na zaključanom ekranu, čak i kada je tablet zaključan."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"poništi izbor vidžeta"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Smanji visinu"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Povećaj visinu"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Vidžeti za zaključani ekran"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Da biste otvorili aplikaciju koja koristi vidžet, treba da potvrdite da ste to vi. Imajte u vidu da svako može da ga vidi, čak i kada je tablet zaključan. Neki vidžeti možda nisu namenjeni za zaključani ekran i možda nije bezbedno da ih tamo dodate."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Važi"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Započni"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Nema obaveštenja"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Nema novih obaveštenja"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Utišavanje obaveštenja je uključeno"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Zvuk i broj upozorenja na uređaju se automatski smanjuju na 2 minuta kada dobijete previše obaveštenja."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Isključi"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Otključajte za starija obaveštenja"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fiksno"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Praćenje glave"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Dodirnite da biste promenili režim zvona"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"isključite zvuk"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"uključite zvuk"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibracija"</string> @@ -814,7 +811,7 @@ <string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string> <string name="keyboard_key_space" msgid="6980847564173394012">"Razmak"</string> <string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string> - <string name="keyboard_key_backspace" msgid="4095278312039628074">"Taster za brisanje unazad"</string> + <string name="keyboard_key_backspace" msgid="4095278312039628074">"Backspace"</string> <string name="keyboard_key_media_play_pause" msgid="8389984232732277478">"Taster za reprodukciju/pauziranje"</string> <string name="keyboard_key_media_stop" msgid="1509943745250377699">"Taster za zaustavljanje"</string> <string name="keyboard_key_media_next" msgid="8502476691227914952">"Taster Sledeća"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Aktuelna aplikacija"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Pristupačnost"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Tasterske prečice"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Prečice pretrage"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Prilagodite tasterske prečice"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pretražite prečice"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nema rezultata pretrage"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona za skupljanje"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Prilagodi"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Gotovo"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona za proširivanje"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ili"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Marker za prevlačenje"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Obezbeđuju aplikacije"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Ekran"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Nepoznato"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Resetujte pločice"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Želite da resetujete pločice na prvobitni redosled i veličine?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Želite da resetujete sve pločice?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Sve pločice Brzih podešavanja će se resetovati na prvobitna podešavanja uređaja"</string> </resources> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index bc0e2d189c02..2d2a010579bc 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Запісаць экран?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Запісаць адну праграму"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Запісаць змесціва ўсяго экрана"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Запісваць экран цалкам: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Пры запісе ўсяго экрана запісваецца ўсё, што паказваецца на экране. Таму прадухіліце паказ пароляў, плацежных рэквізітаў, паведамленняў, фота, відэа і аўдыя."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Пры запісе праграмы запісваецца ўсё, што паказваецца або прайграецца ў гэтай праграме. Таму прадухіліце паказ пароляў, плацежных рэквізітаў, паведамленняў, фота, відэа і аўдыя."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Запісаць экран"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Зараз вы запісваеце змесціва праграмы \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Спыніць запіс"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Экран абагульваецца"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Абагульваецца змесціва"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Спыніць абагульванне экрана?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Спыніць абагульванне?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Зараз вы абагульваеце змесціва ўсяго экрана з праграмай \"<xliff:g id="HOST_APP_NAME">%1$s</xliff:g>\""</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Зараз вы абагульваеце змесціва ўсяго экрана з праграмай"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Зараз вы абагульваеце змесціва праграмы \"<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>\""</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Зараз вы абагульваеце змесціва праграмы"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Зараз вы абагульваеце змесціва з праграмай"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Спыніць абагульванне"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Экран трансліруецца"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Спыніць трансляцыю?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Віджэты на экране блакіроўкі"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Віджэты на экране блакіроўкі будуць бачныя, нават калі планшэт заблакіраваны."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"скасаваць выбар віджэта"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Паменшыць вышыню"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Павялічыць вышыню"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Віджэты на экране блакіроўкі"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Каб адкрыць праграму з дапамогай віджэта, вам неабходна будзе пацвердзіць сваю асобу. Таксама памятайце, што такія віджэты могуць пабачыць іншыя людзі, нават калі экран планшэта заблакіраваны. Некаторыя віджэты могуць не падыходзіць для выкарыстання на экране блакіроўкі, і дадаваць іх сюды можа быць небяспечна."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Зразумела"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Ачысціць усё"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Кіраваць"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Гісторыя"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Налады апавяшчэнняў"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Гісторыя апавяшчэнняў"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Новае"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Без гуку"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Апавяшчэнні"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Пачаць зараз"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Апавяшчэнняў няма"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Няма новых апавяшчэнняў"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Зніжэнне гучнасці апавяшчэнняў уключана"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Калі адначасова прыходзіць шмат апавяшчэнняў, гук прылады і абвестак зніжаецца на час да 2 хвілін."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Выключыць"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Разблакіруйце, каб убачыць усе апавяшчэнні"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Замацавана"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Адсочваць рух галавы"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Націсніце, каб змяніць рэжым званка"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"выключыць гук"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"уключыць гук"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"вібрыраваць"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Бягучая праграма"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Спецыяльныя магчымасці"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Спалучэнні клавіш"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Наладзіць спалучэнні клавіш"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Пошук спалучэнняў клавіш"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Няма вынікаў пошуку"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Значок \"Згарнуць\""</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Наладзіць"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Гатова"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Значок \"Разгарнуць\""</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"або"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Маркер перацягвання"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Забяспечваюцца праграмамі"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Экран"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Невядома"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Скінуць пліткі"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Скінуць пліткі да зыходнага парадку і памеру?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Скінуць усе пліткі?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Усе пліткі хуткіх налад будуць скінуты да першапачатковых налад прылады"</string> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 2ee1f5f0f21e..c2d5b9e0e1b9 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Да се записва ли екранът?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Записване на едно приложение"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Записване на целия екран"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Записване на целия екран: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Когато записвате целия си екран, се записва всичко, което се показва на него. Затова бъдете внимателни с неща като пароли, подробности за начини на плащане, съобщения, снимки, аудио и видео."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Когато записвате приложение, се записва всичко, което се показва или възпроизвежда в него. Затова бъдете внимателни с неща като пароли, подробности за начини на плащане, съобщения, снимки, аудио и видео."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Записване на екрана"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"В момента записвате <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Спиране на записа"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Екранът се споделя"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Съдържанието се споделя"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Да се спре ли споделянето на екрана?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Да се спре ли споделянето?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"В момента споделяте целия си екран с(ъс) <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"В момента споделяте целия си екран с приложение"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"В момента споделяте <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"В момента споделяте приложение"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"В момента споделяте с приложение"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Спиране на споделянето"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Екранът се предава"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Да се спре ли предаването?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Приспособления за заключения екран"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Всеки ще вижда приспособленията на закл. екран дори ако таблетът ви е заключен."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"премахване на избора от приспособлението"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Намаляване на височината"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Увеличаване на височината"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Приспособления за заключения екран"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"За да отворите дадено приложение посредством приспособление, ще трябва да потвърдите, че това сте вие. Също така имайте предвид, че всеки ще вижда приспособленията дори когато таблетът ви е заключен. Възможно е някои от тях да не са предназначени за заключения екран и добавянето им на него може да е опасно."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Разбрах"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Изчистване на всички"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Управление"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"История"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Настройки за известията"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"История на известията"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Нови"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Беззвучни"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Известия"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Стартиране сега"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Няма известия"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Няма нови известия"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Изчакването за известията е включено"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Силата на звука и сигналите на у-вото се намаляват за до 2 минути, когато получавате твърде много известия наведнъж."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Изключване"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Отключете за достъп до по-стари известия"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Фиксирано"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Прослед. на движенията на главата"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Докоснете, за да промените режима на звънене"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"спиране"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"пускане"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"вибриране"</string> @@ -867,7 +862,7 @@ <string name="group_system_access_google_assistant" msgid="7210074957915968110">"Отваряне на Асистент"</string> <string name="group_system_lock_screen" msgid="7391191300363416543">"Заключване на екрана"</string> <string name="group_system_quick_memo" msgid="3764560265935722903">"Създаване на бележка"</string> - <string name="keyboard_shortcut_group_system_multitasking" msgid="6967816258924795558">"Изпълняване на няколко задачи едновременно"</string> + <string name="keyboard_shortcut_group_system_multitasking" msgid="6967816258924795558">"Няколко задачи едновременно"</string> <string name="system_multitasking_rhs" msgid="8714224917276297810">"Използване на разделен екран с текущото приложение вдясно"</string> <string name="system_multitasking_lhs" msgid="8402954791206308783">"Използване на разделен екран с текущото приложение вляво"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Превключване от разделен към цял екран"</string> @@ -1407,7 +1402,7 @@ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Системни"</string> <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Системни контроли"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Системни приложения"</string> - <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Изпълняване на няколко задачи едновременно"</string> + <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Няколко задачи едновременно"</string> <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Скорошни приложения"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Разделен екран"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Въвеждане"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Текущо приложение"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Достъпност"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Клавишни комбинации"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Персонализиране на клавишните комбинации"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Търсете клавишни комбинации"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Няма резултати от търсенето"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Икона за свиване"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Персонализиране"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Готово"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Икона за разгъване"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"или"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Манипулатор за преместване с плъзгане"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Предоставено от приложения"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Екран"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Неизвестно"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Нулиране на панелите"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Да се възстанови ли първоначалният ред и размери на панелите?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Да се нулират ли всички панели?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Всички панели с бързи настройки ще бъдат нулирани до първоначалните настройки на устройството"</string> </resources> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index c593210c4613..5f8ea8bb610a 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"আপনার স্ক্রিন রেকর্ড করবেন?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"একটি অ্যাপ রেকর্ড করুন"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"সম্পূর্ণ স্ক্রিন রেকর্ড করুন"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"পুরো স্ক্রিন রেকর্ড করুন: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"আপনার সম্পূর্ণ স্ক্রিন রেকর্ড করার সময়, আপনার স্ক্রিনে দেখানো সব কিছু রেকর্ড করা হয়। তাই পাসওয়ার্ড, পেমেন্টের বিবরণ, মেসেজ, ফটো এবং অডিও ও ভিডিওর মতো বিষয়ের ক্ষেত্রে সতর্ক থাকুন।"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"আপনি কোনও অ্যাপ রেকর্ড করার সময়, সেই অ্যাপে দেখানো বা চালানো সব কিছু রেকর্ড করা হয়। তাই পাসওয়ার্ড, পেমেন্টের বিবরণ, মেসেজ, ফটো এবং অডিও ও ভিডিওর মতো বিষয়ের ক্ষেত্রে সতর্ক থাকুন।"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"স্ক্রিন রেকর্ড করুন"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"আপনি বর্তমানে <xliff:g id="APP_NAME">%1$s</xliff:g> রেকর্ড করছেন"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"রেকর্ড করা বন্ধ করুন"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"স্ক্রিন শেয়ার করা হচ্ছে"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"কন্টেন্ট শেয়ার করা হচ্ছে"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"স্ক্রিন শেয়ার করা বন্ধ করবেন?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"শেয়ার করা বন্ধ করতে চান?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"আপনি বর্তমানে <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> অ্যাপের সাথে আপনার সম্পূর্ণ স্ক্রিন শেয়ার করছেন"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"আপনি বর্তমানে কোনও একটি অ্যাপের সাথে আপনার সম্পূর্ণ স্ক্রিন শেয়ার করছেন"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"আপনি বর্তমানে <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> অ্যাপের সাথে শেয়ার করছেন"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"আপনি বর্তমানে কোনও একটি অ্যাপের সাথে শেয়ার করছেন"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"আপনি বর্তমানে কোনও একটি অ্যাপের সাথে শেয়ার করছেন"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"শেয়ার করা বন্ধ করুন"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"স্ক্রিন কাস্ট করা হচ্ছে"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"কাস্ট করা বন্ধ করবেন?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"লক স্ক্রিন উইজেট"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"আপনার ট্যাবলেট লক থাকলেও যেকোনও ব্যক্তি লক স্ক্রিনে উইজেট দেখতে পাবেন।"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"উইজেট বাদ দিন"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"উচ্চতা কমান"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"উচ্চতা বাড়ান"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"লক স্ক্রিন উইজেট"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"উইজেট ব্যবহার করে কোনও অ্যাপ খুলতে, আপনাকে নিজের পরিচয় যাচাই করতে হবে। এছাড়াও, মনে রাখবেন, আপনার ট্যাবলেট লক থাকলেও যেকেউ তা দেখতে পারবেন। কিছু উইজেট আপনার লক স্ক্রিনের উদ্দেশ্যে তৈরি করা হয়নি এবং এখানে যোগ করা নিরাপদ নাও হতে পারে।"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"বুঝেছি"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"এখন শুরু করুন"</string> <string name="empty_shade_text" msgid="8935967157319717412">"কোনও বিজ্ঞপ্তি নেই"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"নতুন কোনও বিজ্ঞপ্তি নেই"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"নোটিফিকেশন কুলডাউন চালু আছে"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"আপনি একসঙ্গে খুব বেশি বিজ্ঞপ্তি পেলে আপনার ডিভাইসের ভলিউম এবং সতর্কবার্তা সর্বাধিক ২ মিনিটের জন্য অটোমেটিক কমে যায়।"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"বন্ধ করুন"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"পুরনো বিজ্ঞপ্তি দেখতে আনলক করুন"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"চালু আছে"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"হেড ট্র্যাকিং"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"রিঙ্গার মোড পরিবর্তন করতে ট্যাপ করুন"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"মিউট করুন"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"আনমিউট করুন"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"ভাইব্রেট করান"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"বর্তমান অ্যাপ"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"অ্যাক্সেসিবিলিটি"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"কীবোর্ড শর্টকাট"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"সার্চ শর্টকাট"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"কীবোর্ড শর্টকাট কাস্টমাইজ করুন"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"শর্টকাট সার্চ করুন"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"কোনও সার্চ ফলাফল নেই"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"আইকন আড়াল করুন"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"কাস্টমাইজ করুন"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"হয়ে গেছে"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"আইকন বড় করুন"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"অথবা"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"টেনে আনার হ্যান্ডেল"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"অ্যাপের তরফ থেকে দেওয়া"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ডিসপ্লে"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"অজানা"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"টাইল রিসেট করুন"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"টাইলগুলিকে অরিজিনাল অর্ডার ও সাইজ অনুযায়ী রিসেট করবেন?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"সব টাইল রিসেট করবেন?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"সব কুইক সেটিংস টাইল, ডিভাইসের আসল সেটিংসে রিসেট হয়ে যাবে"</string> </resources> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 38f42659245e..32f6be34cd52 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Snimati ekran?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Snimaj jednu aplikaciju"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Snimaj cijeli ekran"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Snimi cijeli ekran: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Kada snimate cijeli ekran, snimat će se sve što se prikazuje na ekranu. 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="3738199712880063924">"Kada snimate aplikaciju, snimat će se sve š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_entire_screen" msgid="5557974446773486600">"Snimaj ekran"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Trenutno snimate aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Zaustavi snimanje"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Dijeljenje ekrana"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Dijeljenje sadržaja"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Zaustaviti dijeljenje ekrana?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Zaustaviti dijeljenje?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Trenutno dijelite cijeli ekran s aplikacijom <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Trenutno dijelite cijeli ekran s aplikacijom"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Trenutno dijelite aplikaciju <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Trenutno dijelite aplikaciju"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Trenutno dijelite s aplikacijom"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Zaustavi dijeljenje"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Emitiranje ekrana"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Zaustaviti emitiranje?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Vidžeti na zaključanom ekranu"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Svi mogu pregledati vidžete na zaključanom ekranu, čak i ako je tablet zaključan."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"poništavanje odabira vidžeta"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Smanjenje visine"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Povećanje visine"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Vidžeti na zaključanom ekranu"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Da otvorite aplikaciju pomoću vidžeta, morat ćete potvrditi identitet. Također imajte na umu da ih svako može pregledati, čak i ako je tablet zaključan. Neki vidžeti možda nisu namijenjeni za vaš zaključani ekran i njihovo dodavanje ovdje možda nije sigurno."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Razumijem"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Započni odmah"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Nema obavještenja"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Nema novih obavještenja"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Stišavanje obavještenja je uključeno"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Jačina zvuka uređaja i obavještenja se automatski stišavaju do 2 minute kada odjednom dobijete previše obavještenja."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Isključi"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Otključajte da vidite starija obavještenja"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fiksno"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Praćenje položaja glave"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Dodirnite da promijenite način rada zvuka zvona"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"isključite zvuk"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"uključite zvuk"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibriranje"</string> @@ -813,7 +810,7 @@ <string name="keyboard_key_back" msgid="4185420465469481999">"Nazad"</string> <string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string> <string name="keyboard_key_space" msgid="6980847564173394012">"Tipka za razmak"</string> - <string name="keyboard_key_enter" msgid="8633362970109751646">"Tipka za novi red"</string> + <string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string> <string name="keyboard_key_backspace" msgid="4095278312039628074">"Tipka za brisanje"</string> <string name="keyboard_key_media_play_pause" msgid="8389984232732277478">"Pokreni/pauziraj"</string> <string name="keyboard_key_media_stop" msgid="1509943745250377699">"Zaustavi"</string> @@ -869,7 +866,7 @@ <string name="system_multitasking_rhs" msgid="8714224917276297810">"Korištenje podijeljenog ekrana s trenutnom aplikacijom na desnoj strani"</string> <string name="system_multitasking_lhs" msgid="8402954791206308783">"Korištenje 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> - <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_rhs" msgid="3838578650313318508">"Prelazak u aplikaciju desno ili ispod uz 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> @@ -1011,7 +1008,7 @@ <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Način rada Ne ometaj uključila je aplikacija <xliff:g id="ID_1">%s</xliff:g>."</string> <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Način rada Ne ometaj uključilo je automatsko pravilo ili aplikacija."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Aplikacije koje rade u pozadini"</string> - <string name="running_foreground_services_msg" msgid="3009459259222695385">"Dodirnite za detalje o potrošnji baterije i prijenosa podataka"</string> + <string name="running_foreground_services_msg" msgid="3009459259222695385">"Dodirnite za detalje o potrošnji baterije i prenosa podataka"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Isključiti prijenos podataka na mobilnoj mreži?"</string> <string name="mobile_data_disable_message" msgid="8604966027899770415">"Nećete imati pristup podacima ni internetu putem mobilnog operatera <xliff:g id="CARRIER">%s</xliff:g>. Internet će biti dostupan samo putem WiFi-ja."</string> <string name="mobile_data_disable_message_default_carrier" msgid="6496033312431658238">"vaš operater"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Trenutna aplikacija"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Pristupačnost"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Prečice tastature"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Prilagodite prečice na tastaturi"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Prečica pretraživanja"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nema rezultata pretraživanja"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona sužavanja"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Prilagođavanje"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Gotovo"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona proširivanja"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ili"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Ručica za prevlačenje"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Pružaju aplikacije"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Prikaz"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Nepoznato"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Vratite kartice na zadano"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Vratiti kartice na zadani redoslijed i veličine?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Vratiti sve kartice na zadano?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Sve kartice Brze postavke će se vratiti na originalne postavke uređaja"</string> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index bcaca5ae16e9..8a700ddd2921 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Vols gravar la pantalla?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Grava una aplicació"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Grava tota la pantalla"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Grava tota la pantalla: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Quan graves tota la pantalla, es grava tot el que es mostra en pantalla. Per aquest motiu, ves amb compte amb elements com les contrasenyes, les dades de pagament, els missatges, les fotos, i l\'àudio i el vídeo."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Quan graves una aplicació, es grava tot el que es mostra o es reprodueix en aquesta 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="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Grava la pantalla"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Ara mateix estàs gravant <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Atura la gravació"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"S\'està compartint la pantalla"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"S\'està compartint contingut"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Vols deixar de compartir la pantalla?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Vols deixar de compartir-lo?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Ara mateix estàs compartint tota la pantalla amb <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Ara mateix estàs compartint tota la pantalla amb una aplicació"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Ara mateix estàs compartint <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Ara mateix estàs compartint una aplicació"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Ara mateix estàs compartint contingut amb una aplicació"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Deixa de compartir"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"S\'està emetent la pantalla"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Vols aturar l\'emissió?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgets de la pantalla de bloqueig"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Tothom pot veure els widgets de la teva pantalla de bloqueig, fins i tot quan la tauleta està bloquejada."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"desselecciona el widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Redueix l\'alçada"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Augmenta l\'alçada"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgets de la pantalla de bloqueig"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Per obrir una aplicació utilitzant un widget, necessitaràs verificar la teva identitat. També has de tenir en compte que qualsevol persona pot veure els widgets, fins i tot quan la tauleta està bloquejada. És possible que alguns widgets no estiguin pensats per a la pantalla de bloqueig i que no sigui segur afegir-los-hi."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Entesos"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Esborra-ho tot"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Gestiona"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Historial"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Configuració de notificacions"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Historial de notificacions"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Novetats"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Silenciat"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificacions"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Comença ara"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No hi ha cap notificació"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"No hi ha cap notificació nova"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"La moderació de notificacions està activada"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"El volum i les alertes del dispositiu es redueixen automàticament durant 2 minuts com a màxim quan reps massa notificacions alhora."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Desactiva"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Desbloqueja per veure notif. anteriors"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fix"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Seguiment del cap"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Toca per canviar el mode de timbre"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"silenciar"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"deixar de silenciar"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrar"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Aplicació actual"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibilitat"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Tecles de drecera"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalitza les tecles de drecera"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Dreceres de cerca"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"No hi ha cap resultat de la cerca"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Replega la icona"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalitza"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Fet"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Desplega la icona"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"o"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Ansa per arrossegar"</string> @@ -1460,7 +1452,7 @@ <string name="home_controls_dream_description" msgid="4644150952104035789">"Utilitza controls de la llar com a estalvi de pantalla"</string> <string name="volume_undo_action" msgid="5815519725211877114">"Desfés"</string> <string name="back_edu_toast_content" msgid="4530314597378982956">"Per tornar enrere, llisca tres dits cap a l\'esquerra o cap a la dreta al ratolí tàctil"</string> - <string name="home_edu_toast_content" msgid="3381071147871955415">"Per anar a la pantalla d\'inici, llisca tres dits cap amunt al ratolí tàctil"</string> + <string name="home_edu_toast_content" msgid="3381071147871955415">"Per anar a la pantalla d\'inici, fes lliscar tres dits cap amunt al ratolí tàctil"</string> <string name="overview_edu_toast_content" msgid="5797030644017804518">"Per veure les aplicacions recents, llisca cap amunt amb tres dits i mantén premut al ratolí tàctil"</string> <string name="all_apps_edu_toast_content" msgid="8807496014667211562">"Per veure totes les aplicacions, prem la tecla d\'acció al teclat"</string> <string name="redacted_notification_single_line_title" msgid="212019960919261670">"Emmascarat"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Proporcionat per aplicacions"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Pantalla"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Desconegut"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Restableix les icones"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Vols restablir l\'ordre i les mides originals de les icones?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Vols restablir totes les icones?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Totes les icones de configuració ràpida es restabliran a les opcions originals del dispositiu"</string> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 76ae86deddd4..bc52bb81a81a 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Pořídit nahrávku obrazovky?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Nahrát jednu aplikaci"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Nahrát celou obrazovku"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Nahrát celou obrazovku: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Při nahrávání celé obrazovky se zaznamenává veškerý obsah na obrazovce. Buďte proto opatrní, když jde o hesla, platební údaje, zprávy, fotografie, zvuk a video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Při nahrávání aplikace se zaznamenává všechno, co se v dané obrazovce zobrazuje nebo přehrává. Buďte proto opatrní, když jde o hesla, platební údaje, zprávy, fotografie, zvuk a video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Nahrát obrazovku"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Momentálně nahráváte aplikaci <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Ukončit nahrávání"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Sdílení obrazovky"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Sdílení obsahu"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Ukončit sdílení obrazovky?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Ukončit sdílení?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Momentálně sdílíte celou obrazovku s aplikací <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Momentálně sdílíte celou obrazovku s aplikací"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Momentálně sdílíte aplikaci <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Momentálně sdílíte aplikaci"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Momentálně sdílíte obsah s aplikací"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Ukončit sdílení"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Odesílání obsahu obrazovky"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Ukončit odesílání?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgety na obrazovce uzamčení"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Widgety na obrazovce uzamčení může zobrazit kdokoli, i když je tablet uzamčen."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"zrušit výběr widgetu"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Snížit výšku"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Zvýšit výšku"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgety na obrazovce uzamčení"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"K otevření aplikace pomocí widgetu budete muset ověřit svou totožnost. Také mějte na paměti, že widgety uvidí kdokoli, i když tablet bude uzamčen. Některé widgety nemusí být pro obrazovku uzamčení určeny a nemusí být bezpečné je na ni přidat."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Rozumím"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Smazat vše"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Spravovat"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Historie"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Nastavení oznámení"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Historie oznámení"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Nové"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Tichý režim"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Oznámení"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Spustit"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Žádná oznámení"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Žádná nová oznámení"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Oznámení jsou zeslabená"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Když máte moc oznámení najednou, až na dvě minuty se sníží hlasitost zařízení a oznámení se omezí."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Vypnout"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Starší oznámení se zobrazí po odemknutí"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fixovaný"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Sledování hlavy"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Klepnutím změníte režim vyzvánění"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"vypnout zvuk"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"zapnout zvuk"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrovat"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Aktuální aplikace"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Přístupnost"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Klávesové zkratky"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Přizpůsobení klávesových zkratek"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Vyhledat zkratky"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Žádné výsledky hledání"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona sbalení"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Přizpůsobit"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Hotovo"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona rozbalení"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"nebo"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Úchyt pro přetažení"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Poskytováno aplikacemi"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Displej"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Neznámé"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Resetování dlaždic"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Resetovat dlaždice na původní pořadí a velikosti?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Resetovat všechny dlaždice?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Všechny dlaždice Rychlého nastavení se resetují do původní konfigurace zařízení"</string> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index abcd4b8d45ce..0da56bd0f1dc 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Vil du optage din skærm?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Optag én app"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Optag hele skærmen"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Optag hele skærmen: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Når du optager hele skærmen, bliver alt det, der vises på skærmen, optaget. Vær derfor forsigtig med ting såsom adgangskoder, betalingsoplysninger, beskeder, billeder, lyd og video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Når du optager en app, optages alt det, der vises eller afspilles i den pågældende app. Vær derfor forsigtig med ting såsom adgangskoder, betalingsoplysninger, beskeder, billeder, lyd og video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Optag skærm"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Du optager i øjeblikket <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Stop optagelse"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Skærmen deles"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Indhold deles"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Vil du stoppe skærmdelingen?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Vil du stoppe med at dele?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Du deler i øjeblikket hele skærmen med <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Du deler i øjeblikket hele skærmen med en app"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Du deler i øjeblikket <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Du deler i øjeblikket en app"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Du deler i øjeblikket med en app"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Stop deling"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Skærmen castes"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Vil du stoppe din cast?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgets på låseskærmen"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Alle kan se widgets på din låseskærm, også selvom din tablet er låst."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"fjern markering af widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Reducer højden"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Forøg højden"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgets på låseskærmen"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Hvis du vil åbne en app ved hjælp af en widget, skal du verificere din identitet. Husk også, at alle kan se dem, også når din tablet er låst. Nogle widgets er muligvis ikke beregnet til låseskærmen, og det kan være usikkert at tilføje dem her."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Start nu"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Ingen notifikationer"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Ingen nye notifikationer"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Dæmpning af notifikationer er aktiveret"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Enheden skruer automatisk ned for lydstyrken og minimerer underretninger på skærmen i op til 2 minutter, når du får for mange notifikationer på én gang."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Deaktiver"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Lås op for at se ældre notifikationer"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fast"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Register. af hovedbevægelser"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Tryk for at ændre ringetilstand"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"slå lyden fra"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"slå lyden til"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrer"</string> @@ -885,7 +882,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"Sms"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Musik"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalender"</string> - <string name="keyboard_shortcut_group_applications_calculator" msgid="6316043911946540137">"Lommeregner"</string> + <string name="keyboard_shortcut_group_applications_calculator" msgid="6316043911946540137">"Lommeregner"</string> <string name="keyboard_shortcut_group_applications_maps" msgid="7312554713993114342">"Maps"</string> <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Forstyr ikke"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Genvej til lydstyrkeknapper"</string> @@ -992,7 +989,7 @@ <string name="notification_channel_instant" msgid="7556135423486752680">"Instant Apps"</string> <string name="notification_channel_setup" msgid="7660580986090760350">"Konfiguration"</string> <string name="notification_channel_storage" msgid="2720725707628094977">"Lagerplads"</string> - <string name="notification_channel_hints" msgid="7703783206000346876">"Tips"</string> + <string name="notification_channel_hints" msgid="7703783206000346876">"Tip"</string> <string name="notification_channel_accessibility" msgid="8956203986976245820">"Hjælpefunktioner"</string> <string name="instant_apps" msgid="8337185853050247304">"Instant Apps"</string> <string name="instant_apps_title" msgid="8942706782103036910">"<xliff:g id="APP">%1$s</xliff:g> kører"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Aktuel app"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Hjælpefunktioner"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Tastaturgenveje"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Tilpas tastaturgenveje"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Genveje til søgning"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Der er ingen søgeresultater"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikon for Skjul"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Tilpas"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Udfør"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikon for Udvid"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"eller"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Håndtag"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Fra apps"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Skærm"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Ukendt"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Nulstil felter"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Vil du nulstille felterne til deres oprindelige rækkefølge og størrelser?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Vil du nulstille alle handlingsfelter?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Alle handlingsfelter i kvikmenuen nulstilles til enhedens oprindelige indstillinger"</string> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 9799a932bcd9..f9b844d73fe2 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Bildschirm aufnehmen?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Einzelne App aufnehmen"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Gesamten Bildschirm aufnehmen"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Gesamten Bildschirm aufnehmen: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Wenn du den gesamten Bildschirm aufnimmst, ist in der Aufnahme alles zu sehen, was auf dem Bildschirm angezeigt wird. Sei also vorsichtig mit Informationen wie Passwörtern, Zahlungsdetails, Nachrichten, Fotos sowie Audio- und Videoinhalten."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Wenn du eine App aufnimmst, ist in der Aufnahme alles zu sehen, was in dieser App angezeigt oder abgespielt wird. Sei also vorsichtig mit Informationen wie Passwörtern, Zahlungsdetails, Nachrichten, Fotos sowie Audio- und Videoinhalten."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Bildschirm aufnehmen"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Du zeichnest momentan Inhalte der App <xliff:g id="APP_NAME">%1$s</xliff:g> auf"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Aufzeichnung beenden"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Bildschirm wird geteilt"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Inhalte teilen"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Bildschirmfreigabe beenden?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Teilen beenden?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Du teilst momentan deinen gesamten Bildschirm mit der App <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Du teilst momentan deinen gesamten Bildschirm mit einer App"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Du teilst momentan die App <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Du teilst momentan Inhalte einer App"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Du teilst momentan Inhalte mit einer App"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Freigabe beenden"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Bildschirm wird übertragen"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Streaming beenden?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Sperrbildschirm-Widgets"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Jeder kann Widgets auf deinem Sperrbildschirm sehen, auch bei gesperrtem Tablet."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"Auswahl für Widget aufheben"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Höhe verringern"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Höhe vergrößern"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Sperrbildschirm-Widgets"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Wenn du eine App mit einem Widget öffnen möchtest, musst du deine Identität bestätigen. Beachte auch, dass jeder die Widgets sehen kann, auch wenn dein Tablet gesperrt ist. Einige Widgets sind möglicherweise nicht für den Sperrbildschirm vorgesehen, sodass es unsicher sein kann, sie hier hinzuzufügen."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Ok"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Alle löschen"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Verwalten"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Verlauf"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Benachrichtigungseinstellungen"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Benachrichtigungsverlauf"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Neu"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Lautlos"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Benachrichtigungen"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Jetzt starten"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Keine Benachrichtigungen"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Keine neuen Benachrichtigungen"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"„Benachrichtigungen reduzieren” ist aktiviert"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Wenn du zu viele Benachrichtigungen auf einmal erhältst, wird die Lautstärke automatisch bis zu 2 min lang verringert und Benachrichtigungen werden minimiert."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Deaktivieren"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Für ältere Benachrichtigungen entsperren"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Statisch"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Erfassung von Kopfbewegungen"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Zum Ändern des Klingeltonmodus tippen"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"Stummschalten"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"Aufheben der Stummschaltung"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"Vibrieren lassen"</string> @@ -854,9 +849,9 @@ <string name="keyboard_shortcut_a11y_filter_input" msgid="4589316004510335529">"Tastenkombinationen für die Eingabe werden angezeigt"</string> <string name="keyboard_shortcut_a11y_filter_open_apps" msgid="6175417687221004059">"Tastenkombinationen zum Öffnen von Apps werden angezeigt"</string> <string name="keyboard_shortcut_a11y_filter_current_app" msgid="7944592357493737911">"Tastenkombinationen für die aktuelle App werden angezeigt"</string> - <string name="group_system_access_notification_shade" msgid="1619028907006553677">"Benachrichtigungen ansehen"</string> + <string name="group_system_access_notification_shade" msgid="1619028907006553677">"Benachrichtigungen ansehen"</string> <string name="group_system_full_screenshot" msgid="5742204844232667785">"Screenshot erstellen"</string> - <string name="group_system_access_system_app_shortcuts" msgid="8562482996626694026">"Tastenkombinationen anzeigen"</string> + <string name="group_system_access_system_app_shortcuts" msgid="8562482996626694026">"Tastenkürzel anzeigen"</string> <string name="group_system_go_back" msgid="2730322046244918816">"Zurück"</string> <string name="group_system_access_home_screen" msgid="4130366993484706483">"Zum Startbildschirm wechseln"</string> <string name="group_system_overview_open_apps" msgid="5659958952937994104">"Letzte Apps aufrufen"</string> @@ -877,8 +872,8 @@ <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> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Zur vorherigen Sprache wechseln"</string> - <string name="input_access_emoji" msgid="8105642858900406351">"Auf Emojis zugreifen"</string> - <string name="input_access_voice_typing" msgid="7291201476395326141">"Auf Spracheingabe zugreifen"</string> + <string name="input_access_emoji" msgid="8105642858900406351">"Emojis aufrufen"</string> + <string name="input_access_voice_typing" msgid="7291201476395326141">"Spracheingabe aufrufen"</string> <string name="keyboard_shortcut_group_applications" msgid="7386239431100651266">"Apps"</string> <string name="keyboard_shortcut_group_applications_assist" msgid="6772492350416591448">"Assistant"</string> <string name="keyboard_shortcut_group_applications_browser" msgid="2776211137869809251">"Browser"</string> @@ -1408,22 +1403,19 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Systemsteuerelemente"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"System-Apps"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Zuletzt aktive Apps"</string> + <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Zuletzt verwendete Apps"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Splitscreen"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Eingabe"</string> - <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App-Verknüpfungen"</string> + <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App-Verknüpfungen"</string> <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Aktuelle App"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Bedienungshilfen"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Tastenkürzel"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Tastenkombinationen anpassen"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Tastenkürzel suchen"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Keine Suchergebnisse"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Symbol „Minimieren“"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Anpassen"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Fertig"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Symbol „Maximieren“"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"oder"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Ziehpunkt"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Von Apps bereitgestellt"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Display"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Unbekannt"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Kacheln zurücksetzen"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Kacheln auf die ursprüngliche Reihenfolge und Größe zurücksetzen?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Alle Kacheln zurücksetzen?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Alle Schnelleinstellungen-Kacheln werden auf die Standardeinstellungen des Geräts zurückgesetzt"</string> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 7200a91b618e..74019de1886b 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Να γίνει εγγραφή της οθόνης σας;"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Εγγραφή μίας εφαρμογής"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Εγγραφή ολόκληρης της οθόνης"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Εγγραφή ολόκληρης της οθόνης: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Όταν κάνετε εγγραφή ολόκληρης της οθόνη σας, καταγράφεται οτιδήποτε εμφανίζεται σε αυτήν. Επομένως, να είστε προσεκτικοί με τους κωδικούς πρόσβασης, τα στοιχεία πληρωμής, τα μηνύματα, τις φωτογραφίες, τον ήχο και το βίντεο."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Όταν κάνετε εγγραφή μιας εφαρμογής, καταγράφεται οτιδήποτε εμφανίζεται ή αναπαράγεται στη συγκεκριμένη εφαρμογή. Επομένως, να είστε προσεκτικοί με τους κωδικούς πρόσβασης, τα στοιχεία πληρωμής, τα μηνύματα, τις φωτογραφίες, τον ήχο και το βίντεο."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Εγγραφή οθόνης"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Αυτή τη στιγμή εγγράφετε το <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Διακοπή εγγραφής"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Γίνεται κοινοποίηση οθόνης"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Κοινή χρήση περιεχομένου"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Διακοπή κοινής χρήσης οθόνης;"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Να διακοπεί η κοινή χρήση;"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Αυτή τη στιγμή μοιράζεστε ολόκληρη την οθόνη σας με το <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Αυτή τη στιγμή μοιράζεστε ολόκληρη την οθόνη σας με μια εφαρμογή"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Αυτή τη στιγμή μοιράζεστε το <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Αυτή τη στιγμή μοιράζεστε μια εφαρμογή"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Αυτή τη στιγμή, μοιράζεστε περιεχόμενο με μια εφαρμογή"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Διακοπή κοινής χρήσης"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Μετάδοση οθόνης"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Τερματισμός μετάδοσης;"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Γραφικά στοιχεία οθόνης κλειδώματος"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Όλοι μπορούν να δουν γραφικά στοιχεία στην οθόνη κλειδώματος, ακόμα και αν το tablet είναι κλειδωμένο."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"αποεπιλογή γραφικού στοιχείου"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Μείωση του ύψους"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Αύξηση του ύψους"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Γραφικά στοιχεία οθόνης κλειδώματος"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Για να ανοίξετε μια εφαρμογή χρησιμοποιώντας ένα γραφικό στοιχείο, θα πρέπει να επαληθεύσετε την ταυτότητά σας. Επίσης, λάβετε υπόψη ότι η προβολή τους είναι δυνατή από οποιονδήποτε, ακόμα και όταν το tablet σας είναι κλειδωμένο. Ορισμένα γραφικά στοιχεία μπορεί να μην προορίζονται για την οθόνη κλειδώματος και η προσθήκη τους εδώ ενδέχεται να μην είναι ασφαλής."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Το κατάλαβα"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Διαγραφή όλων"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Διαχείριση"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Ιστορικό"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Ρυθμίσεις ειδοποιήσεων"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Ιστορικό ειδοποιήσεων"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Νέα"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Σίγαση"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Ειδοποιήσεις"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Έναρξη τώρα"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Δεν υπάρχουν ειδοποιήσεις"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Δεν υπάρχουν νέες ειδοποιήσεις"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Η ρύθμιση cooldown ειδοποιήσεων είναι ενεργή"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Αυτόματη μείωση έντασης ήχου συσκευής και ειδοποιήσεων για έως 2 λεπτά όταν λαμβάνετε πολλές ειδοποιήσεις ταυτόχρονα."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Απενεργοποίηση"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Ξεκλειδώστε για εμφάνιση παλαιότ. ειδοπ."</string> @@ -705,6 +698,7 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Σταθερός"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Παρακ. κίνησ. κεφαλής"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Πατήστε για να αλλάξετε τη λειτουργία ειδοποίησης ήχου"</string> + <string name="volume_ringer_mode" msgid="6867838048430807128">"λειτουργία ειδοποίησης ήχου"</string> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"σίγαση"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"κατάργηση σίγασης"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"δόνηση"</string> @@ -1415,15 +1409,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Τρέχουσα εφαρμογή"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Προσβασιμότητα"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Συντομεύσεις πληκτρολογίου"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Προσαρμογή συντομεύσεων πληκτρολογίου"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Συντομεύσεις αναζήτησης"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Κανένα αποτέλεσμα αναζήτησης"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Εικονίδιο σύμπτυξης"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Προσαρμογή"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Τέλος"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Εικονίδιο ανάπτυξης"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ή"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Λαβή μεταφοράς"</string> @@ -1485,6 +1476,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Παρέχεται από εφαρμογές"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Προβολή"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Άγνωστο"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Επαναφορά πλακιδίων"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Επαναφορά των πλακιδίων στην αρχική τους σειρά και μεγέθη;"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Επαναφορά σε όλα τα πλακάκια;"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Σε όλα τα πλακάκια Γρήγορων ρυθμίσεων θα γίνει επαναφορά στις αρχικές ρυθμίσεις της συσκευής"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 1ecf4f17cac3..d56abeb98050 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Record your screen?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Record one app"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Record entire screen"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Record entire screen: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"When you\'re recording your entire screen, anything displayed on your screen is recorded. So, be careful with things like passwords, payment details, messages, photos, audio and video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"When you\'re recording an app, anything displayed or played in that app is recorded. So, be careful with things like passwords, payment details, messages, photos, audio and video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Record screen"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"You\'re currently recording <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Stop recording"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Sharing screen"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Sharing content"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Stop sharing screen?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Stop sharing?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"You\'re currently sharing your entire screen with <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"You\'re currently sharing your entire screen with an app"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"You\'re currently sharing <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"You\'re currently sharing an app"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"You\'re currently sharing with an app"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Stop sharing"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Casting screen"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Stop casting?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Lock screen widgets"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Anyone can view widgets on your lock screen, even if your tablet\'s locked."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"unselect widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Decrease height"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Increase height"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Lock screen widgets"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"To open an app using a widget, you\'ll need to verify that it\'s you. Also, bear in mind that anyone can view them, even when your tablet\'s locked. Some widgets may not have been intended for your lock screen and may be unsafe to add here."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Got it"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Clear all"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Manage"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"History"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Notification settings"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Notification history"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"New"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Silent"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifications"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Start now"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No notifications"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"No new notifications"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Notification cooldown is on"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Your device volume and alerts are reduced automatically for up to 2 minutes when you get too many notifications at once."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Turn off"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Unlock to see older notifications"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fixed"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Head tracking"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Tap to change ringer mode"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"mute"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"unmute"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrate"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Current app"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibility"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Keyboard shortcuts"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Customise keyboard shortcuts"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Search shortcuts"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"No search results"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Collapse icon"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Customise"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Done"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Expand icon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"or"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Drag handle"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Provided by apps"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Display"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Unknown"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Reset tiles"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Reset tiles to their original order and sizes?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Reset all tiles?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"All Quick Settings tiles will reset to the device\'s original settings"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index f775513ca418..bee2393b4080 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Record your screen?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Record one app"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Record entire screen"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Record entire screen: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"When you’re recording your entire screen, anything shown on your screen is recorded. So be careful with things like passwords, payment details, messages, photos, and audio and video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"When you’re recording an app, anything shown or played in that app is recorded. So be careful with things like passwords, payment details, messages, photos, and audio and video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Record screen"</string> @@ -590,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Start now"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No notifications"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"No new notifications"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Notification cooldown is on"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Your device volume and alerts are reduced automatically for up to 2 minutes when you get too many notifications at once."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Turn off"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Unlock to see older notifications"</string> @@ -698,6 +698,7 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fixed"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Head Tracking"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Tap to change ringer mode"</string> + <string name="volume_ringer_mode" msgid="6867838048430807128">"ringer mode"</string> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"mute"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"unmute"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrate"</string> @@ -1408,15 +1409,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Current App"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibility"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Keyboard shortcuts"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Customize keyboard shortcuts"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Search shortcuts"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"No search results"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Collapse icon"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Customize"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Done"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Expand icon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"or"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Drag handle"</string> @@ -1478,6 +1476,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Provided by apps"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Display"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Unknown"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Reset tiles"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Reset tiles to their original order and sizes?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Reset all tiles?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"All Quick Settings tiles will reset to the device’s original settings"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 1ecf4f17cac3..d56abeb98050 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Record your screen?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Record one app"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Record entire screen"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Record entire screen: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"When you\'re recording your entire screen, anything displayed on your screen is recorded. So, be careful with things like passwords, payment details, messages, photos, audio and video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"When you\'re recording an app, anything displayed or played in that app is recorded. So, be careful with things like passwords, payment details, messages, photos, audio and video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Record screen"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"You\'re currently recording <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Stop recording"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Sharing screen"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Sharing content"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Stop sharing screen?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Stop sharing?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"You\'re currently sharing your entire screen with <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"You\'re currently sharing your entire screen with an app"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"You\'re currently sharing <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"You\'re currently sharing an app"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"You\'re currently sharing with an app"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Stop sharing"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Casting screen"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Stop casting?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Lock screen widgets"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Anyone can view widgets on your lock screen, even if your tablet\'s locked."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"unselect widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Decrease height"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Increase height"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Lock screen widgets"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"To open an app using a widget, you\'ll need to verify that it\'s you. Also, bear in mind that anyone can view them, even when your tablet\'s locked. Some widgets may not have been intended for your lock screen and may be unsafe to add here."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Got it"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Clear all"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Manage"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"History"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Notification settings"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Notification history"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"New"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Silent"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifications"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Start now"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No notifications"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"No new notifications"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Notification cooldown is on"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Your device volume and alerts are reduced automatically for up to 2 minutes when you get too many notifications at once."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Turn off"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Unlock to see older notifications"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fixed"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Head tracking"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Tap to change ringer mode"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"mute"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"unmute"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrate"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Current app"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibility"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Keyboard shortcuts"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Customise keyboard shortcuts"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Search shortcuts"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"No search results"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Collapse icon"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Customise"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Done"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Expand icon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"or"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Drag handle"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Provided by apps"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Display"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Unknown"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Reset tiles"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Reset tiles to their original order and sizes?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Reset all tiles?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"All Quick Settings tiles will reset to the device\'s original settings"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 1ecf4f17cac3..d56abeb98050 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Record your screen?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Record one app"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Record entire screen"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Record entire screen: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"When you\'re recording your entire screen, anything displayed on your screen is recorded. So, be careful with things like passwords, payment details, messages, photos, audio and video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"When you\'re recording an app, anything displayed or played in that app is recorded. So, be careful with things like passwords, payment details, messages, photos, audio and video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Record screen"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"You\'re currently recording <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Stop recording"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Sharing screen"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Sharing content"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Stop sharing screen?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Stop sharing?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"You\'re currently sharing your entire screen with <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"You\'re currently sharing your entire screen with an app"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"You\'re currently sharing <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"You\'re currently sharing an app"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"You\'re currently sharing with an app"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Stop sharing"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Casting screen"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Stop casting?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Lock screen widgets"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Anyone can view widgets on your lock screen, even if your tablet\'s locked."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"unselect widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Decrease height"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Increase height"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Lock screen widgets"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"To open an app using a widget, you\'ll need to verify that it\'s you. Also, bear in mind that anyone can view them, even when your tablet\'s locked. Some widgets may not have been intended for your lock screen and may be unsafe to add here."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Got it"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Clear all"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Manage"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"History"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Notification settings"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Notification history"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"New"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Silent"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifications"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Start now"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No notifications"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"No new notifications"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Notification cooldown is on"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Your device volume and alerts are reduced automatically for up to 2 minutes when you get too many notifications at once."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Turn off"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Unlock to see older notifications"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fixed"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Head tracking"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Tap to change ringer mode"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"mute"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"unmute"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrate"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Current app"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibility"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Keyboard shortcuts"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Customise keyboard shortcuts"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Search shortcuts"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"No search results"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Collapse icon"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Customise"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Done"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Expand icon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"or"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Drag handle"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Provided by apps"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Display"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Unknown"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Reset tiles"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Reset tiles to their original order and sizes?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Reset all tiles?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"All Quick Settings tiles will reset to the device\'s original settings"</string> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 77c2a639f903..6f04e8ea6dba 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"¿Quieres grabar la pantalla?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Grabar una app"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Grabar toda la pantalla"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Grabar toda la pantalla: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Cuando grabes toda la pantalla, se grabará todo lo que se muestre en ella. Por lo tanto, debes tener cuidado con contraseñas, detalles de pagos, mensajes, fotos, audios y videos."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Cuando grabes una app, se registrará todo lo que se muestre o reproduzca en ella. Por lo tanto, debes tener cuidado con contraseñas, detalles de pagos, mensajes, fotos, audios y videos."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Grabar pantalla"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Actualmente, estás grabando <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Detener grabación"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Compartiendo pantalla"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Compartiendo contenido"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"¿Quieres dejar de compartir la pantalla?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"¿Quieres dejar de compartir?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Actualmente, estás compartiendo toda la pantalla con <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Actualmente, estás compartiendo toda la pantalla con una app"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Actualmente, estás compartiendo <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Actualmente, estás compartiendo una app"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Actualmente, estás compartiendo con una app"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Dejar de compartir"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Transmitiendo pantalla"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"¿Detener la transmisión?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgets en la pantalla de bloqueo"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Los widgets de la pantalla de bloqueo podrán verse incluso si bloqueas la tablet."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"anular la selección del widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Reducir la altura"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Aumentar la altura"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgets en la pantalla de bloqueo"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Para abrir una app usando un widget, debes verificar tu identidad. Además, ten en cuenta que cualquier persona podrá verlo, incluso cuando la tablet esté bloqueada. Es posible que algunos widgets no se hayan diseñados para la pantalla de bloqueo y podría ser peligroso agregarlos allí."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Entendido"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Comenzar ahora"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No hay notificaciones"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"No hay notificaciones nuevas"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Reducción de sonido de notificaciones activada"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"El volumen y las alertas se reducen por hasta 2 minutos si recibes muchas notificaciones a la vez."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Desactivar"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Desbloquea para ver notificaciones anteriores"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fijar"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Monitoreo de cabeza"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Presiona para cambiar el modo de timbre"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"silenciar"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"dejar de silenciar"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrar"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"App actual"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accesibilidad"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Combinaciones de teclas"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personaliza las combinaciones de teclas"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Buscar combinaciones de teclas"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"La búsqueda no arrojó resultados"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ícono de contraer"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizar"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Listo"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ícono de expandir"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"o"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Controlador de arrastre"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Proporcionado por apps"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Pantalla"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Desconocido"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Restablecer tarjetas"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"¿Quieres restablecer las tarjetas al orden y el tamaño originales?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"¿Quieres restablecer todas las tarjetas?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Se restablecerán todas las tarjeta de Configuración rápida a la configuración original del dispositivo"</string> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 81b1562ed533..10f3754c208a 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"¿Grabar la pantalla?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Grabar una aplicación"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Grabar toda la pantalla"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Grabar toda la pantalla: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Cuando grabas toda la pantalla, se graba todo lo que se muestre en ella. Debes tener cuidado con elementos como contraseñas, detalles de pagos, mensajes, fotos, audio y vídeo."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Cuando grabas una aplicación, se graba todo lo que se muestre o reproduzca en ella. Debes tener cuidado con elementos como contraseñas, detalles de pagos, mensajes, fotos, audio y vídeo."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Grabar pantalla"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Estás grabando <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Detener grabación"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Compartiendo pantalla"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Compartiendo contenido"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"¿Dejar de compartir pantalla?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"¿Dejar de compartir?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Estás compartiendo toda tu pantalla con <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Estás compartiendo toda tu pantalla con una aplicación"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Estás compartiendo <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Estás compartiendo una aplicación"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Estás compartiendo una aplicación"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Dejar de compartir"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Enviando pantalla"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"¿Dejar de enviar?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgets para la pantalla de bloqueo"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Cualquiera puede ver los widgets de tu pantalla de bloqueo, aunque tu tablet esté bloqueada."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"deseleccionar widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Reducir altura"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Aumentar altura"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgets para la pantalla de bloqueo"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Para abrir una aplicación usando un widget, deberás verificar que eres tú. Además, ten en cuenta que cualquier persona podrá verlos, incluso aunque tu tablet esté bloqueada. Es posible que algunos widgets no estén pensados para la pantalla de bloqueo y no sea seguro añadirlos aquí."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Entendido"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Borrar todo"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Gestionar"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Historial"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Ajustes de notificaciones"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Historial de notificaciones"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Nuevas"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Silenciadas"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificaciones"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Empezar ahora"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No hay notificaciones"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"No hay notificaciones nuevas"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Bajar el volumen de notificaciones está activado"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"El volumen y las alertas de tu dispositivo se reducen durante hasta 2 minutos si recibes muchas notificaciones a la vez."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Desactivar"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Desbloquea para ver notificaciones anteriores"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fijo"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Seguimiento de cabeza"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Toca para cambiar el modo de timbre"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"silenciar"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"dejar de silenciar"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrar"</string> @@ -814,7 +809,7 @@ <string name="keyboard_key_home" msgid="3734400625170020657">"Inicio"</string> <string name="keyboard_key_back" msgid="4185420465469481999">"Atrás"</string> <string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string> - <string name="keyboard_key_space" msgid="6980847564173394012">"Espacio"</string> + <string name="keyboard_key_space" msgid="6980847564173394012">"Espa-cio"</string> <string name="keyboard_key_enter" msgid="8633362970109751646">"Intro"</string> <string name="keyboard_key_backspace" msgid="4095278312039628074">"Tecla de retroceso"</string> <string name="keyboard_key_media_play_pause" msgid="8389984232732277478">"Reproducir/Pausa"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Aplicación en uso"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accesibilidad"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Combinaciones de teclas"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizar las combinaciones de teclas"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Atajos de búsqueda"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"No hay resultados de búsqueda"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icono de contraer"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizar"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Hecho"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icono de desplegar"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"o"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Controlador de arrastre"</string> @@ -1447,7 +1439,7 @@ <string name="touchpad_home_gesture_success_title" msgid="3648264553645798470">"¡Bien hecho!"</string> <string name="touchpad_home_gesture_success_body" msgid="2590690589194027059">"Has completado el gesto para ir a la pantalla de inicio"</string> <string name="touchpad_recent_apps_gesture_action_title" msgid="934906836867137906">"Ver aplicaciones recientes"</string> - <string name="touchpad_recent_apps_gesture_guidance" msgid="6304446013842271822">"Desliza hacia arriba y mantén pulsado con tres dedos en el panel táctil"</string> + <string name="touchpad_recent_apps_gesture_guidance" msgid="6304446013842271822">"Desliza hacia arriba con tres dedos y mantén pulsado en el panel táctil"</string> <string name="touchpad_recent_apps_gesture_success_title" msgid="8481920554139332593">"¡Bien hecho!"</string> <string name="touchpad_recent_apps_gesture_success_body" msgid="4334263906697493273">"Has completado el gesto para ver las aplicaciones recientes."</string> <string name="tutorial_action_key_title" msgid="8172535792469008169">"Ver todas las aplicaciones"</string> @@ -1471,7 +1463,7 @@ <string name="home_edu_notification_title" msgid="6097902076909654045">"Usa el panel táctil para ir a la pantalla de inicio"</string> <string name="home_edu_notification_content" msgid="6631697734535766588">"Desliza hacia arriba con tres dedos. Toca para aprender a usar más gestos."</string> <string name="overview_edu_notification_title" msgid="1265824157319562406">"Usa el panel táctil para ver las aplicaciones recientes"</string> - <string name="overview_edu_notification_content" msgid="3578204677648432500">"Desliza hacia arriba y mantén pulsado con tres dedos. Toca para aprender a usar más gestos."</string> + <string name="overview_edu_notification_content" msgid="3578204677648432500">"Desliza hacia arriba con tres dedos y mantén pulsado. Toca para aprender a usar más gestos."</string> <string name="all_apps_edu_notification_title" msgid="372262997265569063">"Usa el teclado para ver todas las aplicaciones"</string> <string name="all_apps_edu_notification_content" msgid="3255070575694025585">"Pulsa la tecla de acción en cualquier momento. Toca para aprender a usar más gestos."</string> <string name="accessibility_deprecate_extra_dim_dialog_title" msgid="910988771011857460">"La atenuación extra ahora forma parte del control deslizante de brillo"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Proporcionado por aplicaciones"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Pantalla"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Desconocido"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Restablecer recuadros"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"¿Restablecer recuadros a su orden y tamaño originales?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"¿Borrar todos los recuadros?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Todos los recuadros de ajustes rápidos se restablecerán a los ajustes originales del dispositivo"</string> </resources> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 56039da5acc8..e73a7dd9e23b 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Kas salvestada ekraanikuvast video?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Ühe rakenduse salvestamine"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Kogu ekraanikuva salvestamine"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Kogu ekraanikuva salvestamine: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Kui salvestate kogu ekraani, salvestatakse kõik ekraanil kuvatud andmed. Seega olge ettevaatlik selliste andmetega nagu paroolid, makseteave, sõnumid, fotod ning heli ja video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Kui salvestate rakendust, salvestatakse kõik, mida selles rakenduses näidatakse või esitatakse. Seega olge ettevaatlik selliste andmetega nagu paroolid, makseteave, sõnumid, fotod ning heli ja video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Ekraanikuva jäädvustamine"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Salvestate praegu rakendust <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Peata salvestamine"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Ekraani jagamine"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Sisu jagamine"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Kas lõpetada ekraanikuva jagamine?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Kas lõpetada jagamine?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Jagate praegu kogu oma ekraanikuva rakendusega <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Jagate praegu kogu oma ekraanikuva rakendusega"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Jagate praegu rakenduse <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> kuva"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Jagate praegu rakenduse kuva"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Jagate praegu rakendusega"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Lõpeta jagamine"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Ekraanikuva ülekandmine"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Kas peatada ülekandmine?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Lukustuskuva vidinad"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Igaüks saab vaadata luk.kuval olevaid vidinaid, isegi kui tahvelarvuti on lukus."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"tühistage vidina valimine"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Vähenda kõrgust"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Suurenda kõrgust"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Lukustuskuva vidinad"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Rakenduse avamiseks vidina abil peate kinnitama, et see olete teie. Samuti pidage meeles, et kõik saavad vidinaid vaadata, isegi kui teie tahvelarvuti on lukus. Mõni vidin ei pruugi olla ette nähtud teie lukustuskuva jaoks ja seda pole turvaline siia lisada."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Selge"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Tühjenda kõik"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Haldamine"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Ajalugu"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Märguandeseaded"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Märguannete ajalugu"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Uued"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Hääletu"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Märguanded"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Alusta kohe"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Märguandeid pole"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Uusi märguandeid ei ole"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Märguannete summutamine on sees"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Kui saate korraga liiga palju märguandeid, vähendab seade automaatselt helitugevust ja minimeerib märguanded kuni kaheks minutiks."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Lülita välja"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Vanemate märguannete nägemiseks avage"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fikseeritud"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Pea jälgimine"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Puudutage telefonihelina režiimi muutmiseks"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"vaigistamine"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"vaigistuse tühistamine"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibreerimine"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Praegune rakendus"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Juurdepääsetavus"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Klaviatuuri otseteed"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Otsingu otseteed"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Klaviatuuri otseteede kohandamine"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Otsige otseteid"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Otsingutulemused puuduvad"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ahendamisikoon"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Kohandamine"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Valmis"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Laiendamisikoon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"või"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Lohistamispide"</string> @@ -1435,14 +1427,14 @@ <string name="launch_keyboard_touchpad_tutorial_notification_title" msgid="1940023776496198762">"Navigeerige klaviatuuri ja puuteplaadi abil"</string> <string name="launch_keyboard_touchpad_tutorial_notification_content" msgid="1780725168171929365">"Õppige puuteplaadi liigutusi, klaviatuuri otseteid ja palju muud"</string> <string name="touchpad_tutorial_back_gesture_button" msgid="3104716365403620315">"Mine tagasi"</string> - <string name="touchpad_tutorial_home_gesture_button" msgid="8023973153559885624">"Avalehele"</string> + <string name="touchpad_tutorial_home_gesture_button" msgid="8023973153559885624">"Avakuvale"</string> <string name="touchpad_tutorial_recent_apps_gesture_button" msgid="8919227647650347359">"Hiljutiste rakenduste vaatamine"</string> <string name="touchpad_tutorial_done_button" msgid="176168488821755503">"Valmis"</string> <string name="touchpad_back_gesture_action_title" msgid="7199067250654332735">"Tagasi"</string> <string name="touchpad_back_gesture_guidance" msgid="5352221087725906542">"Pühkige puuteplaadil kolme sõrmega vasakule või paremale"</string> <string name="touchpad_back_gesture_success_title" msgid="7370719098633023496">"Tubli töö!"</string> <string name="touchpad_back_gesture_success_body" msgid="2324724953720741719">"Tegite tagasiliikumise liigutuse."</string> - <string name="touchpad_home_gesture_action_title" msgid="8885107349719257882">"Avalehele"</string> + <string name="touchpad_home_gesture_action_title" msgid="8885107349719257882">"Avakuvale"</string> <string name="touchpad_home_gesture_guidance" msgid="4178219118381915899">"Pühkige puuteplaadil kolme sõrmega üles"</string> <string name="touchpad_home_gesture_success_title" msgid="3648264553645798470">"Väga hea!"</string> <string name="touchpad_home_gesture_success_body" msgid="2590690589194027059">"Tegite avakuvale minemise liigutuse"</string> @@ -1460,8 +1452,8 @@ <string name="home_controls_dream_description" msgid="4644150952104035789">"Juurdepääs kodu juhtelementidele ekraanisäästjalt"</string> <string name="volume_undo_action" msgid="5815519725211877114">"Võta tagasi"</string> <string name="back_edu_toast_content" msgid="4530314597378982956">"Tagasiliikumiseks pühkige puuteplaadil kolme sõrmega vasakule või paremale"</string> - <string name="home_edu_toast_content" msgid="3381071147871955415">"Avakuvale liikumiseks pühkige puuteplaadil kolme sõrmega üles"</string> - <string name="overview_edu_toast_content" msgid="5797030644017804518">"Hiljutiste rakenduste kuvamiseks pühkige puuteplaadil kolme sõrmega üles ja hoidke sõrmi puuteplaadil"</string> + <string name="home_edu_toast_content" msgid="3381071147871955415">"Avakuvale liikumiseks pühkige puuteplaadil kolme sõrmega üles."</string> + <string name="overview_edu_toast_content" msgid="5797030644017804518">"Hiljutiste rakenduste kuvamiseks pühkige puuteplaadil kolme sõrmega üles ja hoidke sõrmi puuteplaadil."</string> <string name="all_apps_edu_toast_content" msgid="8807496014667211562">"Kõigi oma rakenduste kuvamiseks vajutage klaviatuuril toiminguklahvi"</string> <string name="redacted_notification_single_line_title" msgid="212019960919261670">"Peidetud"</string> <string name="redacted_notification_single_line_text" msgid="8684166405005242945">"Vaatamiseks avage"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Rakendustelt"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Kuva"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Teadmata"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Paanide lähtestamine"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Kas soovite paanid lähtestada nende algsesse järjekorda ja suurusesse?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Kas lähtestada kõik paanid?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Kõik kiirseadete paanid lähtestatakse seadme algseadetele"</string> </resources> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 426d1d754c94..71bc77f0572b 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Pantaila grabatu nahi duzu?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Grabatu aplikazio bat"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Grabatu pantaila osoa"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Grabatu pantaila osoa: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Pantaila osoa grabatzen ari zarenean, pantailan agertzen den guztia grabatzen da. Beraz, kontuz ibili pasahitzekin, ordainketen xehetasunekin, mezuekin, argazkiekin, audioekin eta bideoekin, besteak beste."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Aplikazio bat grabatzen ari zarenean, aplikazio horretan agertzen den edo bertan erreproduzitzen ari den guztia grabatzen da. Beraz, kontuz ibili pasahitzekin, ordainketen xehetasunekin, mezuekin, argazkiekin, audioekin eta bideoekin, besteak beste."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Grabatu pantaila"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"<xliff:g id="APP_NAME">%1$s</xliff:g> grabatzen ari zara"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Utzi grabatzeari"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Pantaila partekatzen"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Edukia partekatzen"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Pantaila partekatzeari utzi nahi diozu?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Partekatzeari utzi nahi diozu?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Pantaila osoa <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> aplikazioarekin partekatzen ari zara"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Pantaila osoa aplikazio batekin partekatzen ari zara"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> partekatzen ari zara"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Aplikazio bat partekatzen ari zara"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Aplikazio batekin edukia partekatzen ari zara"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Utzi partekatzeari"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Pantaila igortzen"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Igortzeari utzi nahi diozu?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Pantaila blokeatuko widgetak"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Edonork ikus ditzake pantaila blokeatuko widgetak, tableta blokeatuta badago ere."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"desautatu widgeta"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Txikitu altuera"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Handitu altuera"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Pantaila blokeatuko widgetak"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Aplikazio bat widget baten bidez irekitzeko, zeu zarela egiaztatu beharko duzu. Gainera, kontuan izan edonork ikusi ahalko dituela halako widgetak, tableta blokeatuta badago ere. Baliteke widget batzuk pantaila blokeaturako egokiak ez izatea, eta agian ez da segurua haiek bertan gehitzea."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Ados"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Garbitu guztiak"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Kudeatu"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Historia"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Jakinarazpen-ezarpenak"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Jakinarazpenen historia"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Berria"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Isila"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Jakinarazpenak"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Hasi"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Ez dago jakinarazpenik"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Ez dago jakinarazpen berririk"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Jakinarazpenak arintzeko ezarpena aktibatuta dago"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Aldi berean jakinarazpen gehiegi jasotzen badituzu, gailuaren bolumena eta alertak automatikoki murriztuko dira 2 minutuz (gehienez)."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Desaktibatu"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Jakinarazpen zaharragoak ikusteko, desblokeatu"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Finkoa"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Buruaren jarraipena"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Sakatu tonu-jotzailearen modua aldatzeko"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"desaktibatu audioa"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"aktibatu audioa"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"dardara"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Oraingo aplikazioa"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Erabilerraztasuna"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Lasterbideak"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Pertsonalizatu lasterbideak"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Bilatu lasterbideak"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ez dago bilaketa-emaitzarik"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Tolesteko ikonoa"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Pertsonalizatu"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Eginda"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Zabaltzeko ikonoa"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"edo"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Arrastatzeko kontrol-puntua"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Aplikazioenak"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Pantaila"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Ezezagunak"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Berrezarri lauzak"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Lauzen jatorrizko ordena eta tamainak berrezarri nahi dituzu?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Lauza guztiak berrezarri nahi dituzu?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Gailuaren jatorrizko ezarpenak berrezarriko dira ezarpen bizkorren lauza guztietan"</string> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index b0d23aa81898..d82edf90a990 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"صفحهنمایش ضبط شود؟"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"ضبط یک برنامه"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"ضبط کل صفحهنمایش"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"ضبط کردن کل صفحهنمایش: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"وقتی کل صفحهنمایش را ضبط میکنید، هر چیزی که در صفحهنمایش نشان داده شود ضبط خواهد شد. درنتیجه مراقب چیزهایی مثل گذرواژهها، جزئیات پرداخت، پیامها، عکسها، و صدا و تصویر باشید."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"وقتی برنامهای را ضبط میکنید، هر چیزی که در آن برنامه نشان داده شود یا پخش شود ضبط خواهد شد. درنتیجه مراقب چیزهایی مثل گذرواژهها، جزئیات پرداخت، پیامها، عکسها، و صدا و تصویر باشید."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"ضبط صفحهنمایش"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"اکنون درحال ضبط <xliff:g id="APP_NAME">%1$s</xliff:g> هستید"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"توقف ضبط"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"درحال همرسانی صفحه"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"همرسانی محتوا"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"همرسانی صفحه متوقف شود؟"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"همرسانی متوقف شود؟"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"اکنون درحال همرسانی کل صفحهنمایشتان با <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> هستید"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"اکنون درحال همرسانی کل صفحهنمایشتان با یک برنامه هستید"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"اکنون درحال همرسانی <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> هستید"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"اکنون درحال همرسانی با یک برنامه هستید"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"درحال همرسانی با یک برنامه هستید"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"توقف همرسانی"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"درحال پخش محتوای صفحهنمایش"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"پخش محتوا متوقف شود؟"</string> @@ -417,7 +413,7 @@ <string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"برای جفت کردن دستگاه جدید، کلیک کنید"</string> <string name="hearing_devices_presets_error" msgid="350363093458408536">"پیشتنظیم بهروزرسانی نشد"</string> <string name="hearing_devices_preset_label" msgid="7878267405046232358">"پیشتنظیم"</string> - <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"زیرنویس ناشنوایان زنده"</string> + <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"زیرنویس زنده ناشنوایان"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"میکروفون دستگاه لغو انسداد شود؟"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"دوربین دستگاه لغو انسداد شود؟"</string> <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"دوربین و میکروفون دستگاه لغو انسداد شود؟"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"ابزارههای صفحه قفل"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"همه میتوانند ابزارهها را در صفحه قفل شما ببینند، حتی اگر رایانه لوحی قفل باشد."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"لغو انتخاب ابزاره"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"کاهش ارتفاع"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"افزایش ارتفاع"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"ابزارههای صفحه قفل"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"برای باز کردن برنامه بااستفاده از ابزاره، باید هویت خودتان را بهتأیید برسانید. همچنین، بهخاطر داشته باشید که همه میتوانند آنها را مشاهده کنند، حتی وقتی رایانه لوحیتان قفل است. برخیاز ابزارهها ممکن است برای صفحه قفل درنظر گرفته نشده باشند و ممکن است اضافه کردن آنها در اینجا ناامن باشد."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"متوجهام"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"اکنون شروع کنید"</string> <string name="empty_shade_text" msgid="8935967157319717412">"اعلانی موجود نیست"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"اعلان جدیدی وجود ندارد"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"«استراحت اعلانها» روشن است"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"وقتی بهطور همزمان تعداد بسیار زیادی اعلان دریافت کنید، میزان صدای دستگاه و هشدارها بهطور خودکار تا ۲ دقیقه کاهش مییابد."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"خاموش کردن"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"برای دیدن اعلانهای قبلی قفل را باز کنید"</string> @@ -653,7 +648,7 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"غیرفعال کردن"</string> <string name="sound_settings" msgid="8874581353127418308">"صدا و لرزش"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"تنظیمات"</string> - <string name="volume_panel_captioning_title" msgid="5984936949147684357">"زیرنویس ناشنوایان زنده"</string> + <string name="volume_panel_captioning_title" msgid="5984936949147684357">"زیرنویس زنده ناشنوایان"</string> <string name="csd_lowered_title" product="default" msgid="2464112924151691129">"صدا به سطح ایمنتر کاهش یافت"</string> <string name="csd_system_lowered_text" product="default" msgid="1250251883692996888">"صدای هدفون برای مدتی طولانیتر از حد توصیهشده بلند بوده است"</string> <string name="csd_500_system_lowered_text" product="default" msgid="7414943302186884124">"صدای هدفون از حد ایمن برای این هفته فراتر رفته است"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"ثابت"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"ردیابی سر"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"برای تغییر حالت زنگ، تکضرب بزنید"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"صامت کردن"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"باصدا کردن"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"لرزش"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"برنامه فعلی"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"دسترسپذیری"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"میانبرهای صفحهکلید"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"سفارشیسازی کردن میانبرهای صفحهکلید"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"جستجوی میانبرها"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"نتیجهای برای جستجو پیدا نشد"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"نماد جمع کردن"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"سفارشیسازی کردن"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"تمام"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"نماد ازهم بازکردن"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"یا"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"دستگیره کشاندن"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"ارائهشده از برنامهها"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"نمایشگر"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"نامشخص"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"بازنشانی کردن کاشیها"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"اندازه و ترتیب کاشیها به حالت اولیهشان بازنشانی شود؟"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"همه کاشیها بازنشانی شود؟"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"همه کاشیهای «تنظیمات فوری» به تنظیمات اصلی دستگاه بازنشانی خواهد شد"</string> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 690228f9d333..e3d27a587814 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Tallennetaanko näytön toimintaa?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Tallenna yhdestä sovelluksesta"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Tallenna koko näyttö"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Tallenna koko näyttö: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Kun tallennat koko näyttöä, kaikki näytöllä näkyvä sisältö tallennetaan. Ole siis varovainen, kun lisäät salasanoja, maksutietoja, viestejä, kuvia, audiota tai videoita."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Kun tallennat sovellusta, kaikki sovelluksessa näkyvä tai toistettu sisältö tallennetaan. Ole siis varovainen, kun lisäät salasanoja, maksutietoja, viestejä, kuvia, audiota tai videoita."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Tallenna näyttö"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Laite, jonka sisältöä tallennat: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Lopeta tallennus"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Näyttöä jaetaan"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Jaetaan sisältöä"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Lopetetaanko näytön jakaminen?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Lopetetaanko jakaminen?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Jaat tällä hetkellä koko näyttöä: <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Jaat tällä hetkellä koko näyttöä sovellukselle"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Jaat tällä hetkellä tätä: <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Jaat tällä hetkellä sovellusta"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Jaat tällä hetkellä sovellukseen"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Lopeta jakaminen"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Näyttöä striimataan"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Lopetetaanko striimaus?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Lukitusnäytön widgetit"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Kaikki voivat nähdä widgetit lukitusnäytöllä, vaikka tabletti olisi lukittuna."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"poista widgetin valinta"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Vähennä korkeutta"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Lisää korkeutta"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Lukitusnäytön widgetit"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Jos haluat avata sovelluksen käyttämällä widgetiä, sinun täytyy vahvistaa henkilöllisyytesi. Muista myös, että widgetit näkyvät kaikille, vaikka tabletti olisi lukittuna. Jotkin widgetit on ehkä tarkoitettu lukitusnäytölle, ja niiden lisääminen tänne ei välttämättä ole turvallista."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Selvä"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Tyhjennä kaikki"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Muuta asetuksia"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Historia"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Ilmoitusasetukset"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Ilmoitushistoria"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Uudet"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Äänetön"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Ilmoitukset"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Aloita nyt"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Ei ilmoituksia"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Ei uusia ilmoituksia"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Ilmoitusten vaimennus on päällä"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Äänenvoimakkuus ja ilmoitukset vaimennetaan enintään 2 minuutiksi, kun saat paljon ilmoituksia."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Laita pois päältä"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Avaa lukitus niin näet ilmoituksia"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Kiinteä"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Pään seuranta"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Vaihda soittoäänen tilaa napauttamalla"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"mykistä"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"poista mykistys"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"värinä"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Nykyinen sovellus"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Saavutettavuus"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Pikanäppäimet"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Pikanäppäimien muokkaaminen"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pikahaut"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ei hakutuloksia"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Tiivistyskuvake"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Muokkaa"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Valmis"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Laajennuskuvake"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"tai"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Vetokahva"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Sovellusten tarjoama"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Näyttö"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Tuntematon"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Palauta laatat"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Palautetaanko laatat alkuperäiseen järjestykseen ja kokoon?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Nollataanko kaikki laatat?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Kaikki pika-asetuslaatat palautetaan laitteen alkuperäisiin asetuksiin"</string> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 5ea58ce1e574..d01acd3de342 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Enregistrer votre écran?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Enregistrer une appli"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Enregistrer l\'écran entier"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Enregistrer tout l\'écran : %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Lorsque vous enregistrez l\'intégralité de votre écran, tout ce qui s\'affiche sur votre écran est enregistré. Par conséquent, soyez prudent avec les mots de passe, les détails du mode de paiement, les messages, les photos et les contenus audio et vidéo."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Lorsque vous enregistrez une appli, tout ce qui est affiché ou lu dans cette appli est enregistré. Par conséquent, soyez prudent avec les mots de passe, les détails du mode de paiement, les messages, les photos et les contenus audio et vidéo."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Enregistrer l\'écran"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Vous êtes en train d\'enregistrer <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Arrêter l\'enregistrement"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Partage d\'écran en cours…"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Partage de contenu en cours…"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Arrêter le partage d\'écran?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Arrêter le partage?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Vous partagez actuellement l\'intégralité de votre écran avec <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Vous partagez actuellement l\'intégralité de votre écran avec une appli"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Vous partagez actuellement <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Vous partagez actuellement une appli"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Vous partagez actuellement un élément avec une appli"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Arrêter le partage"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Diffusion de l\'écran en cours…"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Arrêter la diffusion?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgets de l\'écran de verrouillage"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"N\'importe qui peut voir les widgets sur votre écran de verrouillage, même si votre tablette est verrouillée."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"désélectionner le widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Diminuer la hauteur"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Augmenter la hauteur"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgets de l\'écran de verrouillage"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Pour ouvrir une appli à l\'aide d\'un widget, vous devrez confirmer votre identité. En outre, gardez à l\'esprit que tout le monde peut voir les widgets, même lorsque votre tablette est verrouillée. Certains widgets n\'ont peut-être pas été conçus pour votre écran de verrouillage, et il pourrait être dangereux de les ajouter ici."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Tout effacer"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Gérer"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Historique"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Paramètres de notification"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Historique des notifications"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Nouvelles"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Mode silencieux"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifications"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Commencer"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Aucune notification"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Aucune nouvelle notification"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"L\'atténuation des notifications est activée"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Les alertes et le volume de l\'appareil sont réduits automatiquement pendant 2 minutes maximum quand vous recevez trop de notifications à la fois."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Désactiver"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Déverr. pour voir les anciennes notif."</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Activé"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Suivi de la tête"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Touchez pour modifier le mode de sonnerie"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"désactiver le son"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"réactiver le son"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibration"</string> @@ -843,7 +838,7 @@ <string name="keyboard_shortcut_join" msgid="3578314570034512676">"ou"</string> <string name="keyboard_shortcut_clear_text" msgid="6631051796030377857">"Effacez la requête de recherche"</string> <string name="keyboard_shortcut_search_list_title" msgid="4271769465397671138">"Raccourcis-clavier"</string> - <string name="keyboard_shortcut_search_list_hint" msgid="5982623262974326746">"Recherchez des raccourcis"</string> + <string name="keyboard_shortcut_search_list_hint" msgid="5982623262974326746">"Rechercher des raccourcis"</string> <string name="keyboard_shortcut_search_list_no_result" msgid="6819302191660875501">"Aucun raccourci trouvé"</string> <string name="keyboard_shortcut_search_category_system" msgid="1151182120757052669">"Système"</string> <string name="keyboard_shortcut_search_category_input" msgid="5440558509904296233">"Entrée"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Appli actuelle"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibilité"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Raccourcis-clavier"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Recherchez des raccourcis"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personnaliser les raccourcis-clavier"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Rechercher des raccourcis"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Aucun résultat de recherche"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icône Réduire"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personnaliser"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Terminé"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icône Développer"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ou"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Poignée de déplacement"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Fournies par des applis"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Affichage"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Inconnu"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Réinitialiser les tuiles"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Réinitialiser les tuiles à leur ordre et à leur taille par défaut?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Réinitialiser toutes les tuiles?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Toutes les tuiles des paramètres rapides seront réinitialisées aux paramètres par défaut de l\'appareil."</string> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 2be31b11c1f5..2da6399949b3 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Enregistrer l\'écran ?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Enregistrer une appli"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Enregistrer tout l\'écran"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Enregistrer tout l\'écran : %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Lorsque vous enregistrez l\'intégralité de votre écran, tout ce qui s\'y affiche est enregistré. Faites donc attention aux éléments tels que les mots de passe, les détails du mode de paiement, les messages, les photos, et les contenus audio et vidéo."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Lorsque vous enregistrez une appli, tout ce qui est affiché ou lu dans celle-ci est enregistré. 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> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Enregistrer l\'écran"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Vous enregistrez actuellement <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Arrêter l\'enregistrement"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Partage de l\'écran…"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Partage de contenu"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Arrêter le partage d\'écran ?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Arrêter le partage ?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Vous partagez actuellement l\'intégralité de votre écran avec <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Vous partagez actuellement l\'intégralité de votre écran avec une appli"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Vous partagez actuellement <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Vous partagez actuellement une appli"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Vous partagez actuellement du contenu avec une appli"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Arrêter le partage"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Cast de l\'écran"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Arrêter de caster ?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgets sur l\'écran de verrouillage"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"N\'importe qui peut consulter les widgets sur votre écran de verrouillage, même si votre tablette est verrouillée."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"désélectionner le widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Diminuer la hauteur"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Augmenter la hauteur"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgets pour l\'écran de verrouillage"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Pour ouvrir une appli à l\'aide d\'un widget, vous devez confirmer qu\'il s\'agit bien de vous. N\'oubliez pas non plus que tout le monde peut voir vos widgets, même lorsque votre tablette est verrouillée. Certains d\'entre eux n\'ont pas été conçus pour l\'écran de verrouillage et les ajouter à cet endroit peut s\'avérer dangereux."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Tout effacer"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Gérer"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Historique"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Paramètres de notification"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Historique des notifications"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Nouvelles notifications"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Silencieux"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifications"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Commencer"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Aucune notification"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Aucune nouvelle notification"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"La limitation des notifications est activée"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Les alertes et le volume de l\'appareil sont réduits automatiquement pendant 2 minutes maximum quand vous recevez trop de notifications à la fois."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Désactiver"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Déverrouiller pour voir anciennes notifications"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Activé"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Suivi de la tête"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Appuyez pour changer le mode de la sonnerie"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"couper le son"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"réactiver le son"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"activer le vibreur"</string> @@ -860,8 +855,8 @@ <string name="group_system_go_back" msgid="2730322046244918816">"Retour"</string> <string name="group_system_access_home_screen" msgid="4130366993484706483">"Accéder à l\'écran d\'accueil"</string> <string name="group_system_overview_open_apps" msgid="5659958952937994104">"Afficher les applis récentes"</string> - <string name="group_system_cycle_forward" msgid="5478663965957647805">"Avancer dans les applications récentes"</string> - <string name="group_system_cycle_back" msgid="8194102916946802902">"Revenir sur les applications récentes"</string> + <string name="group_system_cycle_forward" msgid="5478663965957647805">"Faire défiler les applications récentes"</string> + <string name="group_system_cycle_back" msgid="8194102916946802902">"Faire défiler les applications récentes à l\'envers"</string> <string name="group_system_access_all_apps_search" msgid="1553588630154197469">"Ouvrir la liste d\'applications"</string> <string name="group_system_access_system_settings" msgid="8731721963449070017">"Ouvrir les paramètres"</string> <string name="group_system_access_google_assistant" msgid="7210074957915968110">"Ouvrir l\'Assistant"</string> @@ -871,7 +866,7 @@ <string name="system_multitasking_rhs" msgid="8714224917276297810">"Utiliser l\'écran partagé avec l\'appli actuelle sur la droite"</string> <string name="system_multitasking_lhs" msgid="8402954791206308783">"Utiliser l\'écran partagé avec l\'appli actuelle sur la gauche"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Passer de l\'écran partagé au plein écran"</string> - <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_rhs" msgid="3838578650313318508">"Passer à 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> @@ -1415,21 +1410,18 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Appli actuelle"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibilité"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Raccourcis clavier"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Raccourcis de recherche"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personnaliser les raccourcis clavier"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Rechercher des raccourcis"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Aucun résultat de recherche"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icône Réduire"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personnaliser"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"OK"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icône Développer"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ou"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Poignée de déplacement"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Paramètres du clavier"</string> <string name="launch_keyboard_tutorial_notification_title" msgid="8849933155160522519">"Naviguer à l\'aide du clavier"</string> - <string name="launch_keyboard_tutorial_notification_content" msgid="2880339951512757918">"Découvrir les raccourcis clavier"</string> + <string name="launch_keyboard_tutorial_notification_content" msgid="2880339951512757918">"Apprenez à utiliser les raccourcis clavier"</string> <string name="launch_touchpad_tutorial_notification_title" msgid="2243780062772196901">"Naviguer à l\'aide de votre pavé tactile"</string> <string name="launch_touchpad_tutorial_notification_content" msgid="7931085031240753226">"Découvrir les gestes au pavé tactile"</string> <string name="launch_keyboard_touchpad_tutorial_notification_title" msgid="1940023776496198762">"Naviguer à l\'aide de votre clavier et de votre pavé tactile"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Fournis par des applis"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Écran"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Inconnu"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Réinitialiser les blocs"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Rétablir l\'ordre et la taille d\'origine des blocs ?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Réinitialiser tous les blocs ?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Tous les blocs \"Réglages rapides\" seront réinitialisés aux paramètres d\'origine de l\'appareil"</string> </resources> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 2bd0b30988e7..e0127254bd3e 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Queres gravar a túa pantalla?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Gravar unha aplicación"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Gravar pantalla completa"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Gravar pantalla completa: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Cando gravas a pantalla completa, recóllese todo o que se mostra nela. Recomendámosche que teñas coidado con determinada información, como os contrasinais, os detalles de pago, as mensaxes e as fotos, así como co contido de audio e de vídeo."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Cando gravas unha aplicación, recóllese todo o que se mostra ou reproduce nela. Recomendámosche que teñas coidado con determinada información, como os contrasinais, os detalles de pago, as mensaxes e as fotos, así como co contido de audio e de vídeo."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Gravar pantalla"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Estás gravando <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Deter gravación"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Compartindo pantalla"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Compartindo contido"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Queres deixar de compartir a pantalla?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Queres deixar de compartir o contido?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Estás compartindo toda a pantalla con <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Estás compartindo toda a pantalla cunha aplicación"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Estás compartindo <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Estás compartindo unha aplicación"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Estás compartindo contido cunha aplicación"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Deixar de compartir"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Emitindo pantalla"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Queres deter a emisión?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgets da pantalla de bloqueo"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Calquera pode ver os widgets na pantalla de bloqueo, mesmo coa tableta bloqueada"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"anular a selección do widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Reducir a altura"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Aumentar a altura"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgets da pantalla de bloqueo"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Para abrir unha aplicación mediante un widget, tes que verificar a túa identidade. Ten en conta que pode velos calquera persoa, mesmo coa tableta bloqueada. Pode ser que algúns widgets non estean pensados para a túa pantalla de bloqueo, polo que talvez non sexa seguro engadilos aquí."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Entendido"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Eliminar todo"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Xestionar"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Historial"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Configuración de notificacións"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Historial de notificacións"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Notificacións novas"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Silenciadas"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificacións"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Iniciar agora"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Non hai notificacións"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Non hai notificacións novas"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"A opción Amainar notificacións está activada"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Ao recibir moitas notificacións, o volume e as alertas redúcense automaticamente ata dous minutos."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Desactivar"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Desbloquea para ver máis notificacións"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fixado"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Seguimento da cabeza"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Toca para cambiar o modo de timbre"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"silenciar"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"activar o son"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrar"</string> @@ -826,7 +821,7 @@ <string name="keyboard_key_page_up" msgid="173914303254199845">"Re Páx"</string> <string name="keyboard_key_page_down" msgid="9035902490071829731">"Av Páx"</string> <string name="keyboard_key_forward_del" msgid="5325501825762733459">"Supr"</string> - <string name="keyboard_key_esc" msgid="6230365950511411322">"Escape"</string> + <string name="keyboard_key_esc" msgid="6230365950511411322">"Esc"</string> <string name="keyboard_key_move_home" msgid="3496502501803911971">"Inicio"</string> <string name="keyboard_key_move_end" msgid="99190401463834854">"Fin"</string> <string name="keyboard_key_insert" msgid="4621692715704410493">"Inserir"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Aplicación actual"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accesibilidade"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Atallos de teclado"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Atallos de busca"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizar os atallos de teclado"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Busca atallos"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Non hai resultados de busca"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icona de contraer"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizar"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Feito"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icona de despregar"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ou"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Controlador de arrastre"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Provenientes de aplicacións"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Visualización"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Categoría descoñecida"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Restablecer as tarxetas"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Queres restablecer as tarxetas ao seu tamaño e orde orixinais?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Queres restablecer todos os atallos?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Restablecerase a configuración orixinal do dispositivo para todos os atallos de Configuración rápida"</string> </resources> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index becca8f8b37f..898ca383c372 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"તમારી સ્ક્રીન રેકોર્ડ કરીએ?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"એક ઍપ રેકોર્ડ કરો"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"પૂર્ણ સ્ક્રીન રેકોર્ડ કરો"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"પૂરી સ્ક્રીન રેકોર્ડ કરો: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"જ્યારે તમે તમારી પૂર્ણ સ્ક્રીન રેકોર્ડ કરી રહ્યાં હો, ત્યારે તમારી સ્ક્રીન પર બતાવવામાં આવતી હોય તેવી બધી વસ્તુ રેકોર્ડ કરવામાં આવે છે. તેથી પાસવર્ડ, ચુકવણીની વિગતો, મેસેજ, ફોટા અને ડિવાઇસ પર વાગી રહેલા ઑડિયો તથા વીડિયો જેવી બાબતોને લઈને સાવચેત રહો."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"જ્યારે તમે કોઈ ઍપને રેકોર્ડ કરી રહ્યાં હો, ત્યારે એ ઍપમાં બતાવવામાં કે ચલાવવામાં આવતી હોય તેવી બધી વસ્તુ રેકોર્ડ કરવામાં આવે છે. તેથી પાસવર્ડ, ચુકવણીની વિગતો, મેસેજ, ફોટા અને ડિવાઇસ પર વાગી રહેલા ઑડિયો તથા વીડિયો જેવી બાબતોને લઈને સાવચેત રહો."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"સ્ક્રીન રેકોર્ડ કરો"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"તમે હાલમાં <xliff:g id="APP_NAME">%1$s</xliff:g> રેકોર્ડ કરી રહ્યાં છો"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"રેકોર્ડિંગ રોકો"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"સ્ક્રીન શેર કરી રહ્યાં છીએ"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"કન્ટેન્ટ શેર કરી રહ્યાં છીએ"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"સ્ક્રીન શેર કરવાનું રોકીએ?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"શેર કરવાનું રોકીએ?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"તમે હાલમાં <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> વડે તમારી પૂર્ણ સ્ક્રીન શેર કરી રહ્યાં છો"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"તમે હાલમાં ઍપ વડે તમારી પૂર્ણ સ્ક્રીન શેર કરી રહ્યાં છો"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"તમે હાલમાં <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> શેર કરી રહ્યાં છો"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"તમે હાલમાં ઍપ શેર કરી રહ્યાં છો"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"તમે હાલમાં ઍપ સાથે શેર કરી રહ્યાં છો"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"શેર કરવાનું રોકો"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"સ્ક્રીન કાસ્ટ કરી રહ્યાં છીએ"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"કાસ્ટ કરવાનું રોકીએ?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"લૉક સ્ક્રીન વિજેટ"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"તમારું ટૅબ્લેટ લૉક કરેલું હોય તો પણ કોઈપણ તમારી લૉક સ્ક્રીન પર વિજેટ જોઈ શકે છે."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"વિજેટ નાપસંદ કરો"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"ઊંચાઈ ઘટાડો"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"ઊંચાઈ વધારો"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"લૉક સ્ક્રીન વિજેટ"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"વિજેટનો ઉપયોગ કરીને ઍપ ખોલવા માટે, તમારે એ ચકાસણી કરવાની જરૂર રહેશે કે આ તમે જ છો. તે ઉપરાંત, ધ્યાનમાં રાખો કે તમારું ટૅબ્લેટ લૉક કરેલું હોય તો પણ કોઈપણ વ્યક્તિ તેમને જોઈ શકે છે. અમુક વિજેટ કદાચ તમારી લૉક સ્ક્રીન માટે બનાવવામાં આવ્યા ન હોઈ શકે છે અને તેમને અહીં ઉમેરવાનું અસલામત હોઈ શકે છે."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"સમજાઈ ગયું"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"હવે શરૂ કરો"</string> <string name="empty_shade_text" msgid="8935967157319717412">"કોઈ નોટિફિકેશન નથી"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"કોઈ નવું નોટિફિકેશન નથી"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"નોટિફિકેશન કૂલડાઉન ચાલુ છે"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"જ્યારે તમને એકસાથે ઘણા બધા નોટિફિકેશન મળે ત્યારે તમારા ડિવાઇસનું વૉલ્યૂમ અને અલર્ટ ઑટોમૅટિક રીતે 2 મિનિટ જેટલા સમય માટે ઘટાડવામાં આવે છે."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"બંધ કરો"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"જૂના નોટિફિકેશન જોવા માટે અનલૉક કરો"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"ફિક્સ્ડ"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"હૅડ ટ્રૅકિંગ"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"રિંગર મોડ બદલવા માટે ટૅપ કરો"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"મ્યૂટ કરો"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"અનમ્યૂટ કરો"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"વાઇબ્રેટ"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"હાલની ઍપ"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ઍક્સેસિબિલિટી"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"કીબોર્ડ શૉર્ટકટ"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"કીબોર્ડ શૉર્ટકટને કસ્ટમાઇઝ કરો"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"શૉર્ટકટ શોધો"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"કોઈ શોધ પરિણામો નથી"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"\'નાનું કરો\'નું આઇકન"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"કસ્ટમાઇઝ કરો"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"થઈ ગયું"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"\'મોટું કરો\'નું આઇકન"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"અથવા"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ઑબ્જેક્ટ ખેંચવાનું હૅન્ડલ"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"ઍપ દ્વારા પ્રદાન કરવામાં આવેલી"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ડિસ્પ્લે"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"અજાણ"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"ટાઇલને રીસેટ કરો"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"ટાઇલને તેમના મૂળ ક્રમ અને કદમાં રીસેટ કરીએ?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"તમામ ટાઇલ રીસેટ કરીએ?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"તમામ ઝડપી સેટિંગ ટાઇલને ડિવાઇસના ઑરિજિનલ સેટિંગ પર રીસેટ કરવામાં આવશે"</string> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index a6fc05e2c7e0..380d394b331a 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"क्या आपको स्क्रीन रिकॉर्ड करनी है?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"एक ऐप्लिकेशन की रिकॉर्डिंग करें"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"पूरी स्क्रीन रिकॉर्ड करें"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"पूरी स्क्रीन रिकॉर्ड करें: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"पूरी स्क्रीन रिकॉर्ड करते समय, स्क्रीन पर दिखने वाली हर चीज़ रिकॉर्ड की जाती है. इसलिए पासवर्ड, पेमेंट के तरीके की जानकारी, मैसेज, डिवाइस पर चल रहे ऑडियो और वीडियो, और फ़ोटो जैसी चीज़ों को लेकर सावधानी बरतें."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"किसी ऐप्लिकेशन को रिकॉर्ड करने के दौरान, उस पर दिख रहा कॉन्टेंट या चल रहा मीडिया दूसरी स्क्रीन पर भी रिकॉर्ड होता है. इसलिए, रिकॉर्ड करते समय पासवर्ड, पेमेंट के तरीके की जानकारी, मैसेज, फ़ोटो, ऑडियो, और वीडियो को लेकर सावधानी बरतें."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"स्क्रीन रिकॉर्ड करें"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"फ़िलहाल, <xliff:g id="APP_NAME">%1$s</xliff:g> की रिकॉर्डिंग की जा रही है"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"रिकॉर्ड करना बंद करें"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"स्क्रीन शेयर की जा रही है"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"कॉन्टेंट शेयर करें"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"स्क्रीन शेयर करना बंद करना है?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"क्या आपको शेयर करने की प्रोसेस बंद करनी है?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"फ़िलहाल, <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> पर पूरी स्क्रीन शेयर की जा रही है"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"फ़िलहाल, किसी ऐप्लिकेशन पर पूरी स्क्रीन शेयर की जा रही है"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"फ़िलहाल, <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> शेयर किया जा रहा है"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"फ़िलहाल, कोई ऐप्लिकेशन शेयर किया जा रहा है"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"फ़िलहाल, ऐप्लिकेशन के साथ कुछ शेयर किया जा रहा है"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"शेयर करना बंद करें"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"स्क्रीन कास्ट की जा रही है"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"कास्ट करना बंद करना है?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"लॉक स्क्रीन विजेट"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"टैबलेट लॉक होने के बावजूद, कोई भी व्यक्ति इसकी लॉक स्क्रीन पर विजेट देख सकता है."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"विजेट से चुने हुए का निशान हटाएं"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"ऊंचाई घटाएं"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"ऊंचाई बढ़ाएं"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"लॉक स्क्रीन विजेट"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"किसी विजेट से कोई ऐप्लिकेशन खोलने के लिए, आपको अपनी पहचान की पुष्टि करनी होगी. ध्यान रखें कि आपके टैबलेट के लॉक होने पर भी, कोई व्यक्ति विजेट देख सकता है. ऐसा हो सकता है कि कुछ विजेट, लॉक स्क्रीन पर दिखाने के लिए न बने हों. इन्हें लॉक स्क्रीन पर जोड़ना असुरक्षित हो सकता है."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ठीक है"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"सभी हटाएं"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"मैनेज करें"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"इतिहास"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"सूचना सेटिंग"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"सूचनाओं का इतिहास"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"नई सूचनाएं"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"साइलेंट मोड में मिली सूचनाएं"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"सूचनाएं"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"अभी शुरू करें"</string> <string name="empty_shade_text" msgid="8935967157319717412">"कोई सूचना नहीं है"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"कोई नई सूचना नहीं है"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"लगातार सूचनाएं आने पर आवाज़ कम करने की सेटिंग चालू है"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"एक साथ कई सूचनाएं मिलने पर, डिवाइस में सूचनाओं से होने वाली आवाज़ और सूचनाएं, दो मिनट के लिए अपने-आप कम हो जाएंगी."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"बंद करें"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"पुरानी सूचाएं देखने के लिए अनलॉक करें"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"चालू है"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"हेड ट्रैकिंग चालू है"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"रिंगर मोड बदलने के लिए टैप करें"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"म्यूट करें"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"अनम्यूट करें"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"वाइब्रेशन की सुविधा चालू करें"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"मौजूदा ऐप्लिकेशन"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"सुलभता"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"कीबोर्ड शॉर्टकट"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"सर्च शॉर्टकट"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"कीबोर्ड शॉर्टकट को पसंद के मुताबिक बनाएं"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"शॉर्टकट खोजें"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"खोज का कोई नतीजा नहीं मिला"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"छोटा करने का आइकॉन"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"पसंद के मुताबिक बनाएं"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"हो गया"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"बड़ा करने का आइकॉन"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"या"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"खींचकर छोड़ने वाला हैंडल"</string> @@ -1469,9 +1461,9 @@ <string name="back_edu_notification_title" msgid="5624780717751357278">"वापस जाने के लिए, अपने डिवाइस के टचपैड का इस्तेमाल करें"</string> <string name="back_edu_notification_content" msgid="2497557451540954068">"तीन उंगलियों से बाईं या दाईं ओर स्वाइप करें. ज़्यादा जेस्चर के बारे में जानने के लिए टैप करें."</string> <string name="home_edu_notification_title" msgid="6097902076909654045">"होम पर जाने के लिए, अपने डिवाइस के टचपैड का इस्तेमाल करें"</string> - <string name="home_edu_notification_content" msgid="6631697734535766588">"तीन उंगलियों से ऊपर की ओर स्वाइप करें. जेस्चर के बारे में ज़्यादा जानने के लिए टैप करें."</string> + <string name="home_edu_notification_content" msgid="6631697734535766588">"तीन उंगलियों से ऊपर की ओर स्वाइप करें. ज़्यादा जेस्चर के बारे में जानने के लिए टैप करें."</string> <string name="overview_edu_notification_title" msgid="1265824157319562406">"हाल ही में इस्तेमाल हुए ऐप्लिकेशन देखने के लिए, अपने डिवाइस के टचपैड का इस्तेमाल करें"</string> - <string name="overview_edu_notification_content" msgid="3578204677648432500">"तीन उंगलियों से ऊपर की ओर स्वाइप करें और दबाकर रखें. जेस्चर की ज़्यादा जानकारी पाने के लिए टैप करें."</string> + <string name="overview_edu_notification_content" msgid="3578204677648432500">"तीन उंगलियों से ऊपर की ओर स्वाइप करके दबाकर रखें. ज़्यादा जेस्चर के बारे में जानने के लिए टैप करें."</string> <string name="all_apps_edu_notification_title" msgid="372262997265569063">"सभी ऐप्लिकेशन देखने के लिए, कीबोर्ड का इस्तेमाल करें"</string> <string name="all_apps_edu_notification_content" msgid="3255070575694025585">"किसी भी समय ऐक्शन बटन दबाएं. हाथ के जेस्चर के बारे में ज़्यादा जानने के लिए टैप करें."</string> <string name="accessibility_deprecate_extra_dim_dialog_title" msgid="910988771011857460">"स्क्रीन की रोशनी को सामान्य लेवल से और कम करने की सुविधा, अब ब्राइटनेस स्लाइडर का हिस्सा है"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"ऐप्लिकेशन से मिली जानकारी"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"डिसप्ले"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"कोई जानकारी नहीं है"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"टाइल रीसेट करें"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"क्या आपको टाइल, उनके ओरिजनल क्रम और साइज़ पर रीसेट करने हैं?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"क्या सभी टाइल रीसेट करनी हैं?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"क्विक सेटिंग टाइल, डिवाइस की ओरिजनल सेटिंग पर रीसेट हो जाएंगी"</string> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index cb7a1931be4d..0a7d82be2a7b 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Želite li snimati zaslon?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Snimanje jedne aplikacije"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Snimanje cijelog zaslona"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Snimanje cijelog zaslona: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Kad snimate cijeli zaslon, snima se sve što se prikazuje na zaslonu. 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="3738199712880063924">"Kad snimate aplikaciju, snima se sve š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_continue_entire_screen" msgid="5557974446773486600">"Snimanje zaslona"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Trenutačno snimate aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Zaustavi snimanje"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Dijeljenje zaslona"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Dijeljenje sadržaja"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Želite li zaustaviti dijeljenje zaslona?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Želite li zaustaviti dijeljenje?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Trenutačno dijelite cijeli zaslon s aplikacijom <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Trenutačno dijelite cijeli zaslon s aplikacijom"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Trenutačno dijelite aplikaciju <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Trenutačno dijelite aplikaciju"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Trenutačno dijelite sadržaj s aplikacijom"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Zaustavi dijeljenje"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Emitiranje zaslona"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Želite li prestati emitirati?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgeti zaključanog zaslona"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Svi vide widgete na vašem zaključanom zaslonu, čak i ako je tablet zaključan."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"poništavanje odabira widgeta"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Smanjenje visine"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Povećanje visine"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgeti na zaključanom zaslonu"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Da biste otvorili aplikaciju pomoću widgeta, trebate potvrditi da ste to vi. Također napominjemo da ih svatko može vidjeti, čak i ako je vaš tablet zaključan. Neki widgeti možda nisu namijenjeni za zaključani zaslon, pa ih možda nije sigurno dodati ovdje."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Shvaćam"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Izbriši sve"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Upravljajte"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Povijest"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Postavke obavijesti"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Povijest obavijesti"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Novo"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Bešumno"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Obavijesti"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Pokreni"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Nema obavijesti"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Nema novih obavijesti"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Stišavanje obavijesti je uključeno"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Glasnoća/upozorenja uređaja automatski se stišavaju do 2 min kad primite previše obavijesti odjednom"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Isključi"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Otključajte za starije obavijesti"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fiksno"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Praćenje glave"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Dodirnite da biste promijenili način softvera zvona"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"isključivanje zvuka"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"uključivanje zvuka"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibriranje"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Trenutačna aplikacija"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Pristupačnost"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Tipkovni prečaci"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Prilagodba tipkovnih prečaca"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Prečaci za pretraživanje"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nema rezultata pretraživanja"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona za sažimanje"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Prilagodi"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Gotovo"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona za proširivanje"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ili"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Marker za povlačenje"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Pružaju aplikacije"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Prikaz"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Nepoznato"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Vraćanje kartica na zadano"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Želite li vratiti kartice na zadani redoslijed i veličine?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Želite li poništiti sve pločice?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Sve pločice Brze postavke vratit će se na izvorne postavke uređaja"</string> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index b09947fc2600..7be9656bd082 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Rögzíti a képernyőt?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Egyetlen alkalmazás rögzítése"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Teljes képernyő rögzítése"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Teljes képernyő rögzítése: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"A teljes képernyő rögzítése esetén a képernyőn megjelenő minden tartalom rögzítésre kerül. Ezért legyen elővigyázatos a jelszavakkal, a fizetési adatokkal, az üzenetekkel, a fotókkal, valamint a hang- és videófelvételekkel."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Alkalmazás rögzítésekor az adott alkalmazásban megjelenített vagy lejátszott minden tartalom rögzítésre kerül. Ezért legyen elővigyázatos a jelszavakkal, a fizetési adatokkal, az üzenetekkel, a fotókkal, valamint a hang- és videófelvételekkel."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Képernyő rögzítése"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Jelenleg a következőről készít felvételt: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Felvétel leállítása"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Képernyő megosztása…"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Tartalom megosztása…"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Leállítja a képernyőmegosztást?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Leállítja a megosztást?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Jelenleg megosztja a teljes képernyőt a következővel: <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Jelenleg megosztja a teljes képernyőt egy alkalmazással"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Jelenleg megosztja a következőt: <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Jelenleg megoszt egy alkalmazást"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Jelenleg megoszt valamit egy alkalmazással"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Megosztás leállítása"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Képernyőtartalom átküldése…"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Leállítja az átküldést?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"A lezárási képernyő moduljai"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Bárki megtekintheti a modulokat a lezárási képernyőjén, még ha a táblagépe zárolva is van."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"modul kijelölésének megszüntetése"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Magasság csökkentése"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Magasság növelése"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"A lezárási képernyő moduljai"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Ha modul használatával szeretne megnyitni egy alkalmazást, igazolnia kell a személyazonosságát. Ne felejtse továbbá, hogy bárki megtekintheti a modulokat, még akkor is, amikor zárolva van a táblagép. Előfordulhat, hogy bizonyos modulokat nem a lezárási képernyőn való használatra terveztek, ezért nem biztonságos a hozzáadásuk."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Értem"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Az összes törlése"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Kezelés"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Előzmények"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Értesítési beállítások"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Értesítéselőzmények"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Új"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Néma"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Értesítések"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Indítás most"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Nincs értesítés"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Nincsenek új értesítések"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Értesítések befagyasztása bekapcsolva"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Az eszköz hangerejét és értesítéseit a rendszer automatikusan legfeljebb két percig csökkenti, ha egyszerre túl sok értesítést kap."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Igen"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"A régebbiek feloldás után láthatók"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Rögzített"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Fejkövetés"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Koppintson a csengés módjának módosításához"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"némítás"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"némítás feloldása"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"rezgés"</string> @@ -1411,19 +1406,16 @@ <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Legutóbbi alkalmazások"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Osztott képernyő"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Bevitel"</string> - <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Alkalmazás-parancsikonok"</string> + <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Alkalmazásikonok"</string> <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Jelenlegi alkalmazás"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Kisegítő lehetőségek"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Billentyűparancsok"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"A billentyűparancsok személyre szabása"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Billentyűparancsok keresése"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nincsenek keresési találatok"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Összecsukás ikon"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Személyre szabás"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Kész"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Kibontás ikon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"vagy"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Fogópont"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Alkalmazás által biztosított"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Kijelző"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Ismeretlen"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Mozaikok visszaállítása"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Visszaállítja a mozaikok eredeti sorrendjét és méretét?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Visszaállítja az összes mozaikot?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Az összes Gyorsbeállítások mozaik visszaáll az eszköz eredeti beállításaira"</string> </resources> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 174b52622fd2..c7a8a0eddb76 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Տեսագրե՞լ ձեր էկրանը"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Տեսագրել մեկ հավելված"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Տեսագրել ամբողջ էկրանը"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Տեսագրել ամբողջ էկրանը՝ %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Երբ դուք տեսագրում եք ամբողջ էկրանը, էկրանին ցուցադրվող ամեն ինչ տեսագրվում է։ Ուստի ուշադիր եղեք այնպիսի բաների հետ, ինչպիսիք են գաղտնաբառերը, վճարային տվյալները, հաղորդագրությունները, լուսանկարները, աուդիո և վիդեո բովանդակությունը։"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Երբ դուք որևէ հավելված եք տեսագրում, հավելվածում ցուցադրվող կամ նվագարկվող ամեն ինչ տեսագրվում է։ Ուստի ուշադիր եղեք այնպիսի բաների հետ, ինչպիսիք են գաղտնաբառերը, վճարային տվյալները, հաղորդագրությունները, լուսանկարները, աուդիո և վիդեո բովանդակությունը։"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Տեսագրել էկրանը"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Դուք ներկայումս տեսագրում եք <xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածը"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Կանգնեցնել տեսագրումը"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Միացված է էկրանի ցուցադրումը"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Բովանդակության փոխանցում"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Դադարեցնե՞լ էկրանի ցուցադրումը"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Չեղարկե՞լ փոխանցումը"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Դուք ներկայումս կիսվում եք ձեր էկրանով <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> հավելվածի հետ"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Դուք ներկայումս կիսվում եք ձեր էկրանով հավելվածի հետ"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Դուք ներկայումս կիսվում եք <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> հավելվածով"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Դուք ներկայումս կիսվում եք հավելվածով"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Դուք ներկայումս բովանդակություն եք փոխանցում այս հավելվածին"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Դադարեցնել էկրանի ցուցադրումը"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Էկրանի հեռարձակում"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Կանգնեցնե՞լ հեռարձակումը"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Կողպէկրանի վիջեթներ"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Բոլորը կարող են դիտել ձեր կողպէկրանի վիջեթները, նույնիսկ եթե պլանշետը կողպված է"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"չեղարկել վիջեթի ընտրությունը"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Նվազեցնել բարձրությունը"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Ավելացնել բարձրությունը"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Կողպէկրանի վիջեթներ"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Վիջեթի միջոցով հավելված բացելու համար դուք պետք է հաստատեք ձեր ինքնությունը։ Նաև նկատի ունեցեք, որ ցանկացած ոք կարող է դիտել վիջեթները, նույնիսկ երբ ձեր պլանշետը կողպված է։ Որոշ վիջեթներ կարող են նախատեսված չլինել ձեր կողպէկրանի համար, և այստեղ դրանց ավելացնելը կարող է վտանգավոր լինել։"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Եղավ"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Մաքրել բոլորը"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Կառավարել"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Պատմություն"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Ծանուցումների կարգավորումներ"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Ծանուցումների պատմություն"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Նոր"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Անձայն"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Ծանուցումներ"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Սկսել հիմա"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Ծանուցումներ չկան"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Նոր ծանուցումներ չկան"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Ծանուցումների ձայնի իջեցումը միացված է"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Սարքի և ծանուցումների ձայնն ավտոմատ իջեցվում է մինչև 2 րոպեով, երբ շատ ծանուցումներ եք ստանում։"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Անջատել"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Ապակողպեք՝ տեսնելու հին ծանուցումները"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Ֆիքսված"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Գլխի շարժումների հետագծում"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Հպեք՝ զանգակի ռեժիմը փոխելու համար"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"անջատել ձայնը"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"միացնել ձայնը"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"միացնել թրթռոցը"</string> @@ -815,7 +810,7 @@ <string name="keyboard_key_back" msgid="4185420465469481999">"Հետ"</string> <string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string> <string name="keyboard_key_space" msgid="6980847564173394012">"Բացատ"</string> - <string name="keyboard_key_enter" msgid="8633362970109751646">"Մուտք"</string> + <string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string> <string name="keyboard_key_backspace" msgid="4095278312039628074">"Backspace"</string> <string name="keyboard_key_media_play_pause" msgid="8389984232732277478">"Նվագարկում/դադար"</string> <string name="keyboard_key_media_stop" msgid="1509943745250377699">"Կանգնեցնել"</string> @@ -860,14 +855,14 @@ <string name="group_system_go_back" msgid="2730322046244918816">"Հետ գնալ"</string> <string name="group_system_access_home_screen" msgid="4130366993484706483">"Անցնել հիմնական էկրան"</string> <string name="group_system_overview_open_apps" msgid="5659958952937994104">"Դիտել վերջին հավելվածները"</string> - <string name="group_system_cycle_forward" msgid="5478663965957647805">"Առաջ անցնել վերջին հավելվածների միջով"</string> - <string name="group_system_cycle_back" msgid="8194102916946802902">"Հետ անցնել վերջին հավելվածների միջով"</string> + <string name="group_system_cycle_forward" msgid="5478663965957647805">"Առաջ անցնել վերջին հավելվածներով"</string> + <string name="group_system_cycle_back" msgid="8194102916946802902">"Հետ անցնել վերջին հավելվածներով"</string> <string name="group_system_access_all_apps_search" msgid="1553588630154197469">"Բացել հավելվածների ցանկը"</string> <string name="group_system_access_system_settings" msgid="8731721963449070017">"Բացել կարգավորումները"</string> <string name="group_system_access_google_assistant" msgid="7210074957915968110">"Բացել Օգնականը"</string> <string name="group_system_lock_screen" msgid="7391191300363416543">"Կողպէկրան"</string> <string name="group_system_quick_memo" msgid="3764560265935722903">"Ստեղծել նշում"</string> - <string name="keyboard_shortcut_group_system_multitasking" msgid="6967816258924795558">"Բազմախնդրություն"</string> + <string name="keyboard_shortcut_group_system_multitasking" msgid="6967816258924795558">"Բազմախնդրություն"</string> <string name="system_multitasking_rhs" msgid="8714224917276297810">"Տրոհել էկրանը և տեղավորել այս հավելվածը աջում"</string> <string name="system_multitasking_lhs" msgid="8402954791206308783">"Տրոհել էկրանը և տեղավորել այս հավելվածը ձախում"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Տրոհված էկրանից անցնել լիաէկրան ռեժիմ"</string> @@ -1407,7 +1402,7 @@ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Համակարգ"</string> <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Համակարգի կառավարման տարրեր"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Համակարգային հավելվածներ"</string> - <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Բազմախնդրություն"</string> + <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Բազմախնդրություն"</string> <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Վերջին օգտագործած հավելվածները"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Տրոհված էկրան"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Ներածում"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Այս հավելվածը"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Հատուկ գործառույթներ"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Ստեղնային դյուրանցումներ"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Կարգավորեք ստեղնային դյուրանցումներ"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Դյուրանցումների որոնում"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Որոնման արդյունքներ չկան"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ծալել պատկերակը"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Կարգավորել"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Պատրաստ է"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ծավալել պատկերակը"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"կամ"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Տեղափոխման նշիչ"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Տրամադրվել են հավելվածների կողմից"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Էկրան"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Անհայտ"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Սալիկների վերակայում"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Վերականգնե՞լ սալիկների սկզբնական դասավորությունն ու չափսերը"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Զրոյացնե՞լ բոլոր սալիկները"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Արագ կարգավորումների բոլոր սալիկները կզրոյացվեն սարքի սկզբնական կարգավորումների համաձայն։"</string> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index e706b272458a..a8a64435de2b 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Rekam layar Anda?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Rekam satu aplikasi"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Rekam seluruh layar"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Rekam seluruh layar: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Saat Anda merekam seluruh layar, semua hal yang ditampilkan di layar akan direkam. Jadi, berhati-hatilah saat memasukkan sandi, detail pembayaran, pesan, foto, audio, dan video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Jika Anda merekam aplikasi, semua hal yang ditampilkan atau diputar di aplikasi tersebut akan direkam. Jadi, berhati-hatilah saat memasukkan sandi, detail pembayaran, pesan, foto, audio, dan video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Rekam layar"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Anda sedang merekam <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Berhenti merekam"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Membagikan layar"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Membagikan konten"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Hentikan berbagi layar?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Berhenti berbagi?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Anda sedang berbagi seluruh layar dengan <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Anda sedang berbagi seluruh layar dengan aplikasi"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Anda sedang berbagi <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Anda sedang berbagi aplikasi"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Anda sedang berbagi dengan aplikasi"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Berhenti berbagi"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Mentransmisikan layar"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Hentikan transmisi?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widget layar kunci"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Siapa saja dapat melihat widget di layar kunci Anda, meskipun tablet terkunci."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"batalkan pilihan widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Kurangi tinggi"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Tambah tinggi"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widget layar kunci"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Untuk membuka aplikasi menggunakan widget, Anda perlu memverifikasi diri Anda. Selain itu, harap ingat bahwa siapa saja dapat melihatnya, bahkan saat tablet Anda terkunci. Beberapa widget mungkin tidak dirancang untuk layar kunci Anda dan mungkin tidak aman untuk ditambahkan di sini."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Oke"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Hapus semua"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Kelola"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Histori"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Setelan notifikasi"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Histori notifikasi"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Baru"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Senyap"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifikasi"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Mulai sekarang"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Tidak ada notifikasi"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Tidak ada notifikasi baru"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Pengurangan suara dan getaran notifikasi aktif"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Saat Anda menerima terlalu banyak notifikasi sekaligus, volume dan getaran perangkat akan otomatis dikurangi hingga selama 2 menit."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Nonaktifkan"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Buka kunci untuk melihat notifikasi lama"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Tetap"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Pelacakan Gerak Kepala"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Ketuk untuk mengubah mode pendering"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"Tanpa suara"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"aktifkan"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"getar"</string> @@ -814,7 +809,7 @@ <string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string> <string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string> <string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string> - <string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string> + <string name="keyboard_key_space" msgid="6980847564173394012">"Spasi"</string> <string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string> <string name="keyboard_key_backspace" msgid="4095278312039628074">"Backspace"</string> <string name="keyboard_key_media_play_pause" msgid="8389984232732277478">"Play/Pause"</string> @@ -1368,7 +1363,7 @@ <string name="call_from_work_profile_text" msgid="2856337395968118274">"Organisasi Anda hanya mengizinkan menelepon dari aplikasi kerja"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Beralih ke profil kerja"</string> <string name="install_dialer_on_work_profile_action" msgid="2014659711597862506">"Instal aplikasi telepon kerja"</string> - <string name="call_from_work_profile_close" msgid="5830072964434474143">"Batalkan"</string> + <string name="call_from_work_profile_close" msgid="5830072964434474143">"Batal"</string> <string name="lock_screen_settings" msgid="6152703934761402399">"Sesuaikan layar kunci"</string> <string name="keyguard_unlock_to_customize_ls" msgid="2068542308086253819">"Buka kunci untuk menyesuaikan layar kunci"</string> <string name="wifi_unavailable_dream_overlay_content_description" msgid="2024166212194640100">"Wi-Fi tidak tersedia"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Aplikasi Saat Ini"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Aksesibilitas"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Pintasan keyboard"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pintasan penelusuran"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Menyesuaikan pintasan keyboard"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Telusuri pintasan"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Tidak ada hasil penelusuran"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikon ciutkan"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Sesuaikan"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Selesai"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikon luaskan"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"atau"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Handel geser"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Disediakan oleh aplikasi"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Tampilan"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Tidak diketahui"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Reset kartu"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Reset kartu ke urutan dan ukuran default?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Reset semua kartu?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Semua kartu Setelan Cepat akan direset ke setelan asli perangkat"</string> </resources> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index 267291069366..66b156aba150 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Viltu taka upp skjáinn?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Taka upp eitt forrit"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Taka upp allan skjáinn"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Taka upp allan skjáinn: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Þegar þú tekur upp allan skjáinn verður allt sem er sýnilegt á skjánum tekið upp. Passaðu því upp á aðgangsorð, greiðsluupplýsingar, skilaboð, myndir, hljóð og vídeó."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Þegar þú tekur upp forrit verður allt sem er sýnilegt eða spilað í forritinu tekið upp. Passaðu því upp á aðgangsorð, greiðsluupplýsingar, skilaboð, myndir, hljóð og vídeó."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Taka upp skjá"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Þú ert að taka upp <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Stöðva upptöku"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Deilir skjá"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Deilir efni"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Hætta að deila skjá?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Hætta að deila?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Þú ert að deila öllum skjánum með <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Þú ert að deila öllum skjánum með forriti"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Þú ert að deila <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Þú ert að deila forriti"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Þú ert að deila með forriti"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Hætta að deila"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Varpar skjá"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Hætta að varpa?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Græjur á lásskjá"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Hver sem er getur séð græjur á lásskjánum þínum, jafnvel þótt spjaldtölvan sé læst."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"afturkalla val á græju"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Lækka"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Hækka"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Græjur fyrir lásskjá"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Þú þarft að staðfesta að þetta sért þú til að geta opnað forrit með græju. Hafðu einnig í huga að hver sem er getur skoðað þær, jafnvel þótt spjaldtölvan sé læst. Sumar græjur eru hugsanlega ekki ætlaðar fyrir lásskjá og því gæti verið óöruggt að bæta þeim við hér."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Ég skil"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Byrja núna"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Engar tilkynningar"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Engar nýjar tilkynningar"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Kveikt er á tilkynningadempun"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Lækkað er sjálfkrafa í hljóðstyrk og áminningum tækisins í allt að tvær mínútur þegar þú færð of margar tilkynningar í einu."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Slökkva"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Taktu úr lás til að sjá eldri tilkynningar"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fast"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Rakning höfuðhreyfinga"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Ýta til að skipta um hringjarastillingu"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"þagga"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"hætta að þagga"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"titringur"</string> @@ -1408,20 +1405,17 @@ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Fjölvinnsla"</string> <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Nýleg forrit"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Skjáskipting"</string> - <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Inntak"</string> + <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Innsláttur"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Flýtileiðir forrita"</string> <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Núverandi forrit"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Aðgengi"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Flýtilyklar"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Leitarflýtileiðir"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Sérsníddu flýtilykla"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Leita að flýtileiðum"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Engar leitarniðurstöður"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Minnka tákn"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Sérsníða"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Lokið"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Stækka tákn"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"eða"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Dragkló"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Frá forritum"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Skjár"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Óþekkt"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Endurstilla flísar"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Endurstilla flísar í upphaflega röð og stærð?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Endurstilla alla reiti?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Allir flýtistillingareitir munu endurstillast á upprunalegar stillingar tækisins"</string> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index fd56c5b69f5a..36d564ba82d4 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Registrare lo schermo?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Registra un\'app"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Registra l\'intero schermo"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Registra l\'intero schermo: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Quando registri l\'intero schermo, tutto ciò che viene mostrato sullo schermo viene registrato. Presta quindi attenzione a password, dati di pagamento, messaggi, foto, audio e video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Quando registri un\'app, tutto ciò che viene mostrato o riprodotto al suo interno viene registrato. Presta quindi attenzione a password, dati di pagamento, messaggi, foto, audio e video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Registra lo schermo"</string> @@ -578,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Cancella tutto"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Gestisci"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Cronologia"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Impostazioni di notifica"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Cronologia delle notifiche"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Nuove"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Notifiche silenziose"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifiche"</string> @@ -592,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Avvia adesso"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Nessuna notifica"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Nessuna nuova notifica"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Attenuazione delle notifiche attivata"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Volume e avvisi vengono ridotti automaticamente per un massimo di 2 minuti quando ricevi troppe notifiche contemporaneamente."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Disattiva"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Sblocca per vedere le notifiche meno recenti"</string> @@ -700,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fisso"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Rilev. movim. testa"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Tocca per cambiare la modalità della suoneria"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"silenzia"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"riattiva l\'audio"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrazione"</string> @@ -1410,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"App corrente"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibilità"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Scorciatoie da tastiera"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizza scorciatoie da tastiera"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Scorciatoie per la ricerca"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nessun risultato di ricerca"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icona Comprimi"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizza"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Fine"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icona Espandi"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"oppure"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Punto di trascinamento"</string> @@ -1480,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Forniti dalle app"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Display"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Sconosciuti"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Reimposta riquadri"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Ripristinare l\'ordine e le dimensioni originali dei riquadri?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Reimpostare tutti i riquadri?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Tutti i riquadri Impostazioni rapide verranno reimpostati sulle impostazioni originali del dispositivo"</string> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 384c680b116f..6cf84e49f3af 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"להקליט את המסך?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"הקלטה של אפליקציה אחת"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"הקלטה של כל המסך"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"הקלטת התוכן של כל המסך: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"כשמקליטים את כל המסך, כל מה שמופיע במסך מוקלט. מומלץ להיזהר עם סיסמאות, פרטי תשלום, הודעות, תמונות, אודיו וסרטונים."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"כשמקליטים אפליקציה, כל מה שרואים או מפעילים בה מוקלט. מומלץ להיזהר עם סיסמאות, פרטי תשלום, הודעות, תמונות, אודיו וסרטונים."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"הקלטת המסך"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"מתבצעת כרגע הקלטה של <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"הפסקת ההקלטה"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"שיתוף המסך מתבצע"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"התוכן משותף"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"להפסיק את שיתוף המסך?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"להפסיק את השיתוף?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"מתבצע כרגע שיתוף של כל המסך שלך עם <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"מתבצע כרגע שיתוף של כל המסך שלך עם אפליקציה"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"מתבצע כרגע שיתוף של <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"מתבצע כרגע שיתוף של אפליקציה"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"מתבצע כרגע שיתוף עם אפליקציה"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"הפסקת השיתוף"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"הפעלת Cast של המסך מתבצעת"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"להפסיק את פעולת ה-Cast?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"ווידג\'טים במסך הנעילה"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"כולם יכולים לראות את הווידג\'טים במסך הנעילה שלך, גם אם הטאבלט נעול."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ביטול הבחירה בווידג\'ט"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"הקטנת הגובה"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"הגדלת הגובה"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"ווידג\'טים במסך הנעילה"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"כדי לפתוח אפליקציה באמצעות ווידג\'ט, עליך לאמת את זהותך. בנוסף, כדאי לזכור שכל אחד יכול לראות את הווידג\'טים גם כשהטאבלט שלך נעול. יכול להיות שחלק מהווידג\'טים לא נועדו למסך הנעילה ושלא בטוח להוסיף אותם לכאן."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"הבנתי"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"כן, אפשר להתחיל"</string> <string name="empty_shade_text" msgid="8935967157319717412">"אין התראות"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"אין התראות חדשות"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"הפוגת התראות מופעלת"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"עוצמת הקול וההתראות במכשיר מופחתות אוטומטית למשך עד 2 דקות כשמתקבלות יותר מדי התראות בבת אחת."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"השבתה"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"יש לבטל את הנעילה כדי לראות התראות ישנות"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"מצב סטטי"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"מעקב אחר תנועות הראש"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"יש להקיש כדי לשנות את מצב תוכנת הצלצול"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"השתקה"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"ביטול ההשתקה"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"רטט"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"האפליקציה הנוכחית"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"נגישות"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"מקשי קיצור"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"התאמה אישית של מקשי הקיצור"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"קיצורי דרך לחיפוש"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"אין תוצאות חיפוש"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"סמל הכיווץ"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"התאמה אישית"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"סיום"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"סמל ההרחבה"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"או"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"נקודת האחיזה לגרירה"</string> @@ -1459,7 +1453,7 @@ <string name="volume_undo_action" msgid="5815519725211877114">"ביטול"</string> <string name="back_edu_toast_content" msgid="4530314597378982956">"כדי לחזור אחורה, מחליקים שמאלה או ימינה עם שלוש אצבעות על לוח המגע."</string> <string name="home_edu_toast_content" msgid="3381071147871955415">"כדי לעבור למסך הבית, מחליקים למעלה עם שלוש אצבעות על לוח המגע"</string> - <string name="overview_edu_toast_content" msgid="5797030644017804518">"כדי לראות את האפליקציות האחרונות, מחליקים למעלה עם שלוש אצבעות על לוח המגע ולוחצים לחיצה ארוכה"</string> + <string name="overview_edu_toast_content" msgid="5797030644017804518">"כדי לראות את האפליקציות האחרונות, מחליקים למעלה לוחצים לחיצה ארוכה עם שלוש אצבעות על לוח המגע"</string> <string name="all_apps_edu_toast_content" msgid="8807496014667211562">"כדי לראות את כל האפליקציות, מקישים על מקש הפעולה במקלדת"</string> <string name="redacted_notification_single_line_title" msgid="212019960919261670">"מצונזר"</string> <string name="redacted_notification_single_line_text" msgid="8684166405005242945">"צריך לבטל את הנעילה כדי לראות"</string> @@ -1467,9 +1461,9 @@ <string name="back_edu_notification_title" msgid="5624780717751357278">"אפשר להשתמש בלוח המגע כדי לחזור אחורה"</string> <string name="back_edu_notification_content" msgid="2497557451540954068">"מחליקים ימינה או שמאלה עם שלוש אצבעות. ניתן להקיש כדי לקבל מידע נוסף על התנועות."</string> <string name="home_edu_notification_title" msgid="6097902076909654045">"איך להשתמש בלוח המגע כדי לעבור למסך הבית"</string> - <string name="home_edu_notification_content" msgid="6631697734535766588">"מחליקים למעלה עם שלוש אצבעות. ניתן להקיש כדי לקבל מידע נוסף על התנועות."</string> + <string name="home_edu_notification_content" msgid="6631697734535766588">"מחליקים למעלה עם שלוש אצבעות. אפשר להקיש כדי לקבל מידע נוסף על התנועות."</string> <string name="overview_edu_notification_title" msgid="1265824157319562406">"איך להשתמש בלוח המגע כדי לראות את האפליקציות האחרונות"</string> - <string name="overview_edu_notification_content" msgid="3578204677648432500">"מחליקים למעלה ולוחצים לחיצה ארוכה עם שלוש אצבעות. ניתן להקיש כדי לקבל מידע נוסף על התנועות."</string> + <string name="overview_edu_notification_content" msgid="3578204677648432500">"מחליקים למעלה ולוחצים לחיצה ארוכה עם שלוש אצבעות. אפשר להקיש כדי לקבל מידע נוסף על התנועות."</string> <string name="all_apps_edu_notification_title" msgid="372262997265569063">"איך להשתמש במקלדת כדי לראות את כל האפליקציות"</string> <string name="all_apps_edu_notification_content" msgid="3255070575694025585">"בכל שלב אפשר ללחוץ על מקש הפעולה. ניתן להקיש כדי לקבל מידע נוסף על התנועות."</string> <string name="accessibility_deprecate_extra_dim_dialog_title" msgid="910988771011857460">"התכונה \'מעומעם במיוחד\' נוספה לפס ההזזה לבהירות"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"מסופקים על ידי אפליקציות"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"מסך"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"לא ידוע"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"איפוס המשבצות"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"לאפס את המשבצות לסדר ולגודל המקורי שלהן?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"לאפס את כל הלחצנים?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"כל הלחצנים ב\'הגדרות מהירות\' יאופסו להגדרות המקוריות של המכשיר"</string> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index a0a3b2bdd403..0793da9ef9a3 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"画面を録画しますか？"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"1 つのアプリを録画"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"画面全体を録画"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"画面全体を録画: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"画面全体を録画すると、画面に表示されるものがすべて録画されます。パスワード、お支払いの詳細、メッセージ、写真、音声、動画などの情報にご注意ください。"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"アプリを録画すると、そのアプリで表示または再生される内容がすべて録画されます。パスワード、お支払いの詳細、メッセージ、写真、音声、動画などの情報にご注意ください。"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"画面を録画"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"現在、<xliff:g id="APP_NAME">%1$s</xliff:g>を録画しています"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"録画を停止"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"画面を共有しています"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"コンテンツの共有"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"画面の共有を停止しますか？"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"共有を停止しますか？"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"現在、画面全体を<xliff:g id="HOST_APP_NAME">%1$s</xliff:g>と共有しています"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"現在、画面全体をアプリと共有しています"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"現在、<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>を共有しています"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"現在、アプリを共有しています"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"現在、アプリと共有しています"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"共有を停止"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"画面をキャストしています"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"キャストを停止しますか？"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"ロック画面ウィジェット"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"タブレットがロックされていても、ロック画面のウィジェットは誰でも確認できます。"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ウィジェットの選択を解除する"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"高さを低くする"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"高さを高くする"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"ロック画面ウィジェット"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ウィジェットを使用してアプリを起動するには、本人確認が必要です。タブレットがロックされた状態でも他のユーザーにウィジェットが表示されますので、注意してください。一部のウィジェットについてはロック画面での使用を想定していないため、ロック画面への追加は危険な場合があります。"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"今すぐ開始"</string> <string name="empty_shade_text" msgid="8935967157319717412">"通知はありません"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"新しい通知はありません"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"通知のクールダウンが ON になっています"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"一度に多くの通知が届いた場合に、最長 2 分間自動的にデバイスの音量が小さくなりアラートも減ります。"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"OFF にする"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"ロック解除して以前の通知を表示"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"固定"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"ヘッド トラッキング"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"タップすると、着信音のモードを変更できます"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"ミュート"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"ミュートを解除"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"バイブレーション"</string> @@ -812,7 +809,7 @@ <string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string> <string name="keyboard_key_back" msgid="4185420465469481999">"戻る"</string> <string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string> - <string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string> + <string name="keyboard_key_space" msgid="6980847564173394012">"スペース"</string> <string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string> <string name="keyboard_key_backspace" msgid="4095278312039628074">"Backspace"</string> <string name="keyboard_key_media_play_pause" msgid="8389984232732277478">"再生 / 一時停止"</string> @@ -875,7 +872,7 @@ <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"入力"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"次の言語に切り替える"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"前の言語に切り替える"</string> - <string name="input_access_emoji" msgid="8105642858900406351">"絵文字にアクセス"</string> + <string name="input_access_emoji" msgid="8105642858900406351">"絵文字にアクセスする"</string> <string name="input_access_voice_typing" msgid="7291201476395326141">"音声入力にアクセス"</string> <string name="keyboard_shortcut_group_applications" msgid="7386239431100651266">"アプリ"</string> <string name="keyboard_shortcut_group_applications_assist" msgid="6772492350416591448">"アシスタント"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"現在のアプリ"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ユーザー補助"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"キーボード ショートカット"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"キーボード ショートカットをカスタマイズする"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"検索ショートカット"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"検索結果がありません"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"閉じるアイコン"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"カスタマイズ"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"完了"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"開くアイコン"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"または"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ドラッグ ハンドル"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"アプリから提供"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ディスプレイ"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"不明"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"タイルのリセット"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"タイルを元の順序とサイズにリセットしますか？"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"すべてのタイルをリセットしますか？"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"すべてのクイック設定タイルがデバイスの元の設定にリセットされます"</string> </resources> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index 471957e044cb..8b513ffeba29 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"გსურთ თქვენი ეკრანის ჩაწერა?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"ერთი აპის ჩაწერა"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"მთლიანი ეკრანის ჩაწერა"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"მთლიანი ეკრანის ჩაწერა: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"მთლიანი ეკრანის ჩაწერისას ჩაიწერება ყველაფერი, რაც თქვენს ეკრანზე გამოჩნდება. ამიტომ სიფრთხილე გამოიჩინეთ ისეთ ინფორმაციასთან, როგორიცაა პაროლები, გადახდის დეტალები, შეტყობინებები, ფოტოები, აუდიო და ვიდეო."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"აპის ჩაწერისას ჩაიწერება ყველაფერი, რაც ამ აპში გამოჩნდება ან დაიკვრება. ამიტომ სიფრთხილე გამოიჩინეთ ისეთ ინფორმაციასთან, როგორიცაა პაროლები, გადახდის დეტალები, შეტყობინებები, ფოტოები, აუდიო და ვიდეო."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"ეკრანის ჩაწერა"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"თქვენ ამჟამად იწერთ <xliff:g id="APP_NAME">%1$s</xliff:g>-ს"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"ჩაწერის შეწყვეტა"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"მიმდინარეობს ეკრანის გაზიარება"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"კონტენტის გაზიარება"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"გსურთ ეკრანის გაზიარების შეწყვეტა?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"შეწყდეს გაზიარება?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"თქვენ ამჟამად უზიარებთ თქვენს მთლიან ეკრანს <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>-ს"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"თქვენ ამჟამად უზიარებთ თქვენს მთლიან ეკრანს აპს"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"თქვენ ამჟამად აზიარებთ <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>-ს"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"თქვენ ამჟამად აზიარებთ აპს"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"თქვენ ამჟამად აზიარებთ აპთან"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"გაზიარების შეწყვეტა"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"მიმდინარეობს ეკრანის ტრანსლირება"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"გსურთ ტრანსლირების შეწყვეტა?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"ჩაკეტილი ეკრანის ვიჯეტები"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"ნებისმიერს შეუძლია თქვენს ჩაკეტილ ეკრანზე ვიჯეტების ნახვა, თუნდაც ტაბლეტი ჩაკეტილი იყოს."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ვიჯეტის არჩევის გაუქმება"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"სიმაღლის შემცირება"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"სიმაღლის გაზრდა"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"დაბლოკილი ეკრანის ვიჯეტები"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"უნდა დაადასტუროთ თქვენი ვინაობა, რათა გახსნათ აპი ვიჯეტის გამოყენებით. გაითვალისწინეთ, რომ ნებისმიერს შეუძლია მათი ნახვა, მაშინაც კი, როცა ტაბლეტი დაბლოკილია. ზოგი ვიჯეტი შეიძლება არ იყოს გათვლილი თქვენი დაბლოკილი ეკრანისთვის და მათი აქ დამატება შეიძლება სახიფათო იყოს."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"გასაგებია"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"ყველას გასუფთავება"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"მართვა"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"ისტორია"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"შეტყობინების პარამეტრები"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"შეტყობინების ისტორია"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"ახალი"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"ჩუმი"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"შეტყობინებები"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"დაწყება ახლავე"</string> <string name="empty_shade_text" msgid="8935967157319717412">"შეტყობინებები არ არის."</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"ახალი შეტყობინებები არ არის"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"შეტყობინების განტვირთვის პერიოდი ჩართულია"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"მოწყობილობის ხმა და გაფრთხილებები მცირდება 2 წუთის განმავლობაში, როდესაც ბევრ შეტყობინებას მიიღებთ ერთდროულად."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"გამორთვა"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"განბლოკეთ ძველი შეტყობინებების სანახავად"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"ფიქსირებული"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"ხმის მიდევნებით"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"შეეხეთ მრეკავის რეჟიმის შესაცვლელად"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"დადუმება"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"დადუმების მოხსნა"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"ვიბრაცია"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"მიმდინარე აპი"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"მისაწვდომობა"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"კლავიატურის მალსახმობები"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"კლავიატურის მალსახმობების მორგება"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ძიების მალსახმობები"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ძიების შედეგები არ არის"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ხატულის ჩაკეცვა"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"მორგება"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"მზადაა"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ხატულის გაფართოება"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ან"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"სახელური ჩავლებისთვის"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"მოწოდებულია აპების მიერ"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ეკრანი"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"უცნობი"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"მოზაიკის ფილების გადაყენება"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"გსურთ მოზაიკის ფილების გადაყენება მათ ორიგინალ წყობაზე და ზომებზე?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"გსურთ ყველა ფილის გადაყენება?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"სწრაფი პარამეტრების ყველა ფილა გადაყენდება მოწყობილობის ორიგინალ პარამეტრებზე"</string> </resources> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 3dbfd86b3f38..4ff87a3a3c8d 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Қолданба экранын жазасыз ба?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Бір қолданба экранын жазу"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Бүкіл экранды жазу"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Бүкіл экранды жазу: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Бүкіл экранды жазған кезде, онда көрінетін барлық нәрсе жазылады. Сондықтан құпия сөздерді, төлем туралы мәліметті, хабарларды немесе басқа құпия ақпаратты енгізген кезде сақ болыңыз."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Қолданбаны жазған кезде, онда көрінетін не ойнатылатын барлық нәрсе жазылады. Сондықтан құпия сөздерді, төлем туралы мәліметті, хабарларды немесе басқа құпия ақпаратты енгізген кезде сақ болыңыз."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Экранды жазу"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Қазір қолданбадағы (<xliff:g id="APP_NAME">%1$s</xliff:g>) контентті жазып жатырсыз."</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Жазуды тоқтату"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Экранды бөлісіп жатыр."</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Контент бөлісіліп жатыр"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Экранды бөлісуді тоқтатасыз ба?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Бөлісу тоқтатылсын ба?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Қазір бүкіл экранды қолданбамен (<xliff:g id="HOST_APP_NAME">%1$s</xliff:g>) бөлісіп жатырсыз."</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Қазір бүкіл экранды қолданбамен бөлісіп жатырсыз."</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Қазір қолданбадағы (<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>) контентті бөлісіп жатырсыз."</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Қазір қолданбаны бөлісіп жатырсыз."</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Қазір қолданбамен бөлісіп жатырсыз."</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Бөлісуді тоқтату"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Экранды трансляциялап жатырсыз."</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Трансляциялау тоқтасын ба?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Құлып экранының виджеттері"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Планшет құлыпталып тұрса да, құлып экранындағы виджеттерді кез келген адам көре алады."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"виджетті таңдаудан алу"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Биіктігін төмендету"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Биіктігін арттыру"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Құлып экранының виджеттері"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Қолданбаны виджет көмегімен ашу үшін жеке басыңызды растауыңыз керек. Сондай-ақ басқалар оларды планшетіңіз құлыптаулы кезде де көре алатынын ескеріңіз. Кейбір виджеттер құлып экранына арналмаған болады, сондықтан оларды мұнда қосу қауіпсіз болмауы мүмкін."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Түсінікті"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Барлығын тазарту"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Басқару"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Тарих"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Хабарландыру параметрлері"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Хабарландыру тарихы"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Жаңа"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Үнсіз"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Хабарландырулар"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Қазір бастау"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Хабарландырулар жоқ"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Жаңа хабарландырулар жоқ"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Хабарландыру дыбысын азайту параметрі қосулы"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Бір уақытта тым көп хабарландыру келсе, дыбыс деңгейі автоматты түрде азайтылып, хабарландырулар 2 минутқа кідіртіледі."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Өшіру"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Ескі хабарландырулар үшін құлыпты ашыңыз"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Бекітілген"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Бас қимылын қадағалау"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Қоңырау режимін өзгерту үшін түртіңіз."</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"дыбысын өшіру"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"дыбысын қосу"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"дірілдету"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Қолданыстағы қолданба"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Арнайы мүмкіндіктер"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Перне тіркесімдері"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Пернелер тіркесімін бейімдеу"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Іздеу жылдам пәрмендері"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Іздеу нәтижелері жоқ."</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Жию белгішесі"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Бейімдеу"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Дайын"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Жаю белгішесі"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"немесе"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Сүйрейтін тетік"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Қолданбалар ұсынған"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Дисплей"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Белгісіз"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Бөлшектерді бастапқы күйге қайтару"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Бөлшектерді бастапқы реті мен өлшеміне қайтару керек пе?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Барлық бөлшекті бастапқы күйге қайтару керек пе?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Барлық \"Жылдам параметрлер\" бөлшегі құрылғының бастапқы параметрлеріне қайтарылады."</string> </resources> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index b2c8977ab7ce..24524df2404f 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"ថតអេក្រង់របស់អ្នកឬ?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"ថតកម្មវិធីទោល"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"ថតអេក្រង់ទាំងមូល"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"ថតអេក្រង់ទាំងមូល៖ %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"នៅពេលអ្នកកំពុងថតអេក្រង់ទាំងមូលរបស់អ្នក អ្វីគ្រប់យ៉ាងដែលបង្ហាញនៅលើអេក្រង់របស់អ្នកត្រូវបានថត។ ដូច្នេះ សូមប្រុងប្រយ័ត្នចំពោះអ្វីៗដូចជា ពាក្យសម្ងាត់ ព័ត៌មានលម្អិតអំពីការទូទាត់ប្រាក់ សារ រូបថត ព្រមទាំងសំឡេង និងវីដេអូ។"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"នៅពេលអ្នកកំពុងថតកម្មវិធីណាមួយ អ្វីគ្រប់យ៉ាងដែលបង្ហាញ ឬចាក់នៅក្នុងកម្មវិធីនោះត្រូវបានថត។ ដូច្នេះ សូមប្រុងប្រយ័ត្នចំពោះអ្វីៗដូចជា ពាក្យសម្ងាត់ ព័ត៌មានលម្អិតអំពីការទូទាត់ប្រាក់ សារ រូបថត ព្រមទាំងសំឡេង និងវីដេអូ។"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"ថតអេក្រង់"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"បច្ចុប្បន្ន អ្នកកំពុងថត <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"ឈប់ថត"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"កំពុងបង្ហាញអេក្រង់"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"កំពុងចែករំលែកខ្លឹមសារ"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"ឈប់បង្ហាញអេក្រង់ឬ?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"ឈប់ចែករំលែកឬ?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"បច្ចុប្បន្ន អ្នកកំពុងបង្ហាញអេក្រង់ទាំងមូលរបស់អ្នកតាមរយៈ <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"បច្ចុប្បន្ន អ្នកកំពុងបង្ហាញអេក្រង់ទាំងមូលរបស់អ្នកតាមរយៈកម្មវិធីមួយ"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"បច្ចុប្បន្ន អ្នកកំពុងបង្ហាញ <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"បច្ចុប្បន្ន អ្នកកំពុងបង្ហាញកម្មវិធីមួយ"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"បច្ចុប្បន្ន អ្នកកំពុងចែករំលែកជាមួយកម្មវិធីមួយ"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"ឈប់បង្ហាញ"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"កំពុងបញ្ជូនអេក្រង់"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"ឈប់បញ្ជូនឬ?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"ធាតុក្រាហ្វិកអេក្រង់ចាក់សោ"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"អ្នកគ្រប់គ្នាអាចមើលធាតុក្រាហ្វិកលើអេក្រង់ចាក់សោរបស់អ្នក ទោះបីជាថេប្លេតរបស់អ្នកត្រូវបានចាក់សោក៏ដោយ។"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ដកការជ្រើសរើសធាតុក្រាហ្វិក"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"បន្ថយកម្ពស់"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"បង្កើនកម្ពស់"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"ធាតុក្រាហ្វិកលើអេក្រង់ចាក់សោ"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ដើម្បីបើកកម្មវិធីដោយប្រើធាតុក្រាហ្វិក អ្នកនឹងត្រូវផ្ទៀងផ្ទាត់ថាជាអ្នក។ ទន្ទឹមនឹងនេះ សូមចងចាំថា នរណាក៏អាចមើលធាតុក្រាហ្វិកបាន សូម្បីពេលថេប្លេតរបស់អ្នកជាប់សោក៏ដោយ។ ធាតុក្រាហ្វិកមួយចំនួនប្រហែលមិនត្រូវបានរចនាឡើងសម្រាប់អេក្រង់ចាក់សោរបស់អ្នកទេ និងមិនមានសុវត្ថិភាពឡើយ បើបញ្ចូលទៅទីនេះ។"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"យល់ហើយ"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"សម្អាតទាំងអស់"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"គ្រប់គ្រង"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"ប្រវត្តិ"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"ការកំណត់ការជូនដំណឹង"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"ប្រវត្តិនៃការជូនដំណឹង"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"ថ្មី"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"ស្ងាត់"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"ការជូនដំណឹង"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"ចាប់ផ្ដើមឥឡូវ"</string> <string name="empty_shade_text" msgid="8935967157319717412">"គ្មានការជូនដំណឹង"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"គ្មានការជូនដំណឹងថ្មីៗទេ"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"ការបន្ថយសំឡេងការជូនដំណឹងត្រូវបានបើក"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"កម្រិតសំឡេង និងការជូនដំណឹងនៅលើឧបករណ៍របស់អ្នកត្រូវបានកាត់បន្ថយដោយស្វ័យប្រវត្តិរហូតដល់ 2 នាទី នៅពេលអ្នកទទួលបានការជូនដំណឹងច្រើនពេកក្នុងពេលតែមួយ។"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"បិទ"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"ដោះសោដើម្បីមើលការជូនដំណឹងចាស់ៗ"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"ថេរ"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"រេតាមក្បាល"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"ចុចដើម្បីប្ដូរមុខងាររោទ៍"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"បិទសំឡេង"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"បើកសំឡេង"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"ញ័រ"</string> @@ -814,7 +809,7 @@ <string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string> <string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string> <string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string> - <string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string> + <string name="keyboard_key_space" msgid="6980847564173394012">"ដកឃ្លា"</string> <string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string> <string name="keyboard_key_backspace" msgid="4095278312039628074">"Backspace"</string> <string name="keyboard_key_media_play_pause" msgid="8389984232732277478">"Play/Pause"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"កម្មវិធីបច្ចុប្បន្ន"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ភាពងាយស្រួល"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"ផ្លូវកាត់ក្ដារចុច"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ផ្លូវកាត់ការស្វែងរក"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"ប្ដូរផ្លូវកាត់ក្ដារចុចតាមបំណង"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ស្វែងរកផ្លូវកាត់"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"គ្មានលទ្ធផលស្វែងរកទេ"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"រូបតំណាង \"បង្រួម\""</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"ប្ដូរតាមបំណង"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"រួចរាល់"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"រូបតំណាង \"ពង្រីក\""</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ឬ"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ដងអូស"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"ផ្ដល់ជូនដោយកម្មវិធី"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ផ្ទាំងបង្ហាញ"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"មិនស្គាល់"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"កំណត់ប្រអប់ឡើងវិញ"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"កំណត់ប្រអប់ឡើងវិញទៅទំហំ និងលំដាប់ដើមរបស់ប្រអប់ទាំងនោះឬ?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"កំណត់ប្រអប់ទាំងអស់ឡើងវិញឬ?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"ប្រអប់ការកំណត់រហ័សទាំងអស់នឹងកំណត់ឡើងវិញទៅការកំណត់ដើមរបស់ឧបករណ៍"</string> </resources> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index 20c367696858..bfaa43919aa3 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಅನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಬೇಕೇ?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"ಒಂದು ಆ್ಯಪ್ ಅನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಿ"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"ಸಂಪೂರ್ಣ ಸ್ಕ್ರೀನ್ ಅನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಿ"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"ಸಂಪೂರ್ಣ ಸ್ಕ್ರೀನ್ ಅನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಿ: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"ನಿಮ್ಮ ಸಂಪೂರ್ಣ ಸ್ಕ್ರೀನ್ ಅನ್ನು ನೀವು ರೆಕಾರ್ಡ್ ಮಾಡುತ್ತಿರುವಾಗ, ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಮೇಲೆ ಗೋಚರಿಸುವ ಎಲ್ಲವನ್ನೂ ರೆಕಾರ್ಡ್ ಮಾಡಲಾಗುತ್ತದೆ. ಆದ್ದರಿಂದ ಪಾಸ್ವರ್ಡ್ಗಳು, ಪಾವತಿ ವಿವರಗಳು, ಸಂದೇಶಗಳು, ಫೋಟೋಗಳು ಮತ್ತು ಆಡಿಯೋ ಮತ್ತು ವೀಡಿಯೊದಂತಹ ವಿಷಯಗಳ ಬಗ್ಗೆ ಜಾಗರೂಕರಾಗಿರಿ."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"ನೀವು ಆ್ಯಪ್ ಅನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡುವಾಗ, ಆ ಆ್ಯಪ್ನಲ್ಲಿ ತೋರಿಸಿರುವ ಅಥವಾ ಪ್ಲೇ ಮಾಡಿದ ಎಲ್ಲವನ್ನೂ ರೆಕಾರ್ಡ್ ಮಾಡಲಾಗುತ್ತದೆ. ಆದ್ದರಿಂದ ಪಾಸ್ವರ್ಡ್ಗಳು, ಪಾವತಿ ವಿವರಗಳು, ಸಂದೇಶಗಳು, ಫೋಟೋಗಳು ಮತ್ತು ಆಡಿಯೋ ಮತ್ತು ವೀಡಿಯೊದಂತಹ ವಿಷಯಗಳ ಬಗ್ಗೆ ಜಾಗರೂಕರಾಗಿರಿ."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"ಸ್ಕ್ರೀನ್ ರೆಕಾರ್ಡ್ ಮಾಡಿ"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"ನೀವು ಪ್ರಸ್ತುತ <xliff:g id="APP_NAME">%1$s</xliff:g> ಅನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡುತ್ತಿದ್ದೀರಿ"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"ರೆಕಾರ್ಡಿಂಗ್ ನಿಲ್ಲಿಸಿ"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"ಪರದೆಯನ್ನು ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"ಕಂಟೆಂಟ್ ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"ಸ್ಕ್ರೀನ್ ಹಂಚಿಕೊಳ್ಳುವಿಕೆಯನ್ನು ನಿಲ್ಲಿಸಬೇಕೆ?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"ಹಂಚಿಕೊಳ್ಳುವುದನ್ನು ನಿಲ್ಲಿಸಬೇಕೇ?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"ನೀವು ಪ್ರಸ್ತುತ ನಿಮ್ಮ ಸಂಪೂರ್ಣ ಸ್ಕ್ರೀನ್ ಅನ್ನು <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳುತ್ತಿದ್ದೀರಿ"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"ನೀವು ಪ್ರಸ್ತುತ ನಿಮ್ಮ ಸಂಪೂರ್ಣ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಆ್ಯಪ್ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳುತ್ತಿದ್ದೀರಿ"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"ನೀವು ಪ್ರಸ್ತುತ <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> ಅನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತಿದ್ದೀರಿ"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"ನೀವು ಪ್ರಸ್ತುತ ಆ್ಯಪ್ ಅನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತಿದ್ದೀರಿ"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"ನೀವು ಪ್ರಸ್ತುತ ಆ್ಯಪ್ ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳುತ್ತಿದ್ದೀರಿ"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"ಹಂಚಿಕೊಳ್ಳುವಿಕೆಯನ್ನು ನಿಲ್ಲಿಸಿ"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ಬಿತ್ತರಿಸಲಾಗುತ್ತಿದೆ"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"ಬಿತ್ತರಿಸುವುದನ್ನು ನಿಲ್ಲಿಸಬೇಕೆ?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"ಲಾಕ್ ಸ್ಕ್ರೀನ್ ವಿಜೆಟ್ಗಳು"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಲಾಕ್ ಆಗಿದ್ದರೂ ಸಹ ಯಾರಾದರೂ ನಿಮ್ಮ ಲಾಕ್ ಸ್ಕ್ರೀನ್ನಲ್ಲಿ ವಿಜೆಟ್ಗಳನ್ನು ವೀಕ್ಷಿಸಬಹುದು."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ವಿಜೆಟ್ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಬೇಡಿ"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"ಎತ್ತರವನ್ನು ಕಡಿಮೆ ಮಾಡಿ"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"ಎತ್ತರವನ್ನು ಹೆಚ್ಚಿಸಿ"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"ಲಾಕ್ ಸ್ಕ್ರೀನ್ ವಿಜೆಟ್ಗಳು"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ವಿಜೆಟ್ ಅನ್ನು ಬಳಸಿಕೊಂಡು ಆ್ಯಪ್ ತೆರೆಯಲು, ಇದು ನೀವೇ ಎಂದು ನೀವು ದೃಢೀಕರಿಸಬೇಕಾಗುತ್ತದೆ. ಅಲ್ಲದೆ, ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಲಾಕ್ ಆಗಿದ್ದರೂ ಸಹ ಯಾರಾದರೂ ಅವುಗಳನ್ನು ವೀಕ್ಷಿಸಬಹುದು ಎಂಬುದನ್ನು ನೆನಪಿನಲ್ಲಿಡಿ. ಕೆಲವು ವಿಜೆಟ್ಗಳು ನಿಮ್ಮ ಲಾಕ್ ಸ್ಕ್ರೀನ್ಗಾಗಿ ಉದ್ದೇಶಿಸದೇ ಇರಬಹುದು ಮತ್ತು ಇಲ್ಲಿ ಸೇರಿಸುವುದು ಸುರಕ್ಷಿತವಲ್ಲದಿರಬಹುದು."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ಅರ್ಥವಾಯಿತು"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"ಈಗ ಪ್ರಾರಂಭಿಸಿ"</string> <string name="empty_shade_text" msgid="8935967157319717412">"ಯಾವುದೇ ಅಧಿಸೂಚನೆಗಳಿಲ್ಲ"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"ಯಾವುದೇ ಹೊಸ ಅಧಿಸೂಚನೆಗಳಿಲ್ಲ"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"ನೋಟಿಫಿಕೇಶನ್ ಕೂಲ್ಡೌನ್ ಆನ್ ಆಗಿದೆ"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"ನೀವು ಏಕಕಾಲದಲ್ಲಿ ತೀರಾ ಹೆಚ್ಚು ನೋಟಿಫಿಕೇಶನ್ಗಳನ್ನು ಪಡೆದಾಗ 2 ನಿಮಿಷಗಳವರೆಗೆ ನಿಮ್ಮ ಸಾಧನದ ವಾಲ್ಯೂಮ್ ಮತ್ತು ಅಲರ್ಟ್ಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಕಡಿಮೆ ಮಾಡಲಾಗುತ್ತದೆ."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"ಆಫ್ ಮಾಡಿ"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"ಹಳೆಯ ಅಧಿಸೂಚನೆಗಳನ್ನು ನೋಡಲು ಅನ್ಲಾಕ್ ಮಾಡಿ"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"ಫಿಕ್ಸಡ್"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"ಹೆಡ್ ಟ್ರ್ಯಾಕಿಂಗ್"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"ರಿಂಗರ್ ಮೋಡ್ ಬದಲಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"ಮ್ಯೂಟ್ ಮಾಡಿ"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"ಅನ್ಮ್ಯೂಟ್ ಮಾಡಿ"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"ವೈಬ್ರೇಟ್"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"ಪ್ರಸ್ತುತ ಆ್ಯಪ್"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"ಕೀಬೋರ್ಡ್ ಶಾರ್ಟ್ಕಟ್ಗಳು"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"ಕೀಬೋರ್ಡ್ ಶಾರ್ಟ್ಕಟ್ಗಳನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ಹುಡುಕಾಟದ ಶಾರ್ಟ್ಕಟ್ಗಳು"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ಯಾವುದೇ ಹುಡುಕಾಟ ಫಲಿತಾಂಶಗಳಿಲ್ಲ"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ಕುಗ್ಗಿಸುವ ಐಕಾನ್"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"ಕಸ್ಟಮೈಸ್ ಮಾಡಿ"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ಮುಗಿದಿದೆ"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ವಿಸ್ತೃತಗೊಳಿಸುವ ಐಕಾನ್"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ಅಥವಾ"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ಡ್ರ್ಯಾಗ್ ಹ್ಯಾಂಡಲ್"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"ಆ್ಯಪ್ಗಳಿಂದ ಒದಗಿಸಲಾಗಿದೆ"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ಡಿಸ್ಪ್ಲೇ"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"ಅಪರಿಚಿತ"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"ಟೈಲ್ಗಳನ್ನು ರೀಸೆಟ್ ಮಾಡಿ"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"ಟೈಲ್ಗಳನ್ನು ಅವುಗಳ ಮೂಲ ಆರ್ಡರ್ ಮತ್ತು ಗಾತ್ರಗಳಿಗೆ ರೀಸೆಟ್ ಮಾಡಬೇಕೇ?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"ಎಲ್ಲಾ ಟೈಲ್ಗಳನ್ನು ರೀಸೆಟ್ ಮಾಡಬೇಕೆ?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"ಎಲ್ಲಾ ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳ ಟೈಲ್ಗಳನ್ನು ಸಾಧನದ ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ರೀಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ"</string> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 35dc245643ae..fee96f981152 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"화면을 녹화하시겠습니까?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"단일 앱 녹화"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"전체 화면 녹화"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"전체 화면 녹화: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"전체 화면을 녹화하면 화면에 표시되는 모든 항목이 녹화됩니다. 따라서 비밀번호, 결제 세부정보, 메시지, 사진, 오디오 및 동영상 등이 노출되지 않도록 주의하세요."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"앱을 녹화하면 앱에 표시되거나 앱에서 재생되는 모든 항목이 녹화됩니다. 따라서 비밀번호, 결제 세부정보, 메시지, 사진, 오디오 및 동영상 등이 노출되지 않도록 주의하세요."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"화면 녹화"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"현재 <xliff:g id="APP_NAME">%1$s</xliff:g>의 콘텐츠를 녹화 중입니다."</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"녹화 중지"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"화면 공유 중"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"콘텐츠 공유"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"화면 공유를 중지하시겠습니까?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"공유를 중단하시겠습니까?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"현재 전체 화면을 <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> 앱과 공유 중입니다."</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"현재 전체 화면을 앱과 공유 중입니다"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"현재 <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>의 콘텐츠를 공유 중입니다."</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"현재 앱을 공유 중입니다"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"현재 앱과 공유 중입니다"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"공유 중지"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"화면 전송 중"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"전송을 중지할까요?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"잠금 화면 위젯"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"태블릿이 잠겨 있어도 누구나 잠금 화면에서 위젯을 볼 수 있습니다."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"위젯 선택 해제"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"높이 줄이기"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"높이 늘리기"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"잠금 화면 위젯"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"위젯을 사용하여 앱을 열려면 본인 인증을 해야 합니다. 또한 태블릿이 잠겨 있더라도 누구나 볼 수 있다는 점을 유의해야 합니다. 일부 위젯은 잠금 화면에 적합하지 않고 여기에 추가하기에 안전하지 않을 수 있습니다."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"확인"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"시작하기"</string> <string name="empty_shade_text" msgid="8935967157319717412">"알림 없음"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"새로운 알림 없음"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"알림 쿨다운 사용 중"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"한 번에 너무 많은 알림을 받으면 최대 2분간 자동으로 기기 볼륨이 줄어들고 알림이 최소화됩니다."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"사용 중지"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"잠금 해제하여 이전 알림 보기"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"수정됨"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"머리 추적"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"탭하여 벨소리 장치 모드 변경"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"음소거"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"음소거 해제"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"진동"</string> @@ -875,7 +872,7 @@ <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"입력"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"다음 언어로 전환"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"이전 언어로 전환"</string> - <string name="input_access_emoji" msgid="8105642858900406351">"이모티콘에 액세스"</string> + <string name="input_access_emoji" msgid="8105642858900406351">"이모티콘 열기"</string> <string name="input_access_voice_typing" msgid="7291201476395326141">"음성 입력에 액세스"</string> <string name="keyboard_shortcut_group_applications" msgid="7386239431100651266">"애플리케이션"</string> <string name="keyboard_shortcut_group_applications_assist" msgid="6772492350416591448">"어시스턴트"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"현재 앱"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"접근성"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"단축키"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"단축키 맞춤설정"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"검색 바로가기"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"검색 결과 없음"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"접기 아이콘"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"맞춤설정"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"완료"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"확장 아이콘"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"또는"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"드래그 핸들"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"앱에서 제공"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"디스플레이"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"알 수 없음"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"타일 재설정"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"타일을 원래 순서 및 크기로 재설정하시겠습니까?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"모든 타일을 재설정하시겠습니까?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"모든 빠른 설정 타일이 기기의 원래 설정으로 재설정됩니다."</string> </resources> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 72e86cc4a703..3c58eb7bd559 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Экранды жаздырасызбы?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Бир колдонмону жаздыруу"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Бүтүндөй экранды жаздыруу"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Толук экранды жаздыруу: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Бүтүндөй экранды жаздырганда, андагы нерселердин баары видеого түшүп калат. Андыктан этият болуп, сырсөздөр, төлөм ыкмалары, билдирүүлөр, сүрөттөр, аудио жана видео материалдар сыяктуу купуя нерселерди көрсөтүп албаңыз."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Колдонмону жаздырганда ал колдонмодо көрсөтүлүп же ойнотулуп жаткан нерселер жаздырылат. Андыктан сырсөздөрдү, төлөмдүн чоо-жайын, билдирүүлөрдү, сүрөттөрдү, аудио жана видеону көрсөтүп албаңыз."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Экранды жаздыруу"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Учурда <xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосун жаздырып жатасыз"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Жаздырууну токтотуу"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Экран бөлүшүлүүдө"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Контент бөлүшүлүүдө"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Экранды бөлүшүүнү токтотосузбу?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Бөлүшүүнү токтотосузбу?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Учурда бүтүндөй экраныңызды <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> менен бөлүшүп жатасыз"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Учурда бүтүндөй экраныңызды колдонмо менен бөлүшүп жатасыз"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Учурда <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> колдонмосун бөлүшүп жатасыз"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Учурда колдонмону бөлүшүп жатасыз"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Учурда колдонмо менен бөлүшүп жатасыз"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Бөлүшүүнү токтотуу"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Тышкы экранга чыгарылууда"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Тышкы экранга чыгарууну токтотосузбу?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Кулпуланган экрандагы виджеттер"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Кулпуланган планшетте баарына көрүнүп турат."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"виджетти тандоодон чыгаруу"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Бийиктигин азайтуу"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Бийиктигин көбөйтүү"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Кулпуланган экрандагы виджеттер"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Колдонмону виджет аркылуу ачуу үчүн өзүңүздү ырасташыңыз керек. Алар кулпуланган планшетиңизде да көрүнүп турат. Кээ бир виджеттерди кулпуланган экранда колдоно албайсыз, андыктан аларды ал жерге кошпой эле койгонуңуз оң."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Түшүндүм"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Баарын тазалап салуу"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Башкаруу"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Таржымал"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Билдирмелердин параметрлери"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Билдирмелердин таржымалы"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Жаңы"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Үнсүз"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Билдирмелер"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Азыр баштоо"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Билдирме жок"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Жаңы билдирмелер жок"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Билдирмелердин үнүн басаңдатуу күйүк"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Өтө көп билдирме келсе, түзмөктүн үнү 2 мүнөткө басаңдап, эскертүүлөрдүн саны азаят."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Өчүрүү"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Билдирмелерди көрүү үчүн кулпуну ачыңыз"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Туруктуу"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Баштын кыймылына көз салуу"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Коңгуроо режимин өзгөртүү үчүн басыңыз"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"үнсүз"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"үнүн чыгаруу"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"дирилдөө"</string> @@ -1411,19 +1406,16 @@ <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Акыркы колдонмолор"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Экранды бөлүү"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Киргизүү"</string> - <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Колдонмодогу кыска жолдор"</string> + <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Колдонмонун ыкчам баскычтары"</string> <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Учурдагы колдонмо"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Атайын мүмкүнчүлүктөр"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Ыкчам баскычтар"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Ыкчам баскычтарды ыңгайлаштыруу"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Ыкчам баскычтарды издөө"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Эч нерсе табылган жок"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Жыйыштыруу сүрөтчөсү"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Ыңгайлаштыруу"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Бүттү"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Жайып көрсөтүү сүрөтчөсү"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"же"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Cүйрөө маркери"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Колдонмолор сунуштады"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Экран"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Белгисиз"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Карталарды баштапкы абалга келтирүү"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Карталар баштапкы иретине жана өлчөмдөрүнө кайтарылсынбы?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Бардык карталарды баштапкы абалга келтиресизби?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Бардык Ыкчам параметрлер карталары түзмөктүн баштапкы параметрлерине кайтарылат"</string> </resources> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index f6fe3cce059a..1dd534df9be0 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"ບັນທຶກໜ້າຈໍຂອງທ່ານບໍ?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"ບັນທຶກແອັບດຽວ"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"ບັນທຶກໝົດໜ້າຈໍ"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"ບັນທຶກໜ້າຈໍທັງໝົດ: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"ເມື່ອທ່ານບັນທຶກໝົດໜ້າຈໍຂອງທ່ານ, ລະບົບຈະບັນທຶກທຸກສິ່ງທີ່ສະແດງຢູ່ໜ້າຈໍຂອງທ່ານ. ດັ່ງນັ້ນ, ໃຫ້ລະມັດລະວັງສິ່ງຕ່າງໆ ເຊັ່ນ: ລະຫັດຜ່ານ, ລາຍລະອຽດການຈ່າຍເງິນ, ຂໍ້ຄວາມ, ຮູບພາບ, ພ້ອມທັງສຽງ ແລະ ວິດີໂອ."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"ເມື່ອທ່ານບັນທຶກແອັບ, ລະບົບຈະບັນທຶກທຸກສິ່ງທີ່ສະແດງ ຫຼື ຫຼິ້ນຢູ່ໃນແອັບນັ້ນ. ດັ່ງນັ້ນ, ໃຫ້ລະມັດລະວັງສິ່ງຕ່າງໆ ເຊັ່ນ: ລະຫັດຜ່ານ, ລາຍລະອຽດການຈ່າຍເງິນ, ຂໍ້ຄວາມ, ຮູບພາບ, ພ້ອມທັງສຽງ ແລະ ວິດີໂອ."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"ບັນທຶກໜ້າຈໍ"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"ທ່ານກຳລັງບັນທຶກ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"ຢຸດການບັນທຶກ"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"ກຳລັງແບ່ງປັນໜ້າຈໍ"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"ກຳລັງແບ່ງປັນເນື້ອຫາ"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"ຢຸດການແບ່ງປັນໜ້າຈໍບໍ?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"ຢຸດການແບ່ງປັນບໍ?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"ທ່ານກຳລັງແບ່ງປັນທັງໝົດໜ້າຈໍຂອງທ່ານກັບ <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"ທ່ານກຳລັງແບ່ງປັນທັງໝົດໜ້າຈໍຂອງທ່ານກັບແອັບ"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"ທ່ານກຳລັງແບ່ງປັນ <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"ທ່ານກຳລັງແບ່ງປັນແອັບ"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"ທ່ານກຳລັງແບ່ງປັນກັບແອັບ"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"ຢຸດການແບ່ງປັນ"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"ກຳລັງສົ່ງສັນຍານໜ້າຈໍ"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"ຢຸດການສົ່ງສັນຍານບໍ?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"ວິດເຈັດໃນໜ້າຈໍລັອກ"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"ທຸກຄົນສາມາດເບິ່ງວິດເຈັດຢູ່ໜ້າຈໍລັອກຂອງທ່ານໄດ້, ເຖິງແມ່ນວ່າແທັບເລັດຂອງທ່ານຈະລັອກຢູ່ກໍຕາມ."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ຍົກເລີກການເລືອກວິດເຈັດ"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"ຫຼຸດຄວາມສູງ"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"ເພີ່ມຄວາມສູງ"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"ວິດເຈັດໃນໜ້າຈໍລັອກ"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ເພື່ອເປີດແອັບໂດຍໃຊ້ວິດເຈັດ, ທ່ານຈະຕ້ອງຢັ້ງຢືນວ່າແມ່ນທ່ານ. ນອກຈາກນັ້ນ, ກະລຸນາຮັບຊາບວ່າທຸກຄົນສາມາດເບິ່ງຂໍ້ມູນດັ່ງກ່າວໄດ້, ເຖິງແມ່ນວ່າແທັບເລັດຂອງທ່ານຈະລັອກຢູ່ກໍຕາມ. ວິດເຈັດບາງຢ່າງອາດບໍ່ໄດ້ມີໄວ້ສຳລັບໜ້າຈໍລັອກຂອງທ່ານ ແລະ ອາດບໍ່ປອດໄພທີ່ຈະເພີ່ມໃສ່ບ່ອນນີ້."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ເຂົ້າໃຈແລ້ວ"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"ລຶບລ້າງທັງໝົດ"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"ຈັດການ"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"ປະຫວັດ"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"ການຕັ້ງຄ່າການແຈ້ງເຕືອນ"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"ປະຫວັດການແຈ້ງເຕືອນ"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"ໃໝ່"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"ປິດສຽງ"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"ການແຈ້ງເຕືອນ"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"ເລີ່ມດຽວນີ້"</string> <string name="empty_shade_text" msgid="8935967157319717412">"ບໍ່ມີການແຈ້ງເຕືອນ"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"ບໍ່ມີການແຈ້ງເຕືອນໃໝ່"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"ຄູດາວການແຈ້ງເຕືອນເປີດຢູ່"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"ສຽງ ແລະ ແຈ້ງເຕືອນອຸປະກອນຂອງທ່ານຖືກຫຼຸດລົງໂດຍອັດຕະໂນມັດເປັນເວລາເຖິງ 2 ນາທີເມື່ອທ່ານໄດ້ຮັບການແຈ້ງເຕືອນຫຼາຍເກີນໄປໃນຄັ້ງດຽວ."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"ປິດ"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"ປົດລັອກເພື່ອເບິ່ງການແຈ້ງເຕືອນເກົ່າ"</string> @@ -705,6 +698,7 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"ຄົງທີ່"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"ການຕິດຕາມຫົວ"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"ແຕະເພື່ອປ່ຽນໂໝດຣິງເກີ"</string> + <string name="volume_ringer_mode" msgid="6867838048430807128">"ໂໝດຣິງເກີ"</string> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"ປິດສຽງ"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"ເຊົາປິດສຽງ"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"ສັ່ນເຕືອນ"</string> @@ -1415,15 +1409,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"ແອັບປັດຈຸບັນ"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ການຊ່ວຍເຂົ້າເຖິງ"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"ຄີລັດ"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"ປັບແຕ່ງຄີລັດ"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ທາງລັດການຊອກຫາ"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ບໍ່ມີຜົນການຊອກຫາ"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ໄອຄອນຫຍໍ້ລົງ"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"ປັບແຕ່ງ"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ແລ້ວໆ"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ໄອຄອນຂະຫຍາຍ"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ຫຼື"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ບ່ອນຈັບລາກ"</string> @@ -1485,6 +1476,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"ສະໜອງໃຫ້ໂດຍແອັບ"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ການສະແດງຜົນ"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"ບໍ່ຮູ້ຈັກ"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"ຣີເຊັດແຜ່ນ"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"ຣີເຊັດແຜ່ນເປັນການຈັດຮຽງ ແລະ ຂະໜາດເດີມບໍ?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"ຣີເຊັດແຜ່ນທັງໝົດບໍ?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"ແຜ່ນການຕັ້ງຄ່າດ່ວນທັງໝົດຈະຣີເຊັດເປັນການຕັ້ງຄ່າແບບເກົ່າຂອງອຸປະກອນ"</string> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 70a0063d7627..a2d26c76d33a 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Įrašyti ekraną?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Įrašyti vieną programą"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Įrašyti visą ekraną"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Įrašyti visą ekraną: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Kai įrašote visą ekraną, įrašomas visas ekrane rodomas turinys. Todėl būkite atsargūs naudodami slaptažodžius, išsamią mokėjimo metodo informaciją, pranešimus, nuotraukas ir garso bei vaizdo įrašus."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Kai įrašote programą, įrašomas visas toje programoje rodomas ar leidžiamas turinys. Todėl būkite atsargūs naudodami slaptažodžius, išsamią mokėjimo metodo informaciją, pranešimus, nuotraukas ir garso bei vaizdo įrašus."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Įrašyti ekraną"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Šiuo metu įrašote šią programą: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Sustabdyti įrašymą"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Bendrinamas ekranas"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Bendrint turinį"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Nebebendrinti ekrano?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Nebebendrinti?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Šiuo metu bendrinate visą ekraną su šia programa: <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Šiuo metu bendrinate visą ekraną su programa"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Šiuo metu bendrinate šią programą: <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Šiuo metu bendrinate programą"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Šiuo metu bendrinate su programa"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Nebebendrinti"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Perduodamas ekranas"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Sustabdyti perdavimą?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Užrakinimo ekrano valdikliai"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Visi gali žr. valdiklius užrakinimo ekrane, net užrakinus planšetinį kompiuterį."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"atšaukti valdiklio pasirinkimą"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Sumažinti aukštį"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Padidinti aukštį"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Užrakinimo ekrano valdikliai"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Kad galėtumėte atidaryti programą naudodami valdiklį, turėsite patvirtinti savo tapatybę. Be to, atminkite, kad bet kas gali peržiūrėti valdiklius net tada, kai planšetinis kompiuteris užrakintas. Kai kurie valdikliai gali būti neskirti jūsų užrakinimo ekranui ir gali būti nesaugu juos čia pridėti."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Supratau"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Viską išvalyti"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Tvarkyti"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Istorija"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Pranešimų nustatymai"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Pranešimų istorija"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Nauja"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Tylus"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Pranešimai"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Pradėti dabar"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Nėra įspėjimų"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Naujų pranešimų nėra"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Pranešimų neaktyvumo laikotarpis įjungtas"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Jūsų įrenginio garsumas ir įspėjimai automatiškai sumažinami iki dviejų minučių, kai iš karto gaunate per daug pranešimų."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Išjungti"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Atrakinę matykite senesnius pranešimus"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fiksuotas"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Galvos stebėjimas"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Palieskite, kad pakeistumėte skambučio režimą"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"nutildyti"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"įjungti garsą"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibruoti"</string> @@ -1411,19 +1406,16 @@ <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Naujausios programos"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Išskaidyto ekrano režimas"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Įvestis"</string> - <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Programos šaukiniai"</string> + <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Programos spartieji klavišai"</string> <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Esama programa"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Pritaikomumas"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Spartieji klavišai"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Paieškos šaukiniai"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Sparčiųjų klavišų tinkinimas"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Ieškoti sparčiųjų klavišų"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nėra jokių paieškos rezultatų"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Sutraukimo piktograma"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Tinkinti"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Atlikta"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Išskleidimo piktograma"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"arba"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Vilkimo rankenėlė"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Teikia programos"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Ekranas"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Nežinoma"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Išklotinės nustatymas iš naujo"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Iš naujo nustatyti išklotinės pradinę tvarką ir dydžius?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Iš naujo nustatyti visus išklotines elementus?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Visi sparčiųjų nustatymų išklotinės elementai bus iš naujo nustatyti į pradinius įrenginio nustatymus"</string> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 360afad1c6fa..98eebd3e5834 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Vai ierakstīt ekrānu?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Ierakstīt vienu lietotni"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Ierakstīt visu ekrānu"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Ierakstīt visu ekrānu: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Ierakstot visu ekrānu, viss, kas redzams ekrānā, tiek ierakstīts. 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="3738199712880063924">"Ierakstot lietotni, tiek ierakstīts viss attiecīgajā lietotnē rādītais vai atskaņotais. 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_entire_screen" msgid="5557974446773486600">"Ierakstīt ekrānu"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Pašlaik ierakstāt lietotni <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Apturēt ierakstīšanu"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Notiek ekrāna kopīgošana"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Notiek satura kopīgošana"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Vai apturēt ekrāna kopīgošanu?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Vai apturēt kopīgošanu?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Pašlaik kopīgojat visu ekrānu ar lietotni <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Pašlaik kopīgojat visu ekrānu ar lietotni"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Pašlaik kopīgojat lietotni <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Pašlaik kopīgojat lietotni"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Pašlaik kopīgojat saturu ar lietotni."</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Apturēt kopīgošanu"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Notiek ekrāna apraide"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Vai pārtraukt apraidi?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Bloķēšanas ekrāna logrīki"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Jebkurš var skatīt logrīkus bloķēšanas ekrānā, pat ja planšetdators ir bloķēts."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"noņemt logrīka atlasi"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Samazināt augstumu"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Palielināt augstumu"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Bloķēšanas ekrāna logrīki"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Lai atvērtu lietotni, izmantojot logrīku, jums būs jāapstiprina sava identitāte. Turklāt ņemiet vērā, ka ikviens var skatīt logrīkus, pat ja planšetdators ir bloķēts. Iespējams, daži logrīki nav paredzēti izmantošanai bloķēšanas ekrānā, un var nebūt droši tos šeit pievienot."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Labi"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Dzēst visu"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Pārvaldīt"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Vēsture"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Paziņojumu iestatījumi"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Paziņojumu vēsture"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Jauni"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Klusums"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Paziņojumi"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Sākt tūlīt"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Nav paziņojumu"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Nav jaunu paziņojumu"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Nogaidīšanas periods paziņojumiem ir ieslēgts"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Saņemot par daudz paziņojumu uzreiz, skaļums un brīdinājumi tiek automātiski samazināti līdz 2 min."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Izslēgt"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Atbloķējiet vecāku paziņojumu skatīšanai"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fiksēts"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Seko galvai"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Pieskarieties, lai mainītu zvanītāja režīmu."</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"izslēgt skaņu"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"ieslēgt skaņu"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrēt"</string> @@ -815,8 +810,8 @@ <string name="keyboard_key_back" msgid="4185420465469481999">"Atpakaļ"</string> <string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string> <string name="keyboard_key_space" msgid="6980847564173394012">"Atstarpe"</string> - <string name="keyboard_key_enter" msgid="8633362970109751646">"Ievadīšanas taustiņš"</string> - <string name="keyboard_key_backspace" msgid="4095278312039628074">"Atpakaļatkāpes taustiņš"</string> + <string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string> + <string name="keyboard_key_backspace" msgid="4095278312039628074">"Backspace"</string> <string name="keyboard_key_media_play_pause" msgid="8389984232732277478">"Atskaņot/apturēt"</string> <string name="keyboard_key_media_stop" msgid="1509943745250377699">"Apturēt"</string> <string name="keyboard_key_media_next" msgid="8502476691227914952">"Nākamais"</string> @@ -826,7 +821,7 @@ <string name="keyboard_key_page_up" msgid="173914303254199845">"Lapa uz augšu"</string> <string name="keyboard_key_page_down" msgid="9035902490071829731">"Lapa uz leju"</string> <string name="keyboard_key_forward_del" msgid="5325501825762733459">"Dzēšanas taustiņš"</string> - <string name="keyboard_key_esc" msgid="6230365950511411322">"Atsoļa taustiņš"</string> + <string name="keyboard_key_esc" msgid="6230365950511411322">"Esc"</string> <string name="keyboard_key_move_home" msgid="3496502501803911971">"Sākumvietas taustiņš"</string> <string name="keyboard_key_move_end" msgid="99190401463834854">"Beigvietas taustiņš"</string> <string name="keyboard_key_insert" msgid="4621692715704410493">"Ievietošanas taustiņš"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Pašreizējā lietotne"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Pieejamība"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Īsinājumtaustiņi"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Meklēšanas saīsnes"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Īsinājumtaustiņu pielāgošana"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Meklēt saīsnes"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nav meklēšanas rezultātu"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Sakļaušanas ikona"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Pielāgot"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Gatavs"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Izvēršanas ikona"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"vai"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Vilkšanas turis"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Nodrošina lietotnes"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Displejs"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Nezināma"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Elementu atiestatīšana"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Vai atiestatīt elementus, atjaunojot to sākotnējo secību un izmērus?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Vai atiestatīt visus elementus?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Visiem ātro iestatījumu elementiem tiks atiestatīti sākotnējie iestatījumi"</string> </resources> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index ebd62a9568e0..f136441a7338 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Да се снима екранот?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Снимање на една апликација"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Снимање на целиот екран"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Снимање на целиот екран: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Додека го снимате целиот екран, сѐ што е прикажано на екранот се снима. Затоа, бидете внимателни со лозинките, деталите за плаќање, пораките, фотографиите и аудиото и видеото."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Додека снимате апликација, може да се сними сѐ што се прикажува или пушта во таа апликација. Затоа, бидете внимателни со лозинките, деталите за плаќање, пораките, фотографиите и аудиото и видеото."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Снимај го екранот"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Во моментов ја снимате <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Сопри го снимањето"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Се споделува екранот"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Се споделуваат содржини"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Да се сопре споделувањето на екранот?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Да се сопре споделувањето?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Во моментов го споделувате целиот екран со <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Во моментов го споделувате целиот екран со апликација"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Во моментов ја споделувате <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Во моментов споделувате апликација"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Во моментов споделувате со апликација"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Сопри го споделувањето"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Се емитува екранот"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Да се сопре емитувањето?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Виџети на заклучен екран"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Секој може да гледа виџети на заклучениот екран, дури и ако таблетот е заклучен."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"поништи го изборот на виџетот"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Намали ја висината"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Зголеми ја висината"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Виџети на заклучен екран"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"За да отворите апликација со помош на виџет, ќе треба да потврдите дека сте вие. Покрај тоа, имајте предвид дека секој може да ги гледа виџетите, дури и кога вашиот таблет е заклучен. Некои виџети можеби не се наменети за вашиот заклучен екран, па можеби не е безбедно да се додадат овде."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Сфатив"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Започни сега"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Нема известувања"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Нема нови известувања"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"„Подискретни известувања“ е вклучена"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Јачината на звукот и известувањата на уредот се намалуваат автоматски до 2 минути кога добивате премногу известувања одеднаш."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Исклучи"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Отклучете за да ги видите старите известувања"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Фиксно"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Следење на главата"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Допрете за да го промените режимот на ѕвончето"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"исклучен звук"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"вклучен звук"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"вибрации"</string> @@ -814,7 +811,7 @@ <string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string> <string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string> <string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string> - <string name="keyboard_key_backspace" msgid="4095278312039628074">"Бришење наназад"</string> + <string name="keyboard_key_backspace" msgid="4095278312039628074">"Backspace"</string> <string name="keyboard_key_media_play_pause" msgid="8389984232732277478">"Пушти/Паузирај"</string> <string name="keyboard_key_media_stop" msgid="1509943745250377699">"Сопри"</string> <string name="keyboard_key_media_next" msgid="8502476691227914952">"Следно"</string> @@ -1413,21 +1410,18 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Тековна апликација"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Пристапност"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Кратенки од тастатура"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Кратенки за пребарување"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Приспособете ги кратенките од тастатурата"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Пребарувајте кратенки"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Нема резултати од пребарување"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Икона за собирање"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Приспособете"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Готово"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Икона за проширување"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"или"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Рачка за влечење"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Поставки за тастатурата"</string> <string name="launch_keyboard_tutorial_notification_title" msgid="8849933155160522519">"Движете се со користење на тастатурата"</string> - <string name="launch_keyboard_tutorial_notification_content" msgid="2880339951512757918">"Научете кратенки од тастатурата"</string> + <string name="launch_keyboard_tutorial_notification_content" msgid="2880339951512757918">"Научете ги кратенките од тастатурата"</string> <string name="launch_touchpad_tutorial_notification_title" msgid="2243780062772196901">"Движете се со користење на допирната подлога"</string> <string name="launch_touchpad_tutorial_notification_content" msgid="7931085031240753226">"Научете движења за допирната подлога"</string> <string name="launch_keyboard_touchpad_tutorial_notification_title" msgid="1940023776496198762">"Движете се со користење на тастатурата и допирната подлога"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Обезбедено од апликации"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Екран"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Непознато"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Ресетирајте ги плочките"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Да се ресетираат плочките на нивниот првичен редослед и големини?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Да се ресетираат сите плочки?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Сите плочки на „Брзи поставки“ ќе се ресетираат на првичните поставки на уредот"</string> </resources> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index 6152fce2e02b..3378b1143ca9 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"നിങ്ങളുടെ സ്ക്രീൻ റെക്കോർഡ് ചെയ്യണോ?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"ഒരു ആപ്പ് റെക്കോർഡ് ചെയ്യുക"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"സ്ക്രീൻ പൂർണ്ണമായി റെക്കോർഡ് ചെയ്യുക"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"മുഴുവൻ സ്ക്രീനും റെക്കോർഡ് ചെയ്യുക: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"നിങ്ങളുടെ സ്ക്രീൻ പൂർണ്ണമായി റെക്കോർഡ് ചെയ്യുമ്പോൾ, സ്ക്രീനിൽ ദൃശ്യമാകുന്ന എല്ലാം റെക്കോർഡ് ചെയ്യപ്പെടും. അതിനാൽ പാസ്വേഡുകൾ, പേയ്മെന്റ് വിശദാംശങ്ങൾ, സന്ദേശങ്ങൾ, ഫോട്ടോകൾ, ഓഡിയോ, വീഡിയോ എന്നിവ പോലുള്ള കാര്യങ്ങൾ നൽകുമ്പോൾ സൂക്ഷിക്കുക."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"നിങ്ങളുടെ ആപ്പ് റെക്കോർഡ് ചെയ്യുമ്പോൾ, ആ ആപ്പിൽ കാണിക്കുന്നതോ പ്ലേ ചെയ്യുന്നതോ ആയ എല്ലാ കാര്യങ്ങളും റെക്കോർഡ് ചെയ്യപ്പെടും. അതിനാൽ പാസ്വേഡുകൾ, പേയ്മെന്റ് വിശദാംശങ്ങൾ, സന്ദേശങ്ങൾ, ഫോട്ടോകൾ, ഓഡിയോ, വീഡിയോ എന്നിവ പോലുള്ള കാര്യങ്ങൾ നൽകുമ്പോൾ സൂക്ഷിക്കുക."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"സ്ക്രീൻ റെക്കോർഡ് ചെയ്യുക"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"നിങ്ങൾ ഇപ്പോൾ <xliff:g id="APP_NAME">%1$s</xliff:g> റെക്കോർഡ് ചെയ്യുകയാണ്"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"റെക്കോർഡിംഗ് നിർത്തുക"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"സ്ക്രീൻ പങ്കിടുന്നു"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"ഉള്ളടക്കം പങ്കിടൽ"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"സ്ക്രീൻ പങ്കിടുന്നത് നിർത്തണോ?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"പങ്കിടൽ നിർത്തണോ?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"നിങ്ങൾ ഇപ്പോൾ മുഴുവൻ സ്ക്രീനും <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> എന്നതുമായി പങ്കിടുകയാണ്"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"നിങ്ങൾ ഇപ്പോൾ മുഴുവൻ സ്ക്രീനും ഒരു ആപ്പുമായി പങ്കിടുകയാണ്"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"നിങ്ങൾ ഇപ്പോൾ <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> പങ്കിടുകയാണ്"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"നിങ്ങൾ നിലവിൽ ഒരു ആപ്പ് പങ്കിടുകയാണ്"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"നിങ്ങൾ നിലവിൽ ഒരു ആപ്പുമായി പങ്കിടുകയാണ്"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"പങ്കിടൽ നിർത്തുക"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"സ്ക്രീൻ കാസ്റ്റ് ചെയ്യുന്നു"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"കാസ്റ്റ് ചെയ്യുന്നത് അവസാനിപ്പിക്കണോ?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"ലോക്ക് സ്ക്രീൻ വിജറ്റുകൾ"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"ടാബ്ലെറ്റ് ലോക്കാണെങ്കിൽ പോലും ലോക്ക് സ്ക്രീനിൽ ആർക്കും വിജറ്റുകൾ കാണാം."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"വിജറ്റ് തിരഞ്ഞെടുത്തത് മാറ്റുക"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"ഉയരം കുറയ്ക്കുക"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"ഉയരം കൂട്ടുക"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"ലോക്ക് സ്ക്രീൻ വിജറ്റുകൾ"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"വിജറ്റ് ഉപയോഗിച്ച് ഒരു ആപ്പ് തുറക്കാൻ, ഇത് നിങ്ങൾ തന്നെയാണെന്ന് പരിശോധിച്ചുറപ്പിക്കേണ്ടതുണ്ട്. നിങ്ങളുടെ ടാബ്ലെറ്റ് ലോക്കായിരിക്കുമ്പോഴും എല്ലാവർക്കും അത് കാണാനാകുമെന്നതും ഓർക്കുക. ചില വിജറ്റുകൾ നിങ്ങളുടെ ലോക്ക് സ്ക്രീനിന് ഉള്ളതായിരിക്കില്ല, അവ ഇവിടെ ചേർക്കുന്നത് സുരക്ഷിതവുമായിരിക്കില്ല."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"മനസ്സിലായി"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"ഇപ്പോൾ ആരംഭിക്കുക"</string> <string name="empty_shade_text" msgid="8935967157319717412">"അറിയിപ്പുകൾ ഒന്നുമില്ല"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"പുതിയ അറിയിപ്പുകളൊന്നുമില്ല"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"അറിയിപ്പിന്റെ ശബ്ദം കുറയ്ക്കൽ ഓണാണ്"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"നിരവധി അറിയിപ്പ് ഒരുമിച്ച് ലഭിക്കുമ്പോൾ, ഉപകരണത്തിന്റെ ശബ്ദവും മുന്നറിയിപ്പും 2 മിനിറ്റ് വരെ സ്വയമേവ കുറയ്ക്കും."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"ഓഫാക്കുക"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"പഴയ അറിയിപ്പുകൾ കാണാൻ അൺലോക്ക് ചെയ്യുക"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"ഓൺ ചെയ്തിരിക്കുന്നു"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"ഹെഡ് ട്രാക്കിംഗ്"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"റിംഗർ മോഡ് മാറ്റാൻ ടാപ്പ് ചെയ്യുക"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"മ്യൂട്ട് ചെയ്യുക"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"അൺമ്യൂട്ട് ചെയ്യുക"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"വൈബ്രേറ്റ് ചെയ്യുക"</string> @@ -869,7 +866,7 @@ <string name="system_multitasking_rhs" msgid="8714224917276297810">"വലതുവശത്തുള്ള നിലവിലെ ആപ്പിനൊപ്പം സ്ക്രീൻ വിഭജന മോഡ് ഉപയോഗിക്കുക"</string> <string name="system_multitasking_lhs" msgid="8402954791206308783">"ഇടതുവശത്തുള്ള നിലവിലെ ആപ്പിനൊപ്പം സ്ക്രീൻ വിഭജന മോഡ് ഉപയോഗിക്കുക"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"സ്ക്രീൻ വിഭജന മോഡിൽ നിന്ന് പൂർണ്ണ സ്ക്രീനിലേക്ക് മാറുക"</string> - <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"സ്ക്രീൻ വിഭജന മോഡ് ഉപയോഗിക്കുമ്പോൾ വലതുവശത്തെ/താഴത്തെ ആപ്പിലേക്ക് മാറൂ"</string> + <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> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"നിലവിലെ ആപ്പ്"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ഉപയോഗസഹായി"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"കീബോഡ് കുറുക്കുവഴികൾ"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"കീബോർഡ് കുറുക്കുവഴികൾ ഇഷ്ടാനുസൃതമാക്കുക"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"തിരയൽ കുറുക്കുവഴികൾ"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"തിരയൽ ഫലങ്ങളൊന്നുമില്ല"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ചുരുക്കൽ ഐക്കൺ"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"ഇഷ്ടാനുസൃതമാക്കുക"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"പൂർത്തിയായി"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"വികസിപ്പിക്കൽ ഐക്കൺ"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"അല്ലെങ്കിൽ"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"വലിച്ചിടുന്നതിനുള്ള ഹാൻഡിൽ"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"ആപ്പുകൾ നൽകുന്നത്"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ഡിസ്പ്ലേ"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"അജ്ഞാതം"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"ടൈലുകൾ റീസെറ്റ് ചെയ്യുക"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"ടൈലുകൾ അവയുടെ ഒറിജിനൽ ക്രമത്തിലേക്കും വലുപ്പങ്ങളിലേക്കും റീസെറ്റ് ചെയ്യണോ?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"എല്ലാ ടൈലുകളും റീസെറ്റ് ചെയ്യണോ?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"എല്ലാ ദ്രുത ക്രമീകരണ ടൈലുകളും ഉപകരണത്തിന്റെ ഒറിജിനൽ ക്രമീകരണത്തിലേക്ക് റീസെറ്റ് ചെയ്യും"</string> </resources> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index aafc8c610c55..9aca3ee05287 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Дэлгэцээ бичих үү?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Нэг аппыг бичих"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Бүтэн дэлгэцийг бичих"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Дэлгэцийг бүхэлд нь бичих: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Таныг бүтэн дэлгэцээ бичиж байхад дэлгэц дээр тань харуулж буй аливаа зүйлийг бичдэг. Тиймээс нууц үг, төлбөрийн дэлгэрэнгүй, мессеж, зураг, аудио, видео зэрэг зүйлд болгоомжтой хандаарай."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Таныг апп бичиж байхад тухайн аппад харуулж эсвэл тоглуулж буй аливаа зүйлийг бичдэг. Тиймээс нууц үг, төлбөрийн дэлгэрэнгүй, мессеж, зураг, аудио, видео зэрэг зүйлд болгоомжтой хандаарай."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Дэлгэцийг бичих"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Та одоогоор <xliff:g id="APP_NAME">%1$s</xliff:g>-г бичиж байна"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Бичихийг зогсоох"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Дэлгэцийг хуваалцаж байна"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Контент хуваалцаж байна"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Дэлгэц хуваалцахыг зогсоох уу?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Хуваалцахыг зогсоох уу?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Та одоогоор дэлгэцээ бүтнээр нь <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>-тай хуваалцаж байна"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Та одоогоор дэлгэцээ бүтнээр нь нэг апптай хуваалцаж байна"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Та одоогоор <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>-г хуваалцаж байна"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Та одоогоор нэг аппыг хуваалцаж байна"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Та одоогоор нэг апптай хуваалцаж байна"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Хуваалцахыг зогсоох"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Дэлгэцийг дамжуулж байна"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Дамжуулахaa болих уу?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Түгжээтэй дэлгэцийн виджет"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Таны таблет түгжээтэй байсан ч түгжээтэй дэлгэцийн виджетийг тань дурын хүн үзнэ"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"виджетийн сонголтыг болиулах"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Намсгах"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Өндөрсгөх"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Түгжээтэй дэлгэцийн виджет"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Виджет ашиглан аппыг нээхийн тулд та өөрийгөө мөн болохыг баталгаажуулах шаардлагатай болно. Мөн таны таблет түгжээтэй байсан ч тэдгээрийг дурын хүн үзэж болохыг санаарай. Зарим виджет таны түгжээтэй дэлгэцэд зориулагдаагүй байж магадгүй ба энд нэмэхэд аюултай байж болзошгүй."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Ойлголоо"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Одоо эхлүүлэх"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Мэдэгдэл байхгүй"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Шинэ мэдэгдэл алга"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Мэдэгдлийн хөргөлт асаалттай байна"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Таныг хэт олон мэдэгдэл нэг дор авахад таны төхөөрөмжийн дууны түвшин болон дохиог 2 хүртэлх минутын турш автоматаар багасгадаг."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Унтраах"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Хуучин мэдэгдлийг харах бол түгжээг тайл"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Зассан"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Толгой хянах"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Хонхны горимыг өөрчлөхийн тулд товшино уу"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"дууг хаах"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"дууг нээх"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"чичрэх"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Одоогийн апп"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Хандалт"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Товчлуурын шууд холбоос"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Товчлуурын шууд холбоосыг өөрчлөх"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Товчлолууд хайх"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ямар ч хайлтын илэрц байхгүй"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Хураах дүрс тэмдэг"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Өөрчлөх"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Болсон"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Дэлгэх дүрс тэмдэг"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"эсвэл"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Чирэх бариул"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Аппуудаас өгсөн"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Дэлгэц"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Тодорхойгүй"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Хавтангуудыг шинэчлэх"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Хавтангуудыг эх дараалал, хэмжээ рүү нь шинэчлэх үү?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Бүх хавтанг шинэчлэх үү?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Шуурхай тохиргооны бүх хавтан төхөөрөмжийн эх тохиргоо руу шинэчлэгдэнэ"</string> </resources> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index fbbb1670b286..82a001a37420 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"तुमची स्क्रीन रेकॉर्ड करायची आहे का?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"एक अॅप रेकॉर्ड करा"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"पूर्ण स्क्रीन रेकॉर्ड करा"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"संपूर्ण स्क्रीन रेकॉर्ड करा: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"तुम्ही तुमची पूर्ण स्क्रीन रेकॉर्ड करता, तेव्हा तुमच्या स्क्रीनवर दाखवलेली कोणतीही गोष्टी रेकॉर्ड केली जाते. त्यामुळे पासवर्ड, पेमेंट तपशील, मेसेज, फोटो आणि ऑडिओ व व्हिडिओ यांसारख्या गोष्टींबाबत सावधगिरी बाळगा."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"तुम्ही अॅप रेकॉर्ड करता, तेव्हा त्या अॅपमध्ये दाखवलेली किंवा प्ले केलेली कोणतीही गोष्ट रेकॉर्ड केली जाते. त्यामुळे पासवर्ड, पेमेंट तपशील, मेसेज, फोटो आणि ऑडिओ व व्हिडिओ यांसारख्या गोष्टींबाबत सावधगिरी बाळगा."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"स्क्रीन रेकॉर्ड करा"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"तुम्ही सध्या <xliff:g id="APP_NAME">%1$s</xliff:g> रेकॉर्ड करत आहात"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"रेकॉर्ड करणे थांबवा"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"स्क्रीन शेअर करत आहे"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"आशय शेअर करत आहे"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"स्क्रीन शेअर करणे थांबवायचे आहे का?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"शेअर करणे थांबवायचे आहे का?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"तुम्ही सध्या तुमची संपूर्ण स्क्रीन <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> सह शेअर करत आहात"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"तुम्ही सध्या तुमची संपूर्ण स्क्रीन एका ॲपसह शेअर करत आहात"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"तुम्ही सध्या <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> शेअर करत आहात"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"तुम्ही सध्या एक ॲप शेअर करत आहात"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"तुम्ही सध्या एक ॲप शेअर करत आहात"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"शेअर करणे थांबवा"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"स्क्रीन कास्ट करत आहे"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"कास्ट करणे थांबवायचे आहे का?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"लॉक स्क्रीन विजेट"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"तुमचा टॅबलेट लॉक केला, तरी कोणीही तुमच्या लॉक स्क्रीनवरील विजेट पाहू शकतो."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"विजेटची निवड रद्द करा"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"उंची कमी करा"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"उंची वाढवा"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"लॉक स्क्रीन विजेट"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"विजेट वापरून अॅप उघडण्यासाठी, तुम्हाला हे तुम्हीच असल्याची पडताळणी करावी लागेल. तसेच, लक्षात ठेवा, तुमचा टॅबलेट लॉक असतानादेखील कोणीही ती पाहू शकते. काही विजेट कदाचित तुमच्या लॉक स्क्रीनसाठी नाहीत आणि ती इथे जोडणे असुरक्षित असू शकते."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"समजले"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"आता सुरू करा"</string> <string name="empty_shade_text" msgid="8935967157319717412">"सूचना नाहीत"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"नवीन सूचना नाहीत"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"नोटिफिकेशन कूलडाउन सुरू आहे"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"एकाच वेळी अनेक नोटिफिकेशन मिळाल्यास, डिव्हाइसचा आवाज आणि सूचना आपोआप कमाल २ मिनिटांपर्यंत कमी होतात."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"बंद करा"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"जुन्या सूचना पाहण्यासाठी अनलॉक करा"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"निश्चित केला आहे"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"हेड ट्रॅकिंग"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"रिंगर मोड बदलण्यासाठी टॅप करा"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"म्यूट करा"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"म्यूट काढून टाका"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"व्हायब्रेट करा"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"सध्याचे अॅप"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"अॅक्सेसिबिलिटी"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"कीबोर्ड शॉर्टकट"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"कीबोर्ड शॉर्टकट कस्टमाइझ करा"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"शोधण्यासाठी शॉर्टकट"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"कोणतेही शोध परिणाम नाहीत"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"कोलॅप्स करा आयकन"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"कस्टमाइझ करा"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"पूर्ण झाले"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"विस्तार करा आयकन"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"किंवा"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ड्रॅग हॅंडल"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"अॅप्सद्वारे पुरवलेले"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"डिस्प्ले"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"अज्ञात"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"टाइल रीसेट करा"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"टाइल त्यांच्या मूळ क्रमानुसार आणि मूळ आकारांमध्ये रीसेट करायच्या आहेत का?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"सर्व टाइल रीसेट करायच्या?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"सर्व क्विक सेटिंग्ज टाइल डिव्हाइसच्या मूळ सेटिंग्जवर रीसेट केल्या जातील"</string> </resources> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 087c8a664076..bc01916bb3e5 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Rakam skrin anda?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Rakam satu apl"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Rakam seluruh skrin"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Rakam keseluruhan skrin: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Apabila anda merakam seluruh skrin anda, apa-apa sahaja yang dipaparkan pada skrin anda akan dirakam. 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="3738199712880063924">"Apabila anda merakam apl, apa-apa sahaja yang dipaparkan atau dimainkan dalam apl tersebut akan dirakam. 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_continue_entire_screen" msgid="5557974446773486600">"Rakam skrin"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Anda sedang merakam <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Hentikan rakaman"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Berkongsi skrin"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Berkongsi kandungan"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Hentikan perkongsian skrin?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Hentikan perkongsian?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Anda sedang berkongsi seluruh skrin anda dengan <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Anda sedang berkongsi seluruh skrin anda dengan apl"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Anda sedang berkongsi <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Anda sedang berkongsi apl"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Anda sedang berkongsi dengan apl"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Hentikan perkongsian"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Menghantar skrin"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Hentikan penghantaran?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widget skrin kunci"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Sesiapa sahaja boleh melihat widget pada skrin kunci, walaupun tablet dikunci."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"nyahpilih widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Kurangkan ketinggian"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Tambahkan ketinggian"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widget skrin kunci"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Untuk membuka apl menggunakan widget, anda perlu mengesahkan identiti anda. Selain itu, perlu diingat bahawa sesiapa sahaja boleh melihat widget tersebut, walaupun semasa tablet anda dikunci. Sesetengah widget mungkin tidak sesuai untuk skrin kunci anda dan mungkin tidak selamat untuk ditambahkan di sini."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Kosongkan semua"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Urus"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Sejarah"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Tetapan pemberitahuan"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Sejarah pemberitahuan"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Baharu"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Senyap"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Pemberitahuan"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Mulakan sekarang"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Tiada pemberitahuan"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Tiada pemberitahuan baharu"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Tempoh bertenang pemberitahuan dihidupkan"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Kelantangan, makluman peranti dikurangkan secara automatik hingga 2 minit apabila menerima banyak pemberitahuan serentak."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Matikan"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Buka kunci untuk melihat pemberitahuan lama"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Tetap"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Penjejakan Kepala"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Ketik untuk menukar mod pendering"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"redam"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"nyahredam"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"getar"</string> @@ -1415,20 +1410,17 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Apl Semasa"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Kebolehaksesan"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Pintasan papan kekunci"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Sesuaikan pintasan papan kekunci"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pintasan carian"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Tiada hasil carian"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Kuncupkan ikon"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Sesuaikan"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Selesai"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Kembangkan ikon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"atau"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Pemegang seret"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Tetapan Papan Kekunci"</string> - <string name="launch_keyboard_tutorial_notification_title" msgid="8849933155160522519">"Navigasi menggunakan papan kekunci anda"</string> + <string name="launch_keyboard_tutorial_notification_title" msgid="8849933155160522519">"Navigasi menggunakan papan kekunci"</string> <string name="launch_keyboard_tutorial_notification_content" msgid="2880339951512757918">"Ketahui pintasan papan kekunci"</string> <string name="launch_touchpad_tutorial_notification_title" msgid="2243780062772196901">"Navigasi menggunakan pad sentuh anda"</string> <string name="launch_touchpad_tutorial_notification_content" msgid="7931085031240753226">"Ketahui gerak isyarat pad sentuh"</string> @@ -1462,7 +1454,7 @@ <string name="back_edu_toast_content" msgid="4530314597378982956">"Untuk kembali, leret ke kiri atau ke kanan dengan tiga jari pada pad sentuh"</string> <string name="home_edu_toast_content" msgid="3381071147871955415">"Untuk mengakses laman utama, leret ke atas dengan tiga jari pada pad sentuh"</string> <string name="overview_edu_toast_content" msgid="5797030644017804518">"Untuk melihat apl terbaharu, leret ke atas dan tahan dengan tiga jari pada pad sentuh"</string> - <string name="all_apps_edu_toast_content" msgid="8807496014667211562">"Untuk melihat semua apl anda, tekan kekunci tindakan pada papan kekunci anda"</string> + <string name="all_apps_edu_toast_content" msgid="8807496014667211562">"Untuk melihat semua apl, tekan kekunci tindakan pada papan kekunci"</string> <string name="redacted_notification_single_line_title" msgid="212019960919261670">"Disunting"</string> <string name="redacted_notification_single_line_text" msgid="8684166405005242945">"Buka kunci untuk melihat"</string> <string name="contextual_education_dialog_title" msgid="4630392552837487324">"Pendidikan kontekstual"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Disediakan oleh apl"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Paparan"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Tidak diketahui"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Tetapkan semula jubin"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Tetapkan semula jubin kepada urutan dan saiz yang asal?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Tetapkan semula semua jubin?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Semua jubin Tetapan Pantas akan ditetapkan semula kepada tetapan asal peranti"</string> </resources> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index d456bcae7085..55626f065caa 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"ဖန်သားပြင်ကို ရိုက်ကူးမလား။"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"အက်ပ်တစ်ခုကို ရိုက်ကူးရန်"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"ဖန်သားပြင်တစ်ခုလုံးကို ရိုက်ကူးရန်"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"ဖန်သားပြင်တစ်ခုလုံးကို ရိုက်ကူးရန်- %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"သင့်ဖန်သားပြင်တစ်ခုလုံး ရိုက်ကူးနေချိန်တွင် ဖန်သားပြင်တွင် ပြထားသည့် အရာအားလုံးကို ရိုက်ကူးသည်။ စကားဝှက်၊ ငွေပေးချေမှု အချက်အလက်၊ မက်ဆေ့ဂျ်၊ ဓာတ်ပုံ၊ အသံနှင့် ဗီဒီယိုကဲ့သို့ အရာများကို ဂရုစိုက်ပါ။"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"အက်ပ်ကို ရိုက်ကူးနေချိန်တွင် ယင်းအက်ပ်တွင် ပြထားသော (သို့) ဖွင့်ထားသော အရာအားလုံးကို ရိုက်ကူးသည်။ စကားဝှက်၊ ငွေပေးချေမှု အချက်အလက်၊ မက်ဆေ့ဂျ်၊ ဓာတ်ပုံ၊ အသံနှင့် ဗီဒီယိုကဲ့သို့ အရာများကို ဂရုစိုက်ပါ။"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"ဖန်သားပြင်ကို ရိုက်ကူးရန်"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"သင်သည် လက်ရှိတွင် <xliff:g id="APP_NAME">%1$s</xliff:g> ကို ရိုက်ကူးနေသည်"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"ရိုက်ကူးမှု ရပ်ရန်"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"ဖန်သားပြင်ကို မျှဝေနေသည်"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"အကြောင်းအရာကို မျှဝေနေသည်"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"ဖန်သားပြင်မျှဝေခြင်း ရပ်မလား။"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"မျှဝေခြင်းကို ရပ်မလား။"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"သင်သည် လက်ရှိတွင် <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> ဖြင့် ဖန်သားပြင်တစ်ခုလုံးကို မျှဝေနေသည်"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"သင်သည် လက်ရှိတွင် အက်ပ်တစ်ခုဖြင့် ဖန်သားပြင်တစ်ခုလုံးကို မျှဝေနေသည်"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"သင်သည် လက်ရှိတွင် <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> ကို မျှဝေနေသည်"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"သင်သည် လက်ရှိတွင် အက်ပ်ကို မျှဝေနေသည်"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"သင်သည် လက်ရှိတွင် အက်ပ်ဖြင့် မျှဝေနေသည်"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"မျှဝေခြင်း ရပ်ရန်"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"ဖန်သားပြင်ကို ကာစ်လုပ်နေသည်"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"ကာစ်လုပ်ခြင်းကို ရပ်လိုသလား။"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"လော့ခ်မျက်နှာပြင် ဝိဂျက်များ"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"တက်ဘလက်လော့ခ်ချထားသော်လည်း မည်သူမဆို လော့ခ်မျက်နှာပြင်ဝိဂျက်ကို ကြည့်နိုင်သည်။"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ဝိဂျက် ပြန်ဖြုတ်ရန်"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"အမြင့်ကို လျှော့ရန်"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"အမြင့်ကို တိုးရန်"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"လော့ခ်မျက်နှာပြင် ဝိဂျက်များ"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ဝိဂျက်သုံး၍ အက်ပ်ဖွင့်ရန်အတွက် သင်ဖြစ်ကြောင်း အတည်ပြုရန်လိုသည်။ ထို့ပြင် သင့်တက်ဘလက် လော့ခ်ချထားချိန်၌ပင် မည်သူမဆို ၎င်းတို့ကို ကြည့်နိုင်ကြောင်း သတိပြုပါ။ ဝိဂျက်အချို့ကို လော့ခ်မျက်နှာပြင်အတွက် ရည်ရွယ်ထားခြင်း မရှိသဖြင့် ဤနေရာတွင် ထည့်ပါက မလုံခြုံနိုင်ပါ။"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"နားလည်ပြီ"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"အားလုံးရှင်းရန်"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"စီမံရန်"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"မှတ်တမ်း"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"အကြောင်းကြားချက် ဆက်တင်များ"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"အကြောင်းကြားချက် မှတ်တမ်း"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"အသစ်"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"အသံတိတ်ခြင်း"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"အကြောင်းကြားချက်များ"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"ယခု စတင်ပါ"</string> <string name="empty_shade_text" msgid="8935967157319717412">"အကြောင်းကြားချက် မရှိပါ"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"အကြောင်းကြားချက်သစ် မရှိပါ"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"အကြောင်းကြားချက် သတိပေးမှု လျှော့ချခြင်း ဖွင့်ထားသည်"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"အကြောင်းကြားချက်များစွာ တစ်ပြိုင်နက်ရပါက သင့်စက်၏ အသံနှင့် သတိပေးချက်ကို ၂ မိနစ်ကြာသည်အထိ အလိုအလျောက်လျှော့ချသည်။"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"ပိတ်ရန်"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"အကြောင်းကြားချက်ဟောင်းကြည့်ရန် လော့ခ်ဖွင့်ပါ"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"ပုံသေ"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"ခေါင်းလှုပ်ရှားမှု"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"ဖုန်းခေါ်သံမုဒ်သို့ ပြောင်းရန် တို့ပါ"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"အသံပိတ်ရန်"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"အသံဖွင့်ရန်"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"တုန်ခါမှု"</string> @@ -860,9 +855,9 @@ <string name="group_system_go_back" msgid="2730322046244918816">"ပြန်သွားရန်"</string> <string name="group_system_access_home_screen" msgid="4130366993484706483">"ပင်မစာမျက်နှာသို့သွားရန်"</string> <string name="group_system_overview_open_apps" msgid="5659958952937994104">"မကြာသေးမီကအက်ပ်များ ကြည့်ရန်"</string> - <string name="group_system_cycle_forward" msgid="5478663965957647805">"မကြာသေးမီက အက်ပ်များကို အဝိုင်းပုံရှေ့သို့လှည့်ရန်"</string> - <string name="group_system_cycle_back" msgid="8194102916946802902">"မကြာသေးမီက အက်ပ်များကို အဝိုင်းပုံနောက်ပြန်လှည့်ရန်"</string> - <string name="group_system_access_all_apps_search" msgid="1553588630154197469">"အက်ပ်ပြသမှု ဖွင့်ရန်"</string> + <string name="group_system_cycle_forward" msgid="5478663965957647805">"လတ်တလော အက်ပ်များတလျှောက် ရှေ့သို့လှည့်ရန်"</string> + <string name="group_system_cycle_back" msgid="8194102916946802902">"လတ်တလော အက်ပ်များတလျှောက် နောက်ပြန်လှည့်ရန်"</string> + <string name="group_system_access_all_apps_search" msgid="1553588630154197469">"အက်ပ်စာရင်း ဖွင့်ရန်"</string> <string name="group_system_access_system_settings" msgid="8731721963449070017">"ဆက်တင်များ ဖွင့်ရန်"</string> <string name="group_system_access_google_assistant" msgid="7210074957915968110">"Assistant ဖွင့်ရန်"</string> <string name="group_system_lock_screen" msgid="7391191300363416543">"လော့ခ်မျက်နှာပြင်"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"လက်ရှိအက်ပ်"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"အများသုံးနိုင်မှု"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"လက်ကွက်ဖြတ်လမ်းများ"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ရှာဖွေစာလုံး ဖြတ်လမ်း"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"လက်ကွက်ဖြတ်လမ်းများကို စိတ်ကြိုက်လုပ်ခြင်း"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ဖြတ်လမ်းများ ရှာရန်"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ရှာဖွေမှုရလဒ် မရှိပါ"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"လျှော့ပြရန် သင်္ကေတ"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"စိတ်ကြိုက်လုပ်ရန်"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ပြီးပြီ"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ပိုပြရန် သင်္ကေတ"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"သို့မဟုတ်"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ဖိဆွဲအထိန်း"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"အက်ပ်များက ပံ့ပိုးထားသည်"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ဖန်သားပြင်"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"အမျိုးအမည်မသိ"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"အကွက်ငယ်များ ပြင်ဆင်သတ်မှတ်ခြင်း"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"အကွက်ငယ်များကို ၎င်းတို့၏ မူလအစီအစဉ်နှင့် အရွယ်အစားများသို့ ပြင်ဆင်သတ်မှတ်မလား။"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"အကွက်ငယ်အားလုံးကို ပြင်ဆင်သတ်မှတ်မလား။"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"အမြန်ဆက်တင်များ အကွက်ငယ်အားလုံးကို စက်ပစ္စည်း၏ မူရင်းဆက်တင်များသို့ ပြင်ဆင်သတ်မှတ်ပါမည်"</string> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 1fbb35b0905e..942018514862 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Vil du ta opp skjermen?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Ta opp én app"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Ta opp hele skjermen"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Ta opp hele skjermen: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Når du tar opp hele skjermen, blir alt som vises på skjermen, tatt opp. Derfor bør du være forsiktig med for eksempel passord, betalingsopplysninger, meldinger, bilder, lyd og video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Når du tar opp en app, blir alt som vises eller spilles av i appen, tatt opp. Derfor bør du være forsiktig med for eksempel passord, betalingsopplysninger, meldinger, bilder, lyd og video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Ta opp skjermen"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Du tar nå opp <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Stopp opptaket"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Deler skjermen"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Deler innhold"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Vil du slutte å dele skjermen?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Vil du slutte å dele?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Du deler nå hele skjermen med <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Du deler nå hele skjermen med en app"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Du deler nå <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Du deler nå en app"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Du deler med en app"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Slutt å dele"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Caster skjermen"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Vil du stoppe castingen?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Moduler på låseskjermen"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Hvem som helst kan se moduler på låseskjermen – selv om nettbrettet er låst."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"velg bort modul"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Reduser høyden"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Øk høyden"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Låseskjermmoduler"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"For å åpne en app ved hjelp av en modul må du bekrefte at det er deg. Husk også at hvem som helst kan se dem, selv om nettbrettet er låst. Noen moduler er kanskje ikke laget for å være på låseskjermen og kan være utrygge å legge til der."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Greit"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Fjern alt"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Administrer"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Logg"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Varslingsinnstillinger"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Varsellogg"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Ny"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Lydløs"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Varsler"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Start nå"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Ingen varsler"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Ingen nye varsler"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Varseldemping er slått på"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Enhetsvolumet og varsler reduseres automatisk i opptil 2 min når du får for mange varsler samtidig."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Slå av"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Lås opp for å se eldre varsler"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fast"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Hodesporing"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Trykk for å endre ringemodus"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"kutt lyden"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"slå på lyden"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrer"</string> @@ -964,7 +959,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">"På/av-meny"</string> + <string name="accessibility_quick_settings_power_menu" msgid="6820426108301758412">"Av/på-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> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Aktiv app"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Tilgjengelighet"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Hurtigtaster"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Tilpass hurtigtastene"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Snarveier til søk"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ingen søkeresultater"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Skjul-ikon"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Tilpass"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Ferdig"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Vis-ikon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"eller"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Håndtak"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Levert av apper"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Skjerm"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Ukjent"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Tilbakestill brikkene"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Vil du tilbakestille brikkene til den opprinnelige rekkefølgen og størrelsen?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Vil du tilbakestille alle brikkene?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Alle brikker for hurtiginnstillinger tilbakestilles til enhetens opprinnelige innstillinger"</string> </resources> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 381118ac4d6c..54644eb57c31 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"तपाईंको स्क्रिन रेकर्ड गर्ने हो?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"एउटा एप रेकर्ड गर्नुहोस्"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"पूरै स्क्रिन रेकर्ड गर्नुहोस्"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"सम्पूर्ण स्क्रिन रेकर्ड गर्नुहोस्: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"तपाईंले आफ्नो पूरै स्क्रिन रेकर्ड गरिरहेका बेला तपाईंको स्क्रिनमा देखाइने सबै सामग्री रेकर्ड गरिन्छ। त्यसैले पासवर्ड, भुक्तानीसम्बन्धी विवरण, म्यासेज, फोटो र अडियो तथा भिडियो जस्ता कुरा हेर्दा वा प्ले गर्दा सावधानी अपनाउनुहोला।"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"तपाईंले यो एप रेकर्ड गरिरहेका बेला यो एपमा देखाइने वा प्ले गरिने सबै सामग्री रेकर्ड गरिन्छ। त्यसैले पासवर्ड, भुक्तानीसम्बन्धी विवरण, म्यासेज, फोटो र अडियो तथा भिडियो जस्ता कुरा हेर्दा वा प्ले गर्दा सावधानी अपनाउनुहोला।"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"स्क्रिन रेकर्ड गर्नुहोस्"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"तपाईं अहिले <xliff:g id="APP_NAME">%1$s</xliff:g> रेकर्ड गरिरहनुभएको छ"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"रेकर्ड गर्न छाड्नुहोस्"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"स्क्रिन सेयर गरिँदै छ"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"सामग्री सेयर गरिँदै छ"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"स्क्रिन सेयर गर्न छाड्ने हो?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"सेयर गर्न छाड्ने हो?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"तपाईं अहिले <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> सँग आफ्नो डिभाइसको पूरै स्क्रिन सेयर गरिरहनुभएको छ"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"तपाईं अहिले कुनै एपसँग आफ्नो डिभाइसको पूरै स्क्रिन सेयर गरिरहनुभएको छ"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"तपाईं अहिले <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> सेयर गरिरहनुभएको छ"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"तपाईं अहिले कुनै एप सेयर गरिरहनुभएको छ"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"तपाईं अहिले एपसँग सेयर गरिरहनुभएको छ"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"सेयर गर्न छाड्नुहोस्"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"स्क्रिन कास्ट गरिँदै छ"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"कास्ट गर्न छाड्ने हो?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"लक स्क्रिन विजेटहरू"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"तपाईंको ट्याब्लेट लक भएका बेला पनि सबैले लक स्क्रिनमा भएका विजेट हेर्न सक्छन्।"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"विजेटको चयन रद्द गर्नुहोस्"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"उचाइ घटाउनुहोस्"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"उचाइ बढाउनुहोस्"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"लक स्क्रिन विजेटहरू"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"विजेट प्रयोग गरी एप खोल्न तपाईंले आफ्नो पहिचान पुष्टि गर्नु पर्ने हुन्छ। साथै, तपाईंको ट्याब्लेट लक भएका बेला पनि सबै जनाले तिनलाई देख्न सक्छन् भन्ने कुरा ख्याल गर्नुहोस्। केही विजेटहरू लक स्क्रिनमा प्रयोग गर्ने उद्देश्यले नबनाइएका हुन सक्छन् र तिनलाई यहाँ हाल्नु सुरक्षित नहुन सक्छ।"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"बुझेँ"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"सबै हटाउनुहोस्"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"व्यवस्थित गर्नुहोस्"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"हिस्ट्री"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"नोटिफिकेसन सेटिङ"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"नोटिफिकेसनसम्बन्धी हिस्ट्री"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"नयाँ"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"साइलेन्ट"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"सूचनाहरू"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"अहिले न"</string> <string name="empty_shade_text" msgid="8935967157319717412">"कुनै सूचनाहरू छैनन्"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"कुनै पनि नयाँ सूचना छैन"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"नोटिफिकेसन कुलडाउन अन छ"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"तपाईंले एकै पटक धेरै नोटिफिकेसन प्राप्त गर्दा बढीमा २ मिनेटसम्म तपाईंको डिभाइसको भोल्युम र अलर्टहरूको सङ्ख्या स्वतः घटाइन्छ।"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"अफ गर्नुहोस्"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"पुराना सूचनाहरू हेर्न अनलक गर्नुहोस्"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"निश्चित"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"हेड ट्र्याकिङ"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"रिङ्गर मोड बदल्न ट्याप गर्नुहोस्"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"म्युट गर्नुहोस्"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"अनम्युट गर्नुहोस्"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"कम्पन गर्नुहोस्"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"हालको एप"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"सर्वसुलभता"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"किबोर्डका सर्टकटहरू"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"किबोर्डका सर्टकटहरू कस्टमाइज गर्नुहोस्"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"खोजका सर्टकटहरू"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"कुनै पनि खोज परिणाम भेटिएन"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"\"कोल्याप्स गर्नुहोस्\" आइकन"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"कस्टमाइज गर्नुहोस्"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"पूरा भयो"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"\"एक्स्पान्ड गर्नुहोस्\" आइकन"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"वा"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ड्र्याग ह्यान्डल"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"एपले उपलब्ध गराएका"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"डिस्प्ले"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"अज्ञात"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"टाइलहरू रिसेट गर्नुहोस्"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"टाइलहरूको डिफल्ट क्रम र आकार रिसेट गर्ने हो?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"सबै टाइलहरू रिसेट गर्ने हो?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"द्रुत सेटिङका सबै टाइलहरू रिसेट गरी डिभाइसका मूल सेटिङ लागू गरिने छन्"</string> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 8ff59ee93c98..4c9eeb8d73ac 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Je scherm opnemen?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Eén app opnemen"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Hele scherm opnemen"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Hele scherm opnemen: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Als je je hele scherm opneemt, wordt alles opgenomen wat op je scherm wordt getoond. Wees daarom voorzichtig met bijvoorbeeld wachtwoorden, betalingsgegevens, berichten, foto\'s, en audio en video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Als je een app opneemt, wordt alles opgenomen wat 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_entire_screen" msgid="5557974446773486600">"Scherm opnemen"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Je neemt op dit moment <xliff:g id="APP_NAME">%1$s</xliff:g> op"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Opname stoppen"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Scherm delen"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Content delen"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Scherm delen stoppen?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Delen stoppen?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Je deelt op dit moment je hele scherm met <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Je deelt op dit moment je hele scherm met een app"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Je deelt op dit moment <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Je deelt op dit moment een app"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Je deelt op dit moment met een app"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Delen stoppen"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Scherm casten"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Stoppen met casten?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgets op het vergrendelscherm"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Iedereen kan widgets op je vergrendelscherm bekijken, ook als je tablet vergrendeld is."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"widget deselecteren"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Hoogte verkleinen"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Hoogte vergroten"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgets op het vergrendelscherm"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Als je een app wilt openen met een widget, moet je verifiëren dat jij het bent. Houd er ook rekening mee dat iedereen ze kan bekijken, ook als je tablet vergrendeld is. Bepaalde widgets zijn misschien niet bedoeld voor je vergrendelscherm en kunnen hier niet veilig worden toegevoegd."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Nu starten"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Geen meldingen"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Geen nieuwe meldingen"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Afkoelperiode van meldingen staat aan"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Als je te veel meldingen tegelijk krijgt, worden het volume op je apparaat en meldingen automatisch maximaal 2 minuten beperkt."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Uitzetten"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Ontgrendel om oudere meldingen te zien"</string> @@ -703,6 +698,7 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Vast"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Hoofdtracking"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Tik om de beltoonmodus te wijzigen"</string> + <string name="volume_ringer_mode" msgid="6867838048430807128">"beltoonmodus"</string> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"geluid uit"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"geluid aanzetten"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"trillen"</string> @@ -1409,19 +1405,16 @@ <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Recente apps"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Gesplitst scherm"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Invoer"</string> - <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App-snelkoppelingen"</string> + <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App-sneltoetsen"</string> <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Huidige app"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Toegankelijkheid"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Sneltoetsen"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Snelkoppelingen voor zoekopdrachten"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Sneltoetsen aanpassen"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Sneltoetsen zoeken"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Geen zoekresultaten"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icoon voor samenvouwen"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Aanpassen"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Klaar"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icoon voor uitvouwen"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"of"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Handgreep voor slepen"</string> @@ -1483,6 +1476,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Geleverd door apps"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Scherm"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Onbekend"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Tegels resetten"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Tegels resetten naar de oorspronkelijke volgorde en grootte?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Alle tegels resetten?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Alle tegels voor Snelle instellingen worden teruggezet naar de oorspronkelijke instellingen van het apparaat"</string> </resources> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index 60864409ee7f..7473ff58d995 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"ଆପଣଙ୍କ ସ୍କ୍ରିନକୁ ରେକର୍ଡ କରିବେ?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"ଗୋଟିଏ ଆପ ରେକର୍ଡ କରନ୍ତୁ"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"ସମ୍ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନ ରେକର୍ଡ କରନ୍ତୁ"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"ସମ୍ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନକୁ ରେକର୍ଡ କରନ୍ତୁ: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"ଆପଣ ଆପଣଙ୍କର ସମ୍ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନ ରେକର୍ଡ କରିବା ସମୟରେ, ଆପଣଙ୍କ ସ୍କ୍ରିନରେ ଦେଖାଯାଉଥିବା ସବୁକିଛି ରେକର୍ଡ ହୋଇଥାଏ। ତେଣୁ ପାସୱାର୍ଡ, ପେମେଣ୍ଟ ବିବରଣୀ, ମେସେଜ, ଫଟୋ ଏବଂ ଅଡିଓ ଓ ଭିଡିଓ ପରି ବିଷୟଗୁଡ଼ିକ ପ୍ରତି ସତର୍କ ରୁହନ୍ତୁ।"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"ଆପଣ ଏକ ଆପ ରେକର୍ଡ କରିବା ସମୟରେ, ସେହି ଆପରେ ଦେଖାଯାଉଥିବା କିମ୍ବା ପ୍ଲେ ହେଉଥିବା ସବୁକିଛି ରେକର୍ଡ ହୋଇଥାଏ। ତେଣୁ ପାସୱାର୍ଡ, ପେମେଣ୍ଟ ବିବରଣୀ, ମେସେଜ, ଫଟୋ ଏବଂ ଅଡିଓ ଓ ଭିଡିଓ ପରି ବିଷୟଗୁଡ଼ିକ ପ୍ରତି ସତର୍କ ରୁହନ୍ତୁ।"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"ସ୍କ୍ରିନ ରେକର୍ଡ କରନ୍ତୁ"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"ଆପଣ ବର୍ତ୍ତମାନ <xliff:g id="APP_NAME">%1$s</xliff:g>ର ବିଷୟବସ୍ତୁକୁ ରେକର୍ଡ କରୁଛନ୍ତି"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"ରେକର୍ଡିଂ ବନ୍ଦ କରନ୍ତୁ"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"ସ୍କ୍ରିନ ସେୟାର କରାଯାଉଛି"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"ବିଷୟବସ୍ତୁ ସେୟାର କରାଯାଉଛି"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"ସ୍କ୍ରିନ ସେୟାର କରିବା ବନ୍ଦ କରିବେ?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"ସେୟାର କରିବା ବନ୍ଦ କରିବେ?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"ଆପଣ ବର୍ତ୍ତମାନ ଆପଣଙ୍କର ସମ୍ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନକୁ <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> ସହ ସେୟାର କରୁଛନ୍ତି"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"ଆପଣ ବର୍ତ୍ତମାନ ଆପଣଙ୍କର ସମ୍ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନକୁ ଏକ ଆପ ସହ ସେୟାର କରୁଛନ୍ତି"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"ଆପଣ ବର୍ତ୍ତମାନ <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>କୁ ସେୟାର କରୁଛନ୍ତି"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"ଆପଣ ବର୍ତ୍ତମାନ ଏକ ଆପକୁ ସେୟାର କରୁଛନ୍ତି"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"ଆପଣ ବର୍ତ୍ତମାନ ଏକ ଆପ ସହ ସେୟାର କରୁଛନ୍ତି"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"ସେୟାର କରିବା ବନ୍ଦ କରନ୍ତୁ"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"ସ୍କ୍ରିନ କାଷ୍ଟ କରାଯାଉଛି"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"କାଷ୍ଟ କରିବା ବନ୍ଦ କରିବେ?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"ଲକ ସ୍କ୍ରିନ ୱିଜେଟ"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"ଆପଣଙ୍କ ଟାବଲେଟ ଲକ ଥିଲେ ମଧ୍ୟ ଯେ କୌଣସି ବ୍ୟକ୍ତି ଲକ ସ୍କ୍ରିନରେ ୱିଜେଟକୁ ଭ୍ୟୁ କରିପାରିବେ।"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ୱିଜେଟକୁ ଅଚୟନ କରନ୍ତୁ"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"ଉଚ୍ଚତାକୁ କମ କରନ୍ତୁ"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"ଉଚ୍ଚତାକୁ ବଢ଼ାନ୍ତୁ"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"ଲକ ସ୍କ୍ରିନ ୱିଜେଟ"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ଏକ ୱିଜେଟ ବ୍ୟବହାର କରି ଗୋଟିଏ ଆପ ଖୋଲିବା ପାଇଁ ଏହା ଆପଣ ଅଟନ୍ତି ବୋଲି ଆପଣଙ୍କୁ ଯାଞ୍ଚ କରିବାକୁ ହେବ। ଆହୁରି ମଧ୍ୟ, ଆପଣଙ୍କ ଟାବଲେଟ ଲକ ଥିଲେ ମଧ୍ୟ ଯେ କୌଣସି ବ୍ୟକ୍ତି ଏହାକୁ ଭ୍ୟୁ କରିପାରିବେ ବୋଲି ମନେ ରଖନ୍ତୁ। କିଛି ୱିଜେଟ ଆପଣଙ୍କ ଲକ ସ୍କ୍ରିନ ପାଇଁ ଉଦ୍ଦିଷ୍ଟ ହୋଇନଥାଇପାରେ ଏବଂ ଏଠାରେ ଯୋଗ କରିବା ଅସୁରକ୍ଷିତ ହୋଇପାରେ।"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ବୁଝିଗଲି"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"ସବୁ ଖାଲି କରନ୍ତୁ"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"ପରିଚାଳନା କରନ୍ତୁ"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"ଇତିହାସ"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"ବିଜ୍ଞପ୍ତି ସେଟିଂସ"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"ବିଜ୍ଞପ୍ତି ଇତିହାସ"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"ନୂଆ"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"ନୀରବ"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"ବର୍ତ୍ତମାନ ଆରମ୍ଭ କରନ୍ତୁ"</string> <string name="empty_shade_text" msgid="8935967157319717412">"କୌଣସି ବିଜ୍ଞପ୍ତି ନାହିଁ"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"କୌଣସି ନୂଆ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ନାହିଁ"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"ବିଜ୍ଞପ୍ତି କୁଲଡାଉନ ଚାଲୁ ଅଛି"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"ଆପଣ ଥରକେ ଏକାଧିକ ବିଜ୍ଞପ୍ତି ପ୍ରାପ୍ତ କଲେ ଆପଣଙ୍କ ଡିଭାଇସର ଭଲ୍ୟୁମ ଓ ଆଲର୍ଟ ସ୍ୱତଃ 2 ମିନିଟ ପର୍ଯ୍ୟନ୍ତ କମ ହୁଏ।"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"ବନ୍ଦ କରନ୍ତୁ"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"ପୁରୁଣା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ଦେଖିବାକୁ ଅନଲକ କରନ୍ତୁ"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"ନିଶ୍ଚିତ ହୋଇଛି"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"ହେଡ ଟ୍ରାକିଂ"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"ରିଙ୍ଗର୍ ମୋଡ୍ ବଦଳାଇବାକୁ ଟାପ୍ କରନ୍ତୁ"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"ମ୍ୟୁଟ"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"ଅନ୍-ମ୍ୟୁଟ୍ କରନ୍ତୁ"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"ଭାଇବ୍ରେଟ୍"</string> @@ -814,9 +809,9 @@ <string name="keyboard_key_home" msgid="3734400625170020657">"ହୋମ"</string> <string name="keyboard_key_back" msgid="4185420465469481999">"ଫେରନ୍ତୁ"</string> <string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string> - <string name="keyboard_key_space" msgid="6980847564173394012">"ସ୍ପେସ୍"</string> - <string name="keyboard_key_enter" msgid="8633362970109751646">"ଏଣ୍ଟର୍"</string> - <string name="keyboard_key_backspace" msgid="4095278312039628074">"ବ୍ୟାକସ୍ପେସ୍"</string> + <string name="keyboard_key_space" msgid="6980847564173394012">"ସ୍ପେସ"</string> + <string name="keyboard_key_enter" msgid="8633362970109751646">"ଏଣ୍ଟର"</string> + <string name="keyboard_key_backspace" msgid="4095278312039628074">"ବେକସ୍ପେସ"</string> <string name="keyboard_key_media_play_pause" msgid="8389984232732277478">"ପ୍ଲେ କରନ୍ତୁ/ପଜ୍ କରନ୍ତୁ"</string> <string name="keyboard_key_media_stop" msgid="1509943745250377699">"ବନ୍ଦ କରନ୍ତୁ"</string> <string name="keyboard_key_media_next" msgid="8502476691227914952">"ପରବର୍ତ୍ତୀ"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"ବର୍ତ୍ତମାନର ଆପ"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ଆକ୍ସେସିବିଲିଟୀ"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"କୀବୋର୍ଡ ସର୍ଟକଟ"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"କୀବୋର୍ଡ ସର୍ଟକଟଗୁଡ଼ିକୁ କଷ୍ଟମାଇଜ କରନ୍ତୁ"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ସର୍ଚ୍ଚ ସର୍ଟକଟ"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"କୌଣସି ସର୍ଚ୍ଚ ଫଳାଫଳ ନାହିଁ"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ଆଇକନକୁ ସଙ୍କୁଚିତ କରନ୍ତୁ"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"କଷ୍ଟମାଇଜ କରନ୍ତୁ"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ହୋଇଗଲା"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ଆଇକନକୁ ବିସ୍ତାର କରନ୍ତୁ"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"କିମ୍ବା"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ଡ୍ରାଗ ହେଣ୍ଡେଲ"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"ଆପ୍ସ ଦ୍ୱାରା ପ୍ରଦାନ କରାଯାଇଛି"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ଡିସପ୍ଲେ"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"ଅଜଣା"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"ଟାଇଲଗୁଡ଼ିକୁ ରିସେଟ କରନ୍ତୁ"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"ଟାଇଲଗୁଡ଼ିକୁ ସେଗୁଡ଼ିକର ମୂଳ କ୍ରମ ଏବଂ ସାଇଜ ଅନୁସାରେ ରିସେଟ କରିବେ?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"ସମସ୍ତ ଟାଇଲକୁ ରିସେଟ କରିବେ?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"ସମସ୍ତ କୁଇକ ସେଟିଂସ ଟାଇଲ ଡିଭାଇସର ମୂଳ ସେଟିଂସରେ ରିସେଟ ହୋଇଯିବ"</string> </resources> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index b99986a5e955..700bb1ce3fd8 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"ਕੀ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਰਿਕਾਰਡ ਕਰਨਾ ਹੈ?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"ਇੱਕ ਐਪ ਨੂੰ ਰਿਕਾਰਡ ਕਰੋ"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"ਪੂਰੀ ਸਕ੍ਰੀਨ ਨੂੰ ਰਿਕਾਰਡ ਕਰੋ"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"ਸਾਰੀ ਸਕ੍ਰੀਨ ਰਿਕਾਰਡ ਕਰੋ: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"ਜਦੋਂ ਤੁਸੀਂ ਆਪਣੀ ਪੂਰੀ ਸਕ੍ਰੀਨ ਨੂੰ ਰਿਕਾਰਡ ਕਰ ਰਹੇ ਹੁੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖਾਈ ਜਾ ਰਹੀ ਹਰ ਚੀਜ਼ ਨੂੰ ਰਿਕਾਰਡ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਇਸ ਲਈ ਪਾਸਵਰਡਾਂ, ਭੁਗਤਾਨ ਵੇਰਵਿਆਂ, ਸੁਨੇਹਿਆਂ, ਫ਼ੋਟੋਆਂ ਅਤੇ ਨਾਲ ਹੀ ਆਡੀਓ ਅਤੇ ਵੀਡੀਓ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਵਾਸਤੇ ਸਾਵਧਾਨ ਰਹੋ।"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"ਜਦੋਂ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਨੂੰ ਰਿਕਾਰਡ ਕਰ ਰਹੇ ਹੁੰਦੇ ਹੋ, ਤਾਂ ਉਸ ਐਪ ਵਿੱਚ ਦਿਖਾਈ ਜਾਂ ਚਲਾਈ ਜਾ ਰਹੀ ਹਰ ਚੀਜ਼ ਨੂੰ ਰਿਕਾਰਡ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਇਸ ਲਈ ਪਾਸਵਰਡਾਂ, ਭੁਗਤਾਨ ਵੇਰਵਿਆਂ, ਸੁਨੇਹਿਆਂ, ਫ਼ੋਟੋਆਂ ਅਤੇ ਆਡੀਓ ਅਤੇ ਵੀਡੀਓ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਵਾਸਤੇ ਸਾਵਧਾਨ ਰਹੋ।"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"ਸਕ੍ਰੀਨ ਰਿਕਾਰਡ ਕਰੋ"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"ਤੁਸੀਂ ਫ਼ਿਲਹਾਲ <xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਰਿਕਾਰਡ ਕਰ ਰਹੇ ਹੋ"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"ਰਿਕਾਰਡਿੰਗ ਬੰਦ ਕਰੋ"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"ਸਕ੍ਰੀਨ ਸਾਂਝੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"ਸਮੱਗਰੀ ਸਾਂਝੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"ਕੀ ਸਕ੍ਰੀਨ ਨੂੰ ਸਾਂਝਾ ਕਰਨਾ ਬੰਦ ਕਰਨਾ ਹੈ?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"ਕੀ ਸਾਂਝਾਕਰਨ ਬੰਦ ਕਰਨਾ ਹੈ?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"ਤੁਸੀਂ ਫ਼ਿਲਹਾਲ <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> ਨਾਲ ਆਪਣੀ ਪੂਰੀ ਸਕ੍ਰੀਨ ਨੂੰ ਸਾਂਝਾ ਕਰ ਰਹੇ ਹੋ"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"ਤੁਸੀਂ ਫ਼ਿਲਹਾਲ ਕਿਸੇ ਐਪ ਨਾਲ ਆਪਣੀ ਪੂਰੀ ਸਕ੍ਰੀਨ ਨੂੰ ਸਾਂਝਾ ਕਰ ਰਹੇ ਹੋ"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"ਤੁਸੀਂ ਫ਼ਿਲਹਾਲ <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> ਨੂੰ ਸਾਂਝਾ ਕਰ ਰਹੇ ਹੋ"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"ਤੁਸੀਂ ਫ਼ਿਲਹਾਲ ਕਿਸੇ ਐਪ ਨੂੰ ਸਾਂਝਾ ਕਰ ਰਹੇ ਹੋ"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"ਤੁਸੀਂ ਫ਼ਿਲਹਾਲ ਕਿਸੇ ਐਪ ਨਾਲ ਸਾਂਝਾ ਕਰ ਰਹੇ ਹੋ"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"ਸਾਂਝਾਕਰਨ ਬੰਦ ਕਰੋ"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"ਸਕ੍ਰੀਨ \'ਤੇ ਕਾਸਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"ਕੀ ਕਾਸਟ ਕਰਨਾ ਬੰਦ ਕਰਨਾ ਹੈ?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"ਲਾਕ ਸਕ੍ਰੀਨ ਵਿਜੇਟ"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"ਕੋਈ ਵੀ ਤੁਹਾਡੀ ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਵਿਜੇਟ ਦੇਖ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਲਾਕ ਹੋਵੇ।"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ਵਿਜੇਟ ਨੂੰ ਅਣਚੁਣਿਆ ਕਰੋ"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"ਉਚਾਈ ਘਟਾਓ"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"ਉਚਾਈ ਵਧਾਓ"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"ਲਾਕ ਸਕ੍ਰੀਨ ਵਿਜੇਟ"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ਵਿਜੇਟ ਦੀ ਵਰਤੋਂ ਕਰ ਕੇ ਐਪ ਖੋਲ੍ਹਣ ਲਈ, ਤੁਹਾਨੂੰ ਇਹ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ ਕਿ ਇਹ ਤੁਸੀਂ ਹੀ ਹੋ। ਨਾਲ ਹੀ, ਇਹ ਵੀ ਧਿਆਨ ਵਿੱਚ ਰੱਖੋ ਕਿ ਕੋਈ ਵੀ ਉਨ੍ਹਾਂ ਨੂੰ ਦੇਖ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਲਾਕ ਹੋਵੇ। ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਕੁਝ ਵਿਜੇਟ ਤੁਹਾਡੀ ਲਾਕ ਸਕ੍ਰੀਨ ਲਈ ਨਾ ਬਣੇ ਹੋਣ ਅਤੇ ਉਨ੍ਹਾਂ ਨੂੰ ਇੱਥੇ ਸ਼ਾਮਲ ਕਰਨਾ ਅਸੁਰੱਖਿਅਤ ਹੋਵੇ।"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ਸਮਝ ਲਿਆ"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"ਹੁਣੇ ਸ਼ੁਰੂ ਕਰੋ"</string> <string name="empty_shade_text" msgid="8935967157319717412">"ਕੋਈ ਸੂਚਨਾ ਨਹੀਂ"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"ਕੋਈ ਨਵੀਂ ਸੂਚਨਾ ਨਹੀਂ ਹੈ"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"ਨੋਟੀਫ਼ਿਕੇਸ਼ਨ ਕੂਲਡਾਊਨ ਚਾਲੂ ਹੈ"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"ਇੱਕ ਵਾਰ \'ਚ ਕਈ ਸੂਚਨਾਵਾਂ ਮਿਲਣ \'ਤੇ, ਡੀਵਾਈਸ ਦੀ ਅਵਾਜ਼ ਅਤੇ ਅਲਰਟ ਵੱਧੋ-ਵੱਧ 2 ਮਿੰਟਾਂ ਲਈ ਆਪਣੇ-ਆਪ ਘੱਟ ਜਾਂਦੇ ਹਨ।"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"ਬੰਦ ਕਰੋ"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"ਪੁਰਾਣੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਅਣਲਾਕ ਕਰੋ"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"ਸਥਿਰ"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"ਹੈੱਡ ਟਰੈਕਿੰਗ"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"ਰਿੰਗਰ ਮੋਡ ਨੂੰ ਬਦਲਣ ਲਈ ਟੈਪ ਕਰੋ"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"ਮਿਊਟ ਕਰੋ"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"ਅਣਮਿਊਟ ਕਰੋ"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"ਥਰਥਰਾਹਟ"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"ਮੌਜੂਦਾ ਐਪ"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ਪਹੁੰਚਯੋਗਤਾ"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ਖੋਜ ਸੰਬੰਧੀ ਸ਼ਾਰਟਕੱਟ"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਵਿਉਂਤਬੱਧ ਕਰੋ"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ਸ਼ਾਰਟਕੱਟ ਖੋਜੋ"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ਕੋਈ ਖੋਜ ਨਤੀਜਾ ਨਹੀਂ ਮਿਲਿਆ"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ਪ੍ਰਤੀਕ ਨੂੰ ਸਮੇਟੋ"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"ਵਿਉਂਤਬੱਧ ਕਰੋ"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ਹੋ ਗਿਆ"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ਪ੍ਰਤੀਕ ਦਾ ਵਿਸਤਾਰ ਕਰੋ"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ਜਾਂ"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ਘਸੀਟਣ ਵਾਲਾ ਹੈਂਡਲ"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"ਐਪਾਂ ਵੱਲੋਂ ਮੁਹੱਈਆ ਕੀਤਾ ਗਿਆ"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ਡਿਸਪਲੇ"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"ਅਗਿਆਤ"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"ਟਾਇਲਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰੋ"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"ਕੀ ਟਾਇਲਾਂ ਨੂੰ ਉਨ੍ਹਾਂ ਦੇ ਮੂਲ ਕ੍ਰਮ ਅਤੇ ਆਕਾਰਾਂ \'ਤੇ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"ਕੀ ਸਾਰੀਆਂ ਟਾਇਲਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"ਸਾਰੀਆਂ ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਟਾਇਲਾਂ ਡੀਵਾਈਸ ਦੀਆਂ ਮੂਲ ਸੈਟਿੰਗਾਂ \'ਤੇ ਰੀਸੈੱਟ ਹੋ ਜਾਣਗੀਆਂ"</string> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 88177ac56bb7..9b03958593d3 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Nagrywać ekran?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Nagrywaj jedną aplikację"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Nagrywaj cały ekran"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Nagraj cały ekran: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Kiedy nagrywasz cały ekran, nagrane zostanie wszystko, co jest na nim widoczne. Dlatego uważaj na hasła, dane do płatności, wiadomości, zdjęcia, nagrania audio czy filmy."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Kiedy nagrywasz aplikację, wszystko, co jest w niej wyświetlane lub odtwarzane, zostaje nagrane. 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_continue_entire_screen" msgid="5557974446773486600">"Nagrywaj ekran"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Obecnie nagrywasz widok aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Zatrzymaj nagrywanie"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Udostępniam ekran"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Udostępniasz treści"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Zatrzymać udostępnianie ekranu?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Przestać udostępniać?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Obecnie udostępniasz aplikacji <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> cały widok ekranu"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Obecnie udostępniasz aplikacji cały widok ekranu"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Obecnie udostępniasz aplikację <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Obecnie udostępniasz aplikację"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Obecnie udostępniasz treści aplikacji"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Zatrzymaj udostępnianie"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Przesyłam zawartość ekranu"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Zatrzymać przesyłanie?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widżety na ekranie blokady"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Widżety są widoczne na ekranie blokady, nawet gdy tablet jest zablokowany."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"odznacz widżet"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Zmniejsz wysokość"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Zwiększ wysokość"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widżety na ekranie blokady"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Aby otworzyć aplikację za pomocą widżetu, musisz potwierdzić swoją tożsamość. Pamiętaj też, że każdy będzie mógł wyświetlić widżety nawet wtedy, gdy tablet będzie zablokowany. Niektóre widżety mogą nie być przeznaczone do umieszczenia na ekranie blokady i ich dodanie w tym miejscu może być niebezpieczne."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Usuń wszystkie"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Zarządzaj"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Historia"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Ustawienia powiadomień"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Historia powiadomień"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Nowe"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Ciche"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Powiadomienia"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Rozpocznij teraz"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Brak powiadomień"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Brak nowych powiadomień"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Wyciszanie powiadomień jest włączone"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Gdy w krótkim czasie otrzymasz za dużo powiadomień, dźwięki zostaną automatycznie wyciszone na maks. 2 min."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Wyłącz"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Odblokuj i zobacz starsze powiadomienia"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Stały"</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> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"wycisz"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"wyłącz wyciszenie"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"włącz wibracje"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Bieżąca aplikacja"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Ułatwienia dostępu"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Skróty klawiszowe"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Dostosuj skróty klawiszowe"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Skróty do wyszukiwania"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Brak wyników wyszukiwania"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona zwijania"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Dostosuj"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Gotowe"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona rozwijania"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"lub"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Uchwyt do przeciągania"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Z aplikacji"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Wyświetlacz"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Nieznane"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Zresetuj kafelki"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Zresetować kafelki do pierwotnej kolejności i rozmiarów?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Zresetować wszystkie kafelki?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Wszystkie kafelki Szybkich ustawień zostaną zresetowane do oryginalnych ustawień urządzenia"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index e67c16856e58..e882cb852a02 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Gravar a tela?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Gravar um app"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Gravar a tela toda"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Gravar a tela toda: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Quando você grava a tela toda, tudo o que aparece nela é registrado. Portanto, tenha cuidado com senhas, detalhes de pagamento, mensagens, fotos, áudios e vídeos."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Quando você grava um app, todas as informações visíveis ou abertas nele ficam registradas. Portanto, tenha cuidado com senhas, detalhes de pagamento, mensagens, fotos, áudios e vídeos."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Gravar a tela"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Você está gravando o app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Parar gravação"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Compartilhando a tela"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Compartilhando conteúdo"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Parar o compartilhamento de tela?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Parar de compartilhar?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Você está compartilhando a tela inteira com o app <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Você está compartilhando a tela inteira com um app"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Você está compartilhando o app <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Você está compartilhando um app"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Você está compartilhando com um app"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Interromper compartilhamento"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Transmitindo a tela"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Parar transmissão?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgets da tela de bloqueio"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Todos podem ver os widgets na tela de bloqueio, mesmo com o tablet bloqueado."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"desmarcar widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Diminuir altura"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Aumentar altura"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgets da tela de bloqueio"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Para abrir um app usando um widget, você precisa confirmar sua identidade. E não se esqueça que qualquer pessoa pode ver os widgets, mesmo com o tablet bloqueado. Além disso, alguns apps não foram criados para a tela de bloqueio, é melhor manter a segurança."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Entendi"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Remover tudo"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Gerenciar"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Histórico"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Configurações de notificação"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Histórico de notificações"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Novas"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Silenciosas"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificações"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Iniciar agora"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Sem notificações"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Nenhuma notificação nova"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"O recurso de atenuar notificações está ativo"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Volume e alertas são reduzidos por até 2 min quando você recebe muitas notificações juntas."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Desativar"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Desbloqueie p/ acessar notificações antigas"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fixo"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Rastreamento de cabeça"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Toque para mudar o modo da campainha"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"desativar o som"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"ativar o som"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrar"</string> @@ -843,7 +838,7 @@ <string name="keyboard_shortcut_join" msgid="3578314570034512676">"ou"</string> <string name="keyboard_shortcut_clear_text" msgid="6631051796030377857">"Limpar a consulta de pesquisa"</string> <string name="keyboard_shortcut_search_list_title" msgid="4271769465397671138">"Atalhos do teclado"</string> - <string name="keyboard_shortcut_search_list_hint" msgid="5982623262974326746">"Atalhos de pesquisa"</string> + <string name="keyboard_shortcut_search_list_hint" msgid="5982623262974326746">"Pesquisar atalhos"</string> <string name="keyboard_shortcut_search_list_no_result" msgid="6819302191660875501">"Nenhum atalho encontrado"</string> <string name="keyboard_shortcut_search_category_system" msgid="1151182120757052669">"Sistema"</string> <string name="keyboard_shortcut_search_category_input" msgid="5440558509904296233">"Entrada"</string> @@ -859,7 +854,7 @@ <string name="group_system_access_system_app_shortcuts" msgid="8562482996626694026">"Mostrar atalhos"</string> <string name="group_system_go_back" msgid="2730322046244918816">"Voltar"</string> <string name="group_system_access_home_screen" msgid="4130366993484706483">"Ir para a tela inicial"</string> - <string name="group_system_overview_open_apps" msgid="5659958952937994104">"Conferir os apps recentes"</string> + <string name="group_system_overview_open_apps" msgid="5659958952937994104">"Ver os apps recentes"</string> <string name="group_system_cycle_forward" msgid="5478663965957647805">"Avançar pela lista de apps recentes"</string> <string name="group_system_cycle_back" msgid="8194102916946802902">"Voltar pela lista de apps recentes"</string> <string name="group_system_access_all_apps_search" msgid="1553588630154197469">"Abrir lista de apps"</string> @@ -868,8 +863,8 @@ <string name="group_system_lock_screen" msgid="7391191300363416543">"Tela de bloqueio"</string> <string name="group_system_quick_memo" msgid="3764560265935722903">"Criar nota"</string> <string name="keyboard_shortcut_group_system_multitasking" msgid="6967816258924795558">"Multitarefas"</string> - <string name="system_multitasking_rhs" msgid="8714224917276297810">"Usar a tela dividida com o aplicativo atual à direita"</string> - <string name="system_multitasking_lhs" msgid="8402954791206308783">"Usar a tela dividida com o app atual à esquerda"</string> + <string name="system_multitasking_rhs" msgid="8714224917276297810">"Usar a tela dividida com o app à direita"</string> + <string name="system_multitasking_lhs" msgid="8402954791206308783">"Usar a tela dividida com o app à esquerda"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Mudar da tela dividida para a tela cheia"</string> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Mudar para o app à direita ou abaixo ao usar a tela dividida"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Mudar para o app à esquerda ou acima ao usar a tela dividida"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"App atual"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Acessibilidade"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Atalhos do teclado"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Atalhos de pesquisa"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizar atalhos de teclado"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pesquisar atalhos"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nenhum resultado de pesquisa"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ícone \"Fechar\""</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizar"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Concluir"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ícone \"Abrir\""</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ou"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Alça de arrastar"</string> @@ -1461,7 +1453,7 @@ <string name="volume_undo_action" msgid="5815519725211877114">"Desfazer"</string> <string name="back_edu_toast_content" msgid="4530314597378982956">"Se quiser voltar, deslize para a esquerda ou direita com três dedos no touchpad"</string> <string name="home_edu_toast_content" msgid="3381071147871955415">"Se quiser acessar a tela inicial, deslize para cima com três dedos no touchpad"</string> - <string name="overview_edu_toast_content" msgid="5797030644017804518">"Se quiser ver os apps recentes, deslize para cima e pressione com três dedos no touchpad"</string> + <string name="overview_edu_toast_content" msgid="5797030644017804518">"Se quiser ver os apps recentes, deslize para cima e pressione o touchpad com três dedos"</string> <string name="all_apps_edu_toast_content" msgid="8807496014667211562">"Para ver todos os apps, pressione a tecla de ação no teclado"</string> <string name="redacted_notification_single_line_title" msgid="212019960919261670">"Encoberto"</string> <string name="redacted_notification_single_line_text" msgid="8684166405005242945">"Desbloquear para visualizar"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Fornecidos por apps"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Exibição"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Desconhecidos"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Redefinir blocos"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Redefinir os blocos para a ordem e os tamanhos originais?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Redefinir todos os blocos?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Todos os blocos \"Configurações rápidas\" serão redefinidos para as configurações originais do dispositivo"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 30e16f06f00f..f1bae0e4113c 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Gravar o ecrã?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Gravar uma app"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Gravar o ecrã inteiro"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Gravar o ecrã inteiro: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Quando está a gravar o ecrã inteiro, tudo o que é apresentado no ecrã é gravado. Por isso, tenha cuidado com, por exemplo, palavras-passe, detalhes de pagamento, mensagens, fotos, áudio e vídeo."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Quando está a gravar uma app, tudo o que é apresentado ou reproduzido nessa app é gravado. Por isso, tenha cuidado com, por exemplo, palavras-passe, detalhes de pagamento, mensagens, fotos, áudio e vídeo."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Gravar ecrã"</string> @@ -578,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Limpar tudo"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Gerir"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Histórico"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Definições de notificação"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Histórico de notificações"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Nova"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Silencioso"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificações"</string> @@ -592,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Começar agora"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Sem notificações"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Não existem novas notificações"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"O repouso das notificações está ativado"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"O volume e os alertas são reduzidos automaticamente durante até 2 minutos quando recebe muitas notificações de uma vez."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Desativar"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Desbloqueie e veja notificações antigas"</string> @@ -700,6 +698,7 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Corrigido"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Posição da cabeça"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Toque para alterar o modo de campainha"</string> + <string name="volume_ringer_mode" msgid="6867838048430807128">"modo de som"</string> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"desativar som"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"reativar som"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrar"</string> @@ -1410,15 +1409,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"App atual"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Acessibilidade"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Atalhos de teclado"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Atalhos de pesquisa"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalize os atalhos de teclado"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pesquisar atalhos"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nenhum resultado da pesquisa"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ícone de reduzir"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizar"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Concluir"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ícone de expandir"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ou"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Indicador para arrastar"</string> @@ -1480,6 +1476,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Disponibilizado por apps"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Ecrã"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Desconhecido"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Reponha os mosaicos"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Repor os mosaicos para a ordem e os tamanhos originais?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Repor todos os mosaicos?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Todos os mosaicos de Definições rápidas vão ser repostos para as definições originais do dispositivo"</string> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index e67c16856e58..e882cb852a02 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Gravar a tela?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Gravar um app"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Gravar a tela toda"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Gravar a tela toda: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Quando você grava a tela toda, tudo o que aparece nela é registrado. Portanto, tenha cuidado com senhas, detalhes de pagamento, mensagens, fotos, áudios e vídeos."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Quando você grava um app, todas as informações visíveis ou abertas nele ficam registradas. Portanto, tenha cuidado com senhas, detalhes de pagamento, mensagens, fotos, áudios e vídeos."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Gravar a tela"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Você está gravando o app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Parar gravação"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Compartilhando a tela"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Compartilhando conteúdo"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Parar o compartilhamento de tela?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Parar de compartilhar?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Você está compartilhando a tela inteira com o app <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Você está compartilhando a tela inteira com um app"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Você está compartilhando o app <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Você está compartilhando um app"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Você está compartilhando com um app"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Interromper compartilhamento"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Transmitindo a tela"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Parar transmissão?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgets da tela de bloqueio"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Todos podem ver os widgets na tela de bloqueio, mesmo com o tablet bloqueado."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"desmarcar widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Diminuir altura"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Aumentar altura"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgets da tela de bloqueio"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Para abrir um app usando um widget, você precisa confirmar sua identidade. E não se esqueça que qualquer pessoa pode ver os widgets, mesmo com o tablet bloqueado. Além disso, alguns apps não foram criados para a tela de bloqueio, é melhor manter a segurança."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Entendi"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Remover tudo"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Gerenciar"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Histórico"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Configurações de notificação"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Histórico de notificações"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Novas"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Silenciosas"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificações"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Iniciar agora"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Sem notificações"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Nenhuma notificação nova"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"O recurso de atenuar notificações está ativo"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Volume e alertas são reduzidos por até 2 min quando você recebe muitas notificações juntas."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Desativar"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Desbloqueie p/ acessar notificações antigas"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fixo"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Rastreamento de cabeça"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Toque para mudar o modo da campainha"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"desativar o som"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"ativar o som"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrar"</string> @@ -843,7 +838,7 @@ <string name="keyboard_shortcut_join" msgid="3578314570034512676">"ou"</string> <string name="keyboard_shortcut_clear_text" msgid="6631051796030377857">"Limpar a consulta de pesquisa"</string> <string name="keyboard_shortcut_search_list_title" msgid="4271769465397671138">"Atalhos do teclado"</string> - <string name="keyboard_shortcut_search_list_hint" msgid="5982623262974326746">"Atalhos de pesquisa"</string> + <string name="keyboard_shortcut_search_list_hint" msgid="5982623262974326746">"Pesquisar atalhos"</string> <string name="keyboard_shortcut_search_list_no_result" msgid="6819302191660875501">"Nenhum atalho encontrado"</string> <string name="keyboard_shortcut_search_category_system" msgid="1151182120757052669">"Sistema"</string> <string name="keyboard_shortcut_search_category_input" msgid="5440558509904296233">"Entrada"</string> @@ -859,7 +854,7 @@ <string name="group_system_access_system_app_shortcuts" msgid="8562482996626694026">"Mostrar atalhos"</string> <string name="group_system_go_back" msgid="2730322046244918816">"Voltar"</string> <string name="group_system_access_home_screen" msgid="4130366993484706483">"Ir para a tela inicial"</string> - <string name="group_system_overview_open_apps" msgid="5659958952937994104">"Conferir os apps recentes"</string> + <string name="group_system_overview_open_apps" msgid="5659958952937994104">"Ver os apps recentes"</string> <string name="group_system_cycle_forward" msgid="5478663965957647805">"Avançar pela lista de apps recentes"</string> <string name="group_system_cycle_back" msgid="8194102916946802902">"Voltar pela lista de apps recentes"</string> <string name="group_system_access_all_apps_search" msgid="1553588630154197469">"Abrir lista de apps"</string> @@ -868,8 +863,8 @@ <string name="group_system_lock_screen" msgid="7391191300363416543">"Tela de bloqueio"</string> <string name="group_system_quick_memo" msgid="3764560265935722903">"Criar nota"</string> <string name="keyboard_shortcut_group_system_multitasking" msgid="6967816258924795558">"Multitarefas"</string> - <string name="system_multitasking_rhs" msgid="8714224917276297810">"Usar a tela dividida com o aplicativo atual à direita"</string> - <string name="system_multitasking_lhs" msgid="8402954791206308783">"Usar a tela dividida com o app atual à esquerda"</string> + <string name="system_multitasking_rhs" msgid="8714224917276297810">"Usar a tela dividida com o app à direita"</string> + <string name="system_multitasking_lhs" msgid="8402954791206308783">"Usar a tela dividida com o app à esquerda"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Mudar da tela dividida para a tela cheia"</string> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Mudar para o app à direita ou abaixo ao usar a tela dividida"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Mudar para o app à esquerda ou acima ao usar a tela dividida"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"App atual"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Acessibilidade"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Atalhos do teclado"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Atalhos de pesquisa"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizar atalhos de teclado"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pesquisar atalhos"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nenhum resultado de pesquisa"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ícone \"Fechar\""</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizar"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Concluir"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ícone \"Abrir\""</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ou"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Alça de arrastar"</string> @@ -1461,7 +1453,7 @@ <string name="volume_undo_action" msgid="5815519725211877114">"Desfazer"</string> <string name="back_edu_toast_content" msgid="4530314597378982956">"Se quiser voltar, deslize para a esquerda ou direita com três dedos no touchpad"</string> <string name="home_edu_toast_content" msgid="3381071147871955415">"Se quiser acessar a tela inicial, deslize para cima com três dedos no touchpad"</string> - <string name="overview_edu_toast_content" msgid="5797030644017804518">"Se quiser ver os apps recentes, deslize para cima e pressione com três dedos no touchpad"</string> + <string name="overview_edu_toast_content" msgid="5797030644017804518">"Se quiser ver os apps recentes, deslize para cima e pressione o touchpad com três dedos"</string> <string name="all_apps_edu_toast_content" msgid="8807496014667211562">"Para ver todos os apps, pressione a tecla de ação no teclado"</string> <string name="redacted_notification_single_line_title" msgid="212019960919261670">"Encoberto"</string> <string name="redacted_notification_single_line_text" msgid="8684166405005242945">"Desbloquear para visualizar"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Fornecidos por apps"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Exibição"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Desconhecidos"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Redefinir blocos"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Redefinir os blocos para a ordem e os tamanhos originais?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Redefinir todos os blocos?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Todos os blocos \"Configurações rápidas\" serão redefinidos para as configurações originais do dispositivo"</string> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index de7f8dac8dd1..18cb139ae6cf 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Înregistrezi ecranul?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Înregistrează o aplicație"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Înregistrează tot ecranul"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Înregistrează tot ecranul: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Când înregistrezi întregul ecran, se înregistrează tot ce apare pe ecran. Prin urmare, ai grijă cu parolele, detaliile de plată, mesajele, fotografiile și conținutul audio și video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Când înregistrezi o aplicație, se înregistrează tot ce se afișează sau se redă în aplicație. Prin urmare, ai grijă cu parolele, detaliile de plată, mesajele, fotografiile și conținutul audio și video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Înregistrează ecranul"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Înregistrezi <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Oprește înregistrarea"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Se permite accesul la ecran"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Se permite accesul la conținut"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Oprești accesul la ecran?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Nu mai permiți accesul?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Permiți accesul <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> la întregul ecran"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Permiți accesul unei aplicații la întregul ecran"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Permiți accesul la <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Permiți accesul la o aplicație"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Permiți accesul unei aplicații"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Nu mai permite accesul"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Se proiectează ecranul"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Oprești proiectarea?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgeturi pe ecranul de blocare"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Oricine poate vedea widgeturile pe ecranul de blocare, chiar cu tableta blocată"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"deselectează widgetul"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Redu înălțimea"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Crește înălțimea"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgeturi pe ecranul de blocare"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Pentru a deschide o aplicație folosind un widget, va trebui să-ți confirmi identitatea. În plus, reține că oricine poate să vadă widgeturile, chiar dacă tableta este blocată. Este posibil ca unele widgeturi să nu fi fost create pentru ecranul de blocare și poate fi nesigur să le adaugi aici."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Șterge toate notificările"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Gestionează"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Istoric"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Setări pentru notificări"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Istoricul notificărilor"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Noi"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Silențioase"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificări"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Începe acum"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Nicio notificare"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Nicio notificare nouă"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Reducerea sunetului notificărilor este activată"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Volumul și alertele dispozitivului sunt reduse automat timp de până la 2 min. când primești prea multe notificări odată"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Dezactivează"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Deblochează ca să vezi notificări vechi"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fix"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Urmărirea mișcărilor capului"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Atinge pentru a schimba modul soneriei"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"dezactivează sunetul"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"activează sunetul"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibrații"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Aplicația actuală"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accesibilitate"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Comenzi rapide de la tastatură"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizează comenzile rapide de la tastatură"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Comenzi directe de căutare"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Niciun rezultat al căutării"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Pictograma de restrângere"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizează"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Gata"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Pictograma de extindere"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"sau"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Ghidaj de tragere"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Oferite de aplicații"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Ecran"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Necunoscută"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Resetează cardurile"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Resetezi cardurile la ordinea și dimensiunile inițiale?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Resetezi toate cardurile?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Toate cardurile Setări rapide se vor reseta la setările inițiale ale dispozitivului"</string> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index a007685d4af3..ffab1aff11f1 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Начать запись экрана?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Записывать одно приложение"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Записывать весь экран"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Записывать весь экран: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Во время записи всего экрана все данные и действия, которые на нем показываются, попадают на видео. Поэтому будьте осторожны с паролями, сведениями о способах оплаты, сообщениями, фотографиями, аудио- и видеозаписями."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Во время записи приложения все данные и действия, которые показываются в его окне, попадают на видео. Поэтому будьте осторожны с паролями, сведениями о способах оплаты, сообщениями, фотографиями, аудио- и видеозаписями."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Запись экрана"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Вы записываете экран приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"."</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Остановить запись"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Демонстрация экрана"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Вы делитесь контентом"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Прекратить показ экрана?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Закрыть доступ?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Вы демонстрируете свой экран в приложении \"<xliff:g id="HOST_APP_NAME">%1$s</xliff:g>\"."</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Вы демонстрируете свой экран в приложении."</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Вы демонстрируете экран приложения \"<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>\"."</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Вы демонстрируете экран приложения."</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Сейчас вы делитесь контентом с приложением."</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Прекратить показ"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Трансляция экрана"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Прекратить трансляцию?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Виджеты на заблокированном экране"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Они видны всем, даже если планшет заблокирован."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"отменить выбор виджета"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Уменьшить высоту"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Увеличить высоту"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Виджеты на заблокированном экране"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Чтобы открыть приложение, используя виджет, вам нужно будет подтвердить свою личность. Обратите внимание, что виджеты видны всем, даже если планшет заблокирован. Некоторые виджеты не предназначены для использования на заблокированном экране. Добавлять их туда может быть небезопасно."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ОК"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Начать"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Нет уведомлений."</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Новых уведомлений нет"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Снижение громкости уведомлений включено"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Если придет слишком много уведомлений, на две минуты громкость и количество оповещений уменьшатся."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Отключить"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Разблокируйте, чтобы увидеть уведомления"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Без отслеживания"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"С отслеживанием"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Нажмите, чтобы изменить режим звонка."</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"отключить звук"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"включить звук"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"включить вибрацию"</string> @@ -1409,19 +1406,16 @@ <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Недавние приложения"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Разделение экрана"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Ввод"</string> - <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Ярлыки приложений"</string> + <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Быстрые клавиши для приложений"</string> <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Это приложение"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Специальные возможности"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Быстрые клавиши"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Как настроить быстрые клавиши"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Найти быстрые клавиши"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ничего не найдено"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Значок \"Свернуть\""</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Настроить"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Готово"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Значок \"Развернуть\""</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"или"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Маркер перемещения"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Приложения"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Экран"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Неизвестно"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Сброс параметров"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Сбросить порядок и размер параметров?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Сбросить все параметры?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Для всех параметров быстрых настроек будут восстановлены значения по умолчанию."</string> </resources> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index ae9c4d0cf711..1b2a2e47ebc2 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"ඔබේ තිරය පටිගත කරන්න ද?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"එක් යෙදුමක් පටිගත කරන්න"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"සම්පූර්ණ තිරය පටිගත කරන්න"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"සම්පූර්ණ තිරය පටිගත කරන්න: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"ඔබ ඔබේ සම්පූර්ණ තිරය පටිගත කරන විට, ඔබේ තිරයේ පෙන්වන ඕනෑම දෙයක් වාර්තා වේ. ඒ නිසා මුරපද, ගෙවීම් විස්තර, පණිවුඩ, ඡායාරූප, සහ ශ්රව්ය සහ දෘශ්ය වැනි දේවල් පිළිබඳ ප්රවේශම් වන්න."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"ඔබ යෙදුමක් පටිගත කරන විට, එම යෙදුමේ පෙන්වන හෝ වාදනය කරන ඕනෑම දෙයක් වාර්තා වේ. ඒ නිසා මුරපද, ගෙවීම් විස්තර, පණිවුඩ, ඡායාරූප, සහ ශ්රව්ය සහ දෘශ්ය වැනි දේවල් පිළිබඳ ප්රවේශම් වන්න."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"තිරය පටිගත කරන්න"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"ඔබ දැනට <xliff:g id="APP_NAME">%1$s</xliff:g> පටිගත කරමින් සිටී"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"පටිගත කිරීම නවත්වන්න"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"තිරය බෙදා ගැනීම"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"අන්තර්ගතය බෙදා ගැනීම"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"තිරය බෙදා ගැනීම නවත්වන්න ද?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"බෙදා ගැනීම නවත්වන්න ද?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"ඔබ දැනට ඔබේ සම්පූර්ණ තිරය <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> සමග බෙදා ගනිමින් සිටී"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"ඔබ දැනට ඔබේ සම්පූර්ණ තිරය යෙදුමක් සමග බෙදා ගනිමින් සිටී"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"ඔබ දැනට <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> බෙදා ගනිමින් සිටී"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"ඔබ දැනට යෙදුමක් බෙදා ගනිමින් සිටී"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"ඔබ දැනට යෙදුමක් සමග බෙදා ගනිමින් සිටී"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"බෙදා ගැනීම නවත්වන්න"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"විකාශ තිරය"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"විකාශය නවතන්න ද?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"අගුළු තිර විජට්"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"ඔබේ ටැබ්ලටය අගුළු දමා තිබුණත්, ඕනෑම කෙනෙකුට ඔබේ අගුළු තිරයෙහි විජට් බැලිය හැක."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"විජට් නොතෝරන්න"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"උස අඩු කරන්න"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"උස වැඩි කරන්න"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"අගුළු තිර විජට්"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"විජට් එකක් භාවිතයෙන් යෙදුමක් විවෘත කිරීමට, ඔබට ඒ ඔබ බව සත්යාපනය කිරීමට අවශ්ය වනු ඇත. එසේම, ඔබේ ටැබ්ලටය අගුළු දමා ඇති විට පවා ඕනෑම කෙනෙකුට ඒවා බැලිය හැකි බව මතක තබා ගන්න. සමහර විජට් ඔබේ අගුළු තිරය සඳහා අදහස් කර නොතිබිය හැකි අතර මෙහි එක් කිරීමට අනාරක්ෂිත විය හැක."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"තේරුණා"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"සියල්ල හිස් කරන්න"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"කළමනාකරණය කරන්න"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"ඉතිහාසය"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"දැනුම්දීම් සැකසීම්"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"දැනුම්දීම් ඉතිහාසය"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"නව"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"නිහඬ"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"දැනුම් දීම්"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"දැන් අරඹන්න"</string> <string name="empty_shade_text" msgid="8935967157319717412">"දැනුම්දීම් නැත"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"නව දැනුම්දීම් නැත"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"දැනුම්දීම් සිසිල් කිරීම ක්රියාත්මකයි"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"ඔබට එකවර දැනුම්දීම් වැඩි ප්රමාණයක් ලැබෙන විට ඔබේ උපාංග පරිමාව සහ ඇඟවීම් මිනිත්තු 2ක් දක්වා ස්වයංක්රීයව අඩු වේ."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"ක්රියාවිරහිත කරන්න"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"පැරණි දැනුම්දීම් බැලීමට අගුළු හරින්න"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"නියම කළ"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"හිස ලුහුබැඳීම"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"නාදකය වෙනස් කිරීමට තට්ටු කරන්න"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"නිහඬ කරන්න"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"නිශ්ශබ්දතාවය ඉවත් කරන්න"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"කම්පනය"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"වත්මන් යෙදුම"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ප්රවේශ්යතාව"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"යතුරු පුවරු කෙටි මං"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"යතුරුපුවරු කෙටිමං අභිරුචිකරණය කරන්න"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"කෙටි මං සොයන්න"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"සෙවීම් ප්රතිඵල නැත"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"හැකුළුම් නිරූපකය"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"අභිරුචිකරණය කරන්න"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"නිමයි"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"දිගහැරීම් නිරූපකය"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"හෝ"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ඇදීම් හැඬලය"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"යෙදුම් මගින් සපයනු ලැබේ"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"සංදර්ශකය"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"නොදනී"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"ටයිල් යළි සකසන්න"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"ටයිල් ඒවායේ මුල් අනුපිළිවෙලට සහ ප්රමාණයට යළි සකසන්න ද?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"සියලු ටයිල් නැවත සකසන්න ද?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"සියලු ඉක්මන් සැකසීම් ටයිල් උපාංගයේ මුල් සැකසීම් වෙත නැවත සකසනු ඇත"</string> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index c2235667f08b..2e03aab20730 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Chcete nahrávať obrazovku?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Nahrávať jednu aplikáciu"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Nahrávať celú obrazovku"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Nahrať celú obrazovku: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Pri nahrávaní celej obrazovky sa zaznamená všetko, čo sa na nej zobrazuje. Preto venujte pozornosť položkám, ako sú heslá, platobné údaje, správy, fotky a zvuk či video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Pri nahrávaní aplikácie sa zaznamená všetko, čo sa v nej zobrazuje alebo prehráva. Preto venujte pozornosť položkám, ako sú heslá, platobné údaje, správy, fotky a zvuk či video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Nahrávať obrazovku"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Momentálne nahrávate aplikáciu <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Zastaviť nahrávanie"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Zdieľa sa obrazovka"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Obsah sa zdieľa"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Chcete prestať zdieľať obrazovku?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Chcete zastaviť zdieľanie?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Momentálne zdieľate celú obrazovku s aplikáciou <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Momentálne zdieľate celú obrazovku s aplikáciou"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Momentálne zdieľate aplikáciu <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Momentálne zdieľate aplikáciu"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Momentálne zdieľate s aplikáciou"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Prestať zdieľať"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Prenáša sa obrazovka"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Chcete zastaviť prenos?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Miniaplikácie na uzamknutej obrazovke"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Miniaplikácie na uzamknutej obrazovke uvidia všetci, aj keď je tablet uzamknutý."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"zrušiť výber miniaplikácie"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Znížiť výšku"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Zväčšiť výšku"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Miniaplikácie na uzamknutej obrazovke"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Ak chcete otvoriť aplikáciu pomocou miniaplikácie, budete musieť overiť svoju totožnosť. Pamätajte, že si miniaplikáciu môže pozrieť ktokoľvek, aj keď máte tablet uzamknutý. Niektoré miniaplikácie možno nie sú určené pre uzamknutú obrazovku a ich pridanie tu môže byť nebezpečné."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Dobre"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Spustiť"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Žiadne upozornenia"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Žiadne nové upozornenia"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Stlmenie upozornení je zapnuté"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Keď dostanete priveľa upozornení naraz, až na dve minúty sa zníži hlasitosť zariadenia a upozornenia sa obmedzia."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Vypnúť"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Odomknutím zobrazíte staršie upozornenia"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Pevné"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Sled. polohy hlavy"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Režim zvonenia zmeníte klepnutím"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"vypnite zvuk"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"zapnite zvuk"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"zapnite vibrovanie"</string> @@ -862,12 +859,12 @@ <string name="group_system_cycle_back" msgid="8194102916946802902">"Cyklické prechádzanie dozadu po nedávnych aplikáciách"</string> <string name="group_system_access_all_apps_search" msgid="1553588630154197469">"Otvorenie zoznamu aplikácií"</string> <string name="group_system_access_system_settings" msgid="8731721963449070017">"Otvorenie nastavení"</string> - <string name="group_system_access_google_assistant" msgid="7210074957915968110">"Otvorenie Asistenta"</string> + <string name="group_system_access_google_assistant" msgid="7210074957915968110">"Otvoriť asistenta"</string> <string name="group_system_lock_screen" msgid="7391191300363416543">"Uzamknutie obrazovky"</string> <string name="group_system_quick_memo" msgid="3764560265935722903">"Napísanie poznámky"</string> <string name="keyboard_shortcut_group_system_multitasking" msgid="6967816258924795558">"Multitasking"</string> - <string name="system_multitasking_rhs" msgid="8714224917276297810">"Použite rozdelenú obrazovku s aktuálnou aplikáciou vpravo"</string> - <string name="system_multitasking_lhs" msgid="8402954791206308783">"Použite rozdelenú obrazovku s aktuálnou aplikáciou vľavo"</string> + <string name="system_multitasking_rhs" msgid="8714224917276297810">"Rozdeliť obrazovku, aktuálna aplikácia vpravo"</string> + <string name="system_multitasking_lhs" msgid="8402954791206308783">"Rozdeliť obrazovku, aktuálna aplikácia vľavo"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Prepnutie rozdelenej obrazovky na celú"</string> <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> @@ -1409,19 +1406,16 @@ <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Nedávne aplikácie"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Rozdelená obrazovka"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Vstup"</string> - <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Odkazy do aplikácií"</string> + <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Skratky aplikácií"</string> <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Aktuálna aplikácia"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Dostupnosť"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Klávesové skratky"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Vyhľadávacie odkazy"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Prispôsobenie klávesových skratiek"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Prehľadávať skratky"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Žiadne výsledky vyhľadávania"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona zbalenia"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Prispôsobiť"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Hotovo"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona rozbalenia"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"alebo"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Presúvadlo"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Poskytnuté aplikáciami"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Zobrazovanie"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Neznáme"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Resetovanie kariet"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Chcete resetovať karty na pôvodné poradie a veľkosti?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Chcete resetovať všetky karty?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Všetky karty rýchlych nastavení sa resetujú na pôvodné nastavenia zariadenia"</string> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 15f1b3ccca7d..ad71a77d5361 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Želite posneti zaslon?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Snemanje ene aplikacije"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Snemanje celotnega zaslona"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Snemanje celotnega zaslona: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Pri snemanju celotnega zaslona se posname vse, kar je prikazano na zaslonu. Zato bodite previdni z gesli, podatki za plačilo, sporočili, fotografijami ter z zvokom in videom."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Pri snemanju aplikacije se posname vse, 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="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Snemanje zaslona"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Trenutno snemate aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Ustavi snemanje"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Deljenje zaslona"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Deljenje vsebine"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Želite ustaviti deljenje zaslona?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Želite ustaviti deljenje?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Trenutno delite celotni zaslon z aplikacijo <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Trenutno delite celotni zaslon z eno od aplikacij"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Trenutno delite aplikacijo <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Trenutno delite eno od aplikacij"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Trenutno delite z eno od aplikacij"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Ustavi deljenje"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Predvajanje vsebine zaslona"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Želite ustaviti predvajanje?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Pripomočki na zaklenjenem zaslonu"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Pripomočki na zaklenjenem zaslonu so vidni vsem, tudi če je tablica zaklenjena."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"preklic izbire pripomočka"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Zmanjšanje višine"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Povečanje višine"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Pripomočki na zaklenjenem zaslonu"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Če želite aplikacijo odpreti s pripomočkom, morate potrditi, da ste to vi. Upoštevajte tudi, da si jih lahko ogledajo vsi, tudi ko je tablični računalnik zaklenjen. Nekateri pripomočki morda niso predvideni za uporabo na zaklenjenem zaslonu, zato jih tukaj morda ni varno dodati."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Razumem"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Izbriši vse"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Upravljaj"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Zgodovina"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Nastavitve obvestil"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Zgodovina obvestil"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Novo"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Tiho"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Obvestila"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Začni zdaj"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Ni obvestil"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Ni novih obvestil"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Utišanje obvestil je vklopljeno"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Ko prejmete preveč obvestil naenkrat, se glasnost naprave in opozoril samodejno zmanjša za največ 2 minuti."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Izklopi"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Odklenite za ogled starejših obvestil"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Fiksno"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Spremljanje premikov glave"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Dotaknite se, če želite spremeniti način zvonjenja."</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"izklop zvoka"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"vklop zvoka"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibriranje"</string> @@ -815,7 +810,7 @@ <string name="keyboard_key_back" msgid="4185420465469481999">"Nazaj"</string> <string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string> <string name="keyboard_key_space" msgid="6980847564173394012">"Preslednica"</string> - <string name="keyboard_key_enter" msgid="8633362970109751646">"Vnesi"</string> + <string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string> <string name="keyboard_key_backspace" msgid="4095278312039628074">"Vračalka"</string> <string name="keyboard_key_media_play_pause" msgid="8389984232732277478">"Predvajaj/zaustavi"</string> <string name="keyboard_key_media_stop" msgid="1509943745250377699">"Ustavi"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Trenutna aplikacija"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Dostopnost"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Bližnjične tipke"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Bližnjice za iskanje"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Prilagajanje bližnjičnih tipk"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Iskanje po bližnjicah"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ni rezultatov iskanja"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona za strnitev"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Prilagodi"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Končano"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona za razširitev"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ali"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Ročica za vlečenje"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Zagotavljajo aplikacije"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Zaslon"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Neznano"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Ponastavitev ploščic"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Želite ponastaviti ploščice na prvotni vrstni red in prvotno velikost?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Želite ponastaviti vse ploščice?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Vse ploščice v hitrih nastavitvah bodo ponastavljene na prvotne nastavitve naprave."</string> </resources> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index 7f74487ac2b0..027636f7f955 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Të regjistrohet ekrani?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Regjistro një aplikacion"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Regjistro të gjithë ekranin"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Regjistro gjithë ekranin: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Kur regjistron të gjithë ekranin, regjistrohet çdo gjë e shfaqur në ekranin tënd. Prandaj, ki kujdes me gjërat si fjalëkalimet, detajet e pagesave, mesazhet, fotografitë, si dhe audion dhe videon."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Kur regjistron një aplikacion, regjistrohet çdo gjë që shfaqet ose luhet në atë aplikacion. Prandaj, ki kujdes me gjërat si fjalëkalimet, detajet e pagesave, mesazhet, fotografitë, si dhe audion dhe videon."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Regjistro ekranin"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Po regjistron aktualisht \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Ndalo regjistrimin"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Ekrani po ndahet"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Po ndan përmbajtjen"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Të ndalohet ndarja e ekranit?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Të ndalohet ndarja?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Po ndan aktualisht të gjithë ekranin me \"<xliff:g id="HOST_APP_NAME">%1$s</xliff:g>\""</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Po ndan aktualisht të gjithë ekranin me një aplikacion"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Po ndan aktualisht \"<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>\""</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Po ndan aktualisht një aplikacion"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Po ndan aktualisht me një aplikacion"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Ndalo ndarjen"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Po transmeton ekranin"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Të ndalohet transmetimi?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Miniaplikacionet në ekranin e kyçjes"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Çdo person mund të shikojë miniaplikacionet në ekranin tënd të kyçjes, edhe nëse tableti është i kyçur."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"anulo zgjedhjen e miniaplikacionit"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Zvogëlo lartësinë"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Rrit lartësinë"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Miniaplikacionet në ekranin e kyçjes"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Për të hapur një aplikacion duke përdorur një miniaplikacion, do të duhet të verifikosh që je ti. Ki parasysh gjithashtu që çdo person mund t\'i shikojë, edhe kur tableti yt është i kyçur. Disa miniaplikacione mund të mos jenë planifikuar për ekranin tënd të kyçjes dhe mund të mos jetë e sigurt t\'i shtosh këtu."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"E kuptova"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Pastroji të gjitha"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Menaxho"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Historiku"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Cilësimet e njoftimeve"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Historiku i njoftimeve"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Të reja"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Në heshtje"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Njoftimet"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Fillo tani"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Asnjë njoftim"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Nuk ka njoftime të reja"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Reduktimi i njoftimeve është aktiv"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Volumi i pajisjes dhe sinjalizimet zvogëlohen automatikisht për deri në 2 minuta kur merr shumë njoftime në të njëjtën kohë."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Çaktivizo"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Shkyç për të parë njoftimet e vjetra"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"E fiksuar"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Ndjekja e lëvizjeve të kokës"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Trokit për të ndryshuar modalitetin e ziles"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"çaktivizo audion"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"aktivizo audion"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"lësho dridhje"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Aplikacioni aktual"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Qasshmëria"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Shkurtoret e tastierës"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizo shkurtoret e tastierës"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Kërko për shkurtoret"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Asnjë rezultat kërkimi"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona e palosjes"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizo"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"U krye"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona e zgjerimit"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ose"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Doreza e zvarritjes"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Mundësuar nga aplikacionet"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Ekrani"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Nuk njihet"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Rivendos pllakëzat"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Të rivendosen pllakëzat në rendin dhe madhësinë e tyre origjinale?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Të rivendosen të gjitha pllakëzat?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Të gjitha pllakëzat e \"Cilësimeve të shpejta\" do të rivendosen te cilësimet origjinale të pajisjes"</string> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index a1952d428f10..bc3a0503b58a 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Желите да снимите екран?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Сними једну апликацију"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Сними цео екран"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Снимите цео екран: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Када снимате цео екран, снима се све што је на њему. Зато пазите на лозинке, информације о плаћању, поруке, слике, аудио и видео садржај."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Када снимате апликацију, снима се сав садржај који се приказује или пушта у њој. Зато пазите на лозинке, информације о плаћању, поруке, слике, аудио и видео садржај."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Сними екран"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Тренутно снимате: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Заустави снимање"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Екран се дели"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Дељење садржаја"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Желите да зауставите дељење екрана?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Желите да зауставите дељење?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Тренутно делите цео екран са: <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Тренутно делите цео екран са апликацијом"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Тренутно делите: <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Тренутно делите апликацију"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Тренутно делите са апликацијом"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Заустави дељење"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Пребацује се екран"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Желите да зауставите пребацивање?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Виџети за закључани екран"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Сви могу да виде виџете на закључаном екрану, чак и када је таблет закључан."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"поништи избор виџета"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Смањи висину"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Повећај висину"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Виџети за закључани екран"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Да бисте отворили апликацију која користи виџет, треба да потврдите да сте то ви. Имајте у виду да свако може да га види, чак и када је таблет закључан. Неки виџети можда нису намењени за закључани екран и можда није безбедно да их тамо додате."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Важи"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Започни"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Нема обавештења"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Нема нових обавештења"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Утишавање обавештења је укључено"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Звук и број упозорења на уређају се аутоматски смањују на 2 минута када добијете превише обавештења."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Искључи"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Откључајте за старија обавештења"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Фиксно"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Праћење главе"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Додирните да бисте променили режим звона"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"искључите звук"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"укључите звук"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"вибрација"</string> @@ -814,7 +811,7 @@ <string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string> <string name="keyboard_key_space" msgid="6980847564173394012">"Размак"</string> <string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string> - <string name="keyboard_key_backspace" msgid="4095278312039628074">"Тастер за брисање уназад"</string> + <string name="keyboard_key_backspace" msgid="4095278312039628074">"Backspace"</string> <string name="keyboard_key_media_play_pause" msgid="8389984232732277478">"Тастер за репродукцију/паузирање"</string> <string name="keyboard_key_media_stop" msgid="1509943745250377699">"Тастер за заустављање"</string> <string name="keyboard_key_media_next" msgid="8502476691227914952">"Тастер Следећа"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Актуелна апликација"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Приступачност"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Тастерске пречице"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Пречице претраге"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Прилагодите тастерске пречице"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Претражите пречице"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Нема резултата претраге"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Икона за скупљање"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Прилагоди"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Готово"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Икона за проширивање"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"или"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Маркер за превлачење"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Обезбеђују апликације"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Екран"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Непознато"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Ресетујте плочице"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Желите да ресетујете плочице на првобитни редослед и величине?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Желите да ресетујете све плочице?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Све плочице Брзих подешавања ће се ресетовати на првобитна подешавања уређаја"</string> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index b898eafc7f03..66b585178f76 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Vill du spela in det som visas på skärmen?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Spela in en app"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Spela in hela skärmen"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Spela in hela skärmen: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"När du spelar in hela skärmen spelas allt som visas på skärmen in. Var försiktig med sådant som lösenord, betalningsuppgifter, meddelanden, foton, ljud och video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"När du spelar in en app spelas allt som visas eller spelas upp i appen in. Var försiktig med sådant som lösenord, betalningsuppgifter, meddelanden, foton, ljud och video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Spela in skärmen"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Du spelar för närvarande in <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Sluta spela in"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Skärmen delas"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Delar innehåll"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Vill du sluta dela skärmen?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Vill du sluta dela?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Du delar för närvarande hela din skärm med <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Du delar för närvarande hela din skärm med en app"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Du delar för närvarande <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Du delar för närvarande en app"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Du delar för närvarande med en app"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Sluta dela"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Skärmen castas"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Vill du sluta att casta?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Widgetar för låsskärm"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Vem som helst kan se widgetar på din låsskärm, även om surfplattan är låst."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"avmarkera widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Minska höjden"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Öka höjden"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Widgetar för låsskärm"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Du måste verifiera din identitet innan du öppnar en app med en widget. Tänk också på att alla kan se dem, även när surfplattan är låst. Vissa widgetar kanske inte är avsedda för låsskärmen och det kan vara osäkert att lägga till dem här."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Rensa alla"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Hantera"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Historik"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Aviseringsinställningar"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Aviseringshistorik"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Ny"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Ljudlöst"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Aviseringar"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Starta nu"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Inga aviseringar"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Det finns inga nya aviseringar"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Dämpning av aviseringar är på"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Enheten sänker volymen och minimerar aviseringar i upp till två minuter när du får för många aviseringar samtidigt."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Inaktivera"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Lås upp för att se äldre aviseringar"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Statiskt"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Huvudspårning"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Tryck för att ändra ringsignalens läge"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"stänga av ljudet"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"slå på ljudet"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"vibration"</string> @@ -1410,20 +1405,17 @@ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multikörning"</string> <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Senaste apparna"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Delad skärm"</string> - <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Ingång"</string> + <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Inmatning"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Genvägar till appar"</string> <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Aktuell app"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Tillgänglighet"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Kortkommandon"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Anpassa kortkommandon"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Sökgenvägar"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Inga sökresultat"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikonen Komprimera"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Anpassa"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Klar"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikonen Utöka"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"eller"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Handtag"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Tillhandahålls av appar"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Skärm"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Okänt"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Återställ rutor"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Vill du återställa rutorna till den ursprungliga ordningen och storleken?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Vill du återställa alla rutor?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Alla Snabbinställningsrutor återställs till enhetens ursprungliga inställningar"</string> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 8731337c88f0..67abd41850ea 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Ungependa kurekodi skrini yako?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Rekodi programu moja"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Rekodi skrini nzima"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Rekodi skrini nzima: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Unaporekodi skrini yako nzima, chochote kinachoonyeshwa kwenye skrini yako kitarekodiwa. Kwa hivyo kuwa mwangalifu na vitu kama vile manenosiri, maelezo ya malipo, ujumbe, picha, sauti na video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Unaporekodi programu, chochote kinachoonyeshwa au kuchezwa kwenye programu hiyo kitarekodiwa. Kwa hivyo kuwa mwangalifu na vitu kama vile manenosiri, maelezo ya malipo, ujumbe, picha, sauti na video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Rekodi skrini"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Kwa sasa unarekodi <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Acha kurekodi"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Inaruhusu ufikiaji kwenye skrini"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Unatuma maudhui"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Ungependa kuacha kuonyesha skrini?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Ungependa kuacha kutuma maudhui?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Kwa sasa unatuma maudhui yaliyo katika skrini yako nzima kwenye <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Kwa sasa unatuma maudhui yaliyo katika skrini yako nzima kwenye programu"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Kwa sasa unaonyesha <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Kwa sasa unatumia programu pamoja na wengine"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Kwa sasa unatuma maudhui kwenye programu"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Acha kuonyesha skrini"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Inatuma skrini"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Ungependa kuacha kutuma?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Wijeti zinazoonekana kwenye skrini iliyofungwa"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Yeyote anaweza kuona wijeti kwenye skrini yako iliyofungwa, hata ikiwa umefunga kishikwambi chako."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"acha kuchagua wijeti"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Punguza urefu"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Ongeza urefu"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Wijeti zinazoonekana kwenye skrini iliyofungwa"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Utahitaji kuthibitisha kuwa ni wewe ili ufungue programu ukitumia wijeti. Pia, kumbuka kuwa mtu yeyote anaweza kuziona, hata kishikwambi chako kikiwa kimefungwa. Huenda baadhi ya wijeti hazikukusudiwa kutumika kwenye skrini yako iliyofungwa na huenda si salama kuziweka hapa."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Nimeelewa"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Futa zote"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Dhibiti"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Historia"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Mipangilio ya arifa"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Historia ya arifa"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Mpya"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Kimya"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Arifa"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Anza sasa"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Hakuna arifa"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Hakuna arifa mpya"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Umewasha mipangilio ya kutuliza arifa"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Arifa na sauti hupunguzwa kiotomatiki kwenye kifaa chako kwa hadi dakika 2 unapopokea arifa nyingi kwa wakati mmoja."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Zima"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Fungua ili uone arifa za zamani"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Imerekebishwa"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Ufuatilizi wa Kichwa"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Gusa ili ubadilishe hali ya programu inayotoa milio ya simu"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"zima sauti"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"washa sauti"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"tetema"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Programu Inayotumika Sasa"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Ufikivu"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Mikato ya kibodi"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Weka mapendeleo ya mikato ya kibodi"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Njia mkato za kutafutia"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Hamna matokeo ya utafutaji"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Kunja aikoni"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Weka mapendeleo"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Nimemaliza"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Panua aikoni"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"au"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Aikoni ya buruta"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Vinavyotolewa na programu"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Maonyesho"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Visivyojulikana"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Badilisha mipangilio ya vigae"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Ungependa kurejesha mipangilio chaguomsingi ya ukubwa na mpangilio wa vigae?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Ungependa kubadilisha vigae vyote?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Vigae vyote vya Mipangilio ya Haraka vitabadilishwa kuwa katika mipangilio halisi ya kifaa"</string> </resources> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index b75a2186ed64..dd4f367f9d1c 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"உங்கள் திரையை ரெக்கார்டு செய்யவா?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"ஓர் ஆப்ஸை ரெக்கார்டு செய்தல்"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"முழுத் திரையை ரெக்கார்டு செய்தல்"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"முழுத் திரையை ரெக்கார்டு செய்தல்: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"முழுத் திரையை நீங்கள் ரெக்கார்டு செய்யும்போது அதில் காட்டப்படும் அனைத்தும் ரெக்கார்டு செய்யப்படும். எனவே கடவுச்சொற்கள், பேமெண்ட் விவரங்கள், மெசேஜ்கள், படங்கள், ஆடியோ, வீடியோ போன்றவை குறித்துக் கவனத்துடன் இருங்கள்."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"ஓர் ஆப்ஸை ரெக்கார்டு செய்யும்போது அதில் காட்டப்படும் அல்லது பிளே செய்யப்படும் அனைத்தும் ரெக்கார்டு செய்யப்படும். எனவே கடவுச்சொற்கள், பேமெண்ட் விவரங்கள், மெசேஜ்கள், படங்கள், ஆடியோ, வீடியோ போன்றவை குறித்துக் கவனத்துடன் இருங்கள்."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"திரையை ரெக்கார்டு செய்"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"இப்போது நீங்கள் <xliff:g id="APP_NAME">%1$s</xliff:g> ஐ ரெக்கார்டு செய்கிறீர்கள்"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"ரெக்கார்டிங்கை நிறுத்து"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"திரையைப் பகிர்கிறது"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"உள்ளடக்கம் பகிரப்படுகிறது"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"திரையைப் பகிர்வதை நிறுத்தவா?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"பகிர்வதை நிறுத்தவா?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"இப்போது உங்கள் முழுத்திரையையும் <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> உடன் பகிர்கிறீர்கள்"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"இப்போது உங்கள் முழுத்திரையையும் ஆப்ஸுடன் பகிர்கிறீர்கள்"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"இப்போது நீங்கள் <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> ஐப் பகிர்கிறீர்கள்"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"இப்போது நீங்கள் ஓர் ஆப்ஸைப் பகிர்கிறீர்கள்"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"இப்போது நீங்கள் ஓர் ஆப்ஸுடன் பகிர்கிறீர்கள்"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"பகிர்வதை நிறுத்து"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"திரையை அலைபரப்புகிறது"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"அலைபரப்பை நிறுத்தவா?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"பூட்டுத் திரை விட்ஜெட்கள்"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"டேப்லெட் பூட்டப்பட்டிருந்தாலும் பூட்டுத் திரையில் விட்ஜெட்டை எவரும் பார்க்கலாம்."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"விட்ஜெட்டைத் தேர்வுநீக்கும்"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"உயரத்தைக் குறைக்கும்"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"உயரத்தை அதிகரிக்கும்"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"பூட்டுத் திரை விட்ஜெட்கள்"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"விட்ஜெட்டைப் பயன்படுத்தி ஆப்ஸைத் திறக்க, அது நீங்கள்தான் என்பதை உறுதிசெய்ய வேண்டும். அத்துடன், உங்கள் டேப்லெட் பூட்டப்பட்டிருந்தாலும்கூட அவற்றை யார் வேண்டுமானாலும் பார்க்கலாம் என்பதை நினைவில்கொள்ளுங்கள். சில விட்ஜெட்கள் உங்கள் பூட்டுத் திரைக்காக உருவாக்கப்பட்டவை அல்ல என்பதையும் அவற்றை இங்கே சேர்ப்பது பாதுகாப்பற்றதாக இருக்கக்கூடும் என்பதையும் நினைவில்கொள்ளுங்கள்."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"சரி"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"எல்லாவற்றையும் அழி"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"நிர்வகி"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"இதுவரை வந்த அறிவிப்புகள்"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"அறிவிப்பு அமைப்புகள்"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"இதுவரையான அறிவிப்புகள்"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"புதிது"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"சைலன்ட்"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"அறிவிப்புகள்"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"இப்போது தொடங்கு"</string> <string name="empty_shade_text" msgid="8935967157319717412">"அறிவிப்புகள் இல்லை"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"புதிய அறிவிப்புகள் இல்லை"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"\'குறைந்த ஒலியளவில் அறிவிப்புகள்\' இயக்கப்பட்டுள்ளது"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"ஒரே நேரம் பல அறிவிப்புகள் வரும்போது சாதன ஒலியளவும் விழிப்பூட்டலும் தானாக 2 நிமிடம் குறைக்கப்படும்."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"முடக்கு"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"பழைய அறிவிப்பைப் பார்க்க அன்லாக் செய்க"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"நிலையானது"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"ஹெட் டிராக்கிங்"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"ரிங்கர் பயன்முறையை மாற்ற தட்டவும்"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"ஒலியடக்கும்"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"ஒலி இயக்கும்"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"அதிர்வுறும்"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"தற்போதைய ஆப்ஸ்"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"மாற்றுத்திறன் வசதி"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"கீபோர்டு ஷார்ட்கட்கள்"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"தேடல் ஷார்ட்கட்கள்"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"கீபோர்டு ஷார்ட்கட்களைப் பிரத்தியேகப்படுத்துதல்"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ஷார்ட்கட்களைத் தேடுக"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"தேடல் முடிவுகள் இல்லை"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"சுருக்குவதற்கான ஐகான்"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"பிரத்தியேகப்படுத்தும்"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"முடிந்தது"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"விரிவாக்குவதற்கான ஐகான்"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"அல்லது"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"இழுப்பதற்கான ஹேண்டில்"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"ஆப்ஸ் வழங்குபவை"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"டிஸ்ப்ளே"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"தெரியவில்லை"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"கட்டங்களை மீட்டமைத்தல்"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"கட்டங்களை அவற்றின் அசல் வரிசைக்கும் அளவுகளுக்கும் மீட்டமைக்கவா?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"அனைத்துக் கட்டங்களையும் மீட்டமைக்கவா?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"விரைவு அமைப்புகளின் கட்டங்கள் அனைத்தும் சாதனத்தின் அசல் அமைப்புகளுக்கு மீட்டமைக்கப்படும்"</string> </resources> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index d66c6560fd7c..ed4c0eff770f 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"మీ స్క్రీన్ను రికార్డ్ చేయాలా?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"ఒక యాప్ను రికార్డ్ చేయండి"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"ఫుల్ స్క్రీన్ను రికార్డ్ చేయండి"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"ఫుల్-స్క్రీన్ను రికార్డ్ చేయండి: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"మీ ఫుల్ స్క్రీన్ను మీరు రికార్డ్ చేసేటప్పుడు, మీ స్క్రీన్పై కనిపించేవన్నీ రికార్డ్ అవుతాయి. కాబట్టి పాస్వర్డ్లు, పేమెంట్ వివరాలు, మెసేజ్లు, ఫోటోలు, ఆడియో, ఇంకా వీడియో వంటి విషయాల్లో జాగ్రత్త వహించండి."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"మీరు యాప్ను రికార్డ్ చేసేటప్పుడు, సంబంధిత యాప్లో కనిపించేవన్నీ లేదా ప్లే అయ్యేవన్నీ రికార్డ్ అవుతాయి. కాబట్టి పాస్వర్డ్లు, పేమెంట్ వివరాలు, మెసేజ్లు, ఫోటోలు, ఆడియో, ఇంకా వీడియో వంటి విషయాల్లో జాగ్రత్త వహించండి."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"స్క్రీన్ను రికార్డ్ చేయండి"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"మీరు ప్రస్తుతం <xliff:g id="APP_NAME">%1$s</xliff:g>ను రికార్డ్ చేస్తున్నారు"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"రికార్డింగ్ను ఆపివేయండి"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"స్క్రీన్ను షేర్ చేస్తోంది"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"కంటెంట్ను షేర్ చేస్తోంది"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"స్క్రీన్ను షేర్ చేయడం ఆపివేయాలా?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"షేర్ చేయడాన్ని ఆపివేయాలా?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"మీరు ప్రస్తుతం మీ మొత్తం స్క్రీన్ను <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>తో షేర్ చేస్తున్నారు"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"మీరు ప్రస్తుతం మీ మొత్తం స్క్రీన్ను యాప్తో షేర్ చేస్తున్నారు"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"మీరు ప్రస్తుతం <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>ను షేర్ చేస్తున్నారు"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"మీరు ప్రస్తుతం యాప్ను షేర్ చేస్తున్నారు"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"మీరు ప్రస్తుతం యాప్తో షేర్ చేస్తున్నారు"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"షేర్ చేయడాన్ని ఆపివేయండి"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"స్క్రీన్ను ప్రసారం చేస్తోంది"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"ప్రసారం చేయడం ఆపివేయాలా?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"లాక్ స్క్రీన్ విడ్జెట్లు"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"మీ టాబ్లెట్ లాక్ చేసి ఉన్నా, మీ లాక్ స్క్రీన్లో విడ్జెట్లను ఎవరైనా చూడవచ్చు."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"విడ్జెట్ ఎంపిక రద్దు చేయండి"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"ఎత్తును తగ్గించండి"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"ఎత్తును పెంచండి"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"లాక్ స్క్రీన్ విడ్జెట్లు"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"విడ్జెట్ను ఉపయోగించి యాప్ను తెరవడానికి, ఇది మీరేనని వెరిఫై చేయాల్సి ఉంటుంది. అలాగే, మీ టాబ్లెట్ లాక్ చేసి ఉన్నప్పటికీ, ఎవరైనా వాటిని చూడగలరని గుర్తుంచుకోండి. కొన్ని విడ్జెట్లు మీ లాక్ స్క్రీన్కు తగినవి కాకపోవచ్చు, వాటిని ఇక్కడ జోడించడం సురక్షితం కాకపోవచ్చు."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"అర్థమైంది"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"ఇప్పుడే ప్రారంభించండి"</string> <string name="empty_shade_text" msgid="8935967157319717412">"నోటిఫికేషన్లు లేవు"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"కొత్త నోటిఫికేషన్లు ఏవీ లేవు"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"నోటిఫికేషన్ కూల్డౌన్ ఆన్ అయింది"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"ఒకేసారి పలు నోటిఫికేషన్లు వస్తే, పరికర వాల్యూమ్, అలర్ట్స్ ఆటోమేటిగ్గా 2 నిమిషాలకు తగ్గించబడతాయి."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"ఆఫ్ చేయండి"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"పాత నోటిఫికేషన్ల కోసం అన్లాక్ చేయండి"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"ఫిక్స్డ్"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"హెడ్ ట్రాకింగ్"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"రింగర్ మోడ్ను మార్చడానికి ట్యాప్ చేయండి"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"మ్యూట్ చేయి"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"అన్మ్యూట్ చేయి"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"వైబ్రేట్"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"ప్రస్తుత యాప్"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"యాక్సెసిబిలిటీ"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"కీబోర్డ్ షార్ట్కట్లు"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"సెర్చ్ షార్ట్కట్లు"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"కీబోర్డ్ షార్ట్కట్లను అనుకూలంగా మార్చండి"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"షార్ట్కట్లను వెతకండి"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"సెర్చ్ ఫలితాలు ఏవీ లేవు"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"కుదించండి చిహ్నం"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"అనుకూలంగా మార్చండి"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"పూర్తయింది"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"విస్తరించండి చిహ్నం"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"లేదా"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"లాగే హ్యాండిల్"</string> @@ -1458,7 +1452,7 @@ <string name="home_controls_dream_description" msgid="4644150952104035789">"హోమ్ కంట్రోల్స్ను స్క్రీన్ సేవర్గా చేసి వేగంగా యాక్సెస్ పొందండి"</string> <string name="volume_undo_action" msgid="5815519725211877114">"చర్య రద్దు చేయండి"</string> <string name="back_edu_toast_content" msgid="4530314597378982956">"వెనుకకు వెళ్లడానికి, టచ్ప్యాడ్లో మూడు వేళ్లను ఉపయోగించి ఎడమ లేదా కుడి వైపునకు స్వైప్ చేయండి"</string> - <string name="home_edu_toast_content" msgid="3381071147871955415">"హోమ్కు వెళ్లడానికి, టచ్ప్యాడ్లో మీ మూడు వెళ్లతో పైకి స్వైప్ చేయండి"</string> + <string name="home_edu_toast_content" msgid="3381071147871955415">"హోమ్కు వెళ్లడానికి, టచ్ప్యాడ్లో మీ మూడు వేళ్లతో పైకి స్వైప్ చేయండి"</string> <string name="overview_edu_toast_content" msgid="5797030644017804518">"ఇటీవలి యాప్లను చూడటానికి, టచ్ప్యాడ్లో మూడు వేళ్లతో పైకి స్వైప్ చేసి, హోల్డ్ చేయండి"</string> <string name="all_apps_edu_toast_content" msgid="8807496014667211562">"మీ యాప్లన్నింటినీ చూడటానికి, మీ కీబోర్డ్లో యాక్షన్ కీని నొక్కండి"</string> <string name="redacted_notification_single_line_title" msgid="212019960919261670">"దాచిపెట్టినది"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"యాప్ల ద్వారా అందించబడినవి"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"డిస్ప్లే"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"తెలియదు"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"టైల్స్ను రీసెట్ చేయండి"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"టైల్స్ను వాటి ఒరిజినల్ క్రమానికి, సైజ్లకు రీసెట్ చేయాలా?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"టైల్స్ అన్ని రీసెట్ చేయాలా?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"అన్ని క్విక్ సెట్టింగ్ల టైల్స్, పరికరం తాలూకు ఒరిజినల్ సెట్టింగ్లకు రీసెట్ చేయబడతాయి"</string> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index b7d1a32fdeba..49ba43ee149f 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"บันทึกหน้าจอไหม"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"บันทึกแอปเดียว"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"บันทึกทั้งหน้าจอ"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"บันทึกทั้งหน้าจอ: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"ขณะบันทึกทั้งหน้าจอ ระบบจะบันทึกทุกสิ่งที่แสดงอยู่บนหน้าจอ ดังนั้นโปรดระวังสิ่งต่างๆ อย่างเช่นรหัสผ่าน รายละเอียดการชำระเงิน ข้อความ รูปภาพ รวมถึงเสียงและวิดีโอ"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"ขณะบันทึกแอป ระบบจะบันทึกทุกสิ่งที่แสดงหรือเล่นอยู่ในแอปดังกล่าว ดังนั้นโปรดระวังสิ่งต่างๆ อย่างเช่นรหัสผ่าน รายละเอียดการชำระเงิน ข้อความ รูปภาพ รวมถึงเสียงและวิดีโอ"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"บันทึกหน้าจอ"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"คุณกำลังบันทึก <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"หยุดบันทึก"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"กำลังแชร์หน้าจอ"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"กำลังแชร์เนื้อหา"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"หยุดแชร์หน้าจอไหม"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"หยุดการแชร์ใช่ไหม"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"คุณกำลังแชร์ทั้งหน้าจอกับ <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"คุณกำลังแชร์ทั้งหน้าจอกับแอป"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"คุณกำลังแชร์ <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"คุณกำลังแชร์แอป"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"คุณกำลังแชร์กับแอป"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"หยุดแชร์"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"กำลังแคสต์หน้าจอ"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"หยุดแคสต์ไหม"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"วิดเจ็ตในหน้าจอล็อก"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"ทุกคนจะดูวิดเจ็ตที่อยู่ในหน้าจอล็อกของคุณได้ แม้ว่าแท็บเล็ตจะล็อกอยู่ก็ตาม"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ยกเลิกการเลือกวิดเจ็ต"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"ลดความสูง"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"เพิ่มความสูง"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"วิดเจ็ตในหน้าจอล็อก"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"หากต้องการเปิดแอปโดยใช้วิดเจ็ต คุณจะต้องยืนยันตัวตนของคุณ นอกจากนี้ โปรดทราบว่าผู้อื่นจะดูวิดเจ็ตเหล่านี้ได้แม้ว่าแท็บเล็ตจะล็อกอยู่ก็ตาม วิดเจ็ตบางอย่างอาจไม่ได้มีไว้สำหรับหน้าจอล็อกของคุณ และอาจไม่ปลอดภัยที่จะเพิ่มที่นี่"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"รับทราบ"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"ล้างทั้งหมด"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"จัดการ"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"ประวัติ"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"การตั้งค่าการแจ้งเตือน"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"ประวัติการแจ้งเตือน"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"ใหม่"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"ปิดเสียง"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"การแจ้งเตือน"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"เริ่มเลย"</string> <string name="empty_shade_text" msgid="8935967157319717412">"ไม่มีการแจ้งเตือน"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"ไม่มีการแจ้งเตือนใหม่"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"การพักการแจ้งเตือนเปิดอยู่"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"ระบบจะลดระดับเสียงและจำนวนการแจ้งเตือนของอุปกรณ์โดยอัตโนมัติสูงสุด 2 นาทีเมื่อคุณได้รับการแจ้งเตือนพร้อมกันมากเกินไป"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"ปิด"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"ปลดล็อกเพื่อดูการแจ้งเตือนเก่า"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"คงที่"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"การติดตามการเคลื่อนไหวของศีรษะ"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"แตะเพื่อเปลี่ยนโหมดเสียงเรียกเข้า"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"ปิดเสียง"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"เปิดเสียง"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"สั่น"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"แอปปัจจุบัน"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"การช่วยเหลือพิเศษ"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"แป้นพิมพ์ลัด"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"ปรับแต่งแป้นพิมพ์ลัด"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ค้นหาแป้นพิมพ์ลัด"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ไม่พบผลการค้นหา"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ไอคอนยุบ"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"ปรับแต่ง"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"เสร็จสิ้น"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ไอคอนขยาย"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"หรือ"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"แฮนเดิลการลาก"</string> @@ -1469,9 +1461,9 @@ <string name="back_edu_notification_title" msgid="5624780717751357278">"ใช้ทัชแพดเพื่อย้อนกลับ"</string> <string name="back_edu_notification_content" msgid="2497557451540954068">"ใช้ 3 นิ้วปัดไปทางซ้ายหรือขวา แตะเพื่อดูข้อมูลเพิ่มเติมเกี่ยวกับท่าทางสัมผัสต่างๆ"</string> <string name="home_edu_notification_title" msgid="6097902076909654045">"ใช้ทัชแพดเพื่อไปยังหน้าแรก"</string> - <string name="home_edu_notification_content" msgid="6631697734535766588">"ใช้ 3 นิ้วปัดขึ้น แตะเพื่อดูข้อมูลเพิ่มเติมเกี่ยวกับท่าทางสัมผัสต่างๆ"</string> + <string name="home_edu_notification_content" msgid="6631697734535766588">"ใช้ 3 นิ้วปัดขึ้น แตะเพื่อดูท่าทางสัมผัสต่างๆ เพิ่มเติม"</string> <string name="overview_edu_notification_title" msgid="1265824157319562406">"ใช้ทัชแพดเพื่อดูแอปล่าสุด"</string> - <string name="overview_edu_notification_content" msgid="3578204677648432500">"ใช้ 3 นิ้วปัดขึ้นแล้วค้างไว้ แตะเพื่อดูข้อมูลเพิ่มเติมเกี่ยวกับท่าทางสัมผัสต่างๆ"</string> + <string name="overview_edu_notification_content" msgid="3578204677648432500">"ใช้ 3 นิ้วปัดขึ้นแล้วค้างไว้ แตะเพื่อดูท่าทางสัมผัสต่างๆ เพิ่มเติม"</string> <string name="all_apps_edu_notification_title" msgid="372262997265569063">"ใช้แป้นพิมพ์เพื่อดูแอปทั้งหมด"</string> <string name="all_apps_edu_notification_content" msgid="3255070575694025585">"กดปุ่มดำเนินการได้ทุกเมื่อ แตะเพื่อดูข้อมูลเพิ่มเติมเกี่ยวกับท่าทางสัมผัสต่างๆ"</string> <string name="accessibility_deprecate_extra_dim_dialog_title" msgid="910988771011857460">"ตอนนี้การหรี่แสงเพิ่มเติมเป็นส่วนหนึ่งของแถบเลื่อนความสว่างแล้ว"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"ให้บริการโดยแอป"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"จอแสดงผล"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"ไม่ทราบ"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"รีเซ็ตการ์ด"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"รีเซ็ตการ์ดเป็นลำดับและขนาดเดิมไหม"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"รีเซ็ตการ์ดทั้งหมดใช่ไหม"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"การ์ดการตั้งค่าด่วนทั้งหมดจะรีเซ็ตเป็นการตั้งค่าเดิมของอุปกรณ์"</string> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index a30a2f2f45f6..e589d31a4900 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"I-record ang iyong screen?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Mag-record ng isang app"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"I-record ang buong screen"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"I-record ang buong screen: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Kapag nire-record mo ang iyong buong screen, nire-record ang anumang ipinapakita sa screen mo. Kaya mag-ingat sa mga bagay-bagay tulad ng mga password, detalye ng pagbabayad, mensahe, larawan, at audio at video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Kapag nagre-record ka ng app, nire-record ang anumang 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> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"I-record ang screen"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Kasalukuyan mong nire-record ang <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Huminto sa pag-record"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Ibinabahagi ang screen"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Pagbabahagi ng content"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Ihinto ang pagbabahagi ng screen?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Itigil ang pagbabahagi?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Kasalukuyan mong ibinabahagi ang iyong buong screen sa <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Kasalukuyan mong ibinabahagi ang iyong buong screen sa isang app"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Kasalukuyan kang nagbabahagi ng <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Kasalukuyan kang nagbabahagi ng app"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Kasalukuyan kang nagbabahagi sa isang app"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Ihinto ang pagbabahagi"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Kina-cast ang screen"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Ihinto ang pag-cast?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Mga widget ng lock screen"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Makikita ng sinuman ang mga widget sa lock screen, kahit naka-lock ang tablet."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"i-unselect ang widget"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Bawasan ang taas"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Dagdagan ang taas"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Mga widget ng lock screen"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Para magbukas ng app gamit ang isang widget, kakailanganin mong i-verify na ikaw iyan. Bukod pa rito, tandaang puwedeng tingnan ng kahit na sino ang mga ito, kahit na naka-lock ang iyong tablet. Posibleng hindi para sa iyong lock screen ang ilang widget at posibleng hindi ligtas ang mga ito na idagdag dito."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"I-clear lahat"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Pamahalaan"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"History"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Mga setting ng notification"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"History ng notification"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Bago"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Naka-silent"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Mga Notification"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Magsimula ngayon"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Walang mga notification"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Walang bagong notification"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Naka-on ang cooldown sa notification"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Babawasan ang volume at alerto nang hanggang 2 minuto kapag nakatanggap ng maraming notification."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"I-off"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"I-unlock para makita ang mga mas lumang notification"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Nakapirmi"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Pag-track ng Ulo"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"I-tap para baguhin ang ringer mode"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"i-mute"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"i-unmute"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"i-vibrate"</string> @@ -1408,22 +1403,19 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Mga kontrol ng system"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Mga system app"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Pag-multitask"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Kamakailang mga app"</string> + <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Mga kamakailang app"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Split screen"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Mga shortcut ng app"</string> <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Kasalukuyang App"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibility"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Mga keyboard shortcut"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"I-customize ang mga keyboard shortcut"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Mga shortcut ng paghahanap"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Walang resulta ng paghahanap"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"I-collapse ang icon"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"I-customize"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Tapos na"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"I-expand ang icon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"o"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Handle sa pag-drag"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Ibinibigay ng mga app"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Display"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Hindi Alam"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"I-reset ang mga tile"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"I-reset ang mga tile sa orihinal na pagkakasunod-sunod at mga laki ng mga ito?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"I-reset ang lahat ng tile?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Magre-reset sa mga orihinal na setting ng device ang lahat ng tile ng Mga Mabilisang Setting"</string> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index c79dfcf8f162..6c2aa50a248f 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Ekranınız kaydedilsin mi?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Bir uygulamayı kaydet"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Tüm ekranı kaydedin"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Tüm ekranı kaydet: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Tüm ekranınızı kaydettiğinizde ekranınızda gösterilen her şey kaydedilir. Bu nedenle şifre, ödeme ayrıntıları, mesaj, fotoğraf, ses ve video gibi öğeler konusunda dikkatli olun."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Bir uygulamayı kaydettiğinizde o uygulamada gösterilen veya oynatılan her şey kaydedilir. Bu nedenle şifre, ödeme ayrıntıları, mesaj, fotoğraf, ses ve video gibi öğeler konusunda dikkatli olun."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Ekranı kaydet"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Şu anda <xliff:g id="APP_NAME">%1$s</xliff:g> içeriğini kaydediyorsunuz"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Kaydı durdur"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Ekran paylaşılıyor"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"İçerik paylaşma"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Ekran paylaşımı durdurulsun mu?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Paylaşım durdurulsun mu?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Şu anda ekranınızın tamamını <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> ile paylaşıyorsunuz"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Şu anda ekranınızın tamamını bir uygulamayla paylaşıyorsunuz"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Şu anda <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> içeriğini paylaşıyorsunuz"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Şu anda bir uygulamayı paylaşıyorsunuz"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Şu anda bir uygulamayla paylaşıyorsunuz"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Paylaşımı durdur"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Ekran yayınlanıyor"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Yayın durdurulsun mu?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Kilit ekranı widget\'ları"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Kilit ekranınızdaki widget\'lar, tabletiniz kilitliyken bile herkes tarafından görüntülenebilir."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"widget\'ın seçimini kaldırın"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Yüksekliği azalt"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Yüksekliği artır"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Kilit ekranı widget\'ları"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Widget kullanarak bir uygulamayı açmak için kimliğinizi doğrulamanız gerekir. Ayrıca, tabletiniz kilitliyken bile widget\'ların herkes tarafından görüntülenebileceğini unutmayın. Bazı widget\'lar kilit ekranınız için tasarlanmamış olabileceğinden buraya eklenmeleri güvenli olmayabilir."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Anladım"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Tümünü temizle"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Yönet"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Geçmiş"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Bildirim ayarları"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Bildirim geçmişi"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Yeni"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Sessiz"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Bildirimler"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Şimdi başlat"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Bildirim yok"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Yeni bildirim yok"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Bildirim şiddetini düşürme etkin"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Aynı anda çok sayıda bildirim aldığınızda 2 dakika boyunca otomatik olarak cihazınızın sesi kısılır ve uyarıları azaltılır."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Kapat"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Eski bildirimler için kilidi açın"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Sabit"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Baş Takibi"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Telefon zili modunu değiştirmek için dokunun"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"sesi kapat"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"sesi aç"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"titreşim"</string> @@ -868,10 +863,10 @@ <string name="group_system_lock_screen" msgid="7391191300363416543">"Kilit ekranı"</string> <string name="group_system_quick_memo" msgid="3764560265935722903">"Not al"</string> <string name="keyboard_shortcut_group_system_multitasking" msgid="6967816258924795558">"Çoklu görev"</string> - <string name="system_multitasking_rhs" msgid="8714224917276297810">"Sağdaki mevcut uygulamayla birlikte bölünmüş ekranı kullanın"</string> - <string name="system_multitasking_lhs" msgid="8402954791206308783">"Soldaki mevcut uygulamayla birlikte bölünmüş ekranı kullanın"</string> + <string name="system_multitasking_rhs" msgid="8714224917276297810">"Sağdaki mevcut uygulamayla birlikte bölünmüş ekranı kullan"</string> + <string name="system_multitasking_lhs" msgid="8402954791206308783">"Soldaki mevcut uygulamayla birlikte bölünmüş ekranı kullan"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Bölünmüş ekrandan tam ekrana geç"</string> - <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_rhs" msgid="3838578650313318508">"Bölünmüş ekran kullanırken sağdaki veya alttaki uygulamaya geçiş yap"</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> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Mevcut Uygulama"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Erişilebilirlik"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Klavye kısayolları"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Klavye kısayollarını özelleştirin"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Arama kısayolları"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Arama sonucu yok"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Daralt simgesi"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Özelleştir"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Bitti"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Genişlet simgesi"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"veya"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Sürükleme tutamacı"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Uygulamalar tarafından sağlanır"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Ekran"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Bilinmiyor"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Kartları sıfırla"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Kartlar orijinal sıralarına ve boyutlarına sıfırlansın mı?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Tüm ayar kutuları sıfırlansın mı?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Tüm Hızlı Ayarlar kutuları cihazın özgün ayarlarına sıfırlanır"</string> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 2808922e166c..a7590abcf486 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Записати відео з екрана?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Записувати один додаток"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Записувати весь екран"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Записувати весь вміст екрана: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Коли ви записуєте вміст усього екрана, на відео потрапляє все, що на ньому відображається. Тому будьте уважні з паролями, повідомленнями, фотографіями, аудіо, відео, платіжною інформацією тощо."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Коли ви записуєте додаток, на відео потрапляє все, що відображається або відтворюється в ньому. Тому будьте уважні з паролями, повідомленнями, фотографіями, аудіо, відео, платіжною інформацією тощо."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Записувати вміст екрана"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Ви зараз записуєте вміст екрана додатка <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Зупинити запис"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Показ екрана"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Ви ділитеся контентом"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Зупинити показ екрана?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Більше не ділитися?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Ви зараз показуєте вміст усього екрана в додатку <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Ви зараз показуєте вміст усього екрана в додатку."</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Ви зараз показуєте вікно додатка <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Ви зараз показуєте вікно додатка"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Ви зараз ділитеся контентом із додатком"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Зупинити показ"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Трансляція екрана"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Зупинити трансляцію?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Віджети для заблокованого екрана"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Будь-хто бачитиме віджети навіть на заблокованому екрані планшета."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"скасувати вибір віджета"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Зменшити висоту"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Збільшити висоту"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Віджети для заблокованого екрана"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Щоб відкрити додаток за допомогою віджета, вам потрібно буде підтвердити особу. Пам’ятайте також, що бачити віджети можуть усі, навіть коли планшет заблоковано. Можливо, деякі віджети не призначені для заблокованого екрана, і додавати їх на нього може бути небезпечно."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Очистити все"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Керувати"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Історія"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Налаштування сповіщень"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Історія сповіщень"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Нові"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Без звуку"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Сповіщення"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Почати зараз"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Сповіщень немає"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Немає нових сповіщень"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Зниження гучності сповіщень увімкнено"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Коли ви отримуєте забагато сповіщень за раз, пристрій автоматично знижує їх гучність і кількість на період до 2 хвилин."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Вимкнути"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Розблокуйте, щоб переглянути старіші"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Завжди ввімкнено"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Відстеження рухів голови"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Торкніться, щоб змінити режим дзвінка"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"вимкнути звук"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"увімкнути звук"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"увімкнути вібросигнал"</string> @@ -860,8 +855,8 @@ <string name="group_system_go_back" msgid="2730322046244918816">"Назад"</string> <string name="group_system_access_home_screen" msgid="4130366993484706483">"Перейти на головний екран"</string> <string name="group_system_overview_open_apps" msgid="5659958952937994104">"Переглянути нещодавні додатки"</string> - <string name="group_system_cycle_forward" msgid="5478663965957647805">"Перемикатися між нещодавніми додатками вперед"</string> - <string name="group_system_cycle_back" msgid="8194102916946802902">"Перемикатися між нещодавніми додатками назад"</string> + <string name="group_system_cycle_forward" msgid="5478663965957647805">"Прокрутити вперед список нещодавніх додатків"</string> + <string name="group_system_cycle_back" msgid="8194102916946802902">"Прокрутити назад список нещодавніх додатків"</string> <string name="group_system_access_all_apps_search" msgid="1553588630154197469">"Відкрити список додатків"</string> <string name="group_system_access_system_settings" msgid="8731721963449070017">"Відкрити налаштування"</string> <string name="group_system_access_google_assistant" msgid="7210074957915968110">"Відкрити додаток Асистент"</string> @@ -871,7 +866,7 @@ <string name="system_multitasking_rhs" msgid="8714224917276297810">"Розділити екран і показувати поточний додаток праворуч"</string> <string name="system_multitasking_lhs" msgid="8402954791206308783">"Розділити екран і показувати поточний додаток ліворуч"</string> <string name="system_multitasking_full_screen" msgid="336048080383640562">"Перейти з розділення екрана на весь екран"</string> - <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Під час розділення екрана перемикатися на додаток праворуч або внизу"</string> + <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> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Поточний додаток"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Доступність"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Комбінації клавіш"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Налаштуйте комбінації клавіш"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Комбінації клавіш для пошуку"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Нічого не знайдено"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Значок згортання"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Налаштувати"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Готово"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Значок розгортання"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"або"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Маркер переміщення"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Надано додатками"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Екран"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Невідомо"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Скинути панелі"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Відновити початковий порядок і розмір панелей?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Скинути всі панелі?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Усі панелі швидких налаштувань буде скинуто до стандартних налаштувань пристрою"</string> </resources> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index b72464cad145..f377ecd93d64 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"آپ کی اسکرین ریکارڈ کریں؟"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"ایک ایپ ریکارڈ کریں"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"پوری اسکرین کو ریکارڈ کریں"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"پوری اسکرین ریکارڈ کریں: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"جب آپ اپنی پوری اسکرین کو ریکارڈ کر رہے ہوتے ہیں تو آپ کی اسکرین پر دکھائی گئی ہر چیز ریکارڈ کی جاتی ہے۔ لہذا، پاس ورڈز، ادائیگی کی تفصیلات، پیغامات، تصاویر، ساتھ ہی آڈیو اور ویڈیو جیسی چیزوں کے سلسلے میں محتاط رہیں۔"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"جب آپ کسی ایپ کو ریکارڈ کر رہے ہوتے ہیں تو اس ایپ میں دکھائی گئی یا چلائی گئی ہر چیز ریکارڈ کی جاتی ہے۔ لہذا، پاس ورڈز، ادائیگی کی تفصیلات، پیغامات، تصاویر، ساتھ ہی آڈیو اور ویڈیو جیسی چیزوں کے سلسلے میں محتاط رہیں۔"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"اسکرین ریکارڈ کریں"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"آپ فی الحال <xliff:g id="APP_NAME">%1$s</xliff:g> ریکارڈ کر رہے ہیں"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"ریکارڈنگ روکیں"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"اسکرین کا اشتراک ہو رہا ہے"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"مواد کا اشتراک کیا جا رہا ہے"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"اسکرین کا اشتراک روکیں؟"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"اشتراک کرنا روکیں؟"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"آپ فی الحال <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> کے ساتھ اپنی پوری اسکرین کا اشتراک کر رہے ہیں"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"آپ فی الحال ایک ایپ کے ساتھ اپنی پوری اسکرین کا اشتراک کر رہے ہیں"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"آپ فی الحال <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> کا اشتراک کر رہے ہیں"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"آپ فی الحال ایک ایپ کا اشتراک کر رہے ہیں"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"آپ فی الحال ایک ایپ کے ساتھ اشتراک کر رہے ہیں"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"اشتراک کرنا روکیں"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"اسکرین کاسٹ ہو رہی ہے"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"کاسٹ کرنا بند کریں؟"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"مقفل اسکرین کے ویجیٹس"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"کوئی بھی آپ کی مقفل اسکرین پر ویجیٹ دیکھ سکتا ہے اگرچہ آپ کا ٹیبلیٹ مقفل ہو۔"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"ویجیٹ غیر منتخب کریں"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"اونچائی کم کریں"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"اونچائی بڑھائیں"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"مقفل اسکرین کے ویجیٹس"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ویجیٹ کے ذریعے ایپ کھولنے کے لیے آپ کو تصدیق کرنی ہوگی کہ یہ آپ ہی ہیں۔ نیز، ذہن میں رکھیں کہ کوئی بھی انہیں دیکھ سکتا ہے، یہاں تک کہ جب آپ کا ٹیبلیٹ مقفل ہو۔ ہو سکتا ہے کچھ ویجٹس آپ کی لاک اسکرین کے لیے نہ بنائے گئے ہوں اور یہاں شامل کرنا غیر محفوظ ہو سکتا ہے۔"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"سمجھ آ گئی"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"سبھی کو صاف کریں"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"نظم کریں"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"سرگزشت"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"اطلاع کی ترتیبات"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"اطلاع کی سرگزشت"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"نیا"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"خاموش"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"اطلاعات"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"ابھی شروع کریں"</string> <string name="empty_shade_text" msgid="8935967157319717412">"کوئی اطلاعات نہیں ہیں"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"کوئی نئی اطلاعات نہیں"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"ںوٹیفیکیشن کول ڈاؤن آن ہے"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"جب آپ کو ایک ساتھ بہت زیادہ اطلاعات موصول ہوتی ہیں تو آپ کے آلے کا والیوم اور الرٹس خودکار طور پر 2 منٹ تک کم ہو جاتے ہیں۔"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"آف کریں"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"پرانی اطلاعات دیکھنے کیلئے غیر مقفل کریں"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"مقرر"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"سر کی ٹریکنگ"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"رنگر وضع تبدیل کرنے کیلئے تھپتھپائیں"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"خاموش کریں"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"غیر خاموش کریں"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"وائبریٹ"</string> @@ -865,7 +860,7 @@ <string name="group_system_access_all_apps_search" msgid="1553588630154197469">"ایپس کی فہرست کھولیں"</string> <string name="group_system_access_system_settings" msgid="8731721963449070017">"ترتیبات کھولیں"</string> <string name="group_system_access_google_assistant" msgid="7210074957915968110">"اسسٹنٹ کھولیں"</string> - <string name="group_system_lock_screen" msgid="7391191300363416543">"مقفل اسکرین"</string> + <string name="group_system_lock_screen" msgid="7391191300363416543">"اسکرین لاک کریں"</string> <string name="group_system_quick_memo" msgid="3764560265935722903">"نوٹ لیں"</string> <string name="keyboard_shortcut_group_system_multitasking" msgid="6967816258924795558">"ملٹی ٹاسکنگ"</string> <string name="system_multitasking_rhs" msgid="8714224917276297810">"دائیں جانب موجودہ ایپ کے ساتھ اسپلٹ اسکرین کا استعمال کریں"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"موجودہ ایپ"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ایکسیسبیلٹی"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"کی بورڈ شارٹ کٹس"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"کی بورڈ شارٹ کٹس کو حسب ضرورت بنائیں"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"تلاش کے شارٹ کٹس"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"تلاش کا کوئی نتیجہ نہیں ہے"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"آئیکن سکیڑیں"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"حسب ضرورت بنائیں"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ہو گیا"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"آئیکن پھیلائیں"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"یا"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"گھسیٹنے کا ہینڈل"</string> @@ -1431,11 +1423,11 @@ <string name="launch_keyboard_tutorial_notification_title" msgid="8849933155160522519">"اپنے کی بورڈ کا استعمال کر کے نیویگیٹ کریں"</string> <string name="launch_keyboard_tutorial_notification_content" msgid="2880339951512757918">"کی بورڈ شارٹ کٹس جانیں"</string> <string name="launch_touchpad_tutorial_notification_title" msgid="2243780062772196901">"اپنے ٹچ پیڈ کا استعمال کر کے نیویگیٹ کریں"</string> - <string name="launch_touchpad_tutorial_notification_content" msgid="7931085031240753226">"ٹچ پیڈ کے اشارے کو جانیں"</string> + <string name="launch_touchpad_tutorial_notification_content" msgid="7931085031240753226">"ٹچ پیڈ کے اشاروں کو جانیں"</string> <string name="launch_keyboard_touchpad_tutorial_notification_title" msgid="1940023776496198762">"اپنے کی بورڈ اور ٹچ پیڈ کا استعمال کر کے نیویگیٹ کریں"</string> <string name="launch_keyboard_touchpad_tutorial_notification_content" msgid="1780725168171929365">"ٹچ پیڈ کے اشارے، کی بورڈ شارٹ کٹس اور مزید جانیں"</string> <string name="touchpad_tutorial_back_gesture_button" msgid="3104716365403620315">"واپس جائیں"</string> - <string name="touchpad_tutorial_home_gesture_button" msgid="8023973153559885624">"گھر جائیں"</string> + <string name="touchpad_tutorial_home_gesture_button" msgid="8023973153559885624">"ہوم پر جائیں"</string> <string name="touchpad_tutorial_recent_apps_gesture_button" msgid="8919227647650347359">"حالیہ ایپس دیکھیں"</string> <string name="touchpad_tutorial_done_button" msgid="176168488821755503">"ہو گیا"</string> <string name="touchpad_back_gesture_action_title" msgid="7199067250654332735">"واپس جائیں"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"ایپس کے ذریعہ فراہم کردہ"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"ڈسپلے"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"نامعلوم"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"ٹائلز ری سیٹ کریں"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"ٹائلز کو ان کے اصل آرڈر اور سائزز پر ری سیٹ کریں؟"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"سبھی ٹائلز ری سیٹ کریں؟"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"سبھی فوری ترتیبات کی ٹائلز آلہ کی اصل ترتیبات پر ری سیٹ ہو جائیں گی"</string> </resources> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index 7f6275c5a1d2..f8b944a672ce 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Ekran yozib olinsinmi?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Bitta ilovani yozib olish"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Butun ekranni yozib olish"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Butun ekranni yozib olish: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Butun ekranni yozib olishda ekranda koʻrsatilgan barcha axborotlar yozib olinadi. Shu sababli parollar, toʻlov tafsilotlari, xabarlar, suratlar, audio va video chiqmasligi uchun ehtiyot boʻling."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Ilovani yozib olishda ilova koʻrsatilgan yoki ijro etilgan barcha axborotlar yozib olinadi. Shu sababli parollar, toʻlov tafsilotlari, xabarlar, suratlar, audio va video chiqmasligi uchun ehtiyot boʻling."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Ekranni yozib olish"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Hozir <xliff:g id="APP_NAME">%1$s</xliff:g> ilovasi yozib olinmoqda"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Yozuvni toʻxtatish"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Ekran ulashilmoqda"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Kontent ulashilmoqda"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Ekran namoyishi toʻxtatilsinmi?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Ulashuv tugatilsinmi?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Hozir butun ekran <xliff:g id="HOST_APP_NAME">%1$s</xliff:g> ilovasiga ulashilmoqda"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Hozir butun ekran ilovaga ulashilmoqda"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Hozir <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g> ilovasiga kontent ulashilmoqda"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Hozir ilovaga kontent ulashilmoqda"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Hozir ilova bilan ulashilmoqda"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Namoyishni toʻxtatish"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Ekran translatsiya qilinmoqda"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Toʻxtatilsinmi?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Ekran qulfi vidjetlari"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Ekran quflidagi vidjetlar hammaga koʻrinadi, hatto planshet qulflanganda ham."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"vidjetni bekor qilish"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Balandligini kichraytirish"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Balandligini oshirish"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Ekran qulfi vidjetlari"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Ilovani vidjet orqali ochish uchun shaxsingizni tasdiqlashingiz kerak. Shuningdek, planshet qulflanganda ham bu axborotlar hammaga koʻrinishini unutmang. Ayrim vidjetlar ekran qulfiga moslanmagan va ularni bu yerda chiqarish xavfli boʻlishi mumkin."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Hammasini tozalash"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Boshqarish"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Tarix"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Bildirishnoma sozlamalari"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Bildirishnomalar tarixi"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Yangi"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Sokin"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Bildirishnomalar"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Boshlash"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Bildirishnomalar yo‘q"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Yangi bildirishoma yoʻq"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Bildirishnomalar ovozini pasaytirish yoniq"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Bir vaqtda juda koʻp bildirishnoma olsangiz, qurilmangiz tovushi va ogohlantirishlar 2 daqiqagacha avtomatik pasaytiriladi."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Faolsizlantirish"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Eskilarini koʻrish uchun qulfni yeching"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Statik"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Boshni kuzatish"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Jiringlagich rejimini oʻzgartirish uchun bosing"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"ovozsiz qilish"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"ovozni yoqish"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"tebranish"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Joriy ilova"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Qulayliklar"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Tezkor tugmalar"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Tezkor tugmalarni moslash"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Tezkor tugmalar qidiruvi"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Hech narsa topilmadi"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Yigʻish belgisi"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Moslash"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Tayyor"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Yoyish belgisi"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"yoki"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Surish dastagi"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Ilovalarga tegishli"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Ekran"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Noaniq"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Katakchalarni asliga qaytarish"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Katakchalar asl tartibi va oʻlchamiga qaytarilsinmi?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Barcha katakchalar asliga qaytarilsinmi?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Barcha Tezkor sozlamalar katakchalari qurilmaning asl sozlamalariga qaytariladi"</string> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 388ebb804828..bdcea11fa79a 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Ghi màn hình?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Ghi một ứng dụng"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Ghi toàn màn hình"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Ghi toàn bộ màn hình: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Khi bạn ghi toàn màn hình, mọi nội dung trên màn hình của bạn đều được ghi. Vì vậy, hãy thận trọng để không làm lộ thông tin như mật khẩu, thông tin thanh toán, tin nhắn, ảnh, âm thanh và video."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Khi bạn ghi một ứng dụng, mọi nội dung xuất hiện hoặc phát trong ứng dụng đó sẽ đều được ghi. Vì vậy, hãy thận trọng để không làm lộ thông tin như mật khẩu, thông tin thanh toán, tin nhắn, ảnh, âm thanh và video."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Ghi màn hình"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Bạn đang ghi lại nội dung của <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Dừng ghi"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Đang chia sẻ màn hình"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Chia sẻ nội dung"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Dừng chia sẻ màn hình?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Dừng chia sẻ?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Bạn đang chia sẻ toàn bộ nội dung trên màn hình với <xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Bạn đang chia sẻ toàn bộ nội dung trên màn hình với một ứng dụng"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Bạn đang chia sẻ nội dung của <xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Bạn đang chia sẻ một ứng dụng"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Bạn đang chia sẻ với một ứng dụng"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Dừng chia sẻ"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Đang truyền màn hình"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Dừng truyền?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Tiện ích trên màn hình khoá"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Ai cũng thấy được tiện ích trên màn hình khoá, kể cả khi khoá máy tính bảng."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"bỏ chọn tiện ích"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Giảm chiều cao"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Tăng chiều cao"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Tiện ích trên màn hình khoá"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Để dùng tiện ích mở một ứng dụng, bạn cần xác minh danh tính của mình. Ngoài ra, hãy lưu ý rằng bất kỳ ai cũng có thể xem các tiện ích này, ngay cả khi máy tính bảng của bạn được khoá. Một số tiện ích có thể không dành cho màn hình khoá và không an toàn khi thêm vào đây."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Tôi hiểu"</string> @@ -595,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Bắt đầu ngay"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Không có thông báo nào"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Không có thông báo mới"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Chế độ Giảm dần âm lượng thông báo đang bật"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Khi bạn nhận quá nhiều thông báo cùng lúc, âm lượng và cảnh báo tự động giảm trong tối đa 2 phút."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Tắt"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Mở khoá để xem thông báo cũ"</string> @@ -703,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Cố định"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Theo dõi chuyển động của đầu"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Nhấn để thay đổi chế độ chuông"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"tắt tiếng"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"bật tiếng"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"rung"</string> @@ -1403,7 +1400,7 @@ <string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) đang dùng"</string> <string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) đã dùng gần đây"</string> <string name="shortcut_helper_category_system" msgid="462110876978937359">"Hệ thống"</string> - <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Cài đặt hệ thống"</string> + <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Điều khiển hệ thống"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Ứng dụng hệ thống"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Đa nhiệm"</string> <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Ứng dụng gần đây"</string> @@ -1413,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"Ứng dụng hiện tại"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Hỗ trợ tiếp cận"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Phím tắt"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> - <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Lối tắt tìm kiếm"</string> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Tuỳ chỉnh phím tắt"</string> + <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Tìm lối tắt"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Không có kết quả tìm kiếm nào"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Biểu tượng Thu gọn"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Tuỳ chỉnh"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Xong"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Biểu tượng Mở rộng"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"hoặc"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Nút kéo"</string> @@ -1483,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Do các ứng dụng cung cấp"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Hiển thị"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Không xác định"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Đặt lại các ô"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Đặt lại các ô về thứ tự và kích thước ban đầu?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Đặt lại mọi ô?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Mọi ô Cài đặt nhanh sẽ được đặt lại về chế độ cài đặt ban đầu của thiết bị"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index b463900a331d..21015392b6d0 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"要录制屏幕吗？"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"录制单个应用"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"录制整个屏幕"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"全屏录制：%s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"录制整个屏幕时，屏幕上显示的所有内容均会被录制。因此，请务必小心操作，谨防泄露密码、付款信息、消息、照片、音频、视频等。"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"录制单个应用时，该应用中显示或播放的所有内容均会被录制。因此，请务必小心操作，谨防泄露密码、付款信息、消息、照片、音频、视频等。"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"录制屏幕"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"您正在录制“<xliff:g id="APP_NAME">%1$s</xliff:g>”"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"停止录制"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"正在共享屏幕"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"分享内容"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"要停止共享屏幕吗？"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"要停止分享吗？"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"您正在与“<xliff:g id="HOST_APP_NAME">%1$s</xliff:g>”分享整个屏幕"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"您正在与一个应用分享整个屏幕"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"您正在分享“<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>”的画面"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"您正在分享一个应用的画面"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"您目前正在与应用进行分享"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"停止共享"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"正在投屏"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"停止投屏吗？"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"锁屏微件"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"任何人都可以查看锁屏上的微件，平板电脑处于锁定状态时也是如此。"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"取消选中微件"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"减小高度"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"增加高度"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"锁屏微件"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"若要使用微件打开应用，您需要验证是您本人在操作。另外请注意，任何人都可以查看此类微件，即使您的平板电脑已锁定。有些微件可能不适合显示在锁定的屏幕中，因此添加到这里可能不安全。"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"知道了"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"全部清除"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"管理"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"历史记录"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"通知设置"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"通知历史记录"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"最新"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"静音"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"通知"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"立即开始"</string> <string name="empty_shade_text" msgid="8935967157319717412">"没有通知"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"没有新通知"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"已触发“通知音量渐降”"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"如果您在短时间内收到很多通知，设备音量和提醒次数会自动降低，最长持续 2 分钟。"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"关闭"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"解锁即可查看旧通知"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"固定"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"头部跟踪"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"点按即可更改振铃器模式"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"静音"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"取消静音"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"振动"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"当前应用"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"无障碍功能"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"键盘快捷键"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"自定义键盘快捷键"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"搜索快捷键"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"无搜索结果"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"收起图标"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"自定义"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"完成"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"展开图标"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"或"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"拖动手柄"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"由应用提供"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"显示"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"未知"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"重置功能块"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"要将功能块重置为原始排序和大小吗？"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"要重置所有功能块吗？"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"所有“快捷设置”功能块都将重置为设备的原始设置"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 91185912af9d..b2e7886fa6eb 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"要錄影螢幕畫面嗎？"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"錄影一個應用程式"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"錄影整個螢幕畫面"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"錄製整個螢幕：%s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"當你錄影整個螢幕畫面時，系統會錄影螢幕畫面上顯示的任何內容。因此，請謹慎處理密碼、付款資料、訊息、相片、音訊和影片等。"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"當你錄影應用程式時，系統會錄影該應用程式中顯示或播放的任何內容。因此，請謹慎處理密碼、付款資料、訊息、相片、音訊和影片等。"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"錄影螢幕畫面"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"你正在錄影「<xliff:g id="APP_NAME">%1$s</xliff:g>」"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"停止錄製"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"正在分享螢幕"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"分享內容"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"要停止分享螢幕嗎？"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"要停止分享嗎？"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"你正與「<xliff:g id="HOST_APP_NAME">%1$s</xliff:g>」分享整個螢幕畫面"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"你正與一個應用程式分享整個螢幕畫面"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"你正在分享「<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>」"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"你正在分享一個應用程式"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"你正與一個應用程式分享內容"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"停止分享"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"正在投放螢幕"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"要停止投放嗎？"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"上鎖畫面小工具"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"無論平板電腦的螢幕是否已上鎖，任何人都可以看到上鎖畫面小工具。"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"取消揀小工具"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"調低高度"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"調高高度"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"上鎖畫面小工具"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"如要使用小工具開啟應用程式，系統會要求你驗證身分。請注意，所有人都能查看小工具，即使平板電腦已鎖定亦然。部分小工具可能不適用於上鎖畫面，新增至這裡可能會有安全疑慮。"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"知道了"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"全部清除"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"管理"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"記錄"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"通知設定"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"通知記錄"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"新"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"靜音"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"通知"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"立即開始"</string> <string name="empty_shade_text" msgid="8935967157319717412">"沒有通知"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"沒有新通知"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"通知緩和已開啟"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"當你在短時間內收到太多通知時，裝置就會調低音量並減少通知數量最多兩分鐘。"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"關閉"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"解鎖即可查看舊通知"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"固定"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"頭部追蹤"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"輕按即可變更響鈴模式"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"靜音"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"取消靜音"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"震動"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"目前的應用程式"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"無障礙功能"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"鍵盤快速鍵"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"自訂鍵盤快速鍵"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"搜尋快速鍵"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"沒有相符的搜尋結果"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"收合圖示"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"自訂"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"完成"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"展開圖示"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"或"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"拖曳控點"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"由應用程式提供"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"螢幕"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"不明"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"重設圖塊"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"要重設圖塊的順序和大小嗎？"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"要重設所有圖塊嗎？"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"所有「快速設定」圖塊將重設為裝置的原始設定"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 2189cbfdf278..adb2838345a7 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"要錄製畫面嗎？"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"錄製單一應用程式"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"錄製整個畫面"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"錄製整個畫面：%s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"錄製整個畫面時，系統會錄下畫面上的所有內容。因此，請謹慎處理密碼、付款資料、訊息、相片和影音內容等資訊。"</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"當你錄製應用程式畫面時，系統會錄下該應用程式顯示或播放的所有內容。因此，請謹慎處理密碼、付款資料、訊息、相片和影音內容等資訊。"</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"錄製畫面"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"目前正在錄製「<xliff:g id="APP_NAME">%1$s</xliff:g>」的畫面"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"停止錄製"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"正在分享畫面"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"正在分享內容"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"停止分享？"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"要停止分享嗎？"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"目前正在與「<xliff:g id="HOST_APP_NAME">%1$s</xliff:g>」分享整個畫面"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"目前正在與某個應用程式分享整個畫面"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"目前正在分享「<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>」的畫面"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"目前正在分享應用程式畫面"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"目前正在與應用程式分享內容"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"停止分享"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"正在投放畫面"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"停止投放？"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"螢幕鎖定小工具"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"即使平板電腦已鎖定，所有人仍可查看螢幕鎖定畫面上的小工具。"</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"取消選取小工具"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"調低"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"調高"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"螢幕鎖定小工具"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"如要使用小工具開啟應用程式，需先驗證身分。請留意，即使平板電腦已鎖定，所有人都還是能查看小工具。某些小工具可能不適用於螢幕鎖定畫面，新增到此可能會有安全疑慮。"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"我知道了"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"全部清除"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"管理"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"記錄"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"通知設定"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"通知記錄"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"最新"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"靜音"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"通知"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"立即開始"</string> <string name="empty_shade_text" msgid="8935967157319717412">"沒有通知"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"沒有新通知"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"通知緩和設定已開啟"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"如果一次收到過多通知，裝置就會自動降低音量並減少通知數量，持續時間最多 2 分鐘。"</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"關閉"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"解鎖即可查看舊通知"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"固定"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"頭部追蹤"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"輕觸即可變更鈴聲模式"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"靜音"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"取消靜音"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"震動"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"目前的應用程式"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"無障礙"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"鍵盤快速鍵"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"自訂鍵盤快速鍵"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"搜尋快速鍵"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"找不到相符的搜尋結果"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"收合圖示"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"自訂"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"完成"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"展開圖示"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"或"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"拖曳控點"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"由應用程式提供"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"螢幕"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"不明"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"重設設定方塊"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"要將設定方塊的順序和大小恢復預設值嗎？"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"要重設所有設定方塊嗎？"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"所有快速設定方塊都會恢復裝置的原始設定"</string> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 05b5040faf85..245ece888fd1 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -112,8 +112,7 @@ <string name="screenrecord_permission_dialog_title" msgid="7415261783188749730">"Rekhoda isikrini sakho?"</string> <string name="screenrecord_permission_dialog_option_text_single_app" msgid="1996450687814647583">"Rekhoda i-app eyodwa"</string> <string name="screenrecord_permission_dialog_option_text_entire_screen" msgid="2794896384693120020">"Rekhoda sonke isikrini"</string> - <!-- no translation found for screenrecord_permission_dialog_option_text_entire_screen_for_display (3754611651558838691) --> - <skip /> + <string name="screenrecord_permission_dialog_option_text_entire_screen_for_display" msgid="3754611651558838691">"Rekhoda sonke isikrini: %s"</string> <string name="screenrecord_permission_dialog_warning_entire_screen" msgid="1321758636709366068">"Uma urekhoda sonke isikrini sakho, noma yini evela esikrinini iyarekhodwa. Ngakho-ke qaphela ngezinto ezifana namaphasiwedi, imininingwane yenkokhelo, imilayezo, izithombe, nomsindo nevidiyo."</string> <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"Uma urekhoda i-app, noma yini evezwa noma edlala kuleyo app iyarekhodwa. Ngakho-ke qaphela ngezinto ezifana namaphasiwedi, imininingwane yenkokhelo, imilayezo, izithombe, nomsindo nevidiyo."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"Rekhoda isikrini"</string> @@ -138,17 +137,14 @@ <string name="screenrecord_stop_dialog_message_specific_app" msgid="5995770227684523244">"Njengamanje urekhoda i-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="screenrecord_stop_dialog_button" msgid="2883812564938194350">"Misa ukurekhoda"</string> <string name="share_to_app_chip_accessibility_label" msgid="4210256229976947065">"Yabelana ngesikrini"</string> - <!-- no translation found for share_to_app_chip_accessibility_label_generic (5517431657924536133) --> - <skip /> + <string name="share_to_app_chip_accessibility_label_generic" msgid="5517431657924536133">"Ukwabelana ngokuqukethwe"</string> <string name="share_to_app_stop_dialog_title" msgid="9212915050910250438">"Misa ukwabelana ngeskrini?"</string> - <!-- no translation found for share_to_app_stop_dialog_title_generic (9079161538135843648) --> - <skip /> + <string name="share_to_app_stop_dialog_title_generic" msgid="9079161538135843648">"Misa ukwabelana?"</string> <string name="share_to_app_stop_dialog_message_entire_screen_with_host_app" msgid="522823522115375414">"Njengamanje wabelana ngaso sonke isikrini sakho ne-<xliff:g id="HOST_APP_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_entire_screen" msgid="5090115386271179270">"Njengamanje wabelana ngaso sonke isikrini sakho ne-app"</string> <string name="share_to_app_stop_dialog_message_single_app_specific" msgid="5923772039347985172">"Njengamanje wabelana nge-<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>"</string> <string name="share_to_app_stop_dialog_message_single_app_generic" msgid="6681016774654578261">"Njengamanje wabelana nge-app"</string> - <!-- no translation found for share_to_app_stop_dialog_message_generic (7622174291691249392) --> - <skip /> + <string name="share_to_app_stop_dialog_message_generic" msgid="7622174291691249392">"Njengamanje wabelana ne-app"</string> <string name="share_to_app_stop_dialog_button" msgid="6334056916284230217">"Misa ukwabelana"</string> <string name="cast_screen_to_other_device_chip_accessibility_label" msgid="4687917476203009885">"Isikrini sokusakaza"</string> <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"Misa ukusakaza?"</string> @@ -523,10 +519,8 @@ <string name="communal_widget_picker_title" msgid="1953369090475731663">"Amawijethi wesikrini esikhiyiwe"</string> <string name="communal_widget_picker_description" msgid="490515450110487871">"Noma ubani angabuka amawijethi ngisho noma ithebulethi ikhiyiwe."</string> <string name="accessibility_action_label_unselect_widget" msgid="1041811747619468698">"yeka ukukhetha iwijethi"</string> - <!-- no translation found for accessibility_action_label_shrink_widget (8259511040536438771) --> - <skip /> - <!-- no translation found for accessibility_action_label_expand_widget (9190524260912211759) --> - <skip /> + <string name="accessibility_action_label_shrink_widget" msgid="8259511040536438771">"Nciphisa ubude"</string> + <string name="accessibility_action_label_expand_widget" msgid="9190524260912211759">"Khuphula ubude"</string> <string name="communal_widgets_disclaimer_title" msgid="1150954395585308868">"Amawijethi wesikrini esikhiyiwe"</string> <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Ukuze uvule i-app usebenzisa iwijethi, uzodinga ukuqinisekisa ukuthi nguwe. Futhi, khumbula ukuthi noma ubani angakwazi ukuzibuka, nanoma ithebhulethi yakho ikhiyiwe. Amanye amawijethi kungenzeka abengahloselwe ukukhiya isikrini sakho futhi kungenzeka awaphephile ukuthi angafakwa lapha."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Ngiyezwa"</string> @@ -583,10 +577,8 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Sula konke"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Phatha"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Umlando"</string> - <!-- no translation found for notification_settings_button_description (2441994740884163889) --> - <skip /> - <!-- no translation found for notification_history_button_description (1578657591405033383) --> - <skip /> + <string name="notification_settings_button_description" msgid="2441994740884163889">"Amasethingi esaziso"</string> + <string name="notification_history_button_description" msgid="1578657591405033383">"Umlando wesaziso"</string> <string name="notification_section_header_incoming" msgid="850925217908095197">"Okusha"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Kuthulile"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Izaziso"</string> @@ -597,7 +589,8 @@ <string name="media_projection_action_text" msgid="3634906766918186440">"Qala manje"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Azikho izaziso"</string> <string name="no_unseen_notif_text" msgid="395512586119868682">"Azikho izaziso ezintsha"</string> - <string name="adaptive_notification_edu_hun_title" msgid="7790738150177329960">"Ukwehlisa umsindo wezaziso kuvuliwe"</string> + <!-- no translation found for adaptive_notification_edu_hun_title (2594042455998795122) --> + <skip /> <string name="adaptive_notification_edu_hun_text" msgid="7743367744129536610">"Ivolumu yedivayisi yakho kanye nezexwayiso kuncishiswa ngokuzenzakalelayo imizuzu efika kwemi-2 lapho uthola izaziso eziningi kakhulu ngesikhathi esisodwa."</string> <string name="go_to_adaptive_notification_settings" msgid="2423690125178298479">"Vala"</string> <string name="unlock_to_see_notif_text" msgid="7439033907167561227">"Vula ukuze ubone izaziso ezindala"</string> @@ -705,6 +698,8 @@ <string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Okugxilile"</string> <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Ukulandelela Ikhanda"</string> <string name="volume_ringer_change" msgid="3574969197796055532">"Thepha ukuze ushintshe imodi yokukhala"</string> + <!-- no translation found for volume_ringer_mode (6867838048430807128) --> + <skip /> <string name="volume_ringer_hint_mute" msgid="4263821214125126614">"thulisa"</string> <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"susa ukuthula"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"dlidliza"</string> @@ -1415,15 +1410,12 @@ <string name="shortcut_helper_category_current_app_shortcuts" msgid="4017840565974573628">"I-App yamanje"</string> <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Ukufinyeleleka"</string> <string name="shortcut_helper_title" msgid="8567500639300970049">"Izinqamuleli zekhibhodi"</string> - <!-- no translation found for shortcut_helper_customize_mode_title (1467657117101096033) --> - <skip /> + <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Hlela izinqamuleli zekhibhodi ngendlela oyifisayo"</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Sesha izinqamuleli"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ayikho imiphumela yosesho"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Goqa isithonjana"</string> - <!-- no translation found for shortcut_helper_customize_button_text (3124983502748069338) --> - <skip /> - <!-- no translation found for shortcut_helper_done_button_text (7249905942125386191) --> - <skip /> + <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Enza ngendlela oyifisayo"</string> + <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Kwenziwe"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Nweba isithonjana"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"noma"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Hudula isibambi"</string> @@ -1485,6 +1477,6 @@ <string name="qs_edit_mode_category_providedByApps" msgid="8346112074897919019">"Kuhlinzekwe ama-app"</string> <string name="qs_edit_mode_category_display" msgid="4749511439121053942">"Bonisa"</string> <string name="qs_edit_mode_category_unknown" msgid="509314252124053550">"Akwaziwa"</string> - <string name="qs_edit_mode_reset_dialog_title" msgid="8841270491554460726">"Setha amathayela kabusha"</string> - <string name="qs_edit_mode_reset_dialog_content" msgid="8626426097929954027">"Setha kabusha amathayela ekuhlelekeni nakosayizi bawo bangempela?"</string> + <string name="qs_edit_mode_reset_dialog_title" msgid="5344853290033761627">"Qala kabusha onke amathayela?"</string> + <string name="qs_edit_mode_reset_dialog_content" msgid="7474773130622653653">"Ithayela Lamasethingi Asheshayo lizosetha kabusha libuyele kumasethingi okuqala edivayisi"</string> </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index c8ef093c40db..82c8c44f1efe 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -116,7 +116,7 @@ <!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" --> <string name="quick_settings_tiles_stock" translatable="false"> - internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded,color_correction,dream,font_scaling,record_issue,hearing_devices + internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded,color_correction,dream,font_scaling,record_issue,hearing_devices,notes </string> <!-- The tiles to display in QuickSettings --> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 7b50582efe64..5a8417d7db9d 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1004,6 +1004,9 @@ <!-- QuickSettings: Tool name for hearing devices dialog related tools [CHAR LIMIT=40] [BACKUP_MESSAGE_ID=8916875614623730005]--> <string name="quick_settings_hearing_devices_live_caption_title">Live Caption</string> + <!-- QuickSettings: Notes tile. The label of a quick settings tile for launching the default notes taking app. [CHAR LIMIT=NONE] --> + <string name="quick_settings_notes_label">Note</string> + <!--- Title of dialog triggered if the microphone is disabled but an app tried to access it. [CHAR LIMIT=150] --> <string name="sensor_privacy_start_use_mic_dialog_title">Unblock device microphone?</string> <!--- Title of dialog triggered if the camera is disabled but an app tried to access it. [CHAR LIMIT=150] --> @@ -2270,6 +2273,8 @@ <string name="system_multitasking_splitscreen_focus_lhs">Switch to app on left or above while using split screen</string> <!-- User visible title for the keyboard shortcut that replaces an app from one to another during split screen [CHAR LIMIT=70] --> <string name="system_multitasking_replace">During split screen: replace an app from one to another</string> + <!-- User visible title for the keyboard shortcut that moves a focused task to a next display [CHAR LIMIT=70] --> + <string name="system_multitasking_move_to_next_display">Move active window between displays</string> <!-- User visible title for the input keyboard shortcuts list. [CHAR LIMIT=70] --> <string name="keyboard_shortcut_group_input">Input</string> diff --git a/packages/SystemUI/res/values/tiles_states_strings.xml b/packages/SystemUI/res/values/tiles_states_strings.xml index ad09b466dd3e..d885e00fbe82 100644 --- a/packages/SystemUI/res/values/tiles_states_strings.xml +++ b/packages/SystemUI/res/values/tiles_states_strings.xml @@ -348,4 +348,14 @@ <item>Off</item> <item>On</item> </string-array> + + <!-- State names for notes tile: unavailable, off, on. + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as + if they could appear. [CHAR LIMIT=32] --> + <string-array name="tile_states_notes"> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> + </string-array> </resources>
\ No newline at end of file diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl index 283e4556d05c..83ca496dbef2 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl @@ -115,23 +115,23 @@ oneway interface IOverviewProxy { /** * Sent when {@link TaskbarDelegate#checkNavBarModes} is called. */ - void checkNavBarModes() = 30; + void checkNavBarModes(int displayId) = 30; /** * Sent when {@link TaskbarDelegate#finishBarAnimations} is called. */ - void finishBarAnimations() = 31; + void finishBarAnimations(int displayId) = 31; /** * Sent when {@link TaskbarDelegate#touchAutoDim} is called. {@param reset} is true, when auto * dim is reset after a timeout. */ - void touchAutoDim(boolean reset) = 32; + void touchAutoDim(int displayid, boolean reset) = 32; /** * Sent when {@link TaskbarDelegate#transitionTo} is called. */ - void transitionTo(int barMode, boolean animate) = 33; + void transitionTo(int displayId, int barMode, boolean animate) = 33; /** * Sent when {@link TaskbarDelegate#appTransitionPending} is called. diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index eda07cfe8d91..f98890ec9c5d 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -2691,9 +2691,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab */ public boolean isUserUnlocked(int userId) { if (Flags.userEncryptedSource()) { - boolean userStorageUnlocked = mUserManager.isUserUnlocked(userId); - mLogger.logUserStorageUnlocked(userId, userStorageUnlocked); - return userStorageUnlocked; + return mUserManager.isUserUnlocked(userId); } else { return mUserIsUnlocked.get(userId); } diff --git a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt b/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt index b3ddde38509a..12fc3c262367 100644 --- a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt +++ b/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt @@ -582,18 +582,6 @@ constructor(@KeyguardUpdateMonitorLog private val logBuffer: LogBuffer) { logBuffer.log(TAG, DEBUG, { int1 = userId }, { "userUnlocked userId: $int1" }) } - fun logUserStorageUnlocked(userId: Int, result: Boolean) { - logBuffer.log( - TAG, - DEBUG, - { - int1 = userId - bool1 = result - }, - { "Invoked UserManager#isUserUnlocked $int1, result: $bool1" }, - ) - } - fun logUserStopped(userId: Int, isUnlocked: Boolean) { logBuffer.log( TAG, diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/FingerprintPropertyInteractor.kt b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/FingerprintPropertyInteractor.kt index b8ff3bb43203..178e1112fa6f 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/FingerprintPropertyInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/FingerprintPropertyInteractor.kt @@ -24,6 +24,7 @@ import com.android.systemui.biometrics.shared.model.SensorLocation import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow @@ -42,7 +43,7 @@ constructor( @Application private val applicationScope: CoroutineScope, @Application private val context: Context, repository: FingerprintPropertyRepository, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, displayStateInteractor: DisplayStateInteractor, udfpsOverlayInteractor: UdfpsOverlayInteractor, ) { @@ -73,15 +74,12 @@ constructor( * - device's natural orientation */ private val unscaledSensorLocation: Flow<SensorLocationInternal> = - combine( - repository.sensorLocations, - uniqueDisplayId, - ) { locations, displayId -> + combine(repository.sensorLocations, uniqueDisplayId) { locations, displayId -> // Devices without multiple physical displays do not use the display id as the key; // instead, the key is an empty string. locations.getOrDefault( displayId, - locations.getOrDefault("", SensorLocationInternal.DEFAULT) + locations.getOrDefault("", SensorLocationInternal.DEFAULT), ) } @@ -92,16 +90,15 @@ constructor( * - device's natural orientation */ val sensorLocation: Flow<SensorLocation> = - combine( + combine(unscaledSensorLocation, configurationInteractor.scaleForResolution) { unscaledSensorLocation, - configurationInteractor.scaleForResolution, - ) { unscaledSensorLocation, scale -> + scale -> val sensorLocation = SensorLocation( naturalCenterX = unscaledSensorLocation.sensorLocationX, naturalCenterY = unscaledSensorLocation.sensorLocationY, naturalRadius = unscaledSensorLocation.sensorRadius, - scale = scale + scale = scale, ) sensorLocation } diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt index e178c093b746..7039d5e7d9b0 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt @@ -17,6 +17,7 @@ package com.android.systemui.bouncer.domain.interactor import android.app.StatusBarManager.SESSION_KEYGUARD +import com.android.app.tracing.coroutines.asyncTraced as async import com.android.compose.animation.scene.SceneKey import com.android.internal.logging.UiEventLogger import com.android.systemui.authentication.domain.interactor.AuthenticationInteractor @@ -39,9 +40,9 @@ import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.scene.domain.interactor.SceneBackInteractor import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.scene.shared.model.Scenes +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject import kotlinx.coroutines.CoroutineScope -import com.android.app.tracing.coroutines.asyncTraced as async import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow @@ -65,7 +66,7 @@ constructor( private val uiEventLogger: UiEventLogger, private val sessionTracker: SessionTracker, sceneBackInteractor: SceneBackInteractor, - private val configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware private val configurationInteractor: ConfigurationInteractor, ) { private val _onIncorrectBouncerInput = MutableSharedFlow<Unit>() val onIncorrectBouncerInput: SharedFlow<Unit> = _onIncorrectBouncerInput diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerUserActionsViewModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerUserActionsViewModel.kt index 4fe6fc69e8be..f50a2ab1d803 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerUserActionsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerUserActionsViewModel.kt @@ -18,7 +18,6 @@ package com.android.systemui.bouncer.ui.viewmodel import com.android.compose.animation.scene.Back import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.UserAction import com.android.compose.animation.scene.UserActionResult import com.android.systemui.bouncer.domain.interactor.BouncerInteractor @@ -33,16 +32,14 @@ import kotlinx.coroutines.flow.map */ class BouncerUserActionsViewModel @AssistedInject -constructor( - private val bouncerInteractor: BouncerInteractor, -) : UserActionsViewModel() { +constructor(private val bouncerInteractor: BouncerInteractor) : UserActionsViewModel() { override suspend fun hydrateActions(setActions: (Map<UserAction, UserActionResult>) -> Unit) { bouncerInteractor.dismissDestination .map { prevScene -> mapOf( Back to UserActionResult(prevScene), - Swipe(SwipeDirection.Down) to UserActionResult(prevScene), + Swipe.Down to UserActionResult(prevScene), ) } .collect { actions -> setActions(actions) } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/PluginModule.java b/packages/SystemUI/src/com/android/systemui/dagger/PluginModule.java index d727a70de377..769d7faad2b0 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/PluginModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/PluginModule.java @@ -16,6 +16,7 @@ package com.android.systemui.dagger; + import com.android.systemui.classifier.FalsingManagerProxy; import com.android.systemui.globalactions.GlobalActionsComponent; import com.android.systemui.globalactions.GlobalActionsImpl; @@ -26,18 +27,20 @@ import com.android.systemui.plugins.GlobalActions; import com.android.systemui.plugins.VolumeDialogController; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.statusbar.StatusBarStateControllerImpl; +import com.android.systemui.statusbar.data.repository.DarkIconDispatcherStore; +import com.android.systemui.statusbar.data.repository.SysuiDarkIconDispatcherStore; import com.android.systemui.statusbar.phone.ActivityStarterImpl; -import com.android.systemui.statusbar.phone.DarkIconDispatcherImpl; import com.android.systemui.statusbar.phone.SysuiDarkIconDispatcher; import com.android.systemui.volume.VolumeDialogControllerImpl; import dagger.Binds; import dagger.Module; +import dagger.Provides; /** * Module for binding Plugin implementations. * - * TODO(b/166258224): Many of these should be moved closer to their implementations. + * <p>TODO(b/166258224): Many of these should be moved closer to their implementations. */ @Module public abstract class PluginModule { @@ -47,12 +50,18 @@ public abstract class PluginModule { abstract ActivityStarter provideActivityStarter(ActivityStarterImpl activityStarterImpl); /** */ - @Binds - abstract DarkIconDispatcher provideDarkIconDispatcher(DarkIconDispatcherImpl controllerImpl); + @Provides + @SysUISingleton + static DarkIconDispatcher provideDarkIconDispatcher(DarkIconDispatcherStore store) { + return store.getDefaultDisplay(); + } - @Binds - abstract SysuiDarkIconDispatcher provideSysuiDarkIconDispatcher( - DarkIconDispatcherImpl controllerImpl); + @Provides + @SysUISingleton + static SysuiDarkIconDispatcher provideSysuiDarkIconDispatcher( + SysuiDarkIconDispatcherStore store) { + return store.getDefaultDisplay(); + } /** */ @Binds diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index b431636b0e8b..c62593063020 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -15,7 +15,6 @@ */ package com.android.systemui.flags -import android.provider.DeviceConfig import com.android.internal.annotations.Keep import com.android.systemui.flags.FlagsFactory.releasedFlag import com.android.systemui.flags.FlagsFactory.resourceBooleanFlag @@ -220,10 +219,6 @@ object Flags { // TODO(b/293380347): Tracking Bug @JvmField val COLOR_FIDELITY = unreleasedFlag("color_fidelity") - // 900 - media - // TODO(b/254512697): Tracking Bug - val MEDIA_TAP_TO_TRANSFER = releasedFlag("media_tap_to_transfer") - // TODO(b/254512654): Tracking Bug @JvmField val DREAM_MEDIA_COMPLICATION = unreleasedFlag("dream_media_complication") @@ -255,15 +250,6 @@ object Flags { val WM_ENABLE_SHELL_TRANSITIONS = sysPropBooleanFlag("persist.wm.debug.shell_transit", default = true) - // TODO(b/254513207): Tracking Bug to delete - @Keep - @JvmField - val WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES = - releasedFlag( - name = "enable_screen_record_enterprise_policies", - namespace = DeviceConfig.NAMESPACE_WINDOW_MANAGER, - ) - // TODO(b/293252410) : Tracking Bug @JvmField val LOCKSCREEN_ENABLE_LANDSCAPE = unreleasedFlag("lockscreen.enable_landscape") diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/docking/ui/viewmodel/KeyboardDockingIndicationViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyboard/docking/ui/viewmodel/KeyboardDockingIndicationViewModel.kt index f0b2b86d67a0..38fc2a80ad02 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/docking/ui/viewmodel/KeyboardDockingIndicationViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/docking/ui/viewmodel/KeyboardDockingIndicationViewModel.kt @@ -19,17 +19,18 @@ package com.android.systemui.keyboard.docking.ui.viewmodel import android.content.Context import android.view.Surface import android.view.WindowManager +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.settingslib.Utils import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.keyboard.docking.domain.interactor.KeyboardDockingIndicationInteractor +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.surfaceeffects.glowboxeffect.GlowBoxConfig import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow -import com.android.app.tracing.coroutines.launchTraced as launch @SysUISingleton class KeyboardDockingIndicationViewModel @@ -38,7 +39,7 @@ constructor( private val windowManager: WindowManager, private val context: Context, keyboardDockingIndicationInteractor: KeyboardDockingIndicationInteractor, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, @Background private val backgroundScope: CoroutineScope, ) { @@ -128,7 +129,7 @@ constructor( blurAmount = BLUR_AMOUNT, duration = DURATION, easeInDuration = EASE_DURATION, - easeOutDuration = EASE_DURATION + easeOutDuration = EASE_DURATION, ) } diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/MultitaskingShortcutsSource.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/MultitaskingShortcutsSource.kt index 05ff0cc30a44..0201f402af2a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/MultitaskingShortcutsSource.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/MultitaskingShortcutsSource.kt @@ -17,6 +17,7 @@ package com.android.systemui.keyboard.shortcut.data.source import android.content.res.Resources +import android.view.KeyEvent.KEYCODE_D import android.view.KeyEvent.KEYCODE_DPAD_LEFT import android.view.KeyEvent.KEYCODE_DPAD_RIGHT import android.view.KeyEvent.KEYCODE_DPAD_UP @@ -29,6 +30,7 @@ import android.view.KeyboardShortcutGroup import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.keyboard.shortcut.data.model.shortcutInfo import com.android.systemui.res.R +import com.android.window.flags.Flags.enableMoveToNextDisplayShortcut import javax.inject.Inject class MultitaskingShortcutsSource @Inject constructor(@Main private val resources: Resources) : @@ -38,42 +40,62 @@ class MultitaskingShortcutsSource @Inject constructor(@Main private val resource listOf( KeyboardShortcutGroup( resources.getString(R.string.shortcutHelper_category_recent_apps), - recentsShortcuts() + recentsShortcuts(), ), KeyboardShortcutGroup( resources.getString(R.string.shortcutHelper_category_split_screen), - splitScreenShortcuts() - ) + splitScreenShortcuts(), + ), ) - private fun splitScreenShortcuts() = - listOf( - // Enter Split screen with current app to RHS: - // - Meta + Ctrl + Right arrow + private fun splitScreenShortcuts() = buildList { + // Enter Split screen with current app to RHS: + // - Meta + Ctrl + Right arrow + add( shortcutInfo(resources.getString(R.string.system_multitasking_rhs)) { command(META_META_ON or META_CTRL_ON, KEYCODE_DPAD_RIGHT) - }, - // Enter Split screen with current app to LHS: - // - Meta + Ctrl + Left arrow + } + ) + // Enter Split screen with current app to LHS: + // - Meta + Ctrl + Left arrow + add( shortcutInfo(resources.getString(R.string.system_multitasking_lhs)) { command(META_META_ON or META_CTRL_ON, KEYCODE_DPAD_LEFT) - }, - // Switch from Split screen to full screen: - // - Meta + Ctrl + Up arrow + } + ) + // Switch from Split screen to full screen: + // - Meta + Ctrl + Up arrow + add( shortcutInfo(resources.getString(R.string.system_multitasking_full_screen)) { command(META_META_ON or META_CTRL_ON, KEYCODE_DPAD_UP) - }, - // Change split screen focus to RHS: - // - Meta + Alt + Right arrow + } + ) + // Change split screen focus to RHS: + // - Meta + Alt + Right arrow + add( shortcutInfo(resources.getString(R.string.system_multitasking_splitscreen_focus_rhs)) { command(META_META_ON or META_ALT_ON, KEYCODE_DPAD_RIGHT) - }, - // Change split screen focus to LHS: - // - Meta + Alt + Left arrow + } + ) + // Change split screen focus to LHS: + // - Meta + Alt + Left arrow + add( shortcutInfo(resources.getString(R.string.system_multitasking_splitscreen_focus_lhs)) { command(META_META_ON or META_ALT_ON, KEYCODE_DPAD_LEFT) - }, + } ) + if (enableMoveToNextDisplayShortcut()) { + // Move a window to the next display: + // - Meta + Ctrl + D + add( + shortcutInfo( + resources.getString(R.string.system_multitasking_move_to_next_display) + ) { + command(META_META_ON or META_CTRL_ON, KEYCODE_D) + } + ) + } + } private fun recentsShortcuts() = listOf( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt index e79f5902575f..2d056001b669 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt @@ -60,6 +60,7 @@ import com.android.systemui.plugins.FalsingManager import com.android.systemui.res.R import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.shade.NotificationShadeWindowView +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.KeyguardIndicationController import com.android.systemui.statusbar.LightRevealScrim @@ -93,7 +94,7 @@ constructor( private val chipbarCoordinator: ChipbarCoordinator, private val keyguardBlueprintViewModel: KeyguardBlueprintViewModel, private val keyguardStatusViewComponentFactory: KeyguardStatusViewComponent.Factory, - private val configuration: ConfigurationState, + @ShadeDisplayAware private val configuration: ConfigurationState, private val context: Context, private val keyguardIndicationController: KeyguardIndicationController, private val shadeInteractor: ShadeInteractor, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/BurnInInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/BurnInInteractor.kt index ca862896efaa..73a4cc3ad9df 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/BurnInInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/BurnInInteractor.kt @@ -25,6 +25,7 @@ import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.doze.util.BurnInHelperWrapper import com.android.systemui.keyguard.shared.model.BurnInModel import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -47,7 +48,7 @@ constructor( private val context: Context, private val burnInHelperWrapper: BurnInHelperWrapper, @Application private val scope: CoroutineScope, - private val configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware private val configurationInteractor: ConfigurationInteractor, private val keyguardInteractor: KeyguardInteractor, ) { val deviceEntryIconXOffset: StateFlow<Int> = @@ -62,7 +63,7 @@ constructor( .stateIn( scope, SharingStarted.WhileSubscribed(), - burnInHelperWrapper.burnInProgressOffset() + burnInHelperWrapper.burnInProgressOffset(), ) /** Given the max x,y dimens, determine the current translation shifts. */ @@ -71,7 +72,7 @@ constructor( burnInOffset(xDimenResourceId, isXAxis = true), burnInOffset(yDimenResourceId, isXAxis = false).map { it * 2 - context.resources.getDimensionPixelSize(yDimenResourceId) - } + }, ) { translationX, translationY -> BurnInModel(translationX, translationY, burnInHelperWrapper.burnInScale()) } @@ -117,7 +118,7 @@ constructor( private fun calculateOffset( maxBurnInOffsetPixels: Int, isXAxis: Boolean, - scale: Float = 1f + scale: Float = 1f, ): Int { return (burnInHelperWrapper.burnInOffset(maxBurnInOffsetPixels, isXAxis) * scale).toInt() } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractor.kt index 6385b3cffbd4..2aaec8797cbe 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractor.kt @@ -19,6 +19,7 @@ package com.android.systemui.keyguard.domain.interactor +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.systemui.CoreStartable import com.android.systemui.biometrics.domain.interactor.FingerprintPropertyInteractor import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor @@ -32,6 +33,7 @@ import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.Intra import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition.Type import com.android.systemui.keyguard.ui.view.layout.sections.SmartspaceSection import com.android.systemui.scene.shared.flag.SceneContainerFlag +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.domain.interactor.ShadeInteractor import javax.inject.Inject import kotlinx.coroutines.CoroutineScope @@ -39,7 +41,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.map -import com.android.app.tracing.coroutines.launchTraced as launch @SysUISingleton class KeyguardBlueprintInteractor @@ -48,7 +49,7 @@ constructor( private val keyguardBlueprintRepository: KeyguardBlueprintRepository, @Application private val applicationScope: CoroutineScope, shadeInteractor: ShadeInteractor, - private val configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware private val configurationInteractor: ConfigurationInteractor, private val fingerprintPropertyInteractor: FingerprintPropertyInteractor, private val smartspaceSection: SmartspaceSection, ) : CoreStartable { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt index 2e0a160bfd16..26c286df01d7 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt @@ -49,6 +49,7 @@ import com.android.systemui.res.R import com.android.systemui.scene.domain.interactor.SceneInteractor import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.scene.shared.model.Scenes +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.data.repository.ShadeRepository import com.android.systemui.util.kotlin.Utils.Companion.sample as sampleCombine import com.android.systemui.util.kotlin.sample @@ -85,7 +86,7 @@ constructor( private val repository: KeyguardRepository, powerInteractor: PowerInteractor, bouncerRepository: KeyguardBouncerRepository, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, shadeRepository: ShadeRepository, private val keyguardTransitionInteractor: KeyguardTransitionInteractor, sceneInteractorProvider: Provider<SceneInteractor>, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AodNotificationIconsSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AodNotificationIconsSection.kt index 36ef78e08c4f..faa497833e7b 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AodNotificationIconsSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AodNotificationIconsSection.kt @@ -33,6 +33,7 @@ import com.android.systemui.keyguard.MigrateClocksToBlueprint import com.android.systemui.keyguard.shared.model.KeyguardSection import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.notification.icon.ui.viewbinder.AlwaysOnDisplayNotificationIconViewStore import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder import com.android.systemui.statusbar.notification.icon.ui.viewbinder.StatusBarIconViewBindingFailureTracker @@ -47,7 +48,7 @@ class AodNotificationIconsSection @Inject constructor( private val context: Context, - private val configurationState: ConfigurationState, + @ShadeDisplayAware private val configurationState: ConfigurationState, private val iconBindingFailureTracker: StatusBarIconViewBindingFailureTracker, private val nicAodViewModel: NotificationIconContainerAlwaysOnDisplayViewModel, private val nicAodIconViewStore: AlwaysOnDisplayNotificationIconViewStore, @@ -70,7 +71,7 @@ constructor( resources.getDimensionPixelSize(R.dimen.below_clock_padding_start_icons), 0, 0, - 0 + 0, ) setVisibility(View.INVISIBLE) } @@ -113,18 +114,18 @@ constructor( START, PARENT_ID, START, - context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal) + context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal), ) connect( nicId, END, PARENT_ID, END, - context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal) + context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal), ) constrainHeight( nicId, - context.resources.getDimensionPixelSize(R.dimen.notification_shelf_height) + context.resources.getDimensionPixelSize(R.dimen.notification_shelf_height), ) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerUdfpsIconViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerUdfpsIconViewModel.kt index 4908dbdec61e..56e3125f7078 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerUdfpsIconViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerUdfpsIconViewModel.kt @@ -24,6 +24,7 @@ import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor import com.android.systemui.deviceentry.domain.interactor.DeviceEntryUdfpsInteractor import com.android.systemui.keyguard.ui.view.DeviceEntryIconView import com.android.systemui.scene.shared.flag.SceneContainerFlag +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shared.recents.utilities.Utilities.clamp import javax.inject.Inject import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -41,7 +42,7 @@ class AlternateBouncerUdfpsIconViewModel @Inject constructor( val context: Context, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, deviceEntryUdfpsInteractor: DeviceEntryUdfpsInteractor, deviceEntryBackgroundViewModel: DeviceEntryBackgroundViewModel, fingerprintPropertyInteractor: FingerprintPropertyInteractor, @@ -85,10 +86,7 @@ constructor( } private val fgIconPadding: Flow<Int> = udfpsOverlayInteractor.iconPadding val fgViewModel: Flow<DeviceEntryForegroundViewModel.ForegroundIconViewModel> = - combine( - fgIconColor, - fgIconPadding, - ) { color, padding -> + combine(fgIconColor, fgIconPadding) { color, padding -> DeviceEntryForegroundViewModel.ForegroundIconViewModel( type = DeviceEntryIconView.IconType.FINGERPRINT, useAodVariant = false, @@ -100,12 +98,7 @@ constructor( val bgColor: Flow<Int> = deviceEntryBackgroundViewModel.color val bgAlpha: Flow<Float> = flowOf(1f) - data class IconLocation( - val left: Int, - val top: Int, - val right: Int, - val bottom: Int, - ) { + data class IconLocation(val left: Int, val top: Int, val right: Int, val bottom: Int) { val width = right - left val height = bottom - top } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodBurnInViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodBurnInViewModel.kt index 478372d4dc0c..1c897237fe89 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodBurnInViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodBurnInViewModel.kt @@ -34,6 +34,7 @@ import com.android.systemui.keyguard.shared.model.Edge import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.ui.StateToValue import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject import kotlin.math.max import kotlinx.coroutines.CoroutineScope @@ -60,7 +61,7 @@ class AodBurnInViewModel constructor( @Application private val applicationScope: CoroutineScope, private val burnInInteractor: BurnInInteractor, - private val configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware private val configurationInteractor: ConfigurationInteractor, private val keyguardInteractor: KeyguardInteractor, private val keyguardTransitionInteractor: KeyguardTransitionInteractor, private val goneToAodTransitionViewModel: GoneToAodTransitionViewModel, 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 4c667c1c702d..12f9467c0f96 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 @@ -23,6 +23,7 @@ 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 com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow @@ -42,7 +43,7 @@ constructor( val context: Context, val deviceEntryIconViewModel: DeviceEntryIconViewModel, keyguardTransitionInteractor: KeyguardTransitionInteractor, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, alternateBouncerToAodTransitionViewModel: AlternateBouncerToAodTransitionViewModel, alternateBouncerToDozingTransitionViewModel: AlternateBouncerToDozingTransitionViewModel, aodToLockscreenTransitionViewModel: AodToLockscreenTransitionViewModel, 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 87c32a54438e..749f19315409 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 @@ -27,6 +27,7 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInterac import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.ui.view.DeviceEntryIconView import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject import kotlin.math.roundToInt import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -45,7 +46,7 @@ class DeviceEntryForegroundViewModel @Inject constructor( val context: Context, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, deviceEntryUdfpsInteractor: DeviceEntryUdfpsInteractor, transitionInteractor: KeyguardTransitionInteractor, deviceEntryIconViewModel: DeviceEntryIconViewModel, @@ -106,12 +107,11 @@ constructor( } val viewModel: Flow<ForegroundIconViewModel> = - combine( - deviceEntryIconViewModel.iconType, - useAodIconVariant, + combine(deviceEntryIconViewModel.iconType, useAodIconVariant, color, padding) { + iconType, + useAodVariant, color, - padding, - ) { iconType, useAodVariant, color, padding -> + padding -> ForegroundIconViewModel( type = iconType, useAodVariant = useAodVariant, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToGlanceableHubTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToGlanceableHubTransitionViewModel.kt index 11ed52ac35b7..c9fdf7a31458 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToGlanceableHubTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToGlanceableHubTransitionViewModel.kt @@ -27,6 +27,7 @@ import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition import com.android.systemui.res.R import com.android.systemui.scene.shared.model.Scenes +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds @@ -41,7 +42,7 @@ class DreamingToGlanceableHubTransitionViewModel @Inject constructor( animationFlow: KeyguardTransitionAnimationFlow, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, ) : DeviceEntryIconTransition { private val transitionAnimation = animationFlow @@ -49,15 +50,13 @@ constructor( duration = TO_GLANCEABLE_HUB_DURATION, edge = Edge.create(from = DREAMING, to = Scenes.Communal), ) - .setupWithoutSceneContainer( - edge = Edge.create(from = DREAMING, to = GLANCEABLE_HUB), - ) + .setupWithoutSceneContainer(edge = Edge.create(from = DREAMING, to = GLANCEABLE_HUB)) val dreamOverlayTranslationX: Flow<Float> = configurationInteractor .directionalDimensionPixelSize( LayoutDirection.LTR, - R.dimen.dreaming_to_hub_transition_dream_overlay_translation_x + R.dimen.dreaming_to_hub_transition_dream_overlay_translation_x, ) .flatMapLatest { translatePx -> transitionAnimation.sharedFlow( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToDreamingTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToDreamingTransitionViewModel.kt index f69f9969ea37..723fba6d976e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToDreamingTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToDreamingTransitionViewModel.kt @@ -27,6 +27,7 @@ import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition import com.android.systemui.res.R import com.android.systemui.scene.shared.model.Scenes +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds @@ -41,7 +42,7 @@ class GlanceableHubToDreamingTransitionViewModel @Inject constructor( animationFlow: KeyguardTransitionAnimationFlow, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, ) : DeviceEntryIconTransition { private val transitionAnimation = @@ -50,9 +51,7 @@ constructor( duration = FROM_GLANCEABLE_HUB_DURATION, edge = Edge.create(from = Scenes.Communal, to = DREAMING), ) - .setupWithoutSceneContainer( - edge = Edge.create(from = GLANCEABLE_HUB, to = DREAMING), - ) + .setupWithoutSceneContainer(edge = Edge.create(from = GLANCEABLE_HUB, to = DREAMING)) val dreamOverlayAlpha: Flow<Float> = transitionAnimation.sharedFlow( @@ -66,7 +65,7 @@ constructor( configurationInteractor .directionalDimensionPixelSize( LayoutDirection.LTR, - R.dimen.hub_to_dreaming_transition_dream_overlay_translation_x + R.dimen.hub_to_dreaming_transition_dream_overlay_translation_x, ) .flatMapLatest { translatePx: Int -> transitionAnimation.sharedFlow( @@ -74,7 +73,7 @@ constructor( onStep = { value -> -translatePx + value * translatePx }, interpolator = Interpolators.EMPHASIZED, onCancel = { -translatePx.toFloat() }, - name = "GLANCEABLE_HUB->LOCKSCREEN: dreamOverlayTranslationX" + name = "GLANCEABLE_HUB->LOCKSCREEN: dreamOverlayTranslationX", ) } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToLockscreenTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToLockscreenTransitionViewModel.kt index 7f3ef61d02c0..5a4d0689d209 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToLockscreenTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToLockscreenTransitionViewModel.kt @@ -28,6 +28,7 @@ import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import com.android.systemui.keyguard.ui.StateToValue import com.android.systemui.res.R import com.android.systemui.scene.shared.model.Scenes +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -45,7 +46,7 @@ import kotlinx.coroutines.flow.map class GlanceableHubToLockscreenTransitionViewModel @Inject constructor( - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, animationFlow: KeyguardTransitionAnimationFlow, ) { private val transitionAnimation = diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt index 36f684ee4759..5c79c0b5c1bb 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt @@ -29,6 +29,7 @@ import com.android.systemui.keyguard.shared.model.ClockSize import com.android.systemui.keyguard.shared.model.ClockSizeSetting import com.android.systemui.res.R import com.android.systemui.scene.shared.flag.SceneContainerFlag +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.notification.icon.ui.viewmodel.NotificationIconContainerAlwaysOnDisplayViewModel import com.android.systemui.statusbar.ui.SystemBarUtilsProxy @@ -50,7 +51,8 @@ constructor( aodNotificationIconViewModel: NotificationIconContainerAlwaysOnDisplayViewModel, @get:VisibleForTesting val shadeInteractor: ShadeInteractor, private val systemBarUtils: SystemBarUtilsProxy, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, + // TODO: b/374267505 - Use ShadeDisplayAware resources here. @Main private val resources: Resources, ) { var burnInLayer: Layer? = null diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardIndicationAreaViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardIndicationAreaViewModel.kt index ceae1b5e9038..bc3ef02a0ec5 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardIndicationAreaViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardIndicationAreaViewModel.kt @@ -31,6 +31,7 @@ import com.android.systemui.keyguard.shared.model.BurnInModel import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.StatusBarState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.util.kotlin.BooleanFlowOperators.anyOf import javax.inject.Inject import javax.inject.Named @@ -53,7 +54,7 @@ constructor( burnInInteractor: BurnInInteractor, @Named(KeyguardQuickAffordancesCombinedViewModelModule.Companion.LOCKSCREEN_INSTANCE) shortcutsCombinedViewModel: KeyguardQuickAffordancesCombinedViewModel, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, keyguardTransitionInteractor: KeyguardTransitionInteractor, communalSceneInteractor: CommunalSceneInteractor, @Background private val backgroundDispatcher: CoroutineDispatcher, @@ -70,7 +71,7 @@ constructor( val visible: Flow<Boolean> = anyOf( keyguardInteractor.statusBarState.map { state -> state == StatusBarState.KEYGUARD }, - communalSceneInteractor.isCommunalVisible + communalSceneInteractor.isCommunalVisible, ) /** An observable for whether the indication area should be padded. */ @@ -85,7 +86,7 @@ constructor( } else { combine( keyguardBottomAreaViewModel.startButton, - keyguardBottomAreaViewModel.endButton + keyguardBottomAreaViewModel.endButton, ) { startButtonModel, endButtonModel -> startButtonModel.isVisible || endButtonModel.isVisible } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGlanceableHubTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGlanceableHubTransitionViewModel.kt index dd8ff8c4a052..acaa9b918da8 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGlanceableHubTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGlanceableHubTransitionViewModel.kt @@ -28,6 +28,7 @@ import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import com.android.systemui.keyguard.ui.StateToValue import com.android.systemui.res.R import com.android.systemui.scene.shared.model.Scenes +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -45,7 +46,7 @@ import kotlinx.coroutines.flow.map class LockscreenToGlanceableHubTransitionViewModel @Inject constructor( - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, animationFlow: KeyguardTransitionAnimationFlow, ) { private val transitionAnimation = diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModel.kt index 88e8968501dd..6565e31c2c6f 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModel.kt @@ -26,6 +26,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.OCCLUDED import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.flow.Flow @@ -40,7 +41,7 @@ class LockscreenToOccludedTransitionViewModel @Inject constructor( shadeDependentFlows: ShadeDependentFlows, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, animationFlow: KeyguardTransitionAnimationFlow, ) : DeviceEntryIconTransition { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModel.kt index 737bd7ac218d..d10970f28995 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModel.kt @@ -29,6 +29,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.OCCLUDED import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.util.kotlin.pairwise import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds @@ -49,7 +50,7 @@ class OccludedToLockscreenTransitionViewModel @Inject constructor( deviceEntryUdfpsInteractor: DeviceEntryUdfpsInteractor, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, animationFlow: KeyguardTransitionAnimationFlow, keyguardInteractor: KeyguardInteractor, keyguardTransitionInteractor: KeyguardTransitionInteractor, @@ -104,7 +105,7 @@ constructor( !isOccluded && keyguardTransitionInteractor.getCurrentState() == OCCLUDED } - .map { 0f } + .map { 0f }, ) val deviceEntryBackgroundViewAlpha: Flow<Float> = diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/Media3ActionFactory.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/Media3ActionFactory.kt index a33685b61237..d38e507082b9 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/Media3ActionFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/Media3ActionFactory.kt @@ -28,6 +28,7 @@ import androidx.annotation.WorkerThread import androidx.media.utils.MediaConstants import androidx.media3.common.Player import androidx.media3.session.CommandButton +import androidx.media3.session.MediaController as Media3Controller import androidx.media3.session.SessionCommand import androidx.media3.session.SessionToken import com.android.systemui.dagger.SysUISingleton @@ -82,10 +83,19 @@ constructor( // Build button info val buttons = suspendCancellableCoroutine { continuation -> // Media3Controller methods must always be called from a specific looper - handler.post { - val result = getMedia3Actions(packageName, m3controller, token) - m3controller.release() - continuation.resumeWith(Result.success(result)) + val runnable = Runnable { + try { + val result = getMedia3Actions(packageName, m3controller, token) + continuation.resumeWith(Result.success(result)) + } finally { + m3controller.release() + } + } + handler.post(runnable) + continuation.invokeOnCancellation { + // Ensure controller is released, even if loading was cancelled partway through + handler.post(m3controller::release) + handler.removeCallbacks(runnable) } } return buttons @@ -95,7 +105,7 @@ constructor( @WorkerThread private fun getMedia3Actions( packageName: String, - m3controller: androidx.media3.session.MediaController, + m3controller: Media3Controller, token: SessionToken, ): MediaButton? { Assert.isNotMainThread() @@ -197,7 +207,7 @@ constructor( * @return A [MediaAction] representing the first supported command, or null if not supported */ private fun getStandardAction( - controller: androidx.media3.session.MediaController, + controller: Media3Controller, token: SessionToken, vararg commands: @Player.Command Int, ): MediaAction? { @@ -304,37 +314,40 @@ constructor( bgScope.launch { val controller = controllerFactory.create(token, looper) handler.post { - when (command) { - Player.COMMAND_PLAY_PAUSE -> { - if (controller.isPlaying) controller.pause() else controller.play() - } + try { + when (command) { + Player.COMMAND_PLAY_PAUSE -> { + if (controller.isPlaying) controller.pause() else controller.play() + } - Player.COMMAND_SEEK_TO_PREVIOUS -> controller.seekToPrevious() - Player.COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM -> - controller.seekToPreviousMediaItem() + Player.COMMAND_SEEK_TO_PREVIOUS -> controller.seekToPrevious() + Player.COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM -> + controller.seekToPreviousMediaItem() - Player.COMMAND_SEEK_TO_NEXT -> controller.seekToNext() - Player.COMMAND_SEEK_TO_NEXT_MEDIA_ITEM -> controller.seekToNextMediaItem() - Player.COMMAND_INVALID -> { - if ( - customAction != null && - customAction!!.sessionCommand != null && - controller.isSessionCommandAvailable( - customAction!!.sessionCommand!! - ) - ) { - controller.sendCustomCommand( - customAction!!.sessionCommand!!, - customAction!!.extras, - ) - } else { - logger.logMedia3UnsupportedCommand("$command, action $customAction") + Player.COMMAND_SEEK_TO_NEXT -> controller.seekToNext() + Player.COMMAND_SEEK_TO_NEXT_MEDIA_ITEM -> controller.seekToNextMediaItem() + Player.COMMAND_INVALID -> { + if (customAction?.sessionCommand != null) { + val sessionCommand = customAction.sessionCommand!! + if (controller.isSessionCommandAvailable(sessionCommand)) { + controller.sendCustomCommand( + sessionCommand, + customAction.extras, + ) + } else { + logger.logMedia3UnsupportedCommand( + "$sessionCommand, action $customAction" + ) + } + } else { + logger.logMedia3UnsupportedCommand("$command, action $customAction") + } } + else -> logger.logMedia3UnsupportedCommand(command.toString()) } - - else -> logger.logMedia3UnsupportedCommand(command.toString()) + } finally { + controller.release() } - controller.release() } } } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaControllerFactory.kt b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaControllerFactory.kt index 741f52998782..d815852b790f 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaControllerFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaControllerFactory.kt @@ -35,7 +35,12 @@ open class MediaControllerFactory @Inject constructor(private val context: Conte return MediaController(context, token) } - /** Creates a new [Media3Controller] from a [SessionToken] */ + /** + * Creates a new [Media3Controller] from the media3 [SessionToken]. + * + * @param token The token for the session + * @param looper The looper that will be used for this controller's operations + */ open suspend fun create(token: SessionToken, looper: Looper): Media3Controller { return Media3Controller.Builder(context, token) .setApplicationLooper(looper) diff --git a/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java b/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java index 36a9fb3eb753..45a3a8ce60c4 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java +++ b/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java @@ -27,17 +27,12 @@ import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager; import com.android.systemui.media.controls.ui.controller.MediaHostStatesManager; import com.android.systemui.media.controls.ui.view.MediaHost; import com.android.systemui.media.dream.dagger.MediaComplicationComponent; -import com.android.systemui.media.taptotransfer.MediaTttCommandLineHelper; -import com.android.systemui.media.taptotransfer.MediaTttFlags; import com.android.systemui.media.taptotransfer.receiver.MediaTttReceiverLogBuffer; import com.android.systemui.media.taptotransfer.sender.MediaTttSenderLogBuffer; -import dagger.Lazy; import dagger.Module; import dagger.Provides; -import java.util.Optional; - import javax.inject.Named; /** Dagger module for the media package. */ @@ -132,16 +127,4 @@ public interface MediaModule { static LogBuffer provideMediaTttReceiverLogBuffer(LogBufferFactory factory) { return factory.create("MediaTttReceiver", 20); } - - /** */ - @Provides - @SysUISingleton - static Optional<MediaTttCommandLineHelper> providesMediaTttCommandLineHelper( - MediaTttFlags mediaTttFlags, - Lazy<MediaTttCommandLineHelper> helperLazy) { - if (!mediaTttFlags.isMediaTttEnabled()) { - return Optional.empty(); - } - return Optional.of(helperLazy.get()); - } } diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt index 92db804d2730..1204cde19c76 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt @@ -43,7 +43,6 @@ import com.android.systemui.common.ui.binder.TintedIconViewBinder import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dump.DumpManager -import com.android.systemui.media.taptotransfer.MediaTttFlags import com.android.systemui.media.taptotransfer.common.MediaTttIcon import com.android.systemui.media.taptotransfer.common.MediaTttUtils import com.android.systemui.res.R @@ -68,25 +67,27 @@ import javax.inject.Inject * TODO(b/245610654): Re-name this to be MediaTttReceiverCoordinator. */ @SysUISingleton -open class MediaTttChipControllerReceiver @Inject constructor( - private val commandQueue: CommandQueue, - context: Context, - logger: MediaTttReceiverLogger, - viewCaptureAwareWindowManager: ViewCaptureAwareWindowManager, - @Main mainExecutor: DelayableExecutor, - accessibilityManager: AccessibilityManager, - configurationController: ConfigurationController, - dumpManager: DumpManager, - powerManager: PowerManager, - @Main private val mainHandler: Handler, - private val mediaTttFlags: MediaTttFlags, - private val uiEventLogger: MediaTttReceiverUiEventLogger, - private val viewUtil: ViewUtil, - wakeLockBuilder: WakeLock.Builder, - systemClock: SystemClock, - private val rippleController: MediaTttReceiverRippleController, - private val temporaryViewUiEventLogger: TemporaryViewUiEventLogger, -) : TemporaryViewDisplayController<ChipReceiverInfo, MediaTttReceiverLogger>( +open class MediaTttChipControllerReceiver +@Inject +constructor( + private val commandQueue: CommandQueue, + context: Context, + logger: MediaTttReceiverLogger, + viewCaptureAwareWindowManager: ViewCaptureAwareWindowManager, + @Main mainExecutor: DelayableExecutor, + accessibilityManager: AccessibilityManager, + configurationController: ConfigurationController, + dumpManager: DumpManager, + powerManager: PowerManager, + @Main private val mainHandler: Handler, + private val uiEventLogger: MediaTttReceiverUiEventLogger, + private val viewUtil: ViewUtil, + wakeLockBuilder: WakeLock.Builder, + systemClock: SystemClock, + private val rippleController: MediaTttReceiverRippleController, + private val temporaryViewUiEventLogger: TemporaryViewUiEventLogger, +) : + TemporaryViewDisplayController<ChipReceiverInfo, MediaTttReceiverLogger>( context, logger, viewCaptureAwareWindowManager, @@ -99,36 +100,43 @@ open class MediaTttChipControllerReceiver @Inject constructor( wakeLockBuilder, systemClock, temporaryViewUiEventLogger, -) { + ) { @SuppressLint("WrongConstant") // We're allowed to use LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS - override val windowLayoutParams = commonWindowLayoutParams.apply { - gravity = Gravity.BOTTOM.or(Gravity.CENTER_HORIZONTAL) - // Params below are needed for the ripple to work correctly - width = WindowManager.LayoutParams.MATCH_PARENT - height = WindowManager.LayoutParams.MATCH_PARENT - layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS - fitInsetsTypes = 0 // Ignore insets from all system bars - } + override val windowLayoutParams = + commonWindowLayoutParams.apply { + gravity = Gravity.BOTTOM.or(Gravity.CENTER_HORIZONTAL) + // Params below are needed for the ripple to work correctly + width = WindowManager.LayoutParams.MATCH_PARENT + height = WindowManager.LayoutParams.MATCH_PARENT + layoutInDisplayCutoutMode = + WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS + fitInsetsTypes = 0 // Ignore insets from all system bars + } // Value animator that controls the bouncing animation of views. - private val bounceAnimator = ValueAnimator.ofFloat(0f, 1f).apply { - repeatCount = ValueAnimator.INFINITE - repeatMode = ValueAnimator.REVERSE - duration = ICON_BOUNCE_ANIM_DURATION - } + private val bounceAnimator = + ValueAnimator.ofFloat(0f, 1f).apply { + repeatCount = ValueAnimator.INFINITE + repeatMode = ValueAnimator.REVERSE + duration = ICON_BOUNCE_ANIM_DURATION + } - private val commandQueueCallbacks = object : CommandQueue.Callbacks { - override fun updateMediaTapToTransferReceiverDisplay( - @StatusBarManager.MediaTransferReceiverState displayState: Int, - routeInfo: MediaRoute2Info, - appIcon: Icon?, - appName: CharSequence? - ) { - this@MediaTttChipControllerReceiver.updateMediaTapToTransferReceiverDisplay( - displayState, routeInfo, appIcon, appName - ) + private val commandQueueCallbacks = + object : CommandQueue.Callbacks { + override fun updateMediaTapToTransferReceiverDisplay( + @StatusBarManager.MediaTransferReceiverState displayState: Int, + routeInfo: MediaRoute2Info, + appIcon: Icon?, + appName: CharSequence?, + ) { + this@MediaTttChipControllerReceiver.updateMediaTapToTransferReceiverDisplay( + displayState, + routeInfo, + appIcon, + appName, + ) + } } - } // A map to store instance id per route info id. private var instanceMap: MutableMap<String, InstanceId> = mutableMapOf() @@ -139,7 +147,7 @@ open class MediaTttChipControllerReceiver @Inject constructor( @StatusBarManager.MediaTransferReceiverState displayState: Int, routeInfo: MediaRoute2Info, appIcon: Icon?, - appName: CharSequence? + appName: CharSequence?, ) { val chipState: ChipStateReceiver? = ChipStateReceiver.getReceiverStateFromId(displayState) val stateName = chipState?.name ?: "Invalid" @@ -150,8 +158,8 @@ open class MediaTttChipControllerReceiver @Inject constructor( return } - val instanceId: InstanceId = instanceMap[routeInfo.id] - ?: temporaryViewUiEventLogger.getNewInstanceId() + val instanceId: InstanceId = + instanceMap[routeInfo.id] ?: temporaryViewUiEventLogger.getNewInstanceId() uiEventLogger.logReceiverStateChange(chipState, instanceId) if (chipState != ChipStateReceiver.CLOSE_TO_SENDER) { @@ -175,53 +183,51 @@ open class MediaTttChipControllerReceiver @Inject constructor( } appIcon.loadDrawableAsync( - context, - Icon.OnDrawableLoadedListener { drawable -> - displayView( - ChipReceiverInfo( - routeInfo, - drawable, - appName, - id = routeInfo.id, - instanceId = instanceId, - ) + context, + Icon.OnDrawableLoadedListener { drawable -> + displayView( + ChipReceiverInfo( + routeInfo, + drawable, + appName, + id = routeInfo.id, + instanceId = instanceId, ) - }, - // Notify the listener on the main handler since the listener will update - // the UI. - mainHandler + ) + }, + // Notify the listener on the main handler since the listener will update + // the UI. + mainHandler, ) } override fun start() { super.start() - if (mediaTttFlags.isMediaTttEnabled()) { - commandQueue.addCallback(commandQueueCallbacks) - } + commandQueue.addCallback(commandQueueCallbacks) registerListener(displayListener) } override fun updateView(newInfo: ChipReceiverInfo, currentView: ViewGroup) { val packageName: String? = newInfo.routeInfo.clientPackageName - var iconInfo = MediaTttUtils.getIconInfoFromPackageName( - context, - packageName, - isReceiver = true, - ) { - packageName?.let { logger.logPackageNotFound(it) } - } + var iconInfo = + MediaTttUtils.getIconInfoFromPackageName(context, packageName, isReceiver = true) { + packageName?.let { logger.logPackageNotFound(it) } + } if (newInfo.appNameOverride != null) { - iconInfo = iconInfo.copy( - contentDescription = ContentDescription.Loaded(newInfo.appNameOverride.toString()) - ) + iconInfo = + iconInfo.copy( + contentDescription = + ContentDescription.Loaded(newInfo.appNameOverride.toString()) + ) } if (newInfo.appIconDrawableOverride != null) { - iconInfo = iconInfo.copy( - icon = MediaTttIcon.Loaded(newInfo.appIconDrawableOverride), - isAppIcon = true, - ) + iconInfo = + iconInfo.copy( + icon = MediaTttIcon.Loaded(newInfo.appIconDrawableOverride), + isAppIcon = true, + ) } val iconPadding = @@ -298,16 +304,14 @@ open class MediaTttChipControllerReceiver @Inject constructor( alphaDuration: Long = ICON_ALPHA_ANIM_DURATION, onAnimationEnd: Runnable? = null, ) { - view.animate() + view + .animate() .translationYBy(translationYBy) .setInterpolator(interpolator) .setDuration(translationDuration) .withEndAction { onAnimationEnd?.run() } .start() - view.animate() - .alpha(alphaEndValue) - .setDuration(alphaDuration) - .start() + view.animate().alpha(alphaEndValue).setDuration(alphaDuration).start() } /** Returns the amount that the chip will be translated by in its intro animation. */ diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinator.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinator.kt index 3e6d46c00df9..6ca04710d74c 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinator.kt @@ -28,7 +28,6 @@ import com.android.systemui.Dumpable import com.android.systemui.common.shared.model.Text import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dump.DumpManager -import com.android.systemui.media.taptotransfer.MediaTttFlags import com.android.systemui.media.taptotransfer.common.MediaTttUtils import com.android.systemui.res.R import com.android.systemui.statusbar.CommandQueue @@ -53,7 +52,6 @@ constructor( private val context: Context, private val dumpManager: DumpManager, private val logger: MediaTttSenderLogger, - private val mediaTttFlags: MediaTttFlags, private val uiEventLogger: MediaTttSenderUiEventLogger, ) : CoreStartable, Dumpable { @@ -68,27 +66,25 @@ constructor( override fun updateMediaTapToTransferSenderDisplay( @StatusBarManager.MediaTransferSenderState displayState: Int, routeInfo: MediaRoute2Info, - undoCallback: IUndoMediaTransferCallback? + undoCallback: IUndoMediaTransferCallback?, ) { this@MediaTttSenderCoordinator.updateMediaTapToTransferSenderDisplay( displayState, routeInfo, - undoCallback + undoCallback, ) } } override fun start() { - if (mediaTttFlags.isMediaTttEnabled()) { - commandQueue.addCallback(commandQueueCallbacks) - dumpManager.registerNormalDumpable(this) - } + commandQueue.addCallback(commandQueueCallbacks) + dumpManager.registerNormalDumpable(this) } private fun updateMediaTapToTransferSenderDisplay( @StatusBarManager.MediaTransferSenderState displayState: Int, routeInfo: MediaRoute2Info, - undoCallback: IUndoMediaTransferCallback? + undoCallback: IUndoMediaTransferCallback?, ) { val chipState: ChipStateSender? = ChipStateSender.getSenderStateFromId(displayState) val stateName = chipState?.name ?: "Invalid" @@ -107,7 +103,7 @@ constructor( // ChipStateSender.FAR_FROM_RECEIVER is the default state when there is no state. logger.logInvalidStateTransitionError( currentState = currentStateForId?.name ?: ChipStateSender.FAR_FROM_RECEIVER.name, - chipState.name + chipState.name, ) return } @@ -126,7 +122,7 @@ constructor( // still be able to see the status of the transfer. logger.logRemovalBypass( removalReason, - bypassReason = "transferStatus=${currentStateForId.transferStatus.name}" + bypassReason = "transferStatus=${currentStateForId.transferStatus.name}", ) return } @@ -139,14 +135,7 @@ constructor( logger.logStateMap(stateMap) chipbarCoordinator.registerListener(displayListener) chipbarCoordinator.displayView( - createChipbarInfo( - chipState, - routeInfo, - undoCallback, - context, - logger, - instanceId, - ) + createChipbarInfo(chipState, routeInfo, undoCallback, context, logger, instanceId) ) } } @@ -245,10 +234,7 @@ constructor( ) } - return ChipbarEndItem.Button( - Text.Resource(R.string.media_transfer_undo), - onClickListener, - ) + return ChipbarEndItem.Button(Text.Resource(R.string.media_transfer_undo), onClickListener) } private val displayListener = diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionActivity.java b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionActivity.java index 47dacae6e0a0..2fda2013d6f5 100644 --- a/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionActivity.java +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionActivity.java @@ -57,7 +57,6 @@ import android.view.Display; import android.view.Window; import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.flags.Flags; import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger; import com.android.systemui.mediaprojection.MediaProjectionServiceHelper; import com.android.systemui.mediaprojection.MediaProjectionUtils; @@ -187,11 +186,9 @@ public class MediaProjectionPermissionActivity extends Activity { return; } - if (mFeatureFlags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES)) { - if (showScreenCaptureDisabledDialogIfNeeded()) { - finishAsCancelled(); - return; - } + if (showScreenCaptureDisabledDialogIfNeeded()) { + finishAsCancelled(); + return; } final String appName = extractAppName(aInfo, packageManager); diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java index b019c136b6ca..a3b7590117c1 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java @@ -406,7 +406,7 @@ public class NavigationBarControllerImpl implements if (navBar != null) { navBar.checkNavBarModes(); } else { - mTaskbarDelegate.checkNavBarModes(); + mTaskbarDelegate.checkNavBarModes(displayId); } } @@ -416,7 +416,7 @@ public class NavigationBarControllerImpl implements if (navBar != null) { navBar.finishBarAnimations(); } else { - mTaskbarDelegate.finishBarAnimations(); + mTaskbarDelegate.finishBarAnimations(displayId); } } @@ -426,7 +426,7 @@ public class NavigationBarControllerImpl implements if (navBar != null) { navBar.touchAutoDim(); } else { - mTaskbarDelegate.touchAutoDim(); + mTaskbarDelegate.touchAutoDim(displayId); } } @@ -436,7 +436,7 @@ public class NavigationBarControllerImpl implements if (navBar != null) { navBar.transitionTo(barMode, animate); } else { - mTaskbarDelegate.transitionTo(barMode, animate); + mTaskbarDelegate.transitionTo(displayId, barMode, animate); } } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java index 1216a8879751..2a3aeae2a550 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java @@ -159,7 +159,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, private final AutoHideUiElement mAutoHideUiElement = new AutoHideUiElement() { @Override public void synchronizeState() { - checkNavBarModes(); + checkNavBarModes(mDisplayId); } @Override @@ -220,6 +220,16 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, mEdgeBackGestureHandler = navBarHelper.getEdgeBackGestureHandler(); } + @Override + public void onDisplayReady(int displayId) { + CommandQueue.Callbacks.super.onDisplayReady(displayId); + } + + @Override + public void onDisplayRemoved(int displayId) { + CommandQueue.Callbacks.super.onDisplayRemoved(displayId); + } + // Separated into a method to keep setDependencies() clean/readable. private LightBarTransitionsController createLightBarTransitionsController() { @@ -349,31 +359,31 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, } } - void checkNavBarModes() { + void checkNavBarModes(int displayId) { if (mOverviewProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().checkNavBarModes(); + mOverviewProxyService.getProxy().checkNavBarModes(displayId); } catch (RemoteException e) { Log.e(TAG, "checkNavBarModes() failed", e); } } - void finishBarAnimations() { + void finishBarAnimations(int displayId) { if (mOverviewProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().finishBarAnimations(); + mOverviewProxyService.getProxy().finishBarAnimations(displayId); } catch (RemoteException e) { Log.e(TAG, "finishBarAnimations() failed", e); } } - void touchAutoDim() { + void touchAutoDim(int displayId) { if (mOverviewProxyService.getProxy() == null) { return; } @@ -382,19 +392,19 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, int state = mStatusBarStateController.getState(); boolean shouldReset = state != StatusBarState.KEYGUARD && state != StatusBarState.SHADE_LOCKED; - mOverviewProxyService.getProxy().touchAutoDim(shouldReset); + mOverviewProxyService.getProxy().touchAutoDim(displayId, shouldReset); } catch (RemoteException e) { Log.e(TAG, "touchAutoDim() failed", e); } } - void transitionTo(@BarTransitions.TransitionMode int barMode, boolean animate) { + void transitionTo(int displayId, @BarTransitions.TransitionMode int barMode, boolean animate) { if (mOverviewProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().transitionTo(barMode, animate); + mOverviewProxyService.getProxy().transitionTo(displayId, barMode, animate); } catch (RemoteException e) { Log.e(TAG, "transitionTo() failed, barMode: " + barMode, e); } diff --git a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskController.kt b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskController.kt index d0f6f7961889..1fa5baaa21ae 100644 --- a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskController.kt +++ b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskController.kt @@ -118,9 +118,7 @@ constructor( getUserForHandlingNotesTaking(entryPoint) } activityContext.startActivityAsUser( - Intent(Intent.ACTION_MANAGE_DEFAULT_APP).apply { - putExtra(Intent.EXTRA_ROLE_NAME, ROLE_NOTES) - }, + createNotesRoleHolderSettingsIntent(), user ) } @@ -399,6 +397,10 @@ constructor( * @see com.android.launcher3.icons.IconCache.EXTRA_SHORTCUT_BADGE_OVERRIDE_PACKAGE */ const val EXTRA_SHORTCUT_BADGE_OVERRIDE_PACKAGE = "extra_shortcut_badge_override_package" + + /** Returns notes role holder settings intent. */ + fun createNotesRoleHolderSettingsIntent() = Intent(Intent.ACTION_MANAGE_DEFAULT_APP). + putExtra(Intent.EXTRA_ROLE_NAME, ROLE_NOTES) } } diff --git a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskEntryPoint.kt b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskEntryPoint.kt index 442000281862..2d62c1067401 100644 --- a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskEntryPoint.kt +++ b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskEntryPoint.kt @@ -44,4 +44,7 @@ enum class NoteTaskEntryPoint { /** @see [NoteTaskInitializer.callbacks] */ KEYBOARD_SHORTCUT, + + /** @see [NotesTile] */ + QS_NOTES_TILE, } diff --git a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskEventLogger.kt b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskEventLogger.kt index a79057e5464b..f152b01360df 100644 --- a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskEventLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskEventLogger.kt @@ -19,6 +19,7 @@ import com.android.internal.logging.UiEvent import com.android.internal.logging.UiEventLogger import com.android.systemui.notetask.NoteTaskEntryPoint.APP_CLIPS import com.android.systemui.notetask.NoteTaskEntryPoint.KEYBOARD_SHORTCUT +import com.android.systemui.notetask.NoteTaskEntryPoint.QS_NOTES_TILE import com.android.systemui.notetask.NoteTaskEntryPoint.QUICK_AFFORDANCE import com.android.systemui.notetask.NoteTaskEntryPoint.TAIL_BUTTON import com.android.systemui.notetask.NoteTaskEntryPoint.WIDGET_PICKER_SHORTCUT @@ -43,45 +44,47 @@ class NoteTaskEventLogger @Inject constructor(private val uiEventLogger: UiEvent /** Logs a [NoteTaskInfo] as an **open** [NoteTaskUiEvent], including package name and uid. */ fun logNoteTaskOpened(info: NoteTaskInfo) { val event = - when (info.entryPoint) { - TAIL_BUTTON -> { - if (info.isKeyguardLocked) { - NOTE_OPENED_VIA_STYLUS_TAIL_BUTTON_LOCKED - } else { - NOTE_OPENED_VIA_STYLUS_TAIL_BUTTON - } + when (info.entryPoint) { + TAIL_BUTTON -> { + if (info.isKeyguardLocked) { + NOTE_OPENED_VIA_STYLUS_TAIL_BUTTON_LOCKED + } else { + NOTE_OPENED_VIA_STYLUS_TAIL_BUTTON } + } - WIDGET_PICKER_SHORTCUT, - WIDGET_PICKER_SHORTCUT_IN_MULTI_WINDOW_MODE -> NOTE_OPENED_VIA_SHORTCUT + WIDGET_PICKER_SHORTCUT, + WIDGET_PICKER_SHORTCUT_IN_MULTI_WINDOW_MODE -> NOTE_OPENED_VIA_SHORTCUT - QUICK_AFFORDANCE -> NOTE_OPENED_VIA_KEYGUARD_QUICK_AFFORDANCE - APP_CLIPS, - KEYBOARD_SHORTCUT, - null -> return - } + QUICK_AFFORDANCE -> NOTE_OPENED_VIA_KEYGUARD_QUICK_AFFORDANCE + APP_CLIPS, + KEYBOARD_SHORTCUT, + QS_NOTES_TILE, // TODO(b/376640872): Add logging for QS Tile entry point. + null -> return + } uiEventLogger.log(event, info.uid, info.packageName) } /** Logs a [NoteTaskInfo] as a **closed** [NoteTaskUiEvent], including package name and uid. */ fun logNoteTaskClosed(info: NoteTaskInfo) { val event = - when (info.entryPoint) { - TAIL_BUTTON -> { - if (info.isKeyguardLocked) { - NoteTaskUiEvent.NOTE_CLOSED_VIA_STYLUS_TAIL_BUTTON_LOCKED - } else { - NoteTaskUiEvent.NOTE_CLOSED_VIA_STYLUS_TAIL_BUTTON - } + when (info.entryPoint) { + TAIL_BUTTON -> { + if (info.isKeyguardLocked) { + NoteTaskUiEvent.NOTE_CLOSED_VIA_STYLUS_TAIL_BUTTON_LOCKED + } else { + NoteTaskUiEvent.NOTE_CLOSED_VIA_STYLUS_TAIL_BUTTON } - - WIDGET_PICKER_SHORTCUT, - WIDGET_PICKER_SHORTCUT_IN_MULTI_WINDOW_MODE, - QUICK_AFFORDANCE, - APP_CLIPS, - KEYBOARD_SHORTCUT, - null -> return } + + WIDGET_PICKER_SHORTCUT, + WIDGET_PICKER_SHORTCUT_IN_MULTI_WINDOW_MODE, + QUICK_AFFORDANCE, + APP_CLIPS, + KEYBOARD_SHORTCUT, + QS_NOTES_TILE, + null -> return + } uiEventLogger.log(event, info.uid, info.packageName) } @@ -90,19 +93,20 @@ class NoteTaskEventLogger @Inject constructor(private val uiEventLogger: UiEvent @UiEvent(doc = "User opened a note by tapping on the lockscreen shortcut.") NOTE_OPENED_VIA_KEYGUARD_QUICK_AFFORDANCE(1294), - - @UiEvent(doc = "User opened a note by pressing the stylus tail button while the screen was unlocked.") // ktlint-disable max-line-length + @UiEvent( + doc = + "User opened a note by pressing the stylus tail button while the screen was unlocked." + ) NOTE_OPENED_VIA_STYLUS_TAIL_BUTTON(1295), - - @UiEvent(doc = "User opened a note by pressing the stylus tail button while the screen was locked.") // ktlint-disable max-line-length + @UiEvent( + doc = + "User opened a note by pressing the stylus tail button while the screen was locked." + ) NOTE_OPENED_VIA_STYLUS_TAIL_BUTTON_LOCKED(1296), - @UiEvent(doc = "User opened a note by tapping on an app shortcut.") NOTE_OPENED_VIA_SHORTCUT(1297), - @UiEvent(doc = "Note closed via a tail button while device is unlocked") NOTE_CLOSED_VIA_STYLUS_TAIL_BUTTON(1311), - @UiEvent(doc = "Note closed via a tail button while device is locked") NOTE_CLOSED_VIA_STYLUS_TAIL_BUTTON_LOCKED(1312); diff --git a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskModule.kt b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskModule.kt index c7aae3ca788e..a1c5c9c682c3 100644 --- a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskModule.kt +++ b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskModule.kt @@ -27,11 +27,27 @@ import com.android.systemui.notetask.NoteTaskBubblesController.NoteTaskBubblesSe import com.android.systemui.notetask.quickaffordance.NoteTaskQuickAffordanceModule import com.android.systemui.notetask.shortcut.CreateNoteTaskShortcutActivity import com.android.systemui.notetask.shortcut.LaunchNoteTaskActivity +import com.android.systemui.qs.QsEventLogger +import com.android.systemui.qs.pipeline.shared.TileSpec +import com.android.systemui.qs.shared.model.TileCategory +import com.android.systemui.qs.tileimpl.QSTileImpl +import com.android.systemui.qs.tiles.NotesTile +import com.android.systemui.qs.tiles.base.interactor.QSTileAvailabilityInteractor +import com.android.systemui.qs.tiles.base.viewmodel.QSTileViewModelFactory +import com.android.systemui.qs.tiles.impl.notes.domain.NotesTileMapper +import com.android.systemui.qs.tiles.impl.notes.domain.interactor.NotesTileDataInteractor +import com.android.systemui.qs.tiles.impl.notes.domain.interactor.NotesTileUserActionInteractor +import com.android.systemui.qs.tiles.impl.notes.domain.model.NotesTileModel +import com.android.systemui.qs.tiles.viewmodel.QSTileConfig +import com.android.systemui.qs.tiles.viewmodel.QSTileUIConfig +import com.android.systemui.qs.tiles.viewmodel.QSTileViewModel +import com.android.systemui.res.R import dagger.Binds import dagger.Module import dagger.Provides import dagger.multibindings.ClassKey import dagger.multibindings.IntoMap +import dagger.multibindings.StringKey /** Compose all dependencies required by Note Task feature. */ @Module(includes = [NoteTaskQuickAffordanceModule::class]) @@ -54,8 +70,22 @@ interface NoteTaskModule { @[Binds IntoMap ClassKey(CreateNoteTaskShortcutActivity::class)] fun bindNoteTaskShortcutActivity(activity: CreateNoteTaskShortcutActivity): Activity + @Binds + @IntoMap + @StringKey(NOTES_TILE_SPEC) + fun provideNotesAvailabilityInteractor( + impl: NotesTileDataInteractor + ): QSTileAvailabilityInteractor + + @Binds + @IntoMap + @StringKey(NotesTile.TILE_SPEC) + fun bindNotesTile(notesTile: NotesTile): QSTileImpl<*> + companion object { + const val NOTES_TILE_SPEC = "notes" + @[Provides NoteTaskEnabledKey] fun provideIsNoteTaskEnabled( featureFlags: FeatureFlags, @@ -65,5 +95,37 @@ interface NoteTaskModule { val isFeatureEnabled = featureFlags.isEnabled(Flags.NOTE_TASKS) return isRoleAvailable && isFeatureEnabled } + + /** Inject NotesTile into tileViewModelMap in QSModule */ + @Provides + @IntoMap + @StringKey(NOTES_TILE_SPEC) + fun provideNotesTileViewModel( + factory: QSTileViewModelFactory.Static<NotesTileModel>, + mapper: NotesTileMapper, + stateInteractor: NotesTileDataInteractor, + userActionInteractor: NotesTileUserActionInteractor, + ): QSTileViewModel = + factory.create( + TileSpec.create(NOTES_TILE_SPEC), + userActionInteractor, + stateInteractor, + mapper, + ) + + @Provides + @IntoMap + @StringKey(NOTES_TILE_SPEC) + fun provideNotesTileConfig(uiEventLogger: QsEventLogger): QSTileConfig = + QSTileConfig( + tileSpec = TileSpec.create(NOTES_TILE_SPEC), + uiConfig = + QSTileUIConfig.Resource( + iconRes = R.drawable.ic_qs_notes, + labelRes = R.string.quick_settings_notes_label, + ), + instanceId = uiEventLogger.getNewInstanceId(), + category = TileCategory.UTILITIES, + ) } } diff --git a/packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayActionsViewModel.kt b/packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayActionsViewModel.kt index 63bfbd1dc1ba..195b0cebe2eb 100644 --- a/packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayActionsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayActionsViewModel.kt @@ -18,7 +18,6 @@ package com.android.systemui.notifications.ui.viewmodel import com.android.compose.animation.scene.Back import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.UserAction import com.android.compose.animation.scene.UserActionResult import com.android.compose.animation.scene.UserActionResult.HideOverlay @@ -38,7 +37,7 @@ class NotificationsShadeOverlayActionsViewModel @AssistedInject constructor() : mapOf( Swipe.Up to HideOverlay(Overlays.NotificationsShade), Back to HideOverlay(Overlays.NotificationsShade), - Swipe(direction = SwipeDirection.Down, fromSource = SceneContainerEdge.TopRight) to + Swipe.Down(fromSource = SceneContainerEdge.TopRight) to ReplaceByOverlay(Overlays.QuickSettingsShade), ) ) diff --git a/packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayContentViewModel.kt b/packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayContentViewModel.kt index 7178d095d230..4fe63379aed4 100644 --- a/packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayContentViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayContentViewModel.kt @@ -16,19 +16,23 @@ package com.android.systemui.notifications.ui.viewmodel +import androidx.compose.runtime.getValue +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.systemui.lifecycle.ExclusiveActivatable +import com.android.systemui.lifecycle.Hydrator import com.android.systemui.scene.domain.interactor.SceneInteractor import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.shade.ui.viewmodel.ShadeHeaderViewModel +import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import kotlinx.coroutines.awaitCancellation import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter -import com.android.app.tracing.coroutines.launchTraced as launch /** * Models UI state used to render the content of the notifications shade overlay. @@ -43,10 +47,32 @@ constructor( val notificationsPlaceholderViewModelFactory: NotificationsPlaceholderViewModel.Factory, val sceneInteractor: SceneInteractor, private val shadeInteractor: ShadeInteractor, + activeNotificationsInteractor: ActiveNotificationsInteractor, ) : ExclusiveActivatable() { + private val hydrator = Hydrator("NotificationsShadeOverlayContentViewModel.hydrator") + + val showHeader: Boolean by + hydrator.hydratedStateOf( + traceName = "showHeader", + initialValue = + shouldShowHeader( + isShadeLayoutWide = shadeInteractor.isShadeLayoutWide.value, + areAnyNotificationsPresent = + activeNotificationsInteractor.areAnyNotificationsPresentValue, + ), + source = + combine( + shadeInteractor.isShadeLayoutWide, + activeNotificationsInteractor.areAnyNotificationsPresent, + this::shouldShowHeader, + ), + ) + override suspend fun onActivated(): Nothing { coroutineScope { + launch { hydrator.activate() } + launch { sceneInteractor.currentScene.collect { currentScene -> when (currentScene) { @@ -77,6 +103,13 @@ constructor( shadeInteractor.collapseNotificationsShade(loggingReason = "shade scrim clicked") } + private fun shouldShowHeader( + isShadeLayoutWide: Boolean, + areAnyNotificationsPresent: Boolean, + ): Boolean { + return !isShadeLayoutWide && areAnyNotificationsPresent + } + @AssistedFactory interface Factory { fun create(): NotificationsShadeOverlayContentViewModel diff --git a/packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeUserActionsViewModel.kt b/packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeUserActionsViewModel.kt index 11854d9317c9..398ace4b67f4 100644 --- a/packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeUserActionsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeUserActionsViewModel.kt @@ -18,7 +18,6 @@ package com.android.systemui.notifications.ui.viewmodel import com.android.compose.animation.scene.Back import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.UserAction import com.android.compose.animation.scene.UserActionResult import com.android.compose.animation.scene.UserActionResult.ReplaceByOverlay @@ -40,7 +39,7 @@ class NotificationsShadeUserActionsViewModel @AssistedInject constructor() : mapOf( Back to SceneFamilies.Home, Swipe.Up to SceneFamilies.Home, - Swipe(direction = SwipeDirection.Down, fromSource = SceneContainerEdge.TopRight) to + Swipe.Down(fromSource = SceneContainerEdge.TopRight) to ReplaceByOverlay(Overlays.QuickSettingsShade), ) ) diff --git a/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt b/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt index bacff99fe048..51ff598c580b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt @@ -31,6 +31,7 @@ import android.widget.FrameLayout import androidx.activity.OnBackPressedDispatcher import androidx.activity.OnBackPressedDispatcherOwner import androidx.activity.setViewTreeOnBackPressedDispatcherOwner +import androidx.annotation.VisibleForTesting import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.tween @@ -41,14 +42,14 @@ import androidx.compose.foundation.ScrollState import androidx.compose.foundation.layout.Arrangement.spacedBy import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.offset -import androidx.compose.foundation.layout.windowInsetsPadding +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.verticalScroll import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect @@ -59,6 +60,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshotFlow +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.input.pointer.PointerEventPass @@ -75,7 +77,6 @@ import androidx.compose.ui.semantics.CustomAccessibilityAction import androidx.compose.ui.semantics.customActions import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.IntOffset -import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.round import androidx.compose.ui.util.fastRoundToInt import androidx.compose.ui.viewinterop.AndroidView @@ -97,6 +98,7 @@ import com.android.compose.modifiers.padding import com.android.compose.modifiers.thenIf import com.android.compose.theme.PlatformTheme import com.android.systemui.Dumpable +import com.android.systemui.brightness.ui.compose.BrightnessSliderContainer import com.android.systemui.compose.modifiers.sysuiResTag import com.android.systemui.dump.DumpManager import com.android.systemui.lifecycle.repeatWhenAttached @@ -107,6 +109,7 @@ import com.android.systemui.plugins.qs.QSContainerController import com.android.systemui.qs.composefragment.SceneKeys.QuickQuickSettings import com.android.systemui.qs.composefragment.SceneKeys.QuickSettings import com.android.systemui.qs.composefragment.SceneKeys.toIdleSceneKey +import com.android.systemui.qs.composefragment.ui.GridAnchor import com.android.systemui.qs.composefragment.ui.NotificationScrimClipParams import com.android.systemui.qs.composefragment.ui.notificationScrimClip import com.android.systemui.qs.composefragment.ui.quickQuickSettingsToQuickSettings @@ -115,8 +118,8 @@ import com.android.systemui.qs.flags.QSComposeFragment import com.android.systemui.qs.footer.ui.compose.FooterActions import com.android.systemui.qs.panels.ui.compose.EditMode import com.android.systemui.qs.panels.ui.compose.QuickQuickSettings +import com.android.systemui.qs.panels.ui.compose.TileGrid import com.android.systemui.qs.shared.ui.ElementKeys -import com.android.systemui.qs.ui.composable.QuickSettingsLayout import com.android.systemui.qs.ui.composable.QuickSettingsShade import com.android.systemui.qs.ui.composable.QuickSettingsTheme import com.android.systemui.res.R @@ -195,6 +198,7 @@ constructor( val context = inflater.context val composeView = ComposeView(context).apply { + id = R.id.quick_settings_container repeatWhenAttached { repeatOnLifecycle(Lifecycle.State.CREATED) { setViewTreeOnBackPressedDispatcherOwner( @@ -239,7 +243,6 @@ constructor( visible = viewModel.isQsVisible, modifier = Modifier.graphicsLayer { alpha = viewModel.viewAlpha } - .windowInsetsPadding(WindowInsets.navigationBars) // Clipping before translation to match QSContainerImpl.onDraw .offset { IntOffset(x = 0, y = viewModel.viewTranslationY.fastRoundToInt()) @@ -299,7 +302,7 @@ constructor( transitions = transitions { from(QuickQuickSettings, QuickSettings) { - quickQuickSettingsToQuickSettings(viewModel::inFirstPage::get) + quickQuickSettingsToQuickSettings(viewModel::animateTilesExpansion::get) } }, ) @@ -596,8 +599,21 @@ constructor( } .padding(top = { qqsPadding }, bottom = { bottomPadding }) ) { + val Tiles = + @Composable { + QuickQuickSettings( + viewModel = viewModel.containerViewModel.quickQuickSettingsViewModel + ) + } + val Media = + @Composable { + if (viewModel.qqsMediaVisible) { + MediaObject(mediaHost = viewModel.qqsMediaHost) + } + } + if (viewModel.isQsEnabled) { - Column( + Box( modifier = Modifier.collapseExpandSemanticAction( stringResource( @@ -608,16 +624,13 @@ constructor( horizontal = { QuickSettingsShade.Dimensions.Padding.roundToPx() } - ), - verticalArrangement = - spacedBy(dimensionResource(R.dimen.qs_tile_margin_vertical)), + ) ) { - QuickQuickSettings( - viewModel = viewModel.containerViewModel.quickQuickSettingsViewModel + QuickQuickSettingsLayout( + tiles = Tiles, + media = Media, + mediaInRow = viewModel.qqsMediaInRow, ) - if (viewModel.qqsMediaVisible) { - MediaObject(mediaHost = viewModel.qqsMediaHost) - } } } } @@ -657,23 +670,58 @@ constructor( .verticalScroll(scrollState) .sysuiResTag(ResIdTags.qsScroll) ) { + val containerViewModel = viewModel.containerViewModel Spacer( modifier = Modifier.height { qqsPadding + qsExtraPadding.roundToPx() } ) - QuickSettingsLayout( - viewModel = viewModel.containerViewModel, - modifier = Modifier.sysuiResTag(ResIdTags.quickSettingsPanel), - ) - Spacer(modifier = Modifier.height(8.dp)) - if (viewModel.qsMediaVisible) { - MediaObject( - mediaHost = viewModel.qsMediaHost, - modifier = - Modifier.padding( - horizontal = { - QuickSettingsShade.Dimensions.Padding.roundToPx() - } - ), + val BrightnessSlider = + @Composable { + BrightnessSliderContainer( + viewModel = containerViewModel.brightnessSliderViewModel, + modifier = + Modifier.fillMaxWidth() + .height( + QuickSettingsShade.Dimensions.BrightnessSliderHeight + ), + ) + } + val TileGrid = + @Composable { + Box { + GridAnchor() + TileGrid( + viewModel = containerViewModel.tileGridViewModel, + modifier = + Modifier.fillMaxWidth() + .heightIn( + max = + QuickSettingsShade.Dimensions.GridMaxHeight + ), + containerViewModel.editModeViewModel::startEditing, + ) + } + } + val Media = + @Composable { + if (viewModel.qsMediaVisible) { + MediaObject(mediaHost = viewModel.qsMediaHost) + } + } + Box( + modifier = + Modifier.fillMaxWidth() + .sysuiResTag(ResIdTags.quickSettingsPanel) + .padding( + top = QuickSettingsShade.Dimensions.Padding, + start = QuickSettingsShade.Dimensions.Padding, + end = QuickSettingsShade.Dimensions.Padding, + ) + ) { + QuickSettingsLayout( + brightness = BrightnessSlider, + tiles = TileGrid, + media = Media, + mediaInRow = viewModel.qsMediaInRow, ) } } @@ -957,6 +1005,63 @@ private fun MediaObject(mediaHost: MediaHost, modifier: Modifier = Modifier) { } } +@Composable +@VisibleForTesting +fun QuickQuickSettingsLayout( + tiles: @Composable () -> Unit, + media: @Composable () -> Unit, + mediaInRow: Boolean, +) { + if (mediaInRow) { + Row( + horizontalArrangement = spacedBy(dimensionResource(R.dimen.qs_tile_margin_vertical)), + verticalAlignment = Alignment.CenterVertically, + ) { + Box(modifier = Modifier.weight(1f)) { tiles() } + Box(modifier = Modifier.weight(1f)) { media() } + } + } else { + Column(verticalArrangement = spacedBy(dimensionResource(R.dimen.qs_tile_margin_vertical))) { + tiles() + media() + } + } +} + +@Composable +@VisibleForTesting +fun QuickSettingsLayout( + brightness: @Composable () -> Unit, + tiles: @Composable () -> Unit, + media: @Composable () -> Unit, + mediaInRow: Boolean, +) { + if (mediaInRow) { + Column( + verticalArrangement = spacedBy(QuickSettingsShade.Dimensions.Padding), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + brightness() + Row( + horizontalArrangement = spacedBy(QuickSettingsShade.Dimensions.Padding), + verticalAlignment = Alignment.CenterVertically, + ) { + Box(modifier = Modifier.weight(1f)) { tiles() } + Box(modifier = Modifier.weight(1f)) { media() } + } + } + } else { + Column( + verticalArrangement = spacedBy(QuickSettingsShade.Dimensions.Padding), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + brightness() + tiles() + media() + } + } +} + private object ResIdTags { const val quickSettingsPanel = "quick_settings_panel" const val quickQsPanel = "quick_qs_panel" diff --git a/packages/SystemUI/src/com/android/systemui/qs/composefragment/dagger/QSFragmentComposeModule.kt b/packages/SystemUI/src/com/android/systemui/qs/composefragment/dagger/QSFragmentComposeModule.kt index 512732090036..676f6a426264 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/composefragment/dagger/QSFragmentComposeModule.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/composefragment/dagger/QSFragmentComposeModule.kt @@ -19,6 +19,7 @@ package com.android.systemui.qs.composefragment.dagger import android.content.Context import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.qs.flags.QSComposeFragment import com.android.systemui.util.Utils import dagger.Module import dagger.Provides @@ -34,7 +35,7 @@ interface QSFragmentComposeModule { @SysUISingleton @Named(QS_USING_MEDIA_PLAYER) fun providesUsingMedia(@Application context: Context): Boolean { - return Utils.useQsMediaPlayer(context) + return QSComposeFragment.isEnabled && Utils.useQsMediaPlayer(context) } } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/composefragment/ui/FromQuickQuickSettingsToQuickSettings.kt b/packages/SystemUI/src/com/android/systemui/qs/composefragment/ui/FromQuickQuickSettingsToQuickSettings.kt index 9e3945ecba57..c1a417411975 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/composefragment/ui/FromQuickQuickSettingsToQuickSettings.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/composefragment/ui/FromQuickQuickSettingsToQuickSettings.kt @@ -20,7 +20,9 @@ import com.android.compose.animation.scene.TransitionBuilder import com.android.systemui.qs.composefragment.SceneKeys import com.android.systemui.qs.shared.ui.ElementKeys -fun TransitionBuilder.quickQuickSettingsToQuickSettings(inFirstPage: () -> Boolean = { true }) { +fun TransitionBuilder.quickQuickSettingsToQuickSettings( + animateTilesExpansion: () -> Boolean = { true } +) { fractionRange(start = 0.5f) { fade(ElementKeys.QuickSettingsContent) } @@ -28,7 +30,7 @@ fun TransitionBuilder.quickQuickSettingsToQuickSettings(inFirstPage: () -> Boole anchoredTranslate(ElementKeys.QuickSettingsContent, ElementKeys.GridAnchor) - sharedElement(ElementKeys.TileElementMatcher, enabled = inFirstPage()) + sharedElement(ElementKeys.TileElementMatcher, enabled = animateTilesExpansion()) // This will animate between 0f (QQS) and 0.6, fading in the QQS tiles when coming back // from non first page QS. The QS content ends fading out at 0.5f, so there's a brief diff --git a/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt index 0ca621d7d2e2..624cf306a3b2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt @@ -39,6 +39,8 @@ import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.lifecycle.ExclusiveActivatable import com.android.systemui.lifecycle.Hydrator import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager +import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.Companion.LOCATION_QQS +import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.Companion.LOCATION_QS import com.android.systemui.media.controls.ui.view.MediaHost import com.android.systemui.media.controls.ui.view.MediaHostState import com.android.systemui.media.dagger.MediaModule.QS_PANEL @@ -49,10 +51,12 @@ import com.android.systemui.qs.composefragment.dagger.QSFragmentComposeModule import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel import com.android.systemui.qs.panels.domain.interactor.TileSquishinessInteractor import com.android.systemui.qs.panels.ui.viewmodel.InFirstPageViewModel +import com.android.systemui.qs.panels.ui.viewmodel.MediaInRowInLandscapeViewModel import com.android.systemui.qs.ui.viewmodel.QuickSettingsContainerViewModel import com.android.systemui.res.R import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.shade.LargeScreenHeaderHelper +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.transition.LargeScreenShadeInterpolator import com.android.systemui.statusbar.StatusBarState import com.android.systemui.statusbar.SysuiStatusBarStateController @@ -90,10 +94,11 @@ constructor( disableFlagsRepository: DisableFlagsRepository, keyguardTransitionInteractor: KeyguardTransitionInteractor, private val largeScreenShadeInterpolator: LargeScreenShadeInterpolator, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, private val largeScreenHeaderHelper: LargeScreenHeaderHelper, private val squishinessInteractor: TileSquishinessInteractor, private val inFirstPageViewModel: InFirstPageViewModel, + mediaInRowInLandscapeViewModelFactory: MediaInRowInLandscapeViewModel.Factory, @Named(QUICK_QS_PANEL) val qqsMediaHost: MediaHost, @Named(QS_PANEL) val qsMediaHost: MediaHost, @Named(QSFragmentComposeModule.QS_USING_MEDIA_PLAYER) private val usingMedia: Boolean, @@ -101,6 +106,8 @@ constructor( ) : Dumpable, ExclusiveActivatable() { val containerViewModel = containerViewModelFactory.create(true) + private val qqsMediaInRowViewModel = mediaInRowInLandscapeViewModelFactory.create(LOCATION_QQS) + private val qsMediaInRowViewModel = mediaInRowInLandscapeViewModelFactory.create(LOCATION_QS) private val hydrator = Hydrator("QSFragmentComposeViewModel.hydrator") @@ -195,7 +202,7 @@ constructor( } } - val isQsFullyExpanded by derivedStateOf { expansionState.progress >= 1f } + val isQsFullyExpanded by derivedStateOf { expansionState.progress >= 1f && isQsExpanded } /** * Accessibility action for collapsing/expanding QS. The provided runnable is responsible for @@ -203,9 +210,6 @@ constructor( */ var collapseExpandAccessibilityAction: Runnable? = null - val inFirstPage: Boolean - get() = inFirstPageViewModel.inFirstPage - var overScrollAmount by mutableStateOf(0) val viewTranslationY by derivedStateOf { @@ -252,6 +256,9 @@ constructor( }, ) + val qqsMediaInRow: Boolean + get() = qqsMediaInRowViewModel.shouldMediaShowInRow + val qsMediaVisible by hydrator.hydratedStateOf( traceName = "qsMediaVisible", @@ -259,6 +266,18 @@ constructor( source = if (usingMedia) mediaHostVisible(qsMediaHost) else flowOf(false), ) + val qsMediaInRow: Boolean + get() = qsMediaInRowViewModel.shouldMediaShowInRow + + val animateTilesExpansion: Boolean + get() = inFirstPage && !mediaSuddenlyAppearingInLandscape + + private val inFirstPage: Boolean + get() = inFirstPageViewModel.inFirstPage + + private val mediaSuddenlyAppearingInLandscape: Boolean + get() = !qqsMediaInRow && qsMediaInRow + private var qsBounds by mutableStateOf(Rect()) private val constrainedSquishinessFraction: Float @@ -362,6 +381,8 @@ constructor( launch { hydrateSquishinessInteractor() } launch { hydrator.activate() } launch { containerViewModel.activate() } + launch { qqsMediaInRowViewModel.activate() } + launch { qsMediaInRowViewModel.activate() } awaitCancellation() } } @@ -391,6 +412,7 @@ constructor( println("isQSVisible", isQsVisible) println("isQSEnabled", isQsEnabled) println("isCustomizing", containerViewModel.editModeViewModel.isEditing.value) + println("inFirstPage", inFirstPage) } printSection("Expansion state") { println("qsExpansion", qsExpansion) @@ -423,7 +445,9 @@ constructor( } printSection("Media") { println("qqsMediaVisible", qqsMediaVisible) + println("qqsMediaInRow", qqsMediaInRow) println("qsMediaVisible", qsMediaVisible) + println("qsMediaInRow", qsMediaInRow) } } } 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 index 43fd0f5feec7..1f55ac777de5 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/dagger/PanelsModule.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/dagger/PanelsModule.kt @@ -35,8 +35,6 @@ import com.android.systemui.qs.panels.ui.compose.PaginatedGridLayout import com.android.systemui.qs.panels.ui.compose.infinitegrid.InfiniteGridLayout import com.android.systemui.qs.panels.ui.viewmodel.IconTilesViewModel import com.android.systemui.qs.panels.ui.viewmodel.IconTilesViewModelImpl -import com.android.systemui.qs.panels.ui.viewmodel.QSColumnsSizeViewModelImpl -import com.android.systemui.qs.panels.ui.viewmodel.QSColumnsViewModel import dagger.Binds import dagger.Module import dagger.Provides @@ -58,8 +56,6 @@ interface PanelsModule { @Binds fun bindIconTilesViewModel(impl: IconTilesViewModelImpl): IconTilesViewModel - @Binds fun bindQSColumnsViewModel(impl: QSColumnsSizeViewModelImpl): QSColumnsViewModel - @Binds @PaginatedBaseLayoutType fun bindPaginatedBaseGridLayout(impl: InfiniteGridLayout): PaginatableGridLayout diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PaginatedGridLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PaginatedGridLayout.kt index 6cc2cbc63d09..2efe500912cd 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PaginatedGridLayout.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PaginatedGridLayout.kt @@ -73,7 +73,7 @@ constructor( tiles.forEach { it.startListening(token) } onDispose { tiles.forEach { it.stopListening(token) } } } - val columns by viewModel.columns + val columns = viewModel.columns val rows = viewModel.rows val pages = diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt index 19ab29e6c796..5ac2ad02d671 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt @@ -30,6 +30,7 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.grid.ui.compose.VerticalSpannedGrid import com.android.systemui.haptics.msdl.qs.TileHapticsViewModelFactoryProvider import com.android.systemui.lifecycle.rememberViewModel +import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.Companion.LOCATION_QS import com.android.systemui.qs.panels.shared.model.SizedTileImpl import com.android.systemui.qs.panels.ui.compose.PaginatableGridLayout import com.android.systemui.qs.panels.ui.compose.bounceableInfo @@ -72,7 +73,12 @@ constructor( rememberViewModel(traceName = "InfiniteGridLayout.TileGrid") { viewModel.dynamicIconTilesViewModelFactory.create() } - val columns by viewModel.gridSizeViewModel.columns + val columnsWithMediaViewModel = + rememberViewModel(traceName = "InfiniteGridLAyout.TileGrid") { + viewModel.columnsWithMediaViewModelFactory.create(LOCATION_QS) + } + + val columns = columnsWithMediaViewModel.columns val sizedTiles = tiles.map { SizedTileImpl(it, it.spec.width()) } val bounceables = remember(sizedTiles) { List(sizedTiles.size) { BounceableTileViewModel() } } @@ -118,7 +124,11 @@ constructor( rememberViewModel(traceName = "InfiniteGridLayout.EditTileGrid") { viewModel.dynamicIconTilesViewModelFactory.create() } - val columns by viewModel.gridSizeViewModel.columns + val columnsViewModel = + rememberViewModel(traceName = "InfiniteGridLayout.EditTileGrid") { + viewModel.columnsWithMediaViewModelFactory.createWithoutMediaTracking() + } + val columns = columnsViewModel.columns val largeTiles by iconTilesViewModel.largeTiles.collectAsStateWithLifecycle() // Non-current tiles should always be displayed as icon tiles. diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/EditModeViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/EditModeViewModel.kt index 7fe856b871bd..4e34e73654fc 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/EditModeViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/EditModeViewModel.kt @@ -30,6 +30,7 @@ import com.android.systemui.qs.pipeline.domain.interactor.CurrentTilesInteractor import com.android.systemui.qs.pipeline.domain.interactor.CurrentTilesInteractor.Companion.POSITION_AT_END import com.android.systemui.qs.pipeline.domain.interactor.MinimumTilesInteractor import com.android.systemui.qs.pipeline.shared.TileSpec +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.util.kotlin.emitOnStart import javax.inject.Inject import javax.inject.Named @@ -54,7 +55,7 @@ constructor( private val currentTilesInteractor: CurrentTilesInteractor, private val tilesAvailabilityInteractor: TilesAvailabilityInteractor, private val minTilesInteractor: MinimumTilesInteractor, - private val configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware private val configurationInteractor: ConfigurationInteractor, @Application private val applicationContext: Context, @Named("Default") private val defaultGridLayout: GridLayout, @Application private val applicationScope: CoroutineScope, diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/InfiniteGridViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/InfiniteGridViewModel.kt index d68710048e13..3327141d2bc5 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/InfiniteGridViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/InfiniteGridViewModel.kt @@ -16,7 +16,6 @@ package com.android.systemui.qs.panels.ui.viewmodel -import com.android.systemui.lifecycle.ExclusiveActivatable import com.android.systemui.qs.panels.ui.dialog.QSResetDialogDelegate import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject @@ -25,19 +24,15 @@ class InfiniteGridViewModel @AssistedInject constructor( val dynamicIconTilesViewModelFactory: DynamicIconTilesViewModel.Factory, - val gridSizeViewModel: QSColumnsViewModel, + val columnsWithMediaViewModelFactory: QSColumnsViewModel.Factory, val squishinessViewModel: TileSquishinessViewModel, private val resetDialogDelegate: QSResetDialogDelegate, -) : ExclusiveActivatable() { +) { fun showResetDialog() { resetDialogDelegate.showDialog() } - override suspend fun onActivated(): Nothing { - gridSizeViewModel.activate() - } - @AssistedFactory interface Factory { fun create(): InfiniteGridViewModel diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModel.kt new file mode 100644 index 000000000000..2ed8fd20df8f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModel.kt @@ -0,0 +1,118 @@ +/* + * 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.ui.viewmodel + +import android.content.res.Configuration +import android.content.res.Resources +import androidx.compose.runtime.getValue +import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.lifecycle.ExclusiveActivatable +import com.android.systemui.lifecycle.Hydrator +import com.android.systemui.media.controls.ui.controller.MediaHostStatesManager +import com.android.systemui.media.controls.ui.controller.MediaLocation +import com.android.systemui.media.controls.ui.view.MediaHostState +import com.android.systemui.qs.composefragment.dagger.QSFragmentComposeModule +import com.android.systemui.shade.domain.interactor.ShadeModeInteractor +import com.android.systemui.shade.shared.model.ShadeMode +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject +import javax.inject.Named +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onStart + +/** + * Indicates whether a particular UMO in [LOCATION_QQS] or [LOCATION_QS] should currently show in a + * row with the tiles, based on its visibility and device configuration. If the player is not + * visible, it will never indicate that media should show in row. + */ +class MediaInRowInLandscapeViewModel +@AssistedInject +constructor( + @Main resources: Resources, + configurationInteractor: ConfigurationInteractor, + shadeModeInteractor: ShadeModeInteractor, + private val mediaHostStatesManager: MediaHostStatesManager, + @Named(QSFragmentComposeModule.QS_USING_MEDIA_PLAYER) private val usingMedia: Boolean, + @Assisted @MediaLocation private val inLocation: Int, +) : ExclusiveActivatable() { + + private val hydrator = Hydrator("MediaInRowInLanscapeViewModel - $inLocation") + + val shouldMediaShowInRow: Boolean + get() = usingMedia && inSingleShade && isLandscapeAndLong && isMediaVisible + + private val inSingleShade: Boolean by + hydrator.hydratedStateOf( + traceName = "inSingleShade", + initialValue = shadeModeInteractor.shadeMode.value == ShadeMode.Single, + source = shadeModeInteractor.shadeMode.map { it == ShadeMode.Single }, + ) + + private val isLandscapeAndLong: Boolean by + hydrator.hydratedStateOf( + traceName = "isLandscapeAndLong", + initialValue = resources.configuration.isLandscapeAndLong, + source = configurationInteractor.configurationValues.map { it.isLandscapeAndLong }, + ) + + private val isMediaVisible by + hydrator.hydratedStateOf( + traceName = "isMediaVisible", + initialValue = false, + source = + conflatedCallbackFlow { + val callback = + object : MediaHostStatesManager.Callback { + override fun onHostStateChanged( + location: Int, + mediaHostState: MediaHostState, + ) { + if (location == inLocation) { + trySend(mediaHostState.visible) + } + } + } + mediaHostStatesManager.addCallback(callback) + + awaitClose { mediaHostStatesManager.removeCallback(callback) } + } + .onStart { + emit( + mediaHostStatesManager.mediaHostStates.get(inLocation)?.visible ?: false + ) + }, + ) + + override suspend fun onActivated(): Nothing { + hydrator.activate() + } + + @AssistedFactory + interface Factory { + fun create(@MediaLocation inLocation: Int): MediaInRowInLandscapeViewModel + } +} + +private val Configuration.isLandscapeAndLong: Boolean + get() = + orientation == Configuration.ORIENTATION_LANDSCAPE && + (screenLayout and Configuration.SCREENLAYOUT_LONG_MASK) == + Configuration.SCREENLAYOUT_LONG_YES diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModel.kt index 8bd9ed05c12c..e5607eb6e620 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModel.kt @@ -16,10 +16,10 @@ package com.android.systemui.qs.panels.ui.viewmodel -import androidx.compose.runtime.State import androidx.compose.runtime.getValue import com.android.systemui.lifecycle.ExclusiveActivatable import com.android.systemui.lifecycle.Hydrator +import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.Companion.LOCATION_QS import com.android.systemui.qs.panels.domain.interactor.PaginatedGridInteractor import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject @@ -31,12 +31,13 @@ class PaginatedGridViewModel @AssistedInject constructor( iconTilesViewModel: IconTilesViewModel, - private val gridSizeViewModel: QSColumnsViewModel, + columnsWithMediaViewModelFactory: QSColumnsViewModel.Factory, paginatedGridInteractor: PaginatedGridInteractor, inFirstPageViewModel: InFirstPageViewModel, ) : IconTilesViewModel by iconTilesViewModel, ExclusiveActivatable() { private val hydrator = Hydrator("PaginatedGridViewModel") + private val columnsWithMediaViewModel = columnsWithMediaViewModelFactory.create(LOCATION_QS) val rows by hydrator.hydratedStateOf( @@ -47,13 +48,13 @@ constructor( var inFirstPage by inFirstPageViewModel::inFirstPage - val columns: State<Int> - get() = gridSizeViewModel.columns + val columns: Int + get() = columnsWithMediaViewModel.columns override suspend fun onActivated(): Nothing { coroutineScope { launch { hydrator.activate() } - launch { gridSizeViewModel.activate() } + launch { columnsWithMediaViewModel.activate() } awaitCancellation() } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModel.kt index 8926d2ff107e..85b7831fb270 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModel.kt @@ -16,25 +16,61 @@ package com.android.systemui.qs.panels.ui.viewmodel -import androidx.compose.runtime.State -import com.android.systemui.lifecycle.Activatable +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue import com.android.systemui.lifecycle.ExclusiveActivatable import com.android.systemui.lifecycle.Hydrator +import com.android.systemui.media.controls.ui.controller.MediaLocation import com.android.systemui.qs.panels.domain.interactor.QSColumnsInteractor -import javax.inject.Inject +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject +import kotlinx.coroutines.awaitCancellation +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.launch -interface QSColumnsViewModel : Activatable { - val columns: State<Int> -} +/** + * View model for the number of columns that should be shown in a QS grid. + * * Create it with a [MediaLocation] to halve the number of columns when media should show in a row + * with the tiles. + * * Create it with a `null` [MediaLocation] to ignore media visibility (useful for edit mode). + */ +class QSColumnsViewModel +@AssistedInject +constructor( + interactor: QSColumnsInteractor, + mediaInRowInLandscapeViewModelFactory: MediaInRowInLandscapeViewModel.Factory, + @Assisted @MediaLocation mediaLocation: Int?, +) : ExclusiveActivatable() { + + private val hydrator = Hydrator("QSColumnsViewModelWithMedia") + + val columns by derivedStateOf { + if (mediaInRowInLandscapeViewModel?.shouldMediaShowInRow == true) { + columnsWithoutMedia / 2 + } else { + columnsWithoutMedia + } + } -class QSColumnsSizeViewModelImpl @Inject constructor(interactor: QSColumnsInteractor) : - QSColumnsViewModel, ExclusiveActivatable() { - private val hydrator = Hydrator("QSColumnsSizeViewModelImpl") + private val mediaInRowInLandscapeViewModel = + mediaLocation?.let { mediaInRowInLandscapeViewModelFactory.create(it) } - override val columns = - hydrator.hydratedStateOf(traceName = "columns", source = interactor.columns) + private val columnsWithoutMedia by + hydrator.hydratedStateOf(traceName = "columnsWithoutMedia", source = interactor.columns) override suspend fun onActivated(): Nothing { - hydrator.activate() + coroutineScope { + launch { hydrator.activate() } + launch { mediaInRowInLandscapeViewModel?.activate() } + awaitCancellation() + } + } + + @AssistedFactory + interface Factory { + fun create(mediaLocation: Int?): QSColumnsViewModel + + fun createWithoutMediaTracking() = create(null) } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModel.kt index 0859c86d74e1..33ce5519b68c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModel.kt @@ -21,6 +21,7 @@ import androidx.compose.runtime.getValue import com.android.systemui.haptics.msdl.qs.TileHapticsViewModelFactoryProvider import com.android.systemui.lifecycle.ExclusiveActivatable import com.android.systemui.lifecycle.Hydrator +import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.Companion.LOCATION_QQS import com.android.systemui.qs.panels.domain.interactor.QuickQuickSettingsRowInteractor import com.android.systemui.qs.panels.shared.model.SizedTileImpl import com.android.systemui.qs.panels.shared.model.splitInRowsSequence @@ -36,23 +37,35 @@ class QuickQuickSettingsViewModel @AssistedInject constructor( tilesInteractor: CurrentTilesInteractor, - private val qsColumnsViewModel: QSColumnsViewModel, + qsColumnsViewModelFactory: QSColumnsViewModel.Factory, quickQuickSettingsRowInteractor: QuickQuickSettingsRowInteractor, + mediaInRowInLandscapeViewModelFactory: MediaInRowInLandscapeViewModel.Factory, val squishinessViewModel: TileSquishinessViewModel, iconTilesViewModel: IconTilesViewModel, val tileHapticsViewModelFactoryProvider: TileHapticsViewModelFactoryProvider, ) : ExclusiveActivatable() { private val hydrator = Hydrator("QuickQuickSettingsViewModel") + private val qsColumnsViewModel = qsColumnsViewModelFactory.create(LOCATION_QQS) + private val mediaInRowViewModel = mediaInRowInLandscapeViewModelFactory.create(LOCATION_QQS) - val columns by qsColumnsViewModel.columns + val columns: Int + get() = qsColumnsViewModel.columns private val largeTiles by hydrator.hydratedStateOf(traceName = "largeTiles", source = iconTilesViewModel.largeTiles) - private val rows by + private val rows: Int + get() = + if (mediaInRowViewModel.shouldMediaShowInRow) { + rowsWithoutMedia * 2 + } else { + rowsWithoutMedia + } + + private val rowsWithoutMedia by hydrator.hydratedStateOf( - traceName = "rows", + traceName = "rowsWithoutMedia", initialValue = quickQuickSettingsRowInteractor.defaultRows, source = quickQuickSettingsRowInteractor.rows, ) @@ -73,6 +86,7 @@ constructor( coroutineScope { launch { hydrator.activate() } launch { qsColumnsViewModel.activate() } + launch { mediaInRowViewModel.activate() } awaitCancellation() } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SubtitleArrayMapping.kt b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SubtitleArrayMapping.kt index f702da46717a..c9a0635021da 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SubtitleArrayMapping.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SubtitleArrayMapping.kt @@ -54,6 +54,7 @@ object SubtitleArrayMapping { subtitleIdsMap["dream"] = R.array.tile_states_dream subtitleIdsMap["font_scaling"] = R.array.tile_states_font_scaling subtitleIdsMap["hearing_devices"] = R.array.tile_states_hearing_devices + subtitleIdsMap["notes"] = R.array.tile_states_notes } /** Get the subtitle resource id of the given tile */ diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NotesTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/NotesTile.kt new file mode 100644 index 000000000000..69df0961bf66 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NotesTile.kt @@ -0,0 +1,111 @@ +/* + * 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.tiles + +import android.content.Intent +import android.os.Handler +import android.os.Looper +import android.service.quicksettings.Tile +import com.android.internal.logging.MetricsLogger +import com.android.systemui.animation.Expandable +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.plugins.FalsingManager +import com.android.systemui.plugins.qs.QSTile +import com.android.systemui.plugins.statusbar.StatusBarStateController +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.qs.tiles.impl.notes.domain.NotesTileMapper +import com.android.systemui.qs.tiles.impl.notes.domain.interactor.NotesTileDataInteractor +import com.android.systemui.qs.tiles.impl.notes.domain.interactor.NotesTileUserActionInteractor +import com.android.systemui.qs.tiles.impl.notes.domain.model.NotesTileModel +import com.android.systemui.qs.tiles.viewmodel.QSTileConfigProvider +import com.android.systemui.qs.tiles.viewmodel.QSTileState +import com.android.systemui.res.R +import javax.inject.Inject +import kotlinx.coroutines.runBlocking + +/** Quick settings tile: Notes */ +class NotesTile +@Inject constructor( + private val host: QSHost, + private val uiEventLogger: QsEventLogger, + @Background private val backgroundLooper: Looper, + @Main private val mainHandler: Handler, + private val falsingManager: FalsingManager, + private val metricsLogger: MetricsLogger, + private val statusBarStateController: StatusBarStateController, + private val activityStarter: ActivityStarter, + private val qsLogger: QSLogger, + private val qsTileConfigProvider: QSTileConfigProvider, + private val dataInteractor: NotesTileDataInteractor, + private val tileMapper: NotesTileMapper, + private val userActionInteractor: NotesTileUserActionInteractor, +) : + QSTileImpl<QSTile.State?>( + host, + uiEventLogger, + backgroundLooper, + mainHandler, + falsingManager, + metricsLogger, + statusBarStateController, + activityStarter, + qsLogger, + ) { + + private lateinit var tileState: QSTileState + private val config = qsTileConfigProvider.getConfig(TILE_SPEC) + + override fun getTileLabel(): CharSequence = + mContext.getString(config.uiConfig.labelRes) + + override fun newTileState(): QSTile.State? { + return QSTile.State().apply { state = Tile.STATE_INACTIVE } + } + + override fun handleClick(expandable: Expandable?) { + userActionInteractor.handleClick() + } + + override fun getLongClickIntent(): Intent = userActionInteractor.longClickIntent + + override fun handleUpdateState(state: QSTile.State?, arg: Any?) { + val model = + if (arg is NotesTileModel) arg else dataInteractor.getCurrentTileModel() + tileState = tileMapper.map(config, model) + + state?.apply { + this.state = tileState.activationState.legacyState + icon = ResourceIcon.get(tileState.iconRes ?: R.drawable.ic_qs_notes) + label = tileState.label + contentDescription = tileState.contentDescription + expandedAccessibilityClassName = tileState.expandedAccessibilityClassName + } + } + + override fun isAvailable(): Boolean { + return dataInteractor.isAvailable() + } + + companion object { + const val TILE_SPEC = "notes" + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java index 284239ab1a78..f3be340f4951 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java @@ -191,8 +191,7 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> mPanelInteractor.collapsePanels(); }; - final Dialog dialog = mController.createScreenRecordDialog(mContext, mFlags, - mDialogTransitionAnimator, mActivityStarter, onStartRecordingClicked); + final Dialog dialog = mController.createScreenRecordDialog(onStartRecordingClicked); ActivityStarter.OnDismissAction dismissAction = () -> { if (shouldAnimateFromExpandable) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/NotesTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/NotesTileMapper.kt new file mode 100644 index 000000000000..ee1b9e5171b7 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/NotesTileMapper.kt @@ -0,0 +1,51 @@ +/* + * 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.tiles.impl.notes.domain + +import android.content.res.Resources +import android.widget.Button +import com.android.systemui.common.shared.model.Icon +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper +import com.android.systemui.qs.tiles.impl.notes.domain.model.NotesTileModel +import com.android.systemui.qs.tiles.viewmodel.QSTileConfig +import com.android.systemui.qs.tiles.viewmodel.QSTileState +import com.android.systemui.res.R +import javax.inject.Inject + +class NotesTileMapper +@Inject +constructor(@Main private val resources: Resources, private val theme: Resources.Theme) : + QSTileDataToStateMapper<NotesTileModel> { + override fun map(config: QSTileConfig, data: NotesTileModel): QSTileState = + QSTileState.build(resources, theme, config.uiConfig) { + iconRes = R.drawable.ic_qs_notes + icon = + Icon.Loaded( + resources.getDrawable( + iconRes!!, + theme), + contentDescription = null + ) + contentDescription = label + activationState = QSTileState.ActivationState.INACTIVE + sideViewIcon = QSTileState.SideViewIcon.Chevron + supportedActions = + setOf(QSTileState.UserAction.CLICK, QSTileState.UserAction.LONG_CLICK) + expandedAccessibilityClass = Button::class + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/interactor/NotesTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/interactor/NotesTileDataInteractor.kt new file mode 100644 index 000000000000..a501b8561330 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/interactor/NotesTileDataInteractor.kt @@ -0,0 +1,47 @@ +/* + * 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.tiles.impl.notes.domain.interactor + +import android.os.UserHandle +import com.android.systemui.Flags +import com.android.systemui.notetask.NoteTaskEnabledKey +import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger +import com.android.systemui.qs.tiles.base.interactor.QSTileDataInteractor +import com.android.systemui.qs.tiles.impl.notes.domain.model.NotesTileModel +import javax.inject.Inject +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flowOf + +class NotesTileDataInteractor +@Inject +constructor(@NoteTaskEnabledKey private val isNoteTaskEnabled: Boolean) : + QSTileDataInteractor<NotesTileModel> { + override fun tileData( + user: UserHandle, + triggers: Flow<DataUpdateTrigger>, + ): Flow<NotesTileModel> = flowOf(NotesTileModel) + + override fun availability(user: UserHandle): Flow<Boolean> = flowOf(isAvailable()) + + fun isAvailable(): Boolean { + return Flags.notesRoleQsTile() && isNoteTaskEnabled + } + + fun getCurrentTileModel(): NotesTileModel { + return NotesTileModel + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/interactor/NotesTileUserActionInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/interactor/NotesTileUserActionInteractor.kt new file mode 100644 index 000000000000..df01d99df0df --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/interactor/NotesTileUserActionInteractor.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.qs.tiles.impl.notes.domain.interactor + +import com.android.systemui.animation.Expandable +import com.android.systemui.notetask.NoteTaskController +import com.android.systemui.notetask.NoteTaskEntryPoint +import com.android.systemui.qs.pipeline.domain.interactor.PanelInteractor +import com.android.systemui.qs.tiles.base.actions.QSTileIntentUserInputHandler +import com.android.systemui.qs.tiles.base.interactor.QSTileInput +import com.android.systemui.qs.tiles.base.interactor.QSTileUserActionInteractor +import com.android.systemui.qs.tiles.impl.notes.domain.model.NotesTileModel +import com.android.systemui.qs.tiles.viewmodel.QSTileUserAction +import javax.inject.Inject + +class NotesTileUserActionInteractor +@Inject constructor( + private val qsTileIntentUserInputHandler: QSTileIntentUserInputHandler, + private val panelInteractor: PanelInteractor, + private val noteTaskController: NoteTaskController, +) : QSTileUserActionInteractor<NotesTileModel> { + val longClickIntent = NoteTaskController.createNotesRoleHolderSettingsIntent() + + override suspend fun handleInput(input: QSTileInput<NotesTileModel>) { + when (input.action) { + is QSTileUserAction.Click -> handleClick() + is QSTileUserAction.LongClick -> handleLongClick(input.action.expandable) + is QSTileUserAction.ToggleClick -> {} + } + } + + fun handleClick() { + noteTaskController.showNoteTask(NoteTaskEntryPoint.QS_NOTES_TILE) + panelInteractor.collapsePanels() + } + + fun handleLongClick(expandable: Expandable?) { + qsTileIntentUserInputHandler.handle(expandable, longClickIntent) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/model/NotesTileModel.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/model/NotesTileModel.kt new file mode 100644 index 000000000000..b72aa60e16f2 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/model/NotesTileModel.kt @@ -0,0 +1,20 @@ +/* + * 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.tiles.impl.notes.domain.model + +/** NotesTileModel tile model. */ +data object NotesTileModel diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractor.kt index 48b39ed25750..85aa6745e438 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractor.kt @@ -16,16 +16,13 @@ package com.android.systemui.qs.tiles.impl.screenrecord.domain.interactor -import android.content.Context import android.util.Log import com.android.internal.jank.InteractionJankMonitor import com.android.systemui.animation.DialogCuj import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable -import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.flags.FeatureFlagsClassic import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger import com.android.systemui.plugins.ActivityStarter @@ -45,7 +42,6 @@ import kotlinx.coroutines.withContext class ScreenRecordTileUserActionInteractor @Inject constructor( - @Application private val context: Context, @Main private val mainContext: CoroutineContext, @Background private val backgroundContext: CoroutineContext, private val screenRecordRepository: ScreenRecordRepository, @@ -55,8 +51,6 @@ constructor( private val dialogTransitionAnimator: DialogTransitionAnimator, private val panelInteractor: PanelInteractor, private val mediaProjectionMetricsLogger: MediaProjectionMetricsLogger, - private val featureFlags: FeatureFlagsClassic, - private val activityStarter: ActivityStarter, ) : QSTileUserActionInteractor<ScreenRecordModel> { override suspend fun handleInput(input: QSTileInput<ScreenRecordModel>): Unit = with(input) { @@ -89,14 +83,7 @@ constructor( panelInteractor.collapsePanels() } - val dialog = - recordingController.createScreenRecordDialog( - context, - featureFlags, - dialogTransitionAnimator, - activityStarter, - onStartRecordingClicked - ) + val dialog = recordingController.createScreenRecordDialog(onStartRecordingClicked) if (dialog == null) { Log.w(TAG, "showPrompt: dialog was null") @@ -115,7 +102,7 @@ constructor( expandable?.dialogTransitionController( DialogCuj( InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, - INTERACTION_JANK_TAG + INTERACTION_JANK_TAG, ) ) controller?.let { @@ -135,7 +122,7 @@ constructor( keyguardDismissUtil.executeWhenUnlocked( dismissAction, false /* requiresShadeOpen */, - true /* afterKeyguardDone */ + true, /* afterKeyguardDone */ ) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayActionsViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayActionsViewModel.kt index 9a416d1d3b3b..000f7f8a7d31 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayActionsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayActionsViewModel.kt @@ -18,7 +18,6 @@ package com.android.systemui.qs.ui.viewmodel import com.android.compose.animation.scene.Back import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.UserAction import com.android.compose.animation.scene.UserActionResult import com.android.compose.animation.scene.UserActionResult.HideOverlay @@ -47,7 +46,7 @@ constructor(private val editModeViewModel: EditModeViewModel) : UserActionsViewM put(Back, HideOverlay(Overlays.QuickSettingsShade)) } put( - Swipe(SwipeDirection.Down, fromSource = SceneContainerEdge.TopLeft), + Swipe.Down(fromSource = SceneContainerEdge.TopLeft), ReplaceByOverlay(Overlays.NotificationsShade), ) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModel.kt index 54e5caca107c..f59541545de4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModel.kt @@ -20,7 +20,6 @@ import com.android.compose.animation.scene.Back import com.android.compose.animation.scene.Edge import com.android.compose.animation.scene.SceneKey import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.UserAction import com.android.compose.animation.scene.UserActionResult import com.android.systemui.qs.ui.adapter.QSSceneAdapter @@ -44,10 +43,8 @@ import kotlinx.coroutines.flow.map */ class QuickSettingsUserActionsViewModel @AssistedInject -constructor( - private val qsSceneAdapter: QSSceneAdapter, - sceneBackInteractor: SceneBackInteractor, -) : UserActionsViewModel() { +constructor(private val qsSceneAdapter: QSSceneAdapter, sceneBackInteractor: SceneBackInteractor) : + UserActionsViewModel() { private val backScene: Flow<SceneKey> = sceneBackInteractor.backScene @@ -55,10 +52,7 @@ constructor( .map { it ?: Scenes.Shade } override suspend fun hydrateActions(setActions: (Map<UserAction, UserActionResult>) -> Unit) { - combine( - qsSceneAdapter.isCustomizerShowing, - backScene, - ) { isCustomizing, backScene -> + combine(qsSceneAdapter.isCustomizerShowing, backScene) { isCustomizing, backScene -> buildMap<UserAction, UserActionResult> { if (isCustomizing) { // TODO(b/332749288) Empty map so there are no back handlers and back can @@ -69,9 +63,9 @@ constructor( // while customizing } else { put(Back, UserActionResult(backScene)) - put(Swipe(SwipeDirection.Up), UserActionResult(backScene)) + put(Swipe.Up, UserActionResult(backScene)) put( - Swipe(fromSource = Edge.Bottom, direction = SwipeDirection.Up), + Swipe.Up(fromSource = Edge.Bottom), UserActionResult(SceneFamilies.Home), ) } diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/RecordIssueDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/recordissue/RecordIssueDialogDelegate.kt index 6758c3ba0767..02b2bb1585bd 100644 --- a/packages/SystemUI/src/com/android/systemui/recordissue/RecordIssueDialogDelegate.kt +++ b/packages/SystemUI/src/com/android/systemui/recordissue/RecordIssueDialogDelegate.kt @@ -35,7 +35,6 @@ import androidx.annotation.WorkerThread import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.flags.FeatureFlagsClassic -import com.android.systemui.flags.Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger import com.android.systemui.mediaprojection.SessionCreationSource import com.android.systemui.mediaprojection.devicepolicy.ScreenCaptureDevicePolicyResolver @@ -132,10 +131,9 @@ constructor( @WorkerThread private fun onScreenRecordSwitchClicked() { if ( - flags.isEnabled(WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES) && - devicePolicyResolver - .get() - .isScreenCaptureCompletelyDisabled(UserHandle.of(userTracker.userId)) + devicePolicyResolver + .get() + .isScreenCaptureCompletelyDisabled(UserHandle.of(userTracker.userId)) ) { mainExecutor.execute { screenCaptureDisabledDialogDelegate.createSysUIDialog().show() diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingController.java b/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingController.java index a8a78a91097c..d7463f8f0c36 100644 --- a/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingController.java +++ b/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingController.java @@ -32,17 +32,13 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; -import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.flags.Flags; import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger; import com.android.systemui.mediaprojection.SessionCreationSource; import com.android.systemui.mediaprojection.devicepolicy.ScreenCaptureDevicePolicyResolver; import com.android.systemui.mediaprojection.devicepolicy.ScreenCaptureDisabledDialogDelegate; -import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.policy.CallbackController; @@ -66,12 +62,10 @@ public class RecordingController private CountDownTimer mCountDownTimer = null; private final Executor mMainExecutor; private final BroadcastDispatcher mBroadcastDispatcher; - private final FeatureFlags mFlags; private final UserTracker mUserTracker; private final RecordingControllerLogger mRecordingControllerLogger; private final MediaProjectionMetricsLogger mMediaProjectionMetricsLogger; private final ScreenCaptureDisabledDialogDelegate mScreenCaptureDisabledDialogDelegate; - private final ScreenRecordDialogDelegate.Factory mScreenRecordDialogFactory; private final ScreenRecordPermissionDialogDelegate.Factory mScreenRecordPermissionDialogDelegateFactory; @@ -116,24 +110,20 @@ public class RecordingController public RecordingController( @Main Executor mainExecutor, BroadcastDispatcher broadcastDispatcher, - FeatureFlags flags, Lazy<ScreenCaptureDevicePolicyResolver> devicePolicyResolver, UserTracker userTracker, RecordingControllerLogger recordingControllerLogger, MediaProjectionMetricsLogger mediaProjectionMetricsLogger, ScreenCaptureDisabledDialogDelegate screenCaptureDisabledDialogDelegate, - ScreenRecordDialogDelegate.Factory screenRecordDialogFactory, ScreenRecordPermissionDialogDelegate.Factory screenRecordPermissionDialogDelegateFactory) { mMainExecutor = mainExecutor; - mFlags = flags; mDevicePolicyResolver = devicePolicyResolver; mBroadcastDispatcher = broadcastDispatcher; mUserTracker = userTracker; mRecordingControllerLogger = recordingControllerLogger; mMediaProjectionMetricsLogger = mediaProjectionMetricsLogger; mScreenCaptureDisabledDialogDelegate = screenCaptureDisabledDialogDelegate; - mScreenRecordDialogFactory = screenRecordDialogFactory; mScreenRecordPermissionDialogDelegateFactory = screenRecordPermissionDialogDelegateFactory; BroadcastOptions options = BroadcastOptions.makeBasic(); @@ -158,12 +148,8 @@ public class RecordingController /** Create a dialog to show screen recording options to the user. * If screen capturing is currently not allowed it will return a dialog * that warns users about it. */ - public Dialog createScreenRecordDialog(Context context, FeatureFlags flags, - DialogTransitionAnimator dialogTransitionAnimator, - ActivityStarter activityStarter, - @Nullable Runnable onStartRecordingClicked) { - if (mFlags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES) - && mDevicePolicyResolver.get() + public Dialog createScreenRecordDialog(@Nullable Runnable onStartRecordingClicked) { + if (mDevicePolicyResolver.get() .isScreenCaptureCompletelyDisabled(getHostUserHandle())) { return mScreenCaptureDisabledDialogDelegate.createSysUIDialog(); } diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialogDelegate.java b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialogDelegate.java deleted file mode 100644 index 9f1447b1f509..000000000000 --- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialogDelegate.java +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.screenrecord; - -import static android.app.Activity.RESULT_OK; - -import static com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorActivity.KEY_CAPTURE_TARGET; -import static com.android.systemui.screenrecord.ScreenRecordingAudioSource.INTERNAL; -import static com.android.systemui.screenrecord.ScreenRecordingAudioSource.MIC; -import static com.android.systemui.screenrecord.ScreenRecordingAudioSource.MIC_AND_INTERNAL; -import static com.android.systemui.screenrecord.ScreenRecordingAudioSource.NONE; - -import android.app.Activity; -import android.app.PendingIntent; -import android.content.Context; -import android.os.Bundle; -import android.os.Handler; -import android.os.Looper; -import android.os.ResultReceiver; -import android.view.Gravity; -import android.view.View; -import android.view.Window; -import android.view.WindowManager; -import android.view.accessibility.AccessibilityNodeInfo; -import android.widget.ArrayAdapter; -import android.widget.Spinner; -import android.widget.Switch; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.android.systemui.mediaprojection.MediaProjectionCaptureTarget; -import com.android.systemui.res.R; -import com.android.systemui.settings.UserContextProvider; -import com.android.systemui.statusbar.phone.SystemUIDialog; - -import dagger.assisted.Assisted; -import dagger.assisted.AssistedFactory; -import dagger.assisted.AssistedInject; - -import java.util.Arrays; -import java.util.List; - -/** - * Dialog to select screen recording options - */ -public class ScreenRecordDialogDelegate implements SystemUIDialog.Delegate { - private static final List<ScreenRecordingAudioSource> MODES = Arrays.asList(INTERNAL, MIC, - MIC_AND_INTERNAL); - private static final long DELAY_MS = 3000; - private static final long INTERVAL_MS = 1000; - - private final SystemUIDialog.Factory mSystemUIDialogFactory; - private final UserContextProvider mUserContextProvider; - private final RecordingController mController; - private final Runnable mOnStartRecordingClicked; - private Switch mTapsSwitch; - private Switch mAudioSwitch; - private Spinner mOptions; - - @AssistedFactory - public interface Factory { - ScreenRecordDialogDelegate create( - RecordingController recordingController, - @Nullable Runnable onStartRecordingClicked - ); - } - - @AssistedInject - public ScreenRecordDialogDelegate( - SystemUIDialog.Factory systemUIDialogFactory, - UserContextProvider userContextProvider, - @Assisted RecordingController controller, - @Assisted @Nullable Runnable onStartRecordingClicked) { - mSystemUIDialogFactory = systemUIDialogFactory; - mUserContextProvider = userContextProvider; - mController = controller; - mOnStartRecordingClicked = onStartRecordingClicked; - } - - @Override - public SystemUIDialog createDialog() { - return mSystemUIDialogFactory.create(this); - } - - @Override - public void onCreate(SystemUIDialog dialog, Bundle savedInstanceState) { - Window window = dialog.getWindow(); - - window.addPrivateFlags(WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS); - - window.setGravity(Gravity.CENTER); - dialog.setTitle(R.string.screenrecord_title); - - dialog.setContentView(R.layout.screen_record_dialog); - - TextView cancelBtn = dialog.findViewById(R.id.button_cancel); - cancelBtn.setOnClickListener(v -> dialog.dismiss()); - TextView startBtn = dialog.findViewById(R.id.button_start); - startBtn.setOnClickListener(v -> { - if (mOnStartRecordingClicked != null) { - // Note that it is important to run this callback before dismissing, so that the - // callback can disable the dialog exit animation if it wants to. - mOnStartRecordingClicked.run(); - } - - // Start full-screen recording - requestScreenCapture(/* captureTarget= */ null); - dialog.dismiss(); - }); - - mAudioSwitch = dialog.findViewById(R.id.screenrecord_audio_switch); - mTapsSwitch = dialog.findViewById(R.id.screenrecord_taps_switch); - mOptions = dialog.findViewById(R.id.screen_recording_options); - ArrayAdapter a = new ScreenRecordingAdapter(dialog.getContext().getApplicationContext(), - android.R.layout.simple_spinner_dropdown_item, - MODES); - a.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - mOptions.setAdapter(a); - mOptions.setOnItemClickListenerInt((parent, view, position, id) -> { - mAudioSwitch.setChecked(true); - }); - - // disable redundant Touch & Hold accessibility action for Switch Access - mOptions.setAccessibilityDelegate(new View.AccessibilityDelegate() { - @Override - public void onInitializeAccessibilityNodeInfo(@NonNull View host, - @NonNull AccessibilityNodeInfo info) { - info.removeAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_LONG_CLICK); - super.onInitializeAccessibilityNodeInfo(host, info); - } - }); - mOptions.setLongClickable(false); - } - - /** - * Starts screen capture after some countdown - * @param captureTarget target to capture (could be e.g. a task) or - * null to record the whole screen - */ - private void requestScreenCapture(@Nullable MediaProjectionCaptureTarget captureTarget) { - Context userContext = mUserContextProvider.getUserContext(); - boolean showTaps = mTapsSwitch.isChecked(); - ScreenRecordingAudioSource audioMode = mAudioSwitch.isChecked() - ? (ScreenRecordingAudioSource) mOptions.getSelectedItem() - : NONE; - PendingIntent startIntent = PendingIntent.getForegroundService(userContext, - RecordingService.REQUEST_CODE, - RecordingService.getStartIntent( - userContext, Activity.RESULT_OK, - audioMode.ordinal(), showTaps, captureTarget), - PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); - PendingIntent stopIntent = PendingIntent.getService(userContext, - RecordingService.REQUEST_CODE, - RecordingService.getStopIntent(userContext), - PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); - mController.startCountdown(DELAY_MS, INTERVAL_MS, startIntent, stopIntent); - } - - private class CaptureTargetResultReceiver extends ResultReceiver { - - CaptureTargetResultReceiver() { - super(new Handler(Looper.getMainLooper())); - } - - @Override - protected void onReceiveResult(int resultCode, Bundle resultData) { - if (resultCode == RESULT_OK) { - MediaProjectionCaptureTarget captureTarget = resultData - .getParcelable(KEY_CAPTURE_TARGET, MediaProjectionCaptureTarget.class); - - // Start recording of the selected target - requestScreenCapture(captureTarget); - } - } - } -} diff --git a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActions.kt b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActions.kt index e5f684635ac7..b0777c9e20b9 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActions.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActions.kt @@ -18,7 +18,6 @@ package com.android.systemui.shade.ui.viewmodel import com.android.compose.animation.scene.Edge import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.UserAction import com.android.compose.animation.scene.UserActionResult import com.android.systemui.scene.shared.model.Overlays @@ -35,7 +34,7 @@ fun singleShadeActions( return arrayOf( // Swiping down, not from the edge, always goes to shade. Swipe.Down to shadeUserActionResult, - swipeDown(pointerCount = 2) to shadeUserActionResult, + Swipe.Down(pointerCount = 2) to shadeUserActionResult, // Swiping down from the top edge. swipeDownFromTop(pointerCount = 1) to @@ -54,7 +53,7 @@ fun splitShadeActions(): Array<Pair<UserAction, UserActionResult>> { return arrayOf( // Swiping down, not from the edge, always goes to shade. Swipe.Down to shadeUserActionResult, - swipeDown(pointerCount = 2) to shadeUserActionResult, + Swipe.Down(pointerCount = 2) to shadeUserActionResult, // Swiping down from the top edge goes to QS. swipeDownFromTop(pointerCount = 1) to shadeUserActionResult, swipeDownFromTop(pointerCount = 2) to shadeUserActionResult, @@ -69,15 +68,10 @@ fun dualShadeActions(): Array<Pair<UserAction, UserActionResult>> { UserActionResult.ShowOverlay(Overlays.QuickSettingsShade, isIrreversible = true) return arrayOf( Swipe.Down to notifShadeUserActionResult, - Swipe(direction = SwipeDirection.Down, fromSource = SceneContainerEdge.TopRight) to - qsShadeuserActionResult, + Swipe.Down(fromSource = SceneContainerEdge.TopRight) to qsShadeuserActionResult, ) } private fun swipeDownFromTop(pointerCount: Int): Swipe { - return Swipe(SwipeDirection.Down, fromSource = Edge.Top, pointerCount = pointerCount) -} - -private fun swipeDown(pointerCount: Int): Swipe { - return Swipe(SwipeDirection.Down, pointerCount = pointerCount) + return Swipe.Down(fromSource = Edge.Top, pointerCount = pointerCount) } diff --git a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModel.kt b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModel.kt index 4bdd36773655..7d6b1a3126dc 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModel.kt @@ -17,7 +17,6 @@ package com.android.systemui.shade.ui.viewmodel import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection import com.android.compose.animation.scene.UserAction import com.android.compose.animation.scene.UserActionResult import com.android.systemui.qs.ui.adapter.QSSceneAdapter @@ -58,7 +57,7 @@ constructor( buildMap<UserAction, UserActionResult> { if (!isCustomizerShowing) { set( - Swipe(SwipeDirection.Up), + Swipe.Up, UserActionResult( backScene, ToSplitShade.takeIf { shadeMode is ShadeMode.Split }, @@ -69,7 +68,7 @@ constructor( // TODO(b/330200163) Add an else to be able to collapse the shade while // customizing if (shadeMode is ShadeMode.Single) { - set(Swipe(SwipeDirection.Down), UserActionResult(Scenes.QuickSettings)) + set(Swipe.Down, UserActionResult(Scenes.QuickSettings)) } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java index 0d789c703d48..f5d443443838 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java @@ -119,7 +119,6 @@ public class OperatorNameViewController extends ViewController<OperatorNameView> /** Factory for constructing an {@link OperatorNameViewController}. */ public static class Factory { - private final DarkIconDispatcher mDarkIconDispatcher; private final TunerService mTunerService; private final TelephonyManager mTelephonyManager; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; @@ -129,7 +128,7 @@ public class OperatorNameViewController extends ViewController<OperatorNameView> private final JavaAdapter mJavaAdapter; @Inject - public Factory(DarkIconDispatcher darkIconDispatcher, + public Factory( TunerService tunerService, TelephonyManager telephonyManager, KeyguardUpdateMonitor keyguardUpdateMonitor, @@ -137,7 +136,6 @@ public class OperatorNameViewController extends ViewController<OperatorNameView> AirplaneModeInteractor airplaneModeInteractor, SubscriptionManagerProxy subscriptionManagerProxy, JavaAdapter javaAdapter) { - mDarkIconDispatcher = darkIconDispatcher; mTunerService = tunerService; mTelephonyManager = telephonyManager; mKeyguardUpdateMonitor = keyguardUpdateMonitor; @@ -148,9 +146,11 @@ public class OperatorNameViewController extends ViewController<OperatorNameView> } /** Create an {@link OperatorNameViewController}. */ - public OperatorNameViewController create(OperatorNameView view) { - return new OperatorNameViewController(view, - mDarkIconDispatcher, + public OperatorNameViewController create( + OperatorNameView view, DarkIconDispatcher darkIconDispatcher) { + return new OperatorNameViewController( + view, + darkIconDispatcher, mTunerService, mTelephonyManager, mKeyguardUpdateMonitor, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt index c8d3f339b3e9..752674854e2d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt @@ -68,13 +68,8 @@ constructor( notifChipsInteractor.onPromotedNotificationChipTapped(this@toChipModel.key) } } - return OngoingActivityChipModel.Shown.ShortTimeDelta( - icon, - colors, - time = this.whenTime, - onClickListener, - ) - // TODO(b/364653005): If Notification.showWhen = false, don't show the time delta. + return OngoingActivityChipModel.Shown.IconOnly(icon, colors, onClickListener) + // TODO(b/364653005): Use Notification.showWhen to determine if we should show the time. // TODO(b/364653005): If Notification.whenTime is in the past, show "ago" in the text. // TODO(b/364653005): If Notification.shortCriticalText is set, use that instead of `when`. // TODO(b/364653005): If the app that posted the notification is in the foreground, don't diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/core/MultiDisplayStatusBarStarter.kt b/packages/SystemUI/src/com/android/systemui/statusbar/core/MultiDisplayStatusBarStarter.kt index 9b3513e8a363..84c7ab200fad 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/core/MultiDisplayStatusBarStarter.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/core/MultiDisplayStatusBarStarter.kt @@ -23,6 +23,7 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.display.data.repository.DisplayRepository import com.android.systemui.display.data.repository.DisplayScopeRepository +import com.android.systemui.statusbar.data.repository.LightBarControllerStore import com.android.systemui.statusbar.data.repository.PrivacyDotWindowControllerStore import com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryStore import com.android.systemui.statusbar.window.StatusBarWindowControllerStore @@ -50,6 +51,7 @@ constructor( private val statusBarWindowControllerStore: StatusBarWindowControllerStore, private val statusBarInitializerStore: StatusBarInitializerStore, private val privacyDotWindowControllerStore: PrivacyDotWindowControllerStore, + private val lightBarControllerStore: LightBarControllerStore, ) : CoreStartable { init { @@ -74,6 +76,14 @@ constructor( createAndStartOrchestratorForDisplay(displayId) createAndStartInitializerForDisplay(displayId) startPrivacyDotForDisplay(displayId) + createLightBarControllerForDisplay(displayId) + } + + private fun createLightBarControllerForDisplay(displayId: Int) { + // Explicitly not calling `start()`, because the store is already calling `start()`. + // This is to maintain the legacy behavior with NavigationBar, that was already expecting + // LightBarController to start at construction time. + lightBarControllerStore.forDisplay(displayId) } private fun createAndStartOrchestratorForDisplay(displayId: Int) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/data/StatusBarDataLayerModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/data/StatusBarDataLayerModule.kt index 39de28e7cb49..27d815190d85 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/data/StatusBarDataLayerModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/data/StatusBarDataLayerModule.kt @@ -15,6 +15,7 @@ */ package com.android.systemui.statusbar.data +import com.android.systemui.statusbar.data.repository.DarkIconDispatcherStoreModule import com.android.systemui.statusbar.data.repository.KeyguardStatusBarRepositoryModule import com.android.systemui.statusbar.data.repository.LightBarControllerStoreModule import com.android.systemui.statusbar.data.repository.RemoteInputRepositoryModule @@ -28,6 +29,7 @@ import dagger.Module @Module( includes = [ + DarkIconDispatcherStoreModule::class, KeyguardStatusBarRepositoryModule::class, LightBarControllerStoreModule::class, RemoteInputRepositoryModule::class, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/DarkIconDispatcherStore.kt b/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/DarkIconDispatcherStore.kt new file mode 100644 index 000000000000..8183a487cee2 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/DarkIconDispatcherStore.kt @@ -0,0 +1,142 @@ +/* + * 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.data.repository + +import android.content.Context +import android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR +import com.android.systemui.CoreStartable +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.display.data.repository.DisplayRepository +import com.android.systemui.display.data.repository.DisplayWindowPropertiesRepository +import com.android.systemui.display.data.repository.PerDisplayStore +import com.android.systemui.display.data.repository.PerDisplayStoreImpl +import com.android.systemui.display.data.repository.SingleDisplayStore +import com.android.systemui.plugins.DarkIconDispatcher +import com.android.systemui.statusbar.core.StatusBarConnectedDisplays +import com.android.systemui.statusbar.phone.DarkIconDispatcherImpl +import com.android.systemui.statusbar.phone.SysuiDarkIconDispatcher +import dagger.Binds +import dagger.Lazy +import dagger.Module +import dagger.Provides +import dagger.multibindings.ClassKey +import dagger.multibindings.IntoMap +import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope + +/** Provides per display instances of [DarkIconDispatcher]. */ +interface DarkIconDispatcherStore : PerDisplayStore<DarkIconDispatcher> + +/** Provides per display instances of [SysuiDarkIconDispatcher]. */ +interface SysuiDarkIconDispatcherStore : PerDisplayStore<SysuiDarkIconDispatcher> + +/** + * Multi display implementation that should be used when the [StatusBarConnectedDisplays] flag is + * enabled. + */ +@SysUISingleton +class MultiDisplayDarkIconDispatcherStore +@Inject +constructor( + @Background backgroundApplicationScope: CoroutineScope, + displayRepository: DisplayRepository, + private val factory: DarkIconDispatcherImpl.Factory, + private val displayWindowPropertiesRepository: DisplayWindowPropertiesRepository, +) : + SysuiDarkIconDispatcherStore, + PerDisplayStoreImpl<SysuiDarkIconDispatcher>(backgroundApplicationScope, displayRepository) { + + init { + StatusBarConnectedDisplays.assertInNewMode() + } + + override fun createInstanceForDisplay(displayId: Int): SysuiDarkIconDispatcher { + val properties = displayWindowPropertiesRepository.get(displayId, TYPE_STATUS_BAR) + return factory.create(displayId, properties.context) + } + + override suspend fun onDisplayRemovalAction(instance: SysuiDarkIconDispatcher) { + instance.stop() + } + + override val instanceClass = SysuiDarkIconDispatcher::class.java +} + +/** + * Single display implementation that should be used when the [StatusBarConnectedDisplays] flag is + * disabled. + */ +@SysUISingleton +class SingleDisplayDarkIconDispatcherStore +@Inject +constructor(factory: DarkIconDispatcherImpl.Factory, context: Context) : + SysuiDarkIconDispatcherStore, + PerDisplayStore<SysuiDarkIconDispatcher> by SingleDisplayStore( + defaultInstance = factory.create(context.displayId, context) + ) { + + init { + StatusBarConnectedDisplays.assertInLegacyMode() + } +} + +/** Extra implementation that simply implements the [DarkIconDispatcherStore] interface. */ +@SysUISingleton +class DarkIconDispatcherStoreImpl +@Inject +constructor(private val store: SysuiDarkIconDispatcherStore) : DarkIconDispatcherStore { + override val defaultDisplay: DarkIconDispatcher + get() = store.defaultDisplay + + override fun forDisplay(displayId: Int): DarkIconDispatcher = store.forDisplay(displayId) +} + +@Module +interface DarkIconDispatcherStoreModule { + + @Binds fun store(impl: DarkIconDispatcherStoreImpl): DarkIconDispatcherStore + + companion object { + @Provides + @SysUISingleton + fun sysUiStore( + singleDisplayLazy: Lazy<SingleDisplayDarkIconDispatcherStore>, + multiDisplayLazy: Lazy<MultiDisplayDarkIconDispatcherStore>, + ): SysuiDarkIconDispatcherStore { + return if (StatusBarConnectedDisplays.isEnabled) { + multiDisplayLazy.get() + } else { + singleDisplayLazy.get() + } + } + + @Provides + @SysUISingleton + @IntoMap + @ClassKey(DarkIconDispatcherStore::class) + fun storeAsCoreStartable( + multiDisplayLazy: Lazy<MultiDisplayDarkIconDispatcherStore> + ): CoreStartable { + return if (StatusBarConnectedDisplays.isEnabled) { + multiDisplayLazy.get() + } else { + CoreStartable.NOP + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/LightBarControllerStore.kt b/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/LightBarControllerStore.kt index ff50e3100672..e4987555833b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/LightBarControllerStore.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/LightBarControllerStore.kt @@ -44,6 +44,7 @@ constructor( private val factory: LightBarControllerImpl.Factory, private val displayScopeRepository: DisplayScopeRepository, private val statusBarModeRepositoryStore: StatusBarModeRepositoryStore, + private val darkIconDispatcherStore: DarkIconDispatcherStore, ) : LightBarControllerStore, PerDisplayStoreImpl<LightBarController>(backgroundApplicationScope, displayRepository) { @@ -53,6 +54,7 @@ constructor( .create( displayId, displayScopeRepository.scopeForDisplay(displayId), + darkIconDispatcherStore.forDisplay(displayId), statusBarModeRepositoryStore.forDisplay(displayId), ) .also { it.start() } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationContentDescription.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationContentDescription.kt index bdd9fd032800..6b6920a3621a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationContentDescription.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationContentDescription.kt @@ -28,14 +28,5 @@ import com.android.systemui.res.R @MainThread fun contentDescForNotification(c: Context, n: Notification): CharSequence { val appName = n.loadHeaderAppName(c) ?: "" - val title = n.extras?.getCharSequence(Notification.EXTRA_TITLE) - val text = n.extras?.getCharSequence(Notification.EXTRA_TEXT) - val ticker = n.tickerText - - // Some apps just put the app name into the title - val titleOrText = if (TextUtils.equals(title, appName)) text else title - val desc = - if (!TextUtils.isEmpty(titleOrText)) titleOrText - else if (!TextUtils.isEmpty(ticker)) ticker else "" - return c.getString(R.string.accessibility_desc_notification_icon, appName, desc) + return c.getString(R.string.accessibility_desc_notification_icon, appName, "") } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerAlwaysOnDisplayViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerAlwaysOnDisplayViewBinder.kt index 663588c8f8c8..fc432ba973ab 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerAlwaysOnDisplayViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerAlwaysOnDisplayViewBinder.kt @@ -17,11 +17,13 @@ package com.android.systemui.statusbar.notification.icon.ui.viewbinder import androidx.lifecycle.lifecycleScope +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.app.tracing.traceSection import com.android.systemui.common.ui.ConfigurationState import com.android.systemui.keyguard.ui.binder.KeyguardRootViewBinder import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel import com.android.systemui.lifecycle.repeatWhenAttached +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.notification.collection.NotifCollection import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder.IconViewStore import com.android.systemui.statusbar.notification.icon.ui.viewmodel.NotificationIconContainerAlwaysOnDisplayViewModel @@ -30,7 +32,6 @@ import com.android.systemui.statusbar.phone.ScreenOffAnimationController import com.android.systemui.statusbar.ui.SystemBarUtilsState import javax.inject.Inject import kotlinx.coroutines.DisposableHandle -import com.android.app.tracing.coroutines.launchTraced as launch /** Binds a [NotificationIconContainer] to a [NotificationIconContainerAlwaysOnDisplayViewModel]. */ class NotificationIconContainerAlwaysOnDisplayViewBinder @@ -38,7 +39,7 @@ class NotificationIconContainerAlwaysOnDisplayViewBinder constructor( private val viewModel: NotificationIconContainerAlwaysOnDisplayViewModel, private val keyguardRootViewModel: KeyguardRootViewModel, - private val configuration: ConfigurationState, + @ShadeDisplayAware private val configuration: ConfigurationState, private val failureTracker: StatusBarIconViewBindingFailureTracker, private val screenOffAnimationController: ScreenOffAnimationController, private val systemBarUtilsState: SystemBarUtilsState, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerShelfViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerShelfViewBinder.kt index 4e40888ee88a..5432f1448902 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerShelfViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerShelfViewBinder.kt @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.notification.icon.ui.viewbinder import com.android.systemui.common.ui.ConfigurationState +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.notification.collection.NotifCollection import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder.IconViewStore import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder.bindIcons @@ -30,7 +31,7 @@ class NotificationIconContainerShelfViewBinder @Inject constructor( private val viewModel: NotificationIconContainerShelfViewModel, - private val configuration: ConfigurationState, + @ShadeDisplayAware private val configuration: ConfigurationState, private val systemBarUtilsState: SystemBarUtilsState, private val failureTracker: StatusBarIconViewBindingFailureTracker, private val viewStore: ShelfNotificationIconViewStore, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerStatusBarViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerStatusBarViewBinder.kt index f0f529e2c615..a21dabb821d4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerStatusBarViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerStatusBarViewBinder.kt @@ -17,9 +17,11 @@ package com.android.systemui.statusbar.notification.icon.ui.viewbinder import androidx.lifecycle.lifecycleScope +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.app.tracing.traceSection import com.android.systemui.common.ui.ConfigurationState import com.android.systemui.lifecycle.repeatWhenAttached +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.notification.collection.NotifCollection import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder.IconViewStore import com.android.systemui.statusbar.notification.icon.ui.viewmodel.NotificationIconContainerStatusBarViewModel @@ -27,23 +29,23 @@ import com.android.systemui.statusbar.phone.NotificationIconContainer import com.android.systemui.statusbar.ui.SystemBarUtilsState import javax.inject.Inject import kotlinx.coroutines.DisposableHandle -import com.android.app.tracing.coroutines.launchTraced as launch /** Binds a [NotificationIconContainer] to a [NotificationIconContainerStatusBarViewModel]. */ class NotificationIconContainerStatusBarViewBinder @Inject constructor( private val viewModel: NotificationIconContainerStatusBarViewModel, - private val configuration: ConfigurationState, + @ShadeDisplayAware private val configuration: ConfigurationState, private val systemBarUtilsState: SystemBarUtilsState, private val failureTracker: StatusBarIconViewBindingFailureTracker, private val viewStore: StatusBarNotificationIconViewStore, ) { - fun bindWhileAttached(view: NotificationIconContainer): DisposableHandle { + fun bindWhileAttached(view: NotificationIconContainer, displayId: Int): DisposableHandle { return traceSection("NICStatusBar#bindWhileAttached") { view.repeatWhenAttached { lifecycleScope.launch { NotificationIconContainerViewBinder.bind( + displayId = displayId, view = view, viewModel = viewModel, configuration = configuration, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt index 063fe45cd199..6dbb71463602 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt @@ -24,6 +24,7 @@ import android.widget.FrameLayout import androidx.annotation.ColorInt import androidx.collection.ArrayMap import androidx.lifecycle.lifecycleScope +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.app.tracing.traceSection import com.android.internal.R as RInternal import com.android.internal.statusbar.StatusBarIcon @@ -54,12 +55,12 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.stateIn -import com.android.app.tracing.coroutines.launchTraced as launch /** Binds a view-model to a [NotificationIconContainer]. */ object NotificationIconContainerViewBinder { suspend fun bind( + displayId: Int, view: NotificationIconContainer, viewModel: NotificationIconContainerStatusBarViewModel, configuration: ConfigurationState, @@ -70,7 +71,10 @@ object NotificationIconContainerViewBinder { launch { val contrastColorUtil = ContrastColorUtil.getInstance(view.context) val iconColors: StateFlow<NotificationIconColors> = - viewModel.iconColors.mapNotNull { it.iconColors(view.viewBounds) }.stateIn(this) + viewModel + .iconColors(displayId) + .mapNotNull { it.iconColors(view.viewBounds) } + .stateIn(this) viewModel.icons.bindIcons( logTag = "statusbar", view = view, @@ -79,11 +83,7 @@ object NotificationIconContainerViewBinder { notifyBindingFailures = { failureTracker.statusBarFailures = it }, viewStore = viewStore, ) { _, sbiv -> - StatusBarIconViewBinder.bindIconColors( - sbiv, - iconColors, - contrastColorUtil, - ) + StatusBarIconViewBinder.bindIconColors(sbiv, iconColors, contrastColorUtil) } } launch { viewModel.bindIsolatedIcon(view, viewStore) } @@ -194,8 +194,7 @@ object NotificationIconContainerViewBinder { combine(iconSizeFlow, iconHorizontalPaddingFlow, systemBarUtilsState.statusBarHeight) { iconSize, iconHPadding, - statusBarHeight, - -> + statusBarHeight -> FrameLayout.LayoutParams(iconSize + 2 * iconHPadding, statusBarHeight) } .stateIn(this) @@ -251,10 +250,7 @@ object NotificationIconContainerViewBinder { traceSection("addIcon") { (sbiv.parent as? ViewGroup)?.run { if (this !== view) { - Log.wtf( - TAG, - "[$logTag] SBIV($notifKey) has an unexpected parent", - ) + Log.wtf(TAG, "[$logTag] SBIV($notifKey) has an unexpected parent") } // If the container was re-inflated and re-bound, then SBIVs might still // be attached to the prior view. @@ -271,7 +267,7 @@ object NotificationIconContainerViewBinder { launch { launch { layoutParams.collectTracingEach( - tag = { "[$logTag] SBIV#bindLayoutParams" }, + tag = { "[$logTag] SBIV#bindLayoutParams" } ) { if (it != sbiv.layoutParams) { sbiv.layoutParams = it @@ -344,7 +340,7 @@ object NotificationIconContainerViewBinder { // a single SBIV instance for the group. Then this whole concept can go away. private inline fun <R> NotificationIconContainer.withIconReplacements( replacements: ArrayMap<String, StatusBarIcon>, - block: () -> R + block: () -> R, ): R { setReplacingIcons(replacements) return block().also { setReplacingIcons(null) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerStatusBarViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerStatusBarViewModel.kt index a64f888cb238..f0b03065e637 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerStatusBarViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerStatusBarViewModel.kt @@ -45,8 +45,8 @@ import kotlinx.coroutines.flow.map class NotificationIconContainerStatusBarViewModel @Inject constructor( - @Background bgContext: CoroutineContext, - darkIconInteractor: DarkIconInteractor, + @Background private val bgContext: CoroutineContext, + private val darkIconInteractor: DarkIconInteractor, iconsInteractor: StatusBarNotificationIconsInteractor, headsUpIconInteractor: HeadsUpNotificationIconInteractor, keyguardInteractor: KeyguardInteractor, @@ -58,10 +58,9 @@ constructor( /** Are changes to the icon container animated? */ val animationsEnabled: Flow<Boolean> = - combine( - shadeInteractor.isShadeTouchable, - keyguardInteractor.isKeyguardShowing, - ) { panelTouchesEnabled, isKeyguardShowing -> + combine(shadeInteractor.isShadeTouchable, keyguardInteractor.isKeyguardShowing) { + panelTouchesEnabled, + isKeyguardShowing -> panelTouchesEnabled && !isKeyguardShowing } .flowOn(bgContext) @@ -69,8 +68,9 @@ constructor( .distinctUntilChanged() /** The colors with which to display the notification icons. */ - val iconColors: Flow<NotificationIconColorLookup> = - darkIconInteractor.darkState + fun iconColors(displayId: Int): Flow<NotificationIconColorLookup> = + darkIconInteractor + .darkState(displayId) .map { (areas: Collection<Rect>, tint: Int) -> NotificationIconColorLookup { viewBounds: Rect -> if (DarkIconDispatcher.isInAreas(areas, viewBounds)) { @@ -125,10 +125,8 @@ constructor( val isolatedIconLocation: Flow<Rect> = headsUpIconInteractor.isolatedIconLocation.filterNotNull().conflate().distinctUntilChanged() - private class IconColorsImpl( - override val tint: Int, - private val areas: Collection<Rect>, - ) : NotificationIconColors { + private class IconColorsImpl(override val tint: Int, private val areas: Collection<Rect>) : + NotificationIconColors { override fun staticDrawableColor(viewBounds: Rect): Int { return if (DarkIconDispatcher.isInAreas(areas, viewBounds)) { tint diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/icon/NotificationIconStyleProvider.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/icon/NotificationIconStyleProvider.kt index 7177a7bd473a..08c1d71b86c9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/icon/NotificationIconStyleProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/icon/NotificationIconStyleProvider.kt @@ -73,8 +73,8 @@ constructor(private val userManager: UserManager, dumpManager: DumpManager) : private val cache = NotifCollectionCache<Boolean>() override fun shouldShowAppIcon(notification: StatusBarNotification, context: Context): Boolean { - val packageContext = notification.getPackageContext(context) return cache.getOrFetch(notification.packageName) { + val packageContext = notification.getPackageContext(context) !belongsToHeadlessSystemApp(packageContext) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/HideNotificationsInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/HideNotificationsInteractor.kt index 3a650aa19eb0..53d0c2e879e3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/HideNotificationsInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/HideNotificationsInteractor.kt @@ -22,6 +22,7 @@ import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.power.shared.model.ScreenPowerState.SCREEN_ON +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.unfold.domain.interactor.UnfoldTransitionInteractor import com.android.systemui.util.animation.data.repository.AnimationStatusRepository import com.android.systemui.util.kotlin.WithPrev @@ -46,9 +47,9 @@ class HideNotificationsInteractor @Inject constructor( private val unfoldTransitionInteractor: UnfoldTransitionInteractor, - private val configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware private val configurationInteractor: ConfigurationInteractor, private val animationsStatus: AnimationStatusRepository, - private val powerInteractor: PowerInteractor + private val powerInteractor: PowerInteractor, ) { val shouldHideNotifications: Flow<Boolean> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/SharedNotificationContainerInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/SharedNotificationContainerInteractor.kt index e644815960aa..b6ce70826f9e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/SharedNotificationContainerInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/SharedNotificationContainerInteractor.kt @@ -47,7 +47,7 @@ class SharedNotificationContainerInteractor constructor( @ShadeDisplayAware private val context: Context, private val splitShadeStateController: Lazy<SplitShadeStateController>, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, keyguardInteractor: KeyguardInteractor, deviceEntryUdfpsInteractor: DeviceEntryUdfpsInteractor, largeScreenHeaderHelperLazy: Lazy<LargeScreenHeaderHelper>, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationListViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationListViewBinder.kt index f75c89aeb44c..bffcae99e7f6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationListViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationListViewBinder.kt @@ -20,6 +20,7 @@ import android.view.LayoutInflater import android.view.View import androidx.lifecycle.lifecycleScope import com.android.app.tracing.TraceUtils.traceAsync +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.internal.logging.MetricsLogger import com.android.internal.logging.nano.MetricsProto import com.android.systemui.common.ui.ConfigurationState @@ -30,6 +31,7 @@ import com.android.systemui.lifecycle.repeatWhenAttachedToWindow import com.android.systemui.plugins.FalsingManager import com.android.systemui.res.R import com.android.systemui.scene.shared.flag.SceneContainerFlag +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.NotificationShelf import com.android.systemui.statusbar.notification.NotificationActivityStarter import com.android.systemui.statusbar.notification.collection.render.SectionHeaderController @@ -70,7 +72,6 @@ import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.stateIn -import com.android.app.tracing.coroutines.launchTraced as launch /** Binds a [NotificationStackScrollLayout] to its [view model][NotificationListViewModel]. */ class NotificationListViewBinder @@ -78,7 +79,7 @@ class NotificationListViewBinder constructor( @Background private val backgroundDispatcher: CoroutineDispatcher, private val hiderTracker: DisplaySwitchNotificationsHiderTracker, - private val configuration: ConfigurationState, + @ShadeDisplayAware private val configuration: ConfigurationState, private val falsingManager: FalsingManager, private val hunBinder: HeadsUpNotificationViewBinder, private val loggerOptional: Optional<NotificationStatsLogger>, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationScrollViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationScrollViewBinder.kt index 4a768714b84f..c5bef99f9307 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationScrollViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationScrollViewBinder.kt @@ -28,6 +28,7 @@ import com.android.systemui.lifecycle.WindowLifecycleState import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.lifecycle.viewModel import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.notification.stack.ui.view.NotificationScrollView import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationScrollViewModel import com.android.systemui.util.kotlin.FlowDumperImpl @@ -48,7 +49,7 @@ constructor( @Main private val mainImmediateDispatcher: CoroutineDispatcher, private val view: NotificationScrollView, private val viewModelFactory: NotificationScrollViewModel.Factory, - private val configuration: ConfigurationState, + @ShadeDisplayAware private val configuration: ConfigurationState, ) : FlowDumperImpl(dumpManager) { private val viewLeftOffset = MutableStateFlow(0).dumpValue("viewLeftOffset") diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt index 827e2bfeba0f..fb60f266e188 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt @@ -72,6 +72,7 @@ import com.android.systemui.res.R import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.shade.LargeScreenHeaderHelper +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.shade.shared.model.ShadeMode.Dual import com.android.systemui.shade.shared.model.ShadeMode.Single @@ -116,7 +117,7 @@ constructor( dumpManager: DumpManager, @Application applicationScope: CoroutineScope, private val context: Context, - configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, private val keyguardInteractor: KeyguardInteractor, private val keyguardTransitionInteractor: KeyguardTransitionInteractor, private val shadeInteractor: ShadeInteractor, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DarkIconDispatcherImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DarkIconDispatcherImpl.java index 398c1d43d4fc..90b591f173f6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DarkIconDispatcherImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DarkIconDispatcherImpl.java @@ -23,11 +23,15 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.Rect; import android.util.ArrayMap; +import android.view.Display; import android.widget.ImageView; -import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dump.DumpManager; +import dagger.assisted.Assisted; +import dagger.assisted.AssistedFactory; +import dagger.assisted.AssistedInject; + import kotlinx.coroutines.flow.FlowKt; import kotlinx.coroutines.flow.MutableStateFlow; import kotlinx.coroutines.flow.StateFlow; @@ -36,17 +40,15 @@ import kotlinx.coroutines.flow.StateFlowKt; import java.io.PrintWriter; import java.util.ArrayList; -import javax.inject.Inject; - /** */ -@SysUISingleton public class DarkIconDispatcherImpl implements SysuiDarkIconDispatcher, LightBarTransitionsController.DarkIntensityApplier { private final LightBarTransitionsController mTransitionsController; private final ArrayList<Rect> mTintAreas = new ArrayList<>(); private final ArrayMap<Object, DarkReceiver> mReceivers = new ArrayMap<>(); + private final DumpManager mDumpManager; private int mIconTint = DEFAULT_ICON_TINT; private int mContrastTint = DEFAULT_INVERSE_ICON_TINT; @@ -61,14 +63,25 @@ public class DarkIconDispatcherImpl implements SysuiDarkIconDispatcher, private final MutableStateFlow<DarkChange> mDarkChangeFlow = StateFlowKt.MutableStateFlow( DarkChange.EMPTY); + private final String mDumpableName; + + /** */ + @AssistedFactory + @FunctionalInterface + public interface Factory { + /** */ + DarkIconDispatcherImpl create(int displayId, Context context); + } + /** */ - @Inject + @AssistedInject public DarkIconDispatcherImpl( - Context context, + @Assisted int displayId, + @Assisted Context context, LightBarTransitionsController.Factory lightBarTransitionsControllerFactory, DumpManager dumpManager) { - + mDumpManager = dumpManager; if (newStatusBarIcons()) { mDarkModeIconColorSingleTone = Color.BLACK; mLightModeIconColorSingleTone = Color.WHITE; @@ -81,7 +94,19 @@ public class DarkIconDispatcherImpl implements SysuiDarkIconDispatcher, mTransitionsController = lightBarTransitionsControllerFactory.create(this); - dumpManager.registerDumpable(getClass().getSimpleName(), this); + mDumpableName = getDumpableName(displayId); + dumpManager.registerNormalDumpable(mDumpableName, this); + } + + @Override + public void stop() { + mDumpManager.unregisterDumpable(mDumpableName); + } + + private String getDumpableName(int displayId) { + String dumpableNameSuffix = + displayId == Display.DEFAULT_DISPLAY ? "" : String.valueOf(displayId); + return getClass().getSimpleName() + dumpableNameSuffix; } public LightBarTransitionsController getTransitionsController() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java index d0f4b6f4a4bb..8de03d83d7af 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java @@ -26,6 +26,7 @@ import androidx.annotation.NonNull; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.widget.ViewClippingUtil; +import com.android.systemui.dagger.qualifiers.DisplaySpecific; import com.android.systemui.flags.FeatureFlagsClassic; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.statusbar.StatusBarStateController; @@ -117,7 +118,7 @@ public class HeadsUpAppearanceController extends ViewController<HeadsUpStatusBar PhoneStatusBarTransitions phoneStatusBarTransitions, KeyguardBypassController bypassController, NotificationWakeUpCoordinator wakeUpCoordinator, - DarkIconDispatcher darkIconDispatcher, + @DisplaySpecific DarkIconDispatcher darkIconDispatcher, KeyguardStateController keyguardStateController, CommandQueue commandQueue, NotificationStackScrollLayoutController stackScrollerController, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarControllerImpl.java index edc1f88b7579..ccb9a119d92f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarControllerImpl.java @@ -133,7 +133,7 @@ public class LightBarControllerImpl implements public LightBarControllerImpl( @Assisted int displayId, @Assisted CoroutineScope coroutineScope, - DarkIconDispatcher darkIconDispatcher, + @Assisted DarkIconDispatcher darkIconDispatcher, BatteryController batteryController, NavigationModeController navModeController, @Assisted StatusBarModePerDisplayRepository statusBarModeRepository, @@ -487,6 +487,7 @@ public class LightBarControllerImpl implements LightBarControllerImpl create( int displayId, CoroutineScope coroutineScope, + DarkIconDispatcher darkIconDispatcher, StatusBarModePerDisplayRepository statusBarModePerDisplayRepository); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt index 424549453af3..16e023ce17fd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt @@ -27,6 +27,7 @@ import androidx.annotation.VisibleForTesting import com.android.systemui.Flags import com.android.systemui.Gefingerpoken import com.android.systemui.battery.BatteryMeterView +import com.android.systemui.dagger.qualifiers.DisplaySpecific import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags.ENABLE_UNFOLD_STATUS_BAR_ANIMATIONS import com.android.systemui.plugins.DarkIconDispatcher @@ -341,7 +342,7 @@ private constructor( private val viewUtil: ViewUtil, private val configurationController: ConfigurationController, private val statusOverlayHoverListenerFactory: StatusOverlayHoverListenerFactory, - private val darkIconDispatcher: DarkIconDispatcher, + @DisplaySpecific private val darkIconDispatcher: DarkIconDispatcher, private val statusBarContentInsetsProviderStore: StatusBarContentInsetsProviderStore, ) { fun create(view: PhoneStatusBarView): PhoneStatusBarViewController { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusOverlayHoverListener.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusOverlayHoverListener.kt index c341bd3466ed..394502b2d31f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusOverlayHoverListener.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusOverlayHoverListener.kt @@ -28,10 +28,13 @@ import androidx.annotation.ColorInt import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.plugins.DarkIconDispatcher import com.android.systemui.res.R +import com.android.systemui.statusbar.data.repository.StatusBarConfigurationControllerStore +import com.android.systemui.statusbar.data.repository.SysuiDarkIconDispatcherStore import com.android.systemui.statusbar.phone.SysuiDarkIconDispatcher.DarkChange import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener @@ -40,14 +43,14 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map -import com.android.app.tracing.coroutines.launchTraced as launch class StatusOverlayHoverListenerFactory @Inject constructor( @Main private val resources: Resources, private val configurationController: ConfigurationController, - private val darkIconDispatcher: SysuiDarkIconDispatcher, + private val darkIconDispatcherStore: SysuiDarkIconDispatcherStore, + private val statusBarConfigurationControllerStore: StatusBarConfigurationControllerStore, ) { /** Creates listener always using the same light color for overlay */ @@ -63,7 +66,7 @@ constructor( * Creates listener using [DarkIconDispatcher] to determine light or dark color of the overlay */ fun createDarkAwareListener(view: View) = - createDarkAwareListener(view, darkIconDispatcher.darkChangeFlow()) + createDarkAwareListener(view, view.darkIconDispatcher.darkChangeFlow()) /** * Creates listener using [DarkIconDispatcher] to determine light or dark color of the overlay @@ -78,7 +81,7 @@ constructor( ) = createDarkAwareListener( view, - darkIconDispatcher.darkChangeFlow(), + view.darkIconDispatcher.darkChangeFlow(), leftHoverMargin, rightHoverMargin, topHoverMargin, @@ -92,8 +95,8 @@ constructor( fun createDarkAwareListener(view: View, darkFlow: StateFlow<DarkChange>) = StatusOverlayHoverListener( view, - configurationController, - resources, + view.statusBarConfigurationController, + view.resources, darkFlow.map { toHoverTheme(view, it) }, ) @@ -107,8 +110,8 @@ constructor( ) = StatusOverlayHoverListener( view, - configurationController, - resources, + view.statusBarConfigurationController, + view.resources, darkFlow.map { toHoverTheme(view, it) }, leftHoverMargin, rightHoverMargin, @@ -116,6 +119,12 @@ constructor( bottomHoverMargin, ) + private val View.statusBarConfigurationController + get() = statusBarConfigurationControllerStore.forDisplay(context.displayId) + + private val View.darkIconDispatcher + get() = darkIconDispatcherStore.forDisplay(context.displayId) + private fun toHoverTheme(view: View, darkChange: DarkChange): HoverTheme { val calculatedTint = DarkIconDispatcher.getTint(darkChange.areas, view, darkChange.tint) // currently calculated tint is either white or some shade of black. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/data/repository/DarkIconRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/data/repository/DarkIconRepository.kt index ba377497bce4..49356eba2842 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/data/repository/DarkIconRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/data/repository/DarkIconRepository.kt @@ -16,7 +16,7 @@ package com.android.systemui.statusbar.phone.data.repository import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.statusbar.phone.SysuiDarkIconDispatcher +import com.android.systemui.statusbar.data.repository.SysuiDarkIconDispatcherStore import com.android.systemui.statusbar.phone.SysuiDarkIconDispatcher.DarkChange import dagger.Binds import dagger.Module @@ -25,16 +25,16 @@ import kotlinx.coroutines.flow.StateFlow /** Dark-mode state for tinting icons. */ interface DarkIconRepository { - val darkState: StateFlow<DarkChange> + fun darkState(displayId: Int): StateFlow<DarkChange> } @SysUISingleton class DarkIconRepositoryImpl @Inject -constructor( - darkIconDispatcher: SysuiDarkIconDispatcher, -) : DarkIconRepository { - override val darkState: StateFlow<DarkChange> = darkIconDispatcher.darkChangeFlow() +constructor(private val darkIconDispatcherStore: SysuiDarkIconDispatcherStore) : + DarkIconRepository { + override fun darkState(displayId: Int): StateFlow<DarkChange> = + darkIconDispatcherStore.forDisplay(displayId).darkChangeFlow() } @Module diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/domain/interactor/DarkIconInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/domain/interactor/DarkIconInteractor.kt index 72f45406b35e..095f0cba8a46 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/domain/interactor/DarkIconInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/domain/interactor/DarkIconInteractor.kt @@ -22,7 +22,8 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map /** States pertaining to calculating colors for icons in dark mode. */ -class DarkIconInteractor @Inject constructor(repository: DarkIconRepository) { +class DarkIconInteractor @Inject constructor(private val repository: DarkIconRepository) { /** Dark-mode state for tinting icons. */ - val darkState: Flow<DarkState> = repository.darkState.map { DarkState(it.areas, it.tint) } + fun darkState(displayId: Int): Flow<DarkState> = + repository.darkState(displayId).map { DarkState(it.areas, it.tint) } } 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 013141b5e142..5cc44762dde8 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 @@ -351,8 +351,11 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue mStatusBar.restoreHierarchyState( savedInstanceState.getSparseParcelableArray(EXTRA_PANEL_STATE)); } - mDarkIconManager = mDarkIconManagerFactory.create( - view.findViewById(R.id.statusIcons), StatusBarLocation.HOME); + mDarkIconManager = + mDarkIconManagerFactory.create( + view.findViewById(R.id.statusIcons), + StatusBarLocation.HOME, + mHomeStatusBarComponent.getDarkIconDispatcher()); mDarkIconManager.setShouldLog(true); updateBlockedIcons(); mStatusBarIconController.addIconGroup(mDarkIconManager); @@ -496,11 +499,12 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue NotificationIconContainer notificationIcons = notificationIconArea.requireViewById(R.id.notificationIcons); mNotificationIconAreaInner = notificationIcons; - if (getContext().getDisplayId() == Display.DEFAULT_DISPLAY) { + int displayId = mHomeStatusBarComponent.getDisplayId(); + if (displayId == Display.DEFAULT_DISPLAY) { //TODO(b/369337701): implement notification icons for all displays. // Currently if we try to bind for all displays, there is a crash, because the same // notification icon view can't have multiple parents. - mNicBindingDisposable = mNicViewBinder.bindWhileAttached(notificationIcons); + mNicBindingDisposable = mNicViewBinder.bindWhileAttached(notificationIcons, displayId); } if (!StatusBarSimpleFragment.isEnabled()) { @@ -939,7 +943,9 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue if (mCarrierConfigTracker.getShowOperatorNameInStatusBarConfig(subId)) { View view = mStatusBar.findViewById(R.id.operator_name); mOperatorNameViewController = - mOperatorNameViewControllerFactory.create((OperatorNameView) view); + mOperatorNameViewControllerFactory.create( + (OperatorNameView) view, + mHomeStatusBarComponent.getDarkIconDispatcher()); mOperatorNameViewController.init(); // This view should not be visible on lock-screen if (mKeyguardStateController.isShowing()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/HomeStatusBarComponent.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/HomeStatusBarComponent.java index d4cb625d3722..f8ad0f2324bc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/HomeStatusBarComponent.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/HomeStatusBarComponent.java @@ -17,7 +17,9 @@ package com.android.systemui.statusbar.phone.fragment.dagger; import com.android.systemui.battery.BatteryMeterViewController; +import com.android.systemui.dagger.qualifiers.DisplaySpecific; import com.android.systemui.dagger.qualifiers.RootView; +import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.statusbar.notification.shared.NotificationsLiveDataStoreRefactor; import com.android.systemui.statusbar.phone.HeadsUpAppearanceController; import com.android.systemui.statusbar.phone.LegacyLightsOutNotifController; @@ -121,4 +123,12 @@ public interface HomeStatusBarComponent { /** */ StatusBarBoundsProvider getBoundsProvider(); + + /** */ + @DisplaySpecific + DarkIconDispatcher getDarkIconDispatcher(); + + /** */ + @DisplaySpecific + int getDisplayId(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/HomeStatusBarModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/HomeStatusBarModule.java index 45c53b05d478..182f8d7e2fd6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/HomeStatusBarModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/HomeStatusBarModule.java @@ -22,8 +22,10 @@ import android.view.ViewStub; import com.android.systemui.battery.BatteryMeterView; import com.android.systemui.dagger.qualifiers.DisplaySpecific; import com.android.systemui.dagger.qualifiers.RootView; +import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.res.R; import com.android.systemui.statusbar.HeadsUpStatusBarView; +import com.android.systemui.statusbar.data.repository.DarkIconDispatcherStore; import com.android.systemui.statusbar.data.repository.StatusBarConfigurationController; import com.android.systemui.statusbar.data.repository.StatusBarConfigurationControllerStore; import com.android.systemui.statusbar.phone.PhoneStatusBarTransitions; @@ -164,4 +166,12 @@ public interface HomeStatusBarModule { return store.forDisplay(displayId); } + /** */ + @Provides + @HomeStatusBarScope + @DisplaySpecific + static DarkIconDispatcher darkIconDispatcher( + @DisplaySpecific int displayId, DarkIconDispatcherStore store) { + return store.forDisplay(displayId); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/DarkIconManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/DarkIconManager.java index 6c303303c8f8..8d314eeb8493 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/DarkIconManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/DarkIconManager.java @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.phone.ui; import android.widget.LinearLayout; import com.android.internal.statusbar.StatusBarIcon; -import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.statusbar.StatusIconDisplayable; import com.android.systemui.statusbar.connectivity.ui.MobileContextProvider; @@ -29,35 +28,34 @@ import com.android.systemui.statusbar.phone.StatusBarLocation; import com.android.systemui.statusbar.pipeline.mobile.ui.MobileUiAdapter; import com.android.systemui.statusbar.pipeline.wifi.ui.WifiUiAdapter; -import javax.inject.Inject; +import dagger.assisted.Assisted; +import dagger.assisted.AssistedFactory; +import dagger.assisted.AssistedInject; -/** - * Version of {@link IconManager} that observes state from the DarkIconDispatcher. - */ +/** Version of {@link IconManager} that observes state from the {@link DarkIconDispatcher}. */ public class DarkIconManager extends IconManager { private final DarkIconDispatcher mDarkIconDispatcher; private final int mIconHorizontalMargin; + @AssistedInject public DarkIconManager( - LinearLayout linearLayout, - StatusBarLocation location, + @Assisted LinearLayout linearLayout, + @Assisted StatusBarLocation location, WifiUiAdapter wifiUiAdapter, MobileUiAdapter mobileUiAdapter, MobileContextProvider mobileContextProvider, - DarkIconDispatcher darkIconDispatcher) { - super(linearLayout, - location, - wifiUiAdapter, - mobileUiAdapter, - mobileContextProvider); - mIconHorizontalMargin = mContext.getResources().getDimensionPixelSize( - com.android.systemui.res.R.dimen.status_bar_icon_horizontal_margin); + @Assisted DarkIconDispatcher darkIconDispatcher) { + super(linearLayout, location, wifiUiAdapter, mobileUiAdapter, mobileContextProvider); + mIconHorizontalMargin = + mContext.getResources() + .getDimensionPixelSize( + com.android.systemui.res.R.dimen.status_bar_icon_horizontal_margin); mDarkIconDispatcher = darkIconDispatcher; } @Override - protected void onIconAdded(int index, String slot, boolean blocked, - StatusBarIconHolder holder) { + protected void onIconAdded( + int index, String slot, boolean blocked, StatusBarIconHolder holder) { StatusIconDisplayable view = addHolder(index, slot, blocked, holder); mDarkIconDispatcher.addDarkReceiver(view); } @@ -106,34 +104,14 @@ public class DarkIconManager extends IconManager { super.exitDemoMode(); } - @SysUISingleton - public static class Factory { - private final WifiUiAdapter mWifiUiAdapter; - private final MobileContextProvider mMobileContextProvider; - private final MobileUiAdapter mMobileUiAdapter; - private final DarkIconDispatcher mDarkIconDispatcher; - - @Inject - public Factory( - WifiUiAdapter wifiUiAdapter, - MobileContextProvider mobileContextProvider, - MobileUiAdapter mobileUiAdapter, - DarkIconDispatcher darkIconDispatcher) { - mWifiUiAdapter = wifiUiAdapter; - mMobileContextProvider = mobileContextProvider; - mMobileUiAdapter = mobileUiAdapter; - mDarkIconDispatcher = darkIconDispatcher; - } + /** */ + @AssistedFactory + public interface Factory { - /** Creates a new {@link DarkIconManager} for the given view group and location. */ - public DarkIconManager create(LinearLayout group, StatusBarLocation location) { - return new DarkIconManager( - group, - location, - mWifiUiAdapter, - mMobileUiAdapter, - mMobileContextProvider, - mDarkIconDispatcher); - } + /** Creates a new {@link DarkIconManager}. */ + DarkIconManager create( + LinearLayout group, + StatusBarLocation location, + DarkIconDispatcher darkIconDispatcher); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt index a472318a1e86..247abc3da175 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt @@ -31,7 +31,10 @@ import androidx.compose.ui.draw.alpha import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.viewinterop.AndroidView import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.android.app.tracing.coroutines.launchTraced as launch +import com.android.systemui.plugins.DarkIconDispatcher import com.android.systemui.res.R +import com.android.systemui.statusbar.data.repository.DarkIconDispatcherStore import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerStatusBarViewBinder import com.android.systemui.statusbar.phone.NotificationIconContainer import com.android.systemui.statusbar.phone.PhoneStatusBarView @@ -44,7 +47,6 @@ import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarVie import com.android.systemui.statusbar.pipeline.shared.ui.binder.StatusBarVisibilityChangeListener import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel import javax.inject.Inject -import com.android.app.tracing.coroutines.launchTraced as launch /** Factory to simplify the dependency management for [StatusBarRoot] */ class StatusBarRootFactory @@ -56,6 +58,7 @@ constructor( private val darkIconManagerFactory: DarkIconManager.Factory, private val iconController: StatusBarIconController, private val ongoingCallController: OngoingCallController, + private val darkIconDispatcherStore: DarkIconDispatcherStore, ) { fun create(root: ViewGroup, andThen: (ViewGroup) -> Unit): ComposeView { val composeView = ComposeView(root.context) @@ -69,6 +72,7 @@ constructor( darkIconManagerFactory = darkIconManagerFactory, iconController = iconController, ongoingCallController = ongoingCallController, + darkIconDispatcher = darkIconDispatcherStore.forDisplay(root.context.displayId), onViewCreated = andThen, ) } @@ -97,6 +101,7 @@ fun StatusBarRoot( darkIconManagerFactory: DarkIconManager.Factory, iconController: StatusBarIconController, ongoingCallController: OngoingCallController, + darkIconDispatcher: DarkIconDispatcher, onViewCreated: (ViewGroup) -> Unit, ) { // None of these methods are used when [StatusBarSimpleFragment] is on. @@ -135,7 +140,11 @@ fun StatusBarRoot( phoneStatusBarView.requireViewById<StatusIconContainer>(R.id.statusIcons) // TODO(b/364360986): turn this into a repo/intr/viewmodel val darkIconManager = - darkIconManagerFactory.create(statusIconContainer, StatusBarLocation.HOME) + darkIconManagerFactory.create( + statusIconContainer, + StatusBarLocation.HOME, + darkIconDispatcher, + ) iconController.addIconGroup(darkIconManager) // TODO(b/372657935): This won't be needed once OngoingCallController is @@ -157,9 +166,13 @@ fun StatusBarRoot( // TODO(b/369337701): implement notification icons for all displays. // Currently if we try to bind for all displays, there is a crash, because the // same notification icon view can't have multiple parents. - if (context.displayId == Display.DEFAULT_DISPLAY) { + val displayId = context.displayId + if (displayId == Display.DEFAULT_DISPLAY) { scope.launch { - notificationIconsBinder.bindWhileAttached(notificationIconContainer) + notificationIconsBinder.bindWhileAttached( + notificationIconContainer, + displayId, + ) } } diff --git a/packages/SystemUI/src/com/android/systemui/unfold/domain/interactor/UnfoldTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/unfold/domain/interactor/UnfoldTransitionInteractor.kt index 03499cbdccb2..885a2b0d7305 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/domain/interactor/UnfoldTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/domain/interactor/UnfoldTransitionInteractor.kt @@ -19,6 +19,7 @@ import android.view.View import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.unfold.data.repository.UnfoldTransitionRepository import com.android.systemui.unfold.data.repository.UnfoldTransitionStatus.TransitionFinished import com.android.systemui.unfold.data.repository.UnfoldTransitionStatus.TransitionInProgress @@ -41,7 +42,7 @@ class UnfoldTransitionInteractor @Inject constructor( private val repository: UnfoldTransitionRepository, - private val configurationInteractor: ConfigurationInteractor, + @ShadeDisplayAware private val configurationInteractor: ConfigurationInteractor, ) { /** Returns availability of fold/unfold transitions on the device */ val isAvailable: Boolean diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/FakeMediaTttChipControllerReceiver.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/FakeMediaTttChipControllerReceiver.kt index b3bd7d15cbf3..c7beb158c2de 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/FakeMediaTttChipControllerReceiver.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/FakeMediaTttChipControllerReceiver.kt @@ -23,7 +23,6 @@ import android.view.ViewGroup import android.view.accessibility.AccessibilityManager import com.android.app.viewcapture.ViewCaptureAwareWindowManager import com.android.systemui.dump.DumpManager -import com.android.systemui.media.taptotransfer.MediaTttFlags import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.temporarydisplay.TemporaryViewUiEventLogger @@ -43,7 +42,6 @@ class FakeMediaTttChipControllerReceiver( dumpManager: DumpManager, powerManager: PowerManager, mainHandler: Handler, - mediaTttFlags: MediaTttFlags, uiEventLogger: MediaTttReceiverUiEventLogger, viewUtil: ViewUtil, wakeLockBuilder: WakeLock.Builder, @@ -62,7 +60,6 @@ class FakeMediaTttChipControllerReceiver( dumpManager, powerManager, mainHandler, - mediaTttFlags, uiEventLogger, viewUtil, wakeLockBuilder, diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiverTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiverTest.kt index 9afa5ad1dd43..378dd452d030 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiverTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiverTest.kt @@ -37,7 +37,6 @@ import com.android.internal.logging.InstanceId import com.android.internal.logging.testing.UiEventLoggerFake import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager -import com.android.systemui.media.taptotransfer.MediaTttFlags import com.android.systemui.res.R import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.policy.ConfigurationController @@ -55,7 +54,6 @@ import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.Mock import org.mockito.Mockito.never -import org.mockito.Mockito.reset import org.mockito.Mockito.verify import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations @@ -66,32 +64,18 @@ import org.mockito.MockitoAnnotations class MediaTttChipControllerReceiverTest : SysuiTestCase() { private lateinit var controllerReceiver: MediaTttChipControllerReceiver - @Mock - private lateinit var packageManager: PackageManager - @Mock - private lateinit var applicationInfo: ApplicationInfo - @Mock - private lateinit var logger: MediaTttReceiverLogger - @Mock - private lateinit var accessibilityManager: AccessibilityManager - @Mock - private lateinit var configurationController: ConfigurationController - @Mock - private lateinit var dumpManager: DumpManager - @Mock - private lateinit var mediaTttFlags: MediaTttFlags - @Mock - private lateinit var powerManager: PowerManager - @Mock - private lateinit var viewUtil: ViewUtil - @Mock - private lateinit var windowManager: WindowManager - @Mock - private lateinit var commandQueue: CommandQueue - @Mock - private lateinit var rippleController: MediaTttReceiverRippleController - @Mock - private lateinit var lazyViewCapture: Lazy<ViewCapture> + @Mock private lateinit var packageManager: PackageManager + @Mock private lateinit var applicationInfo: ApplicationInfo + @Mock private lateinit var logger: MediaTttReceiverLogger + @Mock private lateinit var accessibilityManager: AccessibilityManager + @Mock private lateinit var configurationController: ConfigurationController + @Mock private lateinit var dumpManager: DumpManager + @Mock private lateinit var powerManager: PowerManager + @Mock private lateinit var viewUtil: ViewUtil + @Mock private lateinit var windowManager: WindowManager + @Mock private lateinit var commandQueue: CommandQueue + @Mock private lateinit var rippleController: MediaTttReceiverRippleController + @Mock private lateinit var lazyViewCapture: Lazy<ViewCapture> private lateinit var viewCaptureAwareWindowManager: ViewCaptureAwareWindowManager private lateinit var commandQueueCallback: CommandQueue.Callbacks private lateinit var fakeAppIconDrawable: Drawable @@ -106,14 +90,17 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { @Before fun setUp() { MockitoAnnotations.initMocks(this) - whenever(mediaTttFlags.isMediaTttEnabled()).thenReturn(true) fakeAppIconDrawable = context.getDrawable(R.drawable.ic_cake)!! whenever(packageManager.getApplicationIcon(PACKAGE_NAME)).thenReturn(fakeAppIconDrawable) whenever(applicationInfo.loadLabel(packageManager)).thenReturn(APP_NAME) - whenever(packageManager.getApplicationInfo( - eq(PACKAGE_NAME), any<PackageManager.ApplicationInfoFlags>() - )).thenReturn(applicationInfo) + whenever( + packageManager.getApplicationInfo( + eq(PACKAGE_NAME), + any<PackageManager.ApplicationInfoFlags>(), + ) + ) + .thenReturn(applicationInfo) context.setMockPackageManager(packageManager) fakeClock = FakeSystemClock() @@ -127,27 +114,31 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { fakeWakeLockBuilder = WakeLockFake.Builder(context) fakeWakeLockBuilder.setWakeLock(fakeWakeLock) - viewCaptureAwareWindowManager = ViewCaptureAwareWindowManager(windowManager, - lazyViewCapture, isViewCaptureEnabled = false) - controllerReceiver = FakeMediaTttChipControllerReceiver( - commandQueue, - context, - logger, - viewCaptureAwareWindowManager, - fakeExecutor, - accessibilityManager, - configurationController, - dumpManager, - powerManager, - Handler.getMain(), - mediaTttFlags, - receiverUiEventLogger, - viewUtil, - fakeWakeLockBuilder, - fakeClock, - rippleController, - temporaryViewUiEventLogger, - ) + viewCaptureAwareWindowManager = + ViewCaptureAwareWindowManager( + windowManager, + lazyViewCapture, + isViewCaptureEnabled = false, + ) + controllerReceiver = + FakeMediaTttChipControllerReceiver( + commandQueue, + context, + logger, + viewCaptureAwareWindowManager, + fakeExecutor, + accessibilityManager, + configurationController, + dumpManager, + powerManager, + Handler.getMain(), + receiverUiEventLogger, + viewUtil, + fakeWakeLockBuilder, + fakeClock, + rippleController, + temporaryViewUiEventLogger, + ) controllerReceiver.start() val callbackCaptor = ArgumentCaptor.forClass(CommandQueue.Callbacks::class.java) @@ -156,48 +147,18 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { } @Test - fun commandQueueCallback_flagOff_noCallbackAdded() { - reset(commandQueue) - whenever(mediaTttFlags.isMediaTttEnabled()).thenReturn(false) - - controllerReceiver = MediaTttChipControllerReceiver( - commandQueue, - context, - logger, - viewCaptureAwareWindowManager, - FakeExecutor(FakeSystemClock()), - accessibilityManager, - configurationController, - dumpManager, - powerManager, - Handler.getMain(), - mediaTttFlags, - receiverUiEventLogger, - viewUtil, - fakeWakeLockBuilder, - fakeClock, - rippleController, - temporaryViewUiEventLogger, - ) - controllerReceiver.start() - - verify(commandQueue, never()).addCallback(any()) - } - - @Test fun commandQueueCallback_closeToSender_triggersChip() { val appName = "FakeAppName" commandQueueCallback.updateMediaTapToTransferReceiverDisplay( StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER, routeInfo, /* appIcon= */ null, - appName + appName, ) assertThat(getChipView().getAppIconView().contentDescription).isEqualTo(appName) - assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( - MediaTttReceiverUiEvents.MEDIA_TTT_RECEIVER_CLOSE_TO_SENDER.id - ) + assertThat(uiEventLoggerFake.eventId(0)) + .isEqualTo(MediaTttReceiverUiEvents.MEDIA_TTT_RECEIVER_CLOSE_TO_SENDER.id) assertThat(uiEventLoggerFake.logs[0].instanceId).isNotNull() } @@ -207,45 +168,44 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER, routeInfo, null, - null + null, ) verify(windowManager, never()).addView(any(), any()) - assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( - MediaTttReceiverUiEvents.MEDIA_TTT_RECEIVER_FAR_FROM_SENDER.id - ) + assertThat(uiEventLoggerFake.eventId(0)) + .isEqualTo(MediaTttReceiverUiEvents.MEDIA_TTT_RECEIVER_FAR_FROM_SENDER.id) assertThat(uiEventLoggerFake.logs[0].instanceId).isNotNull() } @Test fun commandQueueCallback_transferToReceiverSucceeded_noChipShown() { commandQueueCallback.updateMediaTapToTransferReceiverDisplay( - StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, - routeInfo, - null, - null + StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, + routeInfo, + null, + null, ) verify(windowManager, never()).addView(any(), any()) - assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + assertThat(uiEventLoggerFake.eventId(0)) + .isEqualTo( MediaTttReceiverUiEvents.MEDIA_TTT_RECEIVER_TRANSFER_TO_RECEIVER_SUCCEEDED.id - ) + ) assertThat(uiEventLoggerFake.logs[0].instanceId).isNotNull() } @Test fun commandQueueCallback_transferToReceiverFailed_noChipShown() { commandQueueCallback.updateMediaTapToTransferReceiverDisplay( - StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_TRANSFER_TO_RECEIVER_FAILED, - routeInfo, - null, - null + StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_TRANSFER_TO_RECEIVER_FAILED, + routeInfo, + null, + null, ) verify(windowManager, never()).addView(any(), any()) - assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( - MediaTttReceiverUiEvents.MEDIA_TTT_RECEIVER_TRANSFER_TO_RECEIVER_FAILED.id - ) + assertThat(uiEventLoggerFake.eventId(0)) + .isEqualTo(MediaTttReceiverUiEvents.MEDIA_TTT_RECEIVER_TRANSFER_TO_RECEIVER_FAILED.id) assertThat(uiEventLoggerFake.logs[0].instanceId).isNotNull() } @@ -255,14 +215,14 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER, routeInfo, null, - null + null, ) commandQueueCallback.updateMediaTapToTransferReceiverDisplay( StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER, routeInfo, null, - null + null, ) val viewCaptor = ArgumentCaptor.forClass(View::class.java) @@ -276,14 +236,14 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER, routeInfo, null, - null + null, ) commandQueueCallback.updateMediaTapToTransferReceiverDisplay( StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, routeInfo, null, - null + null, ) val viewCaptor = ArgumentCaptor.forClass(View::class.java) @@ -297,14 +257,14 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER, routeInfo, null, - null + null, ) commandQueueCallback.updateMediaTapToTransferReceiverDisplay( StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, routeInfo, null, - null + null, ) assertThat(uiEventLoggerFake[0].instanceId).isEqualTo(uiEventLoggerFake[1].instanceId) @@ -316,14 +276,14 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER, routeInfo, null, - null + null, ) commandQueueCallback.updateMediaTapToTransferReceiverDisplay( StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_TRANSFER_TO_RECEIVER_FAILED, routeInfo, null, - null + null, ) val viewCaptor = ArgumentCaptor.forClass(View::class.java) @@ -334,19 +294,19 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { @Test fun commandQueueCallback_closeThenFar_wakeLockAcquiredThenReleased() { commandQueueCallback.updateMediaTapToTransferReceiverDisplay( - StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER, - routeInfo, - null, - null + StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER, + routeInfo, + null, + null, ) assertThat(fakeWakeLock.isHeld).isTrue() commandQueueCallback.updateMediaTapToTransferReceiverDisplay( - StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER, - routeInfo, - null, - null + StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER, + routeInfo, + null, + null, ) assertThat(fakeWakeLock.isHeld).isFalse() @@ -355,10 +315,10 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { @Test fun commandQueueCallback_closeThenFar_wakeLockNeverAcquired() { commandQueueCallback.updateMediaTapToTransferReceiverDisplay( - StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER, - routeInfo, - null, - null + StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER, + routeInfo, + null, + null, ) assertThat(fakeWakeLock.isHeld).isFalse() @@ -370,7 +330,7 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER, routeInfo, null, - null + null, ) verify(logger).logStateChange(any(), any(), any()) @@ -391,10 +351,12 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { val view = getChipView() assertThat(view.getAppIconView().drawable).isEqualTo(fakeAppIconDrawable) assertThat(view.getAppIconView().contentDescription) - .isEqualTo(context.getString( - R.string.media_transfer_receiver_content_description_with_app_name, - APP_NAME, - )) + .isEqualTo( + context.getString( + R.string.media_transfer_receiver_content_description_with_app_name, + APP_NAME, + ) + ) } @Test @@ -463,7 +425,7 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, routeInfo, null, - APP_NAME + APP_NAME, ) verify(windowManager, never()).addView(any(), any()) @@ -476,10 +438,11 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { } private fun getChipReceiverInfo(packageName: String?): ChipReceiverInfo { - val routeInfo = MediaRoute2Info.Builder("id", "Test route name") - .addFeature("feature") - .setClientPackageName(packageName) - .build() + val routeInfo = + MediaRoute2Info.Builder("id", "Test route name") + .addFeature("feature") + .setClientPackageName(packageName) + .build() return ChipReceiverInfo( routeInfo, null, @@ -495,7 +458,8 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { private const val APP_NAME = "Fake app name" private const val PACKAGE_NAME = "com.android.systemui" -private val routeInfo = MediaRoute2Info.Builder("id", "Test route name") - .addFeature("feature") - .setClientPackageName(PACKAGE_NAME) - .build() +private val routeInfo = + MediaRoute2Info.Builder("id", "Test route name") + .addFeature("feature") + .setClientPackageName(PACKAGE_NAME) + .build() diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt index b4cad6bb057b..c90ac5993c31 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt @@ -41,7 +41,6 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.classifier.FalsingCollector import com.android.systemui.common.shared.model.Text.Companion.loadText import com.android.systemui.dump.DumpManager -import com.android.systemui.media.taptotransfer.MediaTttFlags import com.android.systemui.plugins.FalsingManager import com.android.systemui.res.R import com.android.systemui.statusbar.CommandQueue @@ -95,7 +94,6 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { @Mock private lateinit var falsingCollector: FalsingCollector @Mock private lateinit var chipbarLogger: ChipbarLogger @Mock private lateinit var logger: MediaTttSenderLogger - @Mock private lateinit var mediaTttFlags: MediaTttFlags @Mock private lateinit var packageManager: PackageManager @Mock private lateinit var powerManager: PowerManager @Mock private lateinit var viewUtil: ViewUtil @@ -118,7 +116,6 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { @Before fun setUp() { MockitoAnnotations.initMocks(this) - whenever(mediaTttFlags.isMediaTttEnabled()).thenReturn(true) whenever(accessibilityManager.getRecommendedTimeoutMillis(any(), any())).thenReturn(TIMEOUT) fakeAppIconDrawable = context.getDrawable(R.drawable.ic_cake)!! @@ -127,7 +124,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { whenever( packageManager.getApplicationInfo( eq(PACKAGE_NAME), - any<PackageManager.ApplicationInfoFlags>() + any<PackageManager.ApplicationInfoFlags>(), ) ) .thenReturn(applicationInfo) @@ -148,8 +145,11 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { ChipbarCoordinator( context, chipbarLogger, - ViewCaptureAwareWindowManager(windowManager, lazyViewCapture, - isViewCaptureEnabled = false), + ViewCaptureAwareWindowManager( + windowManager, + lazyViewCapture, + isViewCaptureEnabled = false, + ), fakeExecutor, accessibilityManager, configurationController, @@ -174,7 +174,6 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { context, dumpManager, logger, - mediaTttFlags, uiEventLogger, ) underTest.start() @@ -183,30 +182,11 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { } @Test - fun commandQueueCallback_flagOff_noCallbackAdded() { - reset(commandQueue) - whenever(mediaTttFlags.isMediaTttEnabled()).thenReturn(false) - underTest = - MediaTttSenderCoordinator( - chipbarCoordinator, - commandQueue, - context, - dumpManager, - logger, - mediaTttFlags, - uiEventLogger, - ) - underTest.start() - - verify(commandQueue, never()).addCallback(any()) - } - - @Test fun commandQueueCallback_almostCloseToStartCast_triggersCorrectChip() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST, routeInfo, - null + null, ) val chipbarView = getChipbarView() @@ -220,13 +200,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { assertThat(uiEventLoggerFake.eventId(0)) .isEqualTo(MediaTttSenderUiEvents.MEDIA_TTT_SENDER_ALMOST_CLOSE_TO_START_CAST.id) verify(vibratorHelper) - .vibrate( - any(), - any(), - any<VibrationEffect>(), - any(), - any<VibrationAttributes>(), - ) + .vibrate(any(), any(), any<VibrationEffect>(), any(), any<VibrationAttributes>()) } @Test @@ -249,7 +223,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST, routeInfo, - null + null, ) val chipbarView = getChipbarView() @@ -263,13 +237,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { assertThat(uiEventLoggerFake.eventId(0)) .isEqualTo(MediaTttSenderUiEvents.MEDIA_TTT_SENDER_ALMOST_CLOSE_TO_END_CAST.id) verify(vibratorHelper) - .vibrate( - any(), - any(), - any<VibrationEffect>(), - any(), - any<VibrationAttributes>(), - ) + .vibrate(any(), any(), any<VibrationEffect>(), any(), any<VibrationAttributes>()) } @Test @@ -277,7 +245,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED, routeInfo, - null + null, ) val chipbarView = getChipbarView() @@ -291,13 +259,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { assertThat(uiEventLoggerFake.eventId(0)) .isEqualTo(MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_RECEIVER_TRIGGERED.id) verify(vibratorHelper) - .vibrate( - any(), - any(), - any<VibrationEffect>(), - any(), - any<VibrationAttributes>(), - ) + .vibrate(any(), any(), any<VibrationEffect>(), any(), any<VibrationAttributes>()) } @Test @@ -320,7 +282,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED, routeInfo, - null + null, ) val chipbarView = getChipbarView() @@ -334,13 +296,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { assertThat(uiEventLoggerFake.eventId(0)) .isEqualTo(MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_THIS_DEVICE_TRIGGERED.id) verify(vibratorHelper) - .vibrate( - any(), - any(), - any<VibrationEffect>(), - any(), - any<VibrationAttributes>(), - ) + .vibrate(any(), any(), any<VibrationEffect>(), any(), any<VibrationAttributes>()) } @Test @@ -350,7 +306,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, routeInfo, - null + null, ) val chipbarView = getChipbarView() @@ -364,13 +320,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { assertThat(uiEventLoggerFake.eventId(2)) .isEqualTo(MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_RECEIVER_SUCCEEDED.id) verify(vibratorHelper, never()) - .vibrate( - any(), - any(), - any<VibrationEffect>(), - any(), - any<VibrationAttributes>(), - ) + .vibrate(any(), any(), any<VibrationEffect>(), any(), any<VibrationAttributes>()) } @Test @@ -380,7 +330,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, routeInfo, - null + null, ) // Event index 2 since initially displaying the triggered chip would also log two events. @@ -397,7 +347,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, routeInfo, - /* undoCallback= */ null + /* undoCallback= */ null, ) val chipbarView = getChipbarView() @@ -452,7 +402,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, routeInfo, - null + null, ) val chipbarView = getChipbarView() @@ -466,13 +416,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { assertThat(uiEventLoggerFake.eventId(2)) .isEqualTo(MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_THIS_DEVICE_SUCCEEDED.id) verify(vibratorHelper, never()) - .vibrate( - any(), - any(), - any<VibrationEffect>(), - any(), - any<VibrationAttributes>(), - ) + .vibrate(any(), any(), any<VibrationEffect>(), any(), any<VibrationAttributes>()) } @Test @@ -481,7 +425,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, routeInfo, - /* undoCallback= */ null + /* undoCallback= */ null, ) val chipbarView = getChipbarView() @@ -538,7 +482,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED, routeInfo, - null + null, ) val chipbarView = getChipbarView() @@ -553,13 +497,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { assertThat(uiEventLoggerFake.eventId(2)) .isEqualTo(MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_RECEIVER_FAILED.id) verify(vibratorHelper) - .vibrate( - any(), - any(), - any<VibrationEffect>(), - any(), - any<VibrationAttributes>(), - ) + .vibrate(any(), any(), any<VibrationEffect>(), any(), any<VibrationAttributes>()) } @Test @@ -567,13 +505,13 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED, routeInfo, - null + null, ) reset(vibratorHelper) commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_FAILED, routeInfo, - null + null, ) val chipbarView = getChipbarView() @@ -588,13 +526,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { assertThat(uiEventLoggerFake.eventId(2)) .isEqualTo(MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_THIS_DEVICE_FAILED.id) verify(vibratorHelper) - .vibrate( - any(), - any(), - any<VibrationEffect>(), - any(), - any<VibrationAttributes>(), - ) + .vibrate(any(), any(), any<VibrationEffect>(), any(), any<VibrationAttributes>()) } @Test @@ -602,7 +534,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, routeInfo, - null + null, ) verify(windowManager, never()).addView(any(), any()) @@ -615,13 +547,13 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST, routeInfo, - null + null, ) commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, routeInfo, - null + null, ) val viewCaptor = ArgumentCaptor.forClass(View::class.java) @@ -635,7 +567,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST, routeInfo, - null + null, ) assertThat(fakeWakeLock.isHeld).isTrue() @@ -643,7 +575,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, routeInfo, - null + null, ) assertThat(fakeWakeLock.isHeld).isFalse() @@ -654,7 +586,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, routeInfo, - null + null, ) assertThat(fakeWakeLock.isHeld).isFalse() @@ -672,7 +604,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED, routeInfo, - null + null, ) verify(windowManager).addView(any(), any()) reset(windowManager) @@ -680,7 +612,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST, routeInfo, - null + null, ) verify(logger).logInvalidStateTransitionError(any(), any()) @@ -692,7 +624,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED, routeInfo, - null + null, ) verify(windowManager).addView(any(), any()) reset(windowManager) @@ -700,7 +632,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST, routeInfo, - null + null, ) verify(logger).logInvalidStateTransitionError(any(), any()) @@ -713,14 +645,14 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, routeInfo, - null + null, ) reset(windowManager) commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, routeInfo, - null + null, ) verify(logger).logInvalidStateTransitionError(any(), any()) @@ -733,14 +665,14 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, routeInfo, - null + null, ) reset(windowManager) commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, routeInfo, - null + null, ) verify(logger).logInvalidStateTransitionError(any(), any()) @@ -752,7 +684,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST, routeInfo, - null + null, ) verify(windowManager).addView(any(), any()) reset(windowManager) @@ -760,7 +692,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, routeInfo, - null + null, ) verify(logger).logInvalidStateTransitionError(any(), any()) @@ -772,7 +704,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST, routeInfo, - null + null, ) verify(windowManager).addView(any(), any()) reset(windowManager) @@ -780,7 +712,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, routeInfo, - null + null, ) verify(logger).logInvalidStateTransitionError(any(), any()) @@ -792,7 +724,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST, routeInfo, - null + null, ) verify(windowManager).addView(any(), any()) reset(windowManager) @@ -800,7 +732,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED, routeInfo, - null + null, ) verify(logger).logInvalidStateTransitionError(any(), any()) @@ -812,7 +744,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST, routeInfo, - null + null, ) verify(windowManager).addView(any(), any()) reset(windowManager) @@ -820,7 +752,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_FAILED, routeInfo, - null + null, ) verify(logger).logInvalidStateTransitionError(any(), any()) @@ -925,7 +857,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST, routeInfo, - null + null, ) verify(logger).logStateChange(any(), any(), any()) @@ -936,13 +868,13 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED, routeInfo, - null + null, ) commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, routeInfo, - null + null, ) fakeExecutor.runAllReady() @@ -959,13 +891,13 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED, routeInfo, - null + null, ) commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, routeInfo, - null + null, ) fakeExecutor.runAllReady() @@ -983,13 +915,13 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, routeInfo, - null + null, ) commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, routeInfo, - null + null, ) fakeExecutor.runAllReady() @@ -1007,13 +939,13 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, routeInfo, - null + null, ) commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, routeInfo, - null + null, ) fakeExecutor.runAllReady() @@ -1051,7 +983,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, routeInfo, - null + null, ) fakeExecutor.runAllReady() @@ -1091,7 +1023,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, routeInfo, - null + null, ) fakeExecutor.runAllReady() @@ -1116,7 +1048,6 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { context, dumpManager, logger, - mediaTttFlags, uiEventLogger, ) underTest.start() @@ -1144,7 +1075,6 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { context, dumpManager, logger, - mediaTttFlags, uiEventLogger, ) underTest.start() @@ -1178,7 +1108,6 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { context, dumpManager, logger, - mediaTttFlags, uiEventLogger, ) underTest.start() @@ -1211,7 +1140,6 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { context, dumpManager, logger, - mediaTttFlags, uiEventLogger, ) underTest.start() @@ -1230,7 +1158,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, routeInfo, - null + null, ) // THEN the media coordinator unregisters the listener @@ -1248,7 +1176,6 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { context, dumpManager, logger, - mediaTttFlags, uiEventLogger, ) underTest.start() @@ -1549,7 +1476,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { private fun ViewGroup.getUndoButton(): View = this.requireViewById(R.id.end_button) private fun ChipStateSender.getExpectedStateText( - otherDeviceName: String = OTHER_DEVICE_NAME, + otherDeviceName: String = OTHER_DEVICE_NAME ): String? { return this.getChipTextString(context, otherDeviceName).loadText(context) } @@ -1560,7 +1487,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED, routeInfo, - null + null, ) } @@ -1570,7 +1497,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED, routeInfo, - null + null, ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt index 963973588236..991f78a3147c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt @@ -27,7 +27,6 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.flags.FeatureFlagsClassic -import com.android.systemui.flags.Flags import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger import com.android.systemui.mediaprojection.SessionCreationSource import com.android.systemui.mediaprojection.devicepolicy.ScreenCaptureDevicePolicyResolver @@ -56,7 +55,6 @@ import org.mockito.ArgumentMatchers.anyLong import org.mockito.Mock import org.mockito.Mockito.never import org.mockito.Mockito.spy -import org.mockito.Mockito.times import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations @@ -150,8 +148,6 @@ class RecordIssueDialogDelegateTest : SysuiTestCase() { @Test fun screenCaptureDisabledDialog_isShown_whenFunctionalityIsDisabled() { - whenever(flags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES)) - .thenReturn(true) whenever(devicePolicyResolver.isScreenCaptureCompletelyDisabled(any<UserHandle>())) .thenReturn(true) @@ -170,48 +166,6 @@ class RecordIssueDialogDelegateTest : SysuiTestCase() { } @Test - fun screenCapturePermissionDialog_isShown_correctly() { - whenever(flags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES)) - .thenReturn(false) - whenever(devicePolicyResolver.isScreenCaptureCompletelyDisabled(any<UserHandle>())) - .thenReturn(false) - whenever(state.hasUserApprovedScreenRecording).thenReturn(false) - - val screenRecordSwitch = dialog.requireViewById<Switch>(R.id.screenrecord_switch) - screenRecordSwitch.isChecked = true - - bgExecutor.runAllReady() - mainExecutor.runAllReady() - - verify(mediaProjectionMetricsLogger) - .notifyProjectionInitiated( - anyInt(), - eq(SessionCreationSource.SYSTEM_UI_SCREEN_RECORDER), - ) - verify(factory, times(2)).create(any(SystemUIDialog.Delegate::class.java)) - } - - @Test - fun noDialogsAreShown_forScreenRecord_whenApprovalIsAlreadyGiven() { - whenever(flags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES)) - .thenReturn(false) - whenever(devicePolicyResolver.isScreenCaptureCompletelyDisabled(any<UserHandle>())) - .thenReturn(false) - - val screenRecordSwitch = dialog.requireViewById<Switch>(R.id.screenrecord_switch) - screenRecordSwitch.isChecked = true - - bgExecutor.runAllReady() - - verify(mediaProjectionMetricsLogger) - .notifyProjectionInitiated( - anyInt(), - eq(SessionCreationSource.SYSTEM_UI_SCREEN_RECORDER), - ) - verify(factory, never()).create() - } - - @Test fun startButton_isDisabled_beforeIssueTypeIsSelected() { assertThat(dialog.getButton(Dialog.BUTTON_POSITIVE).isEnabled).isFalse() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java index 6b16e78436d4..afff4858499a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java @@ -42,15 +42,11 @@ import android.testing.TestableLooper; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; -import com.android.systemui.flags.FakeFeatureFlags; -import com.android.systemui.flags.Flags; import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger; import com.android.systemui.mediaprojection.SessionCreationSource; import com.android.systemui.mediaprojection.devicepolicy.ScreenCaptureDevicePolicyResolver; import com.android.systemui.mediaprojection.devicepolicy.ScreenCaptureDisabledDialogDelegate; -import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.util.concurrency.FakeExecutor; @@ -79,10 +75,6 @@ public class RecordingControllerTest extends SysuiTestCase { @Mock private ScreenCaptureDevicePolicyResolver mDevicePolicyResolver; @Mock - private DialogTransitionAnimator mDialogTransitionAnimator; - @Mock - private ActivityStarter mActivityStarter; - @Mock private UserTracker mUserTracker; @Mock private MediaProjectionMetricsLogger mMediaProjectionMetricsLogger; @@ -92,10 +84,6 @@ public class RecordingControllerTest extends SysuiTestCase { @Mock private SystemUIDialog mScreenCaptureDisabledDialog; @Mock - private ScreenRecordDialogDelegate.Factory mScreenRecordDialogFactory; - @Mock - private ScreenRecordDialogDelegate mScreenRecordDialogDelegate; - @Mock private ScreenRecordPermissionDialogDelegate.Factory mScreenRecordPermissionDialogDelegateFactory; @Mock @@ -103,7 +91,6 @@ public class RecordingControllerTest extends SysuiTestCase { @Mock private SystemUIDialog mScreenRecordSystemUIDialog; - private FakeFeatureFlags mFeatureFlags; private RecordingController mController; private static final int USER_ID = 10; @@ -114,12 +101,8 @@ public class RecordingControllerTest extends SysuiTestCase { Context spiedContext = spy(mContext); when(spiedContext.getUserId()).thenReturn(TEST_USER_ID); - mFeatureFlags = new FakeFeatureFlags(); when(mScreenCaptureDisabledDialogDelegate.createSysUIDialog()) .thenReturn(mScreenCaptureDisabledDialog); - when(mScreenRecordDialogFactory.create(any(), any())) - .thenReturn(mScreenRecordDialogDelegate); - when(mScreenRecordDialogDelegate.createDialog()).thenReturn(mScreenRecordSystemUIDialog); when(mScreenRecordPermissionDialogDelegateFactory.create(any(), any(), anyInt(), any())) .thenReturn(mScreenRecordPermissionDialogDelegate); when(mScreenRecordPermissionDialogDelegate.createDialog()) @@ -127,13 +110,11 @@ public class RecordingControllerTest extends SysuiTestCase { mController = new RecordingController( mMainExecutor, mBroadcastDispatcher, - mFeatureFlags, () -> mDevicePolicyResolver, mUserTracker, new RecordingControllerLogger(logcatLogBuffer("RecordingControllerTest")), mMediaProjectionMetricsLogger, mScreenCaptureDisabledDialogDelegate, - mScreenRecordDialogFactory, mScreenRecordPermissionDialogDelegateFactory ); mController.addCallback(mCallback); @@ -236,46 +217,19 @@ public class RecordingControllerTest extends SysuiTestCase { } @Test - public void testPoliciesFlagDisabled_screenCapturingNotAllowed_returnsNullDevicePolicyDialog() { - mFeatureFlags.set(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES, false); - when(mDevicePolicyResolver.isScreenCaptureCompletelyDisabled((any()))).thenReturn(true); - - Dialog dialog = - mController.createScreenRecordDialog( - mContext, - mFeatureFlags, - mDialogTransitionAnimator, - mActivityStarter, - /* onStartRecordingClicked= */ null); - - assertThat(dialog).isSameInstanceAs(mScreenRecordSystemUIDialog); - assertThat(mScreenRecordPermissionDialogDelegate) - .isInstanceOf(ScreenRecordPermissionDialogDelegate.class); - } - - @Test - public void testPoliciesFlagEnabled_screenCapturingNotAllowed_returnsDevicePolicyDialog() { - mFeatureFlags.set(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES, true); + public void testScreenCapturingNotAllowed_returnsDevicePolicyDialog() { when(mDevicePolicyResolver.isScreenCaptureCompletelyDisabled((any()))).thenReturn(true); - Dialog dialog = mController.createScreenRecordDialog(mContext, mFeatureFlags, - mDialogTransitionAnimator, mActivityStarter, /* onStartRecordingClicked= */ null); + Dialog dialog = mController.createScreenRecordDialog(/* onStartRecordingClicked= */ null); assertThat(dialog).isEqualTo(mScreenCaptureDisabledDialog); } @Test - public void testPoliciesFlagEnabled_screenCapturingAllowed_returnsNullDevicePolicyDialog() { - mFeatureFlags.set(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES, true); + public void testScreenCapturingAllowed_returnsNullDevicePolicyDialog() { when(mDevicePolicyResolver.isScreenCaptureCompletelyDisabled((any()))).thenReturn(false); - Dialog dialog = - mController.createScreenRecordDialog( - mContext, - mFeatureFlags, - mDialogTransitionAnimator, - mActivityStarter, - /* onStartRecordingClicked= */ null); + Dialog dialog = mController.createScreenRecordDialog(/* onStartRecordingClicked= */ null); assertThat(dialog).isSameInstanceAs(mScreenRecordSystemUIDialog); assertThat(mScreenRecordPermissionDialogDelegate) @@ -283,12 +237,10 @@ public class RecordingControllerTest extends SysuiTestCase { } @Test - public void testPoliciesFlagEnabled_screenCapturingAllowed_logsProjectionInitiated() { - mFeatureFlags.set(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES, true); + public void testScreenCapturingAllowed_logsProjectionInitiated() { when(mDevicePolicyResolver.isScreenCaptureCompletelyDisabled((any()))).thenReturn(false); - mController.createScreenRecordDialog(mContext, mFeatureFlags, - mDialogTransitionAnimator, mActivityStarter, /* onStartRecordingClicked= */ null); + mController.createScreenRecordDialog(/* onStartRecordingClicked= */ null); verify(mMediaProjectionMetricsLogger) .notifyProjectionInitiated( diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java deleted file mode 100644 index 0427011c06f6..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java +++ /dev/null @@ -1,574 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.systemui.statusbar.notification.row; - -import static android.app.AppOpsManager.OP_CAMERA; -import static android.app.AppOpsManager.OP_RECORD_AUDIO; -import static android.app.AppOpsManager.OP_SYSTEM_ALERT_WINDOW; -import static android.app.NotificationManager.IMPORTANCE_DEFAULT; -import static android.app.NotificationManager.IMPORTANCE_HIGH; -import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE; - -import static com.android.systemui.statusbar.NotificationEntryHelper.modifyRanking; - -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.app.INotificationManager; -import android.app.Notification; -import android.app.NotificationChannel; -import android.content.Intent; -import android.content.pm.LauncherApps; -import android.content.pm.PackageManager; -import android.content.pm.ShortcutManager; -import android.graphics.Color; -import android.os.Binder; -import android.os.Handler; -import android.os.UserManager; -import android.provider.Settings; -import android.service.notification.StatusBarNotification; -import android.testing.TestableLooper; -import android.util.ArraySet; -import android.view.View; -import android.view.accessibility.AccessibilityManager; - -import androidx.test.ext.junit.runners.AndroidJUnit4; -import androidx.test.filters.SmallTest; - -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.UiEventLogger; -import com.android.internal.logging.testing.UiEventLoggerFake; -import com.android.internal.statusbar.IStatusBarService; -import com.android.systemui.SysuiTestCase; -import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository; -import com.android.systemui.kosmos.KosmosJavaAdapter; -import com.android.systemui.people.widget.PeopleSpaceWidgetManager; -import com.android.systemui.plugins.ActivityStarter; -import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; -import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.power.domain.interactor.PowerInteractorFactory; -import com.android.systemui.scene.data.repository.WindowRootViewVisibilityRepository; -import com.android.systemui.scene.domain.interactor.WindowRootViewVisibilityInteractor; -import com.android.systemui.settings.UserContextProvider; -import com.android.systemui.shade.ShadeController; -import com.android.systemui.statusbar.NotificationLockscreenUserManager; -import com.android.systemui.statusbar.NotificationPresenter; -import com.android.systemui.statusbar.notification.AssistantFeedbackController; -import com.android.systemui.statusbar.notification.NotificationActivityStarter; -import com.android.systemui.statusbar.notification.collection.NotificationEntry; -import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider; -import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier; -import com.android.systemui.statusbar.notification.row.NotificationGutsManager.OnSettingsClickListener; -import com.android.systemui.statusbar.notification.stack.NotificationListContainer; -import com.android.systemui.statusbar.policy.DeviceProvisionedController; -import com.android.systemui.statusbar.policy.HeadsUpManager; -import com.android.systemui.util.concurrency.FakeExecutor; -import com.android.systemui.util.kotlin.JavaAdapter; -import com.android.systemui.wmshell.BubblesManager; - -import kotlinx.coroutines.test.TestScope; - -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.Optional; - -/** - * Tests for {@link NotificationGutsManager}. - */ -@SmallTest -@RunWith(AndroidJUnit4.class) -@TestableLooper.RunWithLooper -public class NotificationGutsManagerTest extends SysuiTestCase { - private static final String TEST_CHANNEL_ID = "NotificationManagerServiceTestChannelId"; - - private NotificationChannel mTestNotificationChannel = new NotificationChannel( - TEST_CHANNEL_ID, TEST_CHANNEL_ID, IMPORTANCE_DEFAULT); - - private final KosmosJavaAdapter mKosmos = new KosmosJavaAdapter(this); - private final TestScope mTestScope = mKosmos.getTestScope(); - private final JavaAdapter mJavaAdapter = new JavaAdapter(mTestScope.getBackgroundScope()); - private final FakeExecutor mExecutor = mKosmos.getFakeExecutor(); - private final Handler mHandler = mKosmos.getFakeExecutorHandler(); - private NotificationTestHelper mHelper; - private NotificationGutsManager mGutsManager; - - @Rule public MockitoRule mockito = MockitoJUnit.rule(); - @Mock private MetricsLogger mMetricsLogger; - @Mock private OnUserInteractionCallback mOnUserInteractionCallback; - @Mock private NotificationPresenter mPresenter; - @Mock private NotificationActivityStarter mNotificationActivityStarter; - @Mock private NotificationListContainer mNotificationListContainer; - @Mock private OnSettingsClickListener mOnSettingsClickListener; - @Mock private DeviceProvisionedController mDeviceProvisionedController; - @Mock private AccessibilityManager mAccessibilityManager; - @Mock private HighPriorityProvider mHighPriorityProvider; - @Mock private INotificationManager mINotificationManager; - @Mock private IStatusBarService mBarService; - @Mock private LauncherApps mLauncherApps; - @Mock private ShortcutManager mShortcutManager; - @Mock private ChannelEditorDialogController mChannelEditorDialogController; - @Mock private PeopleNotificationIdentifier mPeopleNotificationIdentifier; - @Mock private UserContextProvider mContextTracker; - @Mock private BubblesManager mBubblesManager; - @Mock private ShadeController mShadeController; - @Mock private PeopleSpaceWidgetManager mPeopleSpaceWidgetManager; - @Mock private AssistantFeedbackController mAssistantFeedbackController; - @Mock private NotificationLockscreenUserManager mNotificationLockscreenUserManager; - @Mock private StatusBarStateController mStatusBarStateController; - @Mock private HeadsUpManager mHeadsUpManager; - @Mock private ActivityStarter mActivityStarter; - - @Mock private UserManager mUserManager; - - private WindowRootViewVisibilityInteractor mWindowRootViewVisibilityInteractor; - - @Before - public void setUp() { - allowTestableLooperAsMainThread(); - mHelper = new NotificationTestHelper(mContext, mDependency); - when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(false); - - mWindowRootViewVisibilityInteractor = new WindowRootViewVisibilityInteractor( - mTestScope.getBackgroundScope(), - new WindowRootViewVisibilityRepository(mBarService, mExecutor), - new FakeKeyguardRepository(), - mHeadsUpManager, - PowerInteractorFactory.create().getPowerInteractor(), - mKosmos.getActiveNotificationsInteractor(), - () -> mKosmos.getSceneInteractor() - ); - - mGutsManager = new NotificationGutsManager( - mContext, - mHandler, - mHandler, - mJavaAdapter, - mAccessibilityManager, - mHighPriorityProvider, - mINotificationManager, - mUserManager, - mPeopleSpaceWidgetManager, - mLauncherApps, - mShortcutManager, - mChannelEditorDialogController, - mContextTracker, - mAssistantFeedbackController, - Optional.of(mBubblesManager), - new UiEventLoggerFake(), - mOnUserInteractionCallback, - mShadeController, - mWindowRootViewVisibilityInteractor, - mNotificationLockscreenUserManager, - mStatusBarStateController, - mBarService, - mDeviceProvisionedController, - mMetricsLogger, - mHeadsUpManager, - mActivityStarter); - mGutsManager.setUpWithPresenter(mPresenter, mNotificationListContainer, - mOnSettingsClickListener); - mGutsManager.setNotificationActivityStarter(mNotificationActivityStarter); - mGutsManager.start(); - } - - //////////////////////////////////////////////////////////////////////////////////////////////// - // Test methods: - - @Test - public void testOpenAndCloseGuts() { - NotificationGuts guts = spy(new NotificationGuts(mContext)); - when(guts.post(any())).thenAnswer(invocation -> { - mHandler.post(((Runnable) invocation.getArguments()[0])); - return null; - }); - - // Test doesn't support animation since the guts view is not attached. - doNothing().when(guts).openControls( - anyInt(), - anyInt(), - anyBoolean(), - any(Runnable.class)); - - ExpandableNotificationRow realRow = createTestNotificationRow(); - NotificationMenuRowPlugin.MenuItem menuItem = createTestMenuItem(realRow); - - ExpandableNotificationRow row = spy(realRow); - when(row.getWindowToken()).thenReturn(new Binder()); - when(row.getGuts()).thenReturn(guts); - - assertTrue(mGutsManager.openGutsInternal(row, 0, 0, menuItem)); - assertEquals(View.INVISIBLE, guts.getVisibility()); - mExecutor.runAllReady(); - verify(guts).openControls( - anyInt(), - anyInt(), - anyBoolean(), - any(Runnable.class)); - verify(mHeadsUpManager).setGutsShown(realRow.getEntry(), true); - - assertEquals(View.VISIBLE, guts.getVisibility()); - mGutsManager.closeAndSaveGuts(false, false, true, 0, 0, false); - - verify(guts).closeControls(anyBoolean(), anyBoolean(), anyInt(), anyInt(), anyBoolean()); - verify(row, times(1)).setGutsView(any()); - mExecutor.runAllReady(); - verify(mHeadsUpManager).setGutsShown(realRow.getEntry(), false); - } - - @Test - public void testLockscreenShadeVisible_visible_gutsNotClosed() { - // First, start out lockscreen or shade as not visible - mWindowRootViewVisibilityInteractor.setIsLockscreenOrShadeVisible(false); - mTestScope.getTestScheduler().runCurrent(); - - NotificationGuts guts = mock(NotificationGuts.class); - mGutsManager.setExposedGuts(guts); - - // WHEN the lockscreen or shade becomes visible - mWindowRootViewVisibilityInteractor.setIsLockscreenOrShadeVisible(true); - mTestScope.getTestScheduler().runCurrent(); - - // THEN the guts are not closed - verify(guts, never()).removeCallbacks(any()); - verify(guts, never()).closeControls( - anyBoolean(), anyBoolean(), anyInt(), anyInt(), anyBoolean()); - } - - @Test - public void testLockscreenShadeVisible_notVisible_gutsClosed() { - // First, start out lockscreen or shade as visible - mWindowRootViewVisibilityInteractor.setIsLockscreenOrShadeVisible(true); - mTestScope.getTestScheduler().runCurrent(); - - NotificationGuts guts = mock(NotificationGuts.class); - mGutsManager.setExposedGuts(guts); - - // WHEN the lockscreen or shade is no longer visible - mWindowRootViewVisibilityInteractor.setIsLockscreenOrShadeVisible(false); - mTestScope.getTestScheduler().runCurrent(); - - // THEN the guts are closed - verify(guts).removeCallbacks(any()); - verify(guts).closeControls( - /* leavebehinds= */ eq(true), - /* controls= */ eq(true), - /* x= */ anyInt(), - /* y= */ anyInt(), - /* force= */ eq(true)); - } - - @Test - public void testLockscreenShadeVisible_notVisible_listContainerReset() { - // First, start out lockscreen or shade as visible - mWindowRootViewVisibilityInteractor.setIsLockscreenOrShadeVisible(true); - mTestScope.getTestScheduler().runCurrent(); - - // WHEN the lockscreen or shade is no longer visible - mWindowRootViewVisibilityInteractor.setIsLockscreenOrShadeVisible(false); - mTestScope.getTestScheduler().runCurrent(); - - // THEN the list container is reset - verify(mNotificationListContainer).resetExposedMenuView(anyBoolean(), anyBoolean()); - } - - @Test - public void testChangeDensityOrFontScale() { - NotificationGuts guts = spy(new NotificationGuts(mContext)); - when(guts.post(any())).thenAnswer(invocation -> { - mHandler.post(((Runnable) invocation.getArguments()[0])); - return null; - }); - - // Test doesn't support animation since the guts view is not attached. - doNothing().when(guts).openControls( - anyInt(), - anyInt(), - anyBoolean(), - any(Runnable.class)); - - ExpandableNotificationRow realRow = createTestNotificationRow(); - NotificationMenuRowPlugin.MenuItem menuItem = createTestMenuItem(realRow); - - ExpandableNotificationRow row = spy(realRow); - - when(row.getWindowToken()).thenReturn(new Binder()); - when(row.getGuts()).thenReturn(guts); - doNothing().when(row).ensureGutsInflated(); - - NotificationEntry realEntry = realRow.getEntry(); - NotificationEntry entry = spy(realEntry); - - when(entry.getRow()).thenReturn(row); - when(entry.getGuts()).thenReturn(guts); - - assertTrue(mGutsManager.openGutsInternal(row, 0, 0, menuItem)); - mExecutor.runAllReady(); - verify(guts).openControls( - anyInt(), - anyInt(), - anyBoolean(), - any(Runnable.class)); - - // called once by mGutsManager.bindGuts() in mGutsManager.openGuts() - verify(row).setGutsView(any()); - - row.onDensityOrFontScaleChanged(); - mGutsManager.onDensityOrFontScaleChanged(entry); - - mExecutor.runAllReady(); - - mGutsManager.closeAndSaveGuts(false, false, false, 0, 0, false); - - verify(guts).closeControls(anyBoolean(), anyBoolean(), anyInt(), anyInt(), anyBoolean()); - - // called again by mGutsManager.bindGuts(), in mGutsManager.onDensityOrFontScaleChanged() - verify(row, times(2)).setGutsView(any()); - } - - @Test - public void testAppOpsSettingsIntent_camera() { - ArraySet<Integer> ops = new ArraySet<>(); - ops.add(OP_CAMERA); - mGutsManager.startAppOpsSettingsActivity("", 0, ops, null); - ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class); - verify(mNotificationActivityStarter, times(1)) - .startNotificationGutsIntent(captor.capture(), anyInt(), any()); - assertEquals(Intent.ACTION_MANAGE_APP_PERMISSIONS, captor.getValue().getAction()); - } - - @Test - public void testAppOpsSettingsIntent_mic() { - ArraySet<Integer> ops = new ArraySet<>(); - ops.add(OP_RECORD_AUDIO); - mGutsManager.startAppOpsSettingsActivity("", 0, ops, null); - ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class); - verify(mNotificationActivityStarter, times(1)) - .startNotificationGutsIntent(captor.capture(), anyInt(), any()); - assertEquals(Intent.ACTION_MANAGE_APP_PERMISSIONS, captor.getValue().getAction()); - } - - @Test - public void testAppOpsSettingsIntent_camera_mic() { - ArraySet<Integer> ops = new ArraySet<>(); - ops.add(OP_CAMERA); - ops.add(OP_RECORD_AUDIO); - mGutsManager.startAppOpsSettingsActivity("", 0, ops, null); - ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class); - verify(mNotificationActivityStarter, times(1)) - .startNotificationGutsIntent(captor.capture(), anyInt(), any()); - assertEquals(Intent.ACTION_MANAGE_APP_PERMISSIONS, captor.getValue().getAction()); - } - - @Test - public void testAppOpsSettingsIntent_overlay() { - ArraySet<Integer> ops = new ArraySet<>(); - ops.add(OP_SYSTEM_ALERT_WINDOW); - mGutsManager.startAppOpsSettingsActivity("", 0, ops, null); - ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class); - verify(mNotificationActivityStarter, times(1)) - .startNotificationGutsIntent(captor.capture(), anyInt(), any()); - assertEquals(Settings.ACTION_MANAGE_APP_OVERLAY_PERMISSION, captor.getValue().getAction()); - } - - @Test - public void testAppOpsSettingsIntent_camera_mic_overlay() { - ArraySet<Integer> ops = new ArraySet<>(); - ops.add(OP_CAMERA); - ops.add(OP_RECORD_AUDIO); - ops.add(OP_SYSTEM_ALERT_WINDOW); - mGutsManager.startAppOpsSettingsActivity("", 0, ops, null); - ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class); - verify(mNotificationActivityStarter, times(1)) - .startNotificationGutsIntent(captor.capture(), anyInt(), any()); - assertEquals(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, captor.getValue().getAction()); - } - - @Test - public void testAppOpsSettingsIntent_camera_overlay() { - ArraySet<Integer> ops = new ArraySet<>(); - ops.add(OP_CAMERA); - ops.add(OP_SYSTEM_ALERT_WINDOW); - mGutsManager.startAppOpsSettingsActivity("", 0, ops, null); - ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class); - verify(mNotificationActivityStarter, times(1)) - .startNotificationGutsIntent(captor.capture(), anyInt(), any()); - assertEquals(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, captor.getValue().getAction()); - } - - @Test - public void testAppOpsSettingsIntent_mic_overlay() { - ArraySet<Integer> ops = new ArraySet<>(); - ops.add(OP_RECORD_AUDIO); - ops.add(OP_SYSTEM_ALERT_WINDOW); - mGutsManager.startAppOpsSettingsActivity("", 0, ops, null); - ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class); - verify(mNotificationActivityStarter, times(1)) - .startNotificationGutsIntent(captor.capture(), anyInt(), any()); - assertEquals(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, captor.getValue().getAction()); - } - - @Test - public void testInitializeNotificationInfoView_highPriority() throws Exception { - NotificationInfo notificationInfoView = mock(NotificationInfo.class); - ExpandableNotificationRow row = spy(mHelper.createRow()); - final NotificationEntry entry = row.getEntry(); - modifyRanking(entry) - .setUserSentiment(USER_SENTIMENT_NEGATIVE) - .setImportance(IMPORTANCE_HIGH) - .build(); - - when(row.getIsNonblockable()).thenReturn(false); - when(mHighPriorityProvider.isHighPriority(entry)).thenReturn(true); - StatusBarNotification statusBarNotification = entry.getSbn(); - mGutsManager.initializeNotificationInfo(row, notificationInfoView); - - verify(notificationInfoView).bindNotification( - any(PackageManager.class), - any(INotificationManager.class), - eq(mOnUserInteractionCallback), - eq(mChannelEditorDialogController), - eq(statusBarNotification.getPackageName()), - any(NotificationChannel.class), - eq(entry), - any(NotificationInfo.OnSettingsClickListener.class), - any(NotificationInfo.OnAppSettingsClickListener.class), - any(UiEventLogger.class), - eq(false), - eq(false), - eq(true), /* wasShownHighPriority */ - eq(mAssistantFeedbackController), - any(MetricsLogger.class)); - } - - @Test - public void testInitializeNotificationInfoView_PassesAlongProvisionedState() throws Exception { - NotificationInfo notificationInfoView = mock(NotificationInfo.class); - ExpandableNotificationRow row = spy(mHelper.createRow()); - modifyRanking(row.getEntry()) - .setUserSentiment(USER_SENTIMENT_NEGATIVE) - .build(); - when(row.getIsNonblockable()).thenReturn(false); - StatusBarNotification statusBarNotification = row.getEntry().getSbn(); - NotificationEntry entry = row.getEntry(); - - when(mDeviceProvisionedController.isDeviceProvisioned()).thenReturn(true); - - mGutsManager.initializeNotificationInfo(row, notificationInfoView); - - verify(notificationInfoView).bindNotification( - any(PackageManager.class), - any(INotificationManager.class), - eq(mOnUserInteractionCallback), - eq(mChannelEditorDialogController), - eq(statusBarNotification.getPackageName()), - any(NotificationChannel.class), - eq(entry), - any(NotificationInfo.OnSettingsClickListener.class), - any(NotificationInfo.OnAppSettingsClickListener.class), - any(UiEventLogger.class), - eq(true), - eq(false), - eq(false), /* wasShownHighPriority */ - eq(mAssistantFeedbackController), - any(MetricsLogger.class)); - } - - @Test - public void testInitializeNotificationInfoView_withInitialAction() throws Exception { - NotificationInfo notificationInfoView = mock(NotificationInfo.class); - ExpandableNotificationRow row = spy(mHelper.createRow()); - modifyRanking(row.getEntry()) - .setUserSentiment(USER_SENTIMENT_NEGATIVE) - .build(); - when(row.getIsNonblockable()).thenReturn(false); - StatusBarNotification statusBarNotification = row.getEntry().getSbn(); - NotificationEntry entry = row.getEntry(); - - mGutsManager.initializeNotificationInfo(row, notificationInfoView); - - verify(notificationInfoView).bindNotification( - any(PackageManager.class), - any(INotificationManager.class), - eq(mOnUserInteractionCallback), - eq(mChannelEditorDialogController), - eq(statusBarNotification.getPackageName()), - any(NotificationChannel.class), - eq(entry), - any(NotificationInfo.OnSettingsClickListener.class), - any(NotificationInfo.OnAppSettingsClickListener.class), - any(UiEventLogger.class), - eq(false), - eq(false), - eq(false), /* wasShownHighPriority */ - eq(mAssistantFeedbackController), - any(MetricsLogger.class)); - } - - //////////////////////////////////////////////////////////////////////////////////////////////// - // Utility methods: - - private ExpandableNotificationRow createTestNotificationRow() { - Notification.Builder nb = new Notification.Builder(mContext, - mTestNotificationChannel.getId()) - .setContentTitle("foo") - .setColorized(true).setColor(Color.RED) - .setFlag(Notification.FLAG_CAN_COLORIZE, true) - .setSmallIcon(android.R.drawable.sym_def_app_icon); - - try { - ExpandableNotificationRow row = mHelper.createRow(nb.build()); - modifyRanking(row.getEntry()) - .setChannel(mTestNotificationChannel) - .build(); - return row; - } catch (Exception e) { - fail(); - return null; - } - } - - private NotificationMenuRowPlugin.MenuItem createTestMenuItem(ExpandableNotificationRow row) { - NotificationMenuRowPlugin menuRow = - new NotificationMenuRow(mContext, mPeopleNotificationIdentifier); - menuRow.createMenu(row, row.getEntry().getSbn()); - - NotificationMenuRowPlugin.MenuItem menuItem = menuRow.getLongpressMenuItem(mContext); - assertNotNull(menuItem); - return menuItem; - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java index 7d019bf1be92..b142fc2deea9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java @@ -510,7 +510,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { } mShadeController.setNotificationPresenter(mNotificationPresenter); - when(mOperatorNameViewControllerFactory.create(any())) + when(mOperatorNameViewControllerFactory.create(any(), any())) .thenReturn(mOperatorNameViewController); when(mUserTracker.getUserId()).thenReturn(ActivityManager.getCurrentUser()); when(mUserTracker.getUserHandle()).thenReturn( 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 d01c1ca36c4e..4b648a3e76e7 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 @@ -1184,9 +1184,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { mKeyguardStateController = mock(KeyguardStateController.class); mOperatorNameViewController = mock(OperatorNameViewController.class); mOperatorNameViewControllerFactory = mock(OperatorNameViewController.Factory.class); - when(mOperatorNameViewControllerFactory.create(any())) + when(mOperatorNameViewControllerFactory.create(any(), any())) .thenReturn(mOperatorNameViewController); - when(mIconManagerFactory.create(any(), any())).thenReturn(mIconManager); + when(mIconManagerFactory.create(any(), any(), any())).thenReturn(mIconManager); mSecureSettings = mock(SecureSettings.class); mShadeExpansionStateManager = new ShadeExpansionStateManager(); diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/Media3ActionFactoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/Media3ActionFactoryKosmos.kt index 7e7eea216584..f49e3771763a 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/Media3ActionFactoryKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/Media3ActionFactoryKosmos.kt @@ -16,7 +16,48 @@ package com.android.systemui.media.controls.domain.pipeline +import android.content.applicationContext +import android.os.Bundle +import android.os.Handler +import android.os.looper +import androidx.media3.session.CommandButton +import androidx.media3.session.MediaController +import androidx.media3.session.SessionToken +import com.android.systemui.Flags +import com.android.systemui.graphics.imageLoader import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testScope +import com.android.systemui.media.controls.shared.mediaLogger +import com.android.systemui.media.controls.util.fakeMediaControllerFactory +import com.android.systemui.media.controls.util.fakeSessionTokenFactory +import com.google.common.collect.ImmutableList import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever -var Kosmos.media3ActionFactory: Media3ActionFactory by Kosmos.Fixture { mock {} } +/** + * Set up fake [Media3ActionFactory]. Note that tests using this fake will need to be + * annotated @RunWithLooper + */ +var Kosmos.media3ActionFactory: Media3ActionFactory by + Kosmos.Fixture { + if (Flags.mediaControlsButtonMedia3()) { + val customLayout = ImmutableList.of<CommandButton>() + val media3Controller = + mock<MediaController>().also { + whenever(it.customLayout).thenReturn(customLayout) + whenever(it.sessionExtras).thenReturn(Bundle()) + } + fakeMediaControllerFactory.setMedia3Controller(media3Controller) + fakeSessionTokenFactory.setMedia3SessionToken(mock<SessionToken>()) + } + Media3ActionFactory( + context = applicationContext, + imageLoader = imageLoader, + controllerFactory = fakeMediaControllerFactory, + tokenFactory = fakeSessionTokenFactory, + logger = mediaLogger, + looper = looper, + handler = Handler(looper), + bgScope = testScope, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelKosmos.kt index bda3192085ed..4ed491233f3c 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelKosmos.kt @@ -29,6 +29,7 @@ import com.android.systemui.qs.footerActionsController import com.android.systemui.qs.footerActionsViewModelFactory import com.android.systemui.qs.panels.domain.interactor.tileSquishinessInteractor import com.android.systemui.qs.panels.ui.viewmodel.inFirstPageViewModel +import com.android.systemui.qs.panels.ui.viewmodel.mediaInRowInLandscapeViewModelFactory import com.android.systemui.qs.ui.viewmodel.quickSettingsContainerViewModelFactory import com.android.systemui.shade.largeScreenHeaderHelper import com.android.systemui.shade.transition.largeScreenShadeInterpolator @@ -57,6 +58,7 @@ val Kosmos.qsFragmentComposeViewModelFactory by largeScreenHeaderHelper, tileSquishinessInteractor, inFirstPageViewModel, + mediaInRowInLandscapeViewModelFactory, qqsMediaHost, qsMediaHost, usingMediaInComposeFragment, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/InfiniteGridViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/InfiniteGridViewModelKosmos.kt index 7613ea31c622..57aa20ae5f02 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/InfiniteGridViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/InfiniteGridViewModelKosmos.kt @@ -25,7 +25,7 @@ val Kosmos.infiniteGridViewModelFactory by override fun create(): InfiniteGridViewModel { return InfiniteGridViewModel( dynamicIconTilesViewModelFactory, - qsColumnsViewModel, + qsColumnsViewModelFactory, tileSquishinessViewModel, qsResetDialogDelegateKosmos, ) diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModelKosmos.kt new file mode 100644 index 000000000000..d1b613fe7f6e --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModelKosmos.kt @@ -0,0 +1,59 @@ +/* + * 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.ui.viewmodel + +import android.content.res.Configuration +import android.content.res.mainResources +import com.android.systemui.common.ui.data.repository.fakeConfigurationRepository +import com.android.systemui.common.ui.domain.interactor.configurationInteractor +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.media.controls.ui.controller.mediaHostStatesManager +import com.android.systemui.qs.composefragment.dagger.usingMediaInComposeFragment +import com.android.systemui.shade.data.repository.shadeRepository +import com.android.systemui.shade.domain.interactor.shadeModeInteractor + +val Kosmos.mediaInRowInLandscapeViewModelFactory by + Kosmos.Fixture { + object : MediaInRowInLandscapeViewModel.Factory { + override fun create(inLocation: Int): MediaInRowInLandscapeViewModel { + return MediaInRowInLandscapeViewModel( + mainResources, + configurationInteractor, + shadeModeInteractor, + mediaHostStatesManager, + usingMediaInComposeFragment, + inLocation, + ) + } + } + } + +fun Kosmos.setConfigurationForMediaInRow(mediaInRow: Boolean) { + shadeRepository.setShadeLayoutWide(!mediaInRow) // media in row only in non wide + val config = + Configuration(mainResources.configuration).apply { + orientation = + if (mediaInRow) { + Configuration.ORIENTATION_LANDSCAPE + } else { + Configuration.ORIENTATION_PORTRAIT + } + screenLayout = Configuration.SCREENLAYOUT_LONG_YES + } + mainResources.configuration.updateFrom(config) + fakeConfigurationRepository.onConfigurationChange(config) +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModelKosmos.kt index 5c8ca83ff2ae..0e5edb75846d 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModelKosmos.kt @@ -23,7 +23,7 @@ val Kosmos.paginatedGridViewModel by Kosmos.Fixture { PaginatedGridViewModel( iconTilesViewModel, - qsColumnsViewModel, + qsColumnsViewModelFactory, paginatedGridInteractor, inFirstPageViewModel, ) diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModelKosmos.kt index 16b2f5438797..d63b1b0b4224 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModelKosmos.kt @@ -19,4 +19,15 @@ package com.android.systemui.qs.panels.ui.viewmodel import com.android.systemui.kosmos.Kosmos import com.android.systemui.qs.panels.domain.interactor.qsColumnsInteractor -val Kosmos.qsColumnsViewModel by Kosmos.Fixture { QSColumnsSizeViewModelImpl(qsColumnsInteractor) } +val Kosmos.qsColumnsViewModelFactory by + Kosmos.Fixture { + object : QSColumnsViewModel.Factory { + override fun create(mediaLocation: Int?): QSColumnsViewModel { + return QSColumnsViewModel( + qsColumnsInteractor, + mediaInRowInLandscapeViewModelFactory, + mediaLocation, + ) + } + } + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModelKosmos.kt index 20be5c675851..81beb20706db 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModelKosmos.kt @@ -27,8 +27,9 @@ val Kosmos.quickQuickSettingsViewModelFactory by override fun create(): QuickQuickSettingsViewModel { return QuickQuickSettingsViewModel( currentTilesInteractor, - qsColumnsViewModel, + qsColumnsViewModelFactory, quickQuickSettingsRowInteractor, + mediaInRowInLandscapeViewModelFactory, tileSquishinessViewModel, iconTilesViewModel, tileHapticsViewModelFactoryProvider, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/notes/NotesTileKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/notes/NotesTileKosmos.kt new file mode 100644 index 000000000000..75c98cb07338 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/notes/NotesTileKosmos.kt @@ -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. + */ + +package com.android.systemui.qs.tiles.impl.notes + +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.notetask.NoteTaskModule +import com.android.systemui.qs.qsEventLogger + +val Kosmos.qsNotesTileConfig by + Kosmos.Fixture { NoteTaskModule.provideNotesTileConfig(qsEventLogger) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/ui/viewmodel/NotificationsShadeOverlayContentViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/ui/viewmodel/NotificationsShadeOverlayContentViewModelKosmos.kt index 718347fc3490..20e4523fda0f 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/ui/viewmodel/NotificationsShadeOverlayContentViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/ui/viewmodel/NotificationsShadeOverlayContentViewModelKosmos.kt @@ -21,6 +21,7 @@ import com.android.systemui.kosmos.Kosmos.Fixture import com.android.systemui.notifications.ui.viewmodel.NotificationsShadeOverlayContentViewModel import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.shade.domain.interactor.shadeInteractor +import com.android.systemui.statusbar.notification.domain.interactor.activeNotificationsInteractor import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationsPlaceholderViewModelFactory val Kosmos.notificationsShadeOverlayContentViewModel: @@ -30,5 +31,6 @@ val Kosmos.notificationsShadeOverlayContentViewModel: notificationsPlaceholderViewModelFactory = notificationsPlaceholderViewModelFactory, sceneInteractor = sceneInteractor, shadeInteractor = shadeInteractor, + activeNotificationsInteractor = activeNotificationsInteractor, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/core/StatusBarOrchestratorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/core/StatusBarOrchestratorKosmos.kt index ad2654a6b471..45aab860cde7 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/core/StatusBarOrchestratorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/core/StatusBarOrchestratorKosmos.kt @@ -29,6 +29,7 @@ import com.android.systemui.power.domain.interactor.powerInteractor import com.android.systemui.shade.mockNotificationShadeWindowViewController import com.android.systemui.shade.mockShadeSurface import com.android.systemui.statusbar.data.repository.fakeStatusBarModePerDisplayRepository +import com.android.systemui.statusbar.data.repository.lightBarControllerStore import com.android.systemui.statusbar.data.repository.privacyDotWindowControllerStore import com.android.systemui.statusbar.data.repository.statusBarModeRepository import com.android.systemui.statusbar.mockNotificationRemoteInputManager @@ -79,5 +80,6 @@ val Kosmos.multiDisplayStatusBarStarter by statusBarWindowControllerStore, statusBarInitializerStore, privacyDotWindowControllerStore, + lightBarControllerStore, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/DarkIconDispatcherStoreKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/DarkIconDispatcherStoreKosmos.kt new file mode 100644 index 000000000000..34a828176a08 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/DarkIconDispatcherStoreKosmos.kt @@ -0,0 +1,41 @@ +/* + * 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.data.repository + +import com.android.systemui.display.data.repository.displayRepository +import com.android.systemui.display.data.repository.displayWindowPropertiesRepository +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.applicationCoroutineScope +import org.mockito.kotlin.mock + +val Kosmos.multiDisplayDarkIconDispatcherStore by + Kosmos.Fixture { + MultiDisplayDarkIconDispatcherStore( + backgroundApplicationScope = applicationCoroutineScope, + displayRepository = displayRepository, + factory = { _, _ -> mock() }, + displayWindowPropertiesRepository = displayWindowPropertiesRepository, + ) + } + +val Kosmos.fakeDarkIconDispatcherStore by Kosmos.Fixture { FakeDarkIconDispatcherStore() } + +var Kosmos.darkIconDispatcherStore by Kosmos.Fixture { fakeDarkIconDispatcherStore } + +val Kosmos.fakeSysUiDarkIconDispatcherStore by Kosmos.Fixture { FakeSysUiDarkIconDispatcherStore() } + +var Kosmos.sysUiDarkIconDispatcherStore by Kosmos.Fixture { fakeSysUiDarkIconDispatcherStore } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeDarkIconDispatcherStore.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeDarkIconDispatcherStore.kt new file mode 100644 index 000000000000..871b277d7c82 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeDarkIconDispatcherStore.kt @@ -0,0 +1,33 @@ +/* + * 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.data.repository + +import android.view.Display +import com.android.systemui.plugins.DarkIconDispatcher +import org.mockito.kotlin.mock + +class FakeDarkIconDispatcherStore : DarkIconDispatcherStore { + + private val perDisplayMocks = mutableMapOf<Int, DarkIconDispatcher>() + + override val defaultDisplay: DarkIconDispatcher + get() = forDisplay(Display.DEFAULT_DISPLAY) + + override fun forDisplay(displayId: Int): DarkIconDispatcher { + return perDisplayMocks.computeIfAbsent(displayId) { mock() } + } +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeLightBarControllerStore.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeLightBarControllerStore.kt new file mode 100644 index 000000000000..28232465e633 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeLightBarControllerStore.kt @@ -0,0 +1,33 @@ +/* + * 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.data.repository + +import android.view.Display +import com.android.systemui.statusbar.phone.LightBarController +import org.mockito.kotlin.mock + +class FakeLightBarControllerStore : LightBarControllerStore { + + val perDisplayMocks = mutableMapOf<Int, LightBarController>() + + override val defaultDisplay: LightBarController + get() = forDisplay(Display.DEFAULT_DISPLAY) + + override fun forDisplay(displayId: Int): LightBarController { + return perDisplayMocks.computeIfAbsent(displayId) { mock() } + } +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeSysUiDarkIconDispatcherStore.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeSysUiDarkIconDispatcherStore.kt new file mode 100644 index 000000000000..4ee323ac40b4 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeSysUiDarkIconDispatcherStore.kt @@ -0,0 +1,33 @@ +/* + * 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.data.repository + +import android.view.Display +import com.android.systemui.statusbar.phone.SysuiDarkIconDispatcher +import org.mockito.kotlin.mock + +class FakeSysUiDarkIconDispatcherStore : SysuiDarkIconDispatcherStore { + + private val perDisplayMocks = mutableMapOf<Int, SysuiDarkIconDispatcher>() + + override val defaultDisplay: SysuiDarkIconDispatcher + get() = forDisplay(Display.DEFAULT_DISPLAY) + + override fun forDisplay(displayId: Int): SysuiDarkIconDispatcher { + return perDisplayMocks.computeIfAbsent(displayId) { mock() } + } +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/LightBarControllerStoreKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/LightBarControllerStoreKosmos.kt index 5f337326b546..13fa3feaa453 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/LightBarControllerStoreKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/LightBarControllerStoreKosmos.kt @@ -27,8 +27,13 @@ val Kosmos.lightBarControllerStoreImpl by LightBarControllerStoreImpl( backgroundApplicationScope = applicationCoroutineScope, displayRepository = displayRepository, - factory = { _, _, _ -> mock() }, + factory = { _, _, _, _ -> mock() }, displayScopeRepository = displayScopeRepository, statusBarModeRepositoryStore = statusBarModeRepository, + darkIconDispatcherStore = darkIconDispatcherStore, ) } + +val Kosmos.fakeLightBarControllerStore by Kosmos.Fixture { FakeLightBarControllerStore() } + +var Kosmos.lightBarControllerStore by Kosmos.Fixture { fakeLightBarControllerStore } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/data/repository/FakeDarkIconRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/data/repository/FakeDarkIconRepository.kt index 282e2e859afe..cb092ced9c72 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/data/repository/FakeDarkIconRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/data/repository/FakeDarkIconRepository.kt @@ -24,7 +24,10 @@ import kotlinx.coroutines.flow.MutableStateFlow @SysUISingleton class FakeDarkIconRepository @Inject constructor() : DarkIconRepository { - override val darkState = MutableStateFlow(DarkChange.EMPTY) + private val perDisplayStates = mutableMapOf<Int, MutableStateFlow<DarkChange>>() + + override fun darkState(displayId: Int) = + perDisplayStates.computeIfAbsent(displayId) { MutableStateFlow(DarkChange.EMPTY) } } @Module diff --git a/packages/Vcn/framework-b/Android.bp b/packages/Vcn/framework-b/Android.bp new file mode 100644 index 000000000000..be64bb1ae404 --- /dev/null +++ b/packages/Vcn/framework-b/Android.bp @@ -0,0 +1,44 @@ +// +// 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 { + default_team: "trendy_team_enigma", + default_applicable_licenses: ["Android-Apache-2.0"], +} + +java_defaults { + name: "framework-connectivity-b-defaults", + sdk_version: "module_current", + min_sdk_version: "35", // TODO: Make it Android 25Q2 when this is included in mainline + defaults: ["framework-module-defaults"], // This is a boot jar + + srcs: [ + "src/**/*.java", + ], +} + +java_sdk_library { + name: "framework-connectivity-b", + defaults: [ + "framework-connectivity-b-defaults", + ], + + permitted_packages: [ + "android.net.vcn", + ], + + // TODO: b/375213246 Expose this library to Tethering module +} diff --git a/packages/Vcn/framework-b/api/current.txt b/packages/Vcn/framework-b/api/current.txt new file mode 100644 index 000000000000..d802177e249b --- /dev/null +++ b/packages/Vcn/framework-b/api/current.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/packages/Vcn/framework-b/api/module-lib-current.txt b/packages/Vcn/framework-b/api/module-lib-current.txt new file mode 100644 index 000000000000..d802177e249b --- /dev/null +++ b/packages/Vcn/framework-b/api/module-lib-current.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/packages/Vcn/framework-b/api/module-lib-removed.txt b/packages/Vcn/framework-b/api/module-lib-removed.txt new file mode 100644 index 000000000000..d802177e249b --- /dev/null +++ b/packages/Vcn/framework-b/api/module-lib-removed.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/packages/Vcn/framework-b/api/removed.txt b/packages/Vcn/framework-b/api/removed.txt new file mode 100644 index 000000000000..d802177e249b --- /dev/null +++ b/packages/Vcn/framework-b/api/removed.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/packages/Vcn/framework-b/api/system-current.txt b/packages/Vcn/framework-b/api/system-current.txt new file mode 100644 index 000000000000..d802177e249b --- /dev/null +++ b/packages/Vcn/framework-b/api/system-current.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/packages/Vcn/framework-b/api/system-removed.txt b/packages/Vcn/framework-b/api/system-removed.txt new file mode 100644 index 000000000000..d802177e249b --- /dev/null +++ b/packages/Vcn/framework-b/api/system-removed.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/packages/Vcn/framework-b/src/android/net/vcn/Placeholder.java b/packages/Vcn/framework-b/src/android/net/vcn/Placeholder.java new file mode 100644 index 000000000000..fb5e15386cc7 --- /dev/null +++ b/packages/Vcn/framework-b/src/android/net/vcn/Placeholder.java @@ -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. + */ + +package android.net.vcn; + +/** + * Placeholder class so new framework-vcn isn't empty + * + * @hide + */ +// This class will be removed once source code is migrated +public class Placeholder {} diff --git a/packages/Vcn/service-b/Android.bp b/packages/Vcn/service-b/Android.bp new file mode 100644 index 000000000000..a462297c07af --- /dev/null +++ b/packages/Vcn/service-b/Android.bp @@ -0,0 +1,36 @@ +// +// 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 { + default_team: "trendy_team_enigma", + default_applicable_licenses: ["Android-Apache-2.0"], +} + +java_library { + name: "service-connectivity-b-pre-jarjar", + sdk_version: "system_server_current", + min_sdk_version: "35", // TODO: Make it Android 25Q2 when this is included in mainline + defaults: ["framework-system-server-module-defaults"], // This is a system server jar + + srcs: [ + "src/**/*.java", + ], + + // TODO: b/375213246 Expose this library to Tethering module + visibility: [ + "//frameworks/base/services", + ], +} diff --git a/packages/Vcn/service-b/src/com/android/server/vcn/Placeholder.java b/packages/Vcn/service-b/src/com/android/server/vcn/Placeholder.java new file mode 100644 index 000000000000..e79914531c38 --- /dev/null +++ b/packages/Vcn/service-b/src/com/android/server/vcn/Placeholder.java @@ -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. + */ + +package com.android.server.vcn; + +/** + * Placeholder class so new service-vcn isn't empty + * + * @hide + */ +// This class will be removed once source code is migrated +public class Placeholder {} diff --git a/ravenwood/Framework.bp b/ravenwood/Framework.bp index d20773844df3..99fc31b258e9 100644 --- a/ravenwood/Framework.bp +++ b/ravenwood/Framework.bp @@ -214,7 +214,8 @@ java_genrule { java_genrule { name: "services.core.ravenwood", - defaults: ["ravenwood-internal-only-visibility-genrule"], + // This is used by unit tests too (so tests will be able to access HSG-processed implementation) + // so it's visible to all. cmd: "cp $(in) $(out)", srcs: [ ":services.core.ravenwood-base{ravenwood.jar}", diff --git a/ravenwood/TEST_MAPPING b/ravenwood/TEST_MAPPING index a1243e37003e..607592b4cbbe 100644 --- a/ravenwood/TEST_MAPPING +++ b/ravenwood/TEST_MAPPING @@ -117,7 +117,11 @@ "host": true }, { - "name": "FrameworksServicesTestsRavenwood", + "name": "FrameworksServicesTestsRavenwood_Compat", + "host": true + }, + { + "name": "FrameworksServicesTestsRavenwood_Uri", "host": true }, { diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java index 91778579ab28..e61a054c4c39 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java @@ -31,9 +31,12 @@ import static org.mockito.Mockito.mock; import android.annotation.Nullable; import android.app.ActivityManager; +import android.app.AppCompatCallbacks; import android.app.Instrumentation; import android.app.ResourcesManager; import android.app.UiAutomation; +import android.content.Context; +import android.content.pm.ApplicationInfo; import android.content.res.Resources; import android.os.Binder; import android.os.Build; @@ -42,6 +45,7 @@ import android.os.HandlerThread; import android.os.Looper; import android.os.Process_ravenwood; import android.os.ServiceManager; +import android.os.ServiceManager.ServiceNotFoundException; import android.os.SystemProperties; import android.provider.DeviceConfig_host; import android.system.ErrnoException; @@ -59,6 +63,7 @@ import com.android.ravenwood.common.RavenwoodCommonUtils; import com.android.ravenwood.common.RavenwoodRuntimeException; import com.android.ravenwood.common.SneakyThrow; import com.android.server.LocalServices; +import com.android.server.compat.PlatformCompat; import org.junit.runner.Description; @@ -334,6 +339,8 @@ public class RavenwoodRuntimeEnvironmentController { RavenwoodSystemServer.init(config); + initializeCompatIds(config); + if (ENABLE_TIMEOUT_STACKS) { sPendingTimeout = sTimeoutExecutor.schedule( RavenwoodRuntimeEnvironmentController::dumpStacks, @@ -349,6 +356,31 @@ public class RavenwoodRuntimeEnvironmentController { Binder.restoreCallingIdentity(packBinderIdentityToken(false, config.mUid, config.mPid)); } + private static void initializeCompatIds(RavenwoodConfig config) { + // Set up compat-IDs for the app side. + // TODO: Inside the system server, all the compat-IDs should be enabled, + // Due to the `AppCompatCallbacks.install(new long[0], new long[0])` call in + // SystemServer. + + // Compat framework only uses the package name and the target SDK level. + ApplicationInfo appInfo = new ApplicationInfo(); + appInfo.packageName = config.mTargetPackageName; + appInfo.targetSdkVersion = config.mTargetSdkLevel; + + PlatformCompat platformCompat = null; + try { + platformCompat = (PlatformCompat) ServiceManager.getServiceOrThrow( + Context.PLATFORM_COMPAT_SERVICE); + } catch (ServiceNotFoundException e) { + throw new RuntimeException(e); + } + + var disabledChanges = platformCompat.getDisabledChanges(appInfo); + var loggableChanges = platformCompat.getLoggableChanges(appInfo); + + AppCompatCallbacks.install(disabledChanges, loggableChanges); + } + /** * De-initialize. */ diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemServer.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemServer.java index f198a08a50e3..438a2bfa7a14 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemServer.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemServer.java @@ -17,7 +17,9 @@ package android.platform.test.ravenwood; import android.content.ClipboardManager; +import android.content.Context; import android.hardware.SerialManager; +import android.os.ServiceManager; import android.os.SystemClock; import android.ravenwood.example.BlueManager; import android.ravenwood.example.RedManager; @@ -27,6 +29,8 @@ import android.util.ArraySet; import com.android.server.LocalServices; import com.android.server.SystemService; import com.android.server.SystemServiceManager; +import com.android.server.compat.PlatformCompat; +import com.android.server.compat.PlatformCompatNative; import com.android.server.utils.TimingsTraceAndSlog; import java.util.List; @@ -65,6 +69,14 @@ public class RavenwoodSystemServer { private static SystemServiceManager sServiceManager; public static void init(RavenwoodConfig config) { + // Always start PlatformCompat, regardless of the requested services. + // PlatformCompat is not really a SystemService, so it won't receive boot phases / etc. + // This initialization code is copied from SystemServer.java. + PlatformCompat platformCompat = new PlatformCompat(config.mState.mSystemServerContext); + ServiceManager.addService(Context.PLATFORM_COMPAT_SERVICE, platformCompat); + ServiceManager.addService(Context.PLATFORM_COMPAT_NATIVE_SERVICE, + new PlatformCompatNative(platformCompat)); + // Avoid overhead if no services required if (config.mServicesRequired.isEmpty()) return; diff --git a/ravenwood/tests/bivalenttest/Android.bp b/ravenwood/tests/bivalenttest/Android.bp index 4895a1a6d1a2..40e6672a3c63 100644 --- a/ravenwood/tests/bivalenttest/Android.bp +++ b/ravenwood/tests/bivalenttest/Android.bp @@ -58,6 +58,9 @@ java_defaults { java_defaults { name: "ravenwood-bivalent-device-defaults", defaults: ["ravenwood-bivalent-defaults"], + + target_sdk_version: "34", // For compat-framework tests + // TODO(b/371215487): migrate bivalenttest.ravenizer tests to another architecture exclude_srcs: [ "test/**/ravenizer/*.java", diff --git a/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/compat/RavenwoodCompatFrameworkTest.kt b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/compat/RavenwoodCompatFrameworkTest.kt new file mode 100644 index 000000000000..a95760db1a61 --- /dev/null +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/compat/RavenwoodCompatFrameworkTest.kt @@ -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. + */ +package com.android.ravenwoodtest.bivalenttest.compat + +import android.app.compat.CompatChanges +import android.os.Build +import android.platform.test.ravenwood.RavenwoodConfig +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.internal.ravenwood.RavenwoodEnvironment.CompatIdsForTest +import org.junit.Assert +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class RavenwoodCompatFrameworkTest { + companion object { + @JvmField // Expose as a raw field, not as a property. + @RavenwoodConfig.Config + val config = RavenwoodConfig.Builder() + .setTargetSdkLevel(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) + .build() + } + + @Test + fun testEnabled() { + Assert.assertTrue(CompatChanges.isChangeEnabled(CompatIdsForTest.TEST_COMPAT_ID_1)) + } + + @Test + fun testDisabled() { + Assert.assertFalse(CompatChanges.isChangeEnabled(CompatIdsForTest.TEST_COMPAT_ID_2)) + } + + @Test + fun testEnabledAfterSForUApps() { + Assert.assertTrue(CompatChanges.isChangeEnabled(CompatIdsForTest.TEST_COMPAT_ID_3)) + } + + @Test + fun testEnabledAfterUForUApps() { + Assert.assertFalse(CompatChanges.isChangeEnabled(CompatIdsForTest.TEST_COMPAT_ID_4)) + } +}
\ No newline at end of file diff --git a/ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java b/ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java index b3d3963270ee..4aae1e11b72e 100644 --- a/ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java +++ b/ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java @@ -19,17 +19,22 @@ package com.android.ravenwoodtest.servicestest; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; import android.content.Context; import android.hardware.SerialManager; import android.hardware.SerialManagerInternal; -import android.platform.test.ravenwood.RavenwoodRule; +import android.platform.test.ravenwood.RavenwoodConfig; +import android.platform.test.ravenwood.RavenwoodConfig.Config; import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; import com.android.server.LocalServices; -import org.junit.Rule; +import com.google.common.collect.Lists; + +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,18 +42,25 @@ import org.junit.runner.RunWith; public class RavenwoodServicesTest { private static final String TEST_VIRTUAL_PORT = "virtual:example"; - @Rule - public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + @Config + public static final RavenwoodConfig sRavenwood = new RavenwoodConfig.Builder() .setProcessSystem() .setServicesRequired(SerialManager.class) .build(); + private Context mContext; + + @Before + public void setUp() { + mContext = InstrumentationRegistry.getInstrumentation().getContext(); + } + @Test public void testDefined() { final SerialManager fromName = (SerialManager) - mRavenwood.getContext().getSystemService(Context.SERIAL_SERVICE); + mContext.getSystemService(Context.SERIAL_SERVICE); final SerialManager fromClass = - mRavenwood.getContext().getSystemService(SerialManager.class); + mContext.getSystemService(SerialManager.class); assertNotNull(fromName); assertNotNull(fromClass); assertEquals(fromName, fromClass); @@ -61,9 +73,9 @@ public class RavenwoodServicesTest { // Verify that we can obtain a manager, and talk to the backend service, and that no // serial ports are configured by default final SerialManager service = (SerialManager) - mRavenwood.getContext().getSystemService(Context.SERIAL_SERVICE); + mContext.getSystemService(Context.SERIAL_SERVICE); final String[] ports = service.getSerialPorts(); - final String[] refPorts = mRavenwood.getContext().getResources().getStringArray( + final String[] refPorts = mContext.getResources().getStringArray( com.android.internal.R.array.config_serialPorts); assertArrayEquals(refPorts, ports); } @@ -71,7 +83,7 @@ public class RavenwoodServicesTest { @Test public void testDriven() { final SerialManager service = (SerialManager) - mRavenwood.getContext().getSystemService(Context.SERIAL_SERVICE); + mContext.getSystemService(Context.SERIAL_SERVICE); final SerialManagerInternal internal = LocalServices.getService( SerialManagerInternal.class); @@ -79,8 +91,17 @@ public class RavenwoodServicesTest { throw new UnsupportedOperationException( "Needs socketpair() to offer accurate emulation"); }); - final String[] ports = service.getSerialPorts(); - assertEquals(1, ports.length); - assertEquals(TEST_VIRTUAL_PORT, ports[0]); + try { + final String[] ports = service.getSerialPorts(); + for (var port : ports) { + if (TEST_VIRTUAL_PORT.equals(port)) { + return; // Pass + } + } + fail("Virtual port " + TEST_VIRTUAL_PORT + " not found. Actual=" + + Lists.newArrayList(ports)); + } finally { + internal.removeVirtualSerialPortForTest(TEST_VIRTUAL_PORT); + } } } diff --git a/ravenwood/texts/ravenwood-annotation-allowed-classes.txt b/ravenwood/texts/ravenwood-annotation-allowed-classes.txt index 70c1d781587f..82be2c0db24e 100644 --- a/ravenwood/texts/ravenwood-annotation-allowed-classes.txt +++ b/ravenwood/texts/ravenwood-annotation-allowed-classes.txt @@ -365,3 +365,9 @@ com.android.server.utils.TimingsTraceAndSlog android.os.IpcDataCache android.app.PropertyInvalidatedCache + +android.app.compat.* +com.android.server.compat.* +com.android.internal.compat.* +android.app.AppCompatCallbacks + diff --git a/ravenwood/texts/ravenwood-services-policies.txt b/ravenwood/texts/ravenwood-services-policies.txt index cc2fa602b3c3..530e5c8f5986 100644 --- a/ravenwood/texts/ravenwood-services-policies.txt +++ b/ravenwood/texts/ravenwood-services-policies.txt @@ -1 +1,12 @@ # Ravenwood "policy" file for services.core. + +# Auto-generated from XSD +class com.android.server.compat.config.Change keepclass +class com.android.server.compat.config.Config keepclass +class com.android.server.compat.config.XmlParser keepclass +class com.android.server.compat.overrides.ChangeOverrides keepclass +class com.android.server.compat.overrides.OverrideValue keepclass +class com.android.server.compat.overrides.Overrides keepclass +class com.android.server.compat.overrides.RawOverrideValue keepclass +class com.android.server.compat.overrides.XmlParser keepclass +class com.android.server.compat.overrides.XmlWriter keepclass
\ No newline at end of file diff --git a/services/Android.bp b/services/Android.bp index 899e224c6fd7..fc0bb33e6e4e 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -282,6 +282,7 @@ system_java_library { "services.wifi", "service-blobstore", "service-jobscheduler", + "service-connectivity-b-pre-jarjar", // Move it to mainline module "android.hidl.base-V1.0-java", ], diff --git a/services/companion/java/com/android/server/companion/CompanionExemptionProcessor.java b/services/companion/java/com/android/server/companion/CompanionExemptionProcessor.java index 4969ffbfa08a..ea2bc17dafcd 100644 --- a/services/companion/java/com/android/server/companion/CompanionExemptionProcessor.java +++ b/services/companion/java/com/android/server/companion/CompanionExemptionProcessor.java @@ -35,6 +35,7 @@ import android.os.Binder; import android.os.Environment; import android.os.PowerExemptionManager; import android.util.ArraySet; +import android.util.Pair; import android.util.Slog; import com.android.internal.util.ArrayUtils; @@ -44,6 +45,7 @@ import com.android.server.pm.UserManagerInternal; import com.android.server.wm.ActivityTaskManagerInternal; import java.io.File; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -185,14 +187,18 @@ public class CompanionExemptionProcessor { try { final List<AssociationInfo> associations = mAssociationStore.getActiveAssociationsByUser(userId); + Set<Pair<String, Integer>> exemptedPackages = new HashSet<>(); for (AssociationInfo a : associations) { try { int uid = pm.getPackageUidAsUser(a.getPackageName(), userId); - updateAutoRevokeExemption(a.getPackageName(), uid, true); + exemptedPackages.add(new Pair<>(a.getPackageName(), uid)); } catch (PackageManager.NameNotFoundException e) { Slog.w(TAG, "Unknown companion package: " + a.getPackageName(), e); } } + for (Pair<String, Integer> exemptedPackage : exemptedPackages) { + updateAutoRevokeExemption(exemptedPackage.first, exemptedPackage.second, true); + } } finally { pref.edit().putBoolean(PREF_KEY_AUTO_REVOKE_GRANTS_DONE, true).apply(); } diff --git a/services/contextualsearch/java/com/android/server/contextualsearch/ContextualSearchManagerService.java b/services/contextualsearch/java/com/android/server/contextualsearch/ContextualSearchManagerService.java index ea6351baf597..fd18fa856916 100644 --- a/services/contextualsearch/java/com/android/server/contextualsearch/ContextualSearchManagerService.java +++ b/services/contextualsearch/java/com/android/server/contextualsearch/ContextualSearchManagerService.java @@ -24,7 +24,8 @@ import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION; import static android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION; -import static android.content.pm.PackageManager.MATCH_FACTORY_ONLY; +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.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; @@ -261,24 +262,28 @@ public class ContextualSearchManagerService extends SystemService { } } - private Intent getResolvedLaunchIntent() { + private Intent getResolvedLaunchIntent(int userId) { synchronized (this) { + if(DEBUG_USER) Log.d(TAG, "Attempting to getResolvedLaunchIntent"); // If mTemporaryPackage is not null, use it to get the ContextualSearch intent. String csPkgName = getContextualSearchPackageName(); if (csPkgName.isEmpty()) { // Return null if csPackageName is not specified. + if (DEBUG_USER) Log.w(TAG, "getContextualSearchPackageName is empty"); return null; } Intent launchIntent = new Intent( ContextualSearchManager.ACTION_LAUNCH_CONTEXTUAL_SEARCH); launchIntent.setPackage(csPkgName); - ResolveInfo resolveInfo = mContext.getPackageManager().resolveActivity( - launchIntent, MATCH_FACTORY_ONLY); + ResolveInfo resolveInfo = mContext.getPackageManager().resolveActivityAsUser( + launchIntent, MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE, userId); if (resolveInfo == null) { + if (DEBUG_USER) Log.w(TAG, "resolveInfo is null"); return null; } ComponentName componentName = resolveInfo.getComponentInfo().getComponentName(); if (componentName == null) { + if (DEBUG_USER) Log.w(TAG, "componentName is null"); return null; } launchIntent.setComponent(componentName); @@ -286,9 +291,10 @@ public class ContextualSearchManagerService extends SystemService { } } - private Intent getContextualSearchIntent(int entrypoint, CallbackToken mToken) { - final Intent launchIntent = getResolvedLaunchIntent(); + private Intent getContextualSearchIntent(int entrypoint, int userId, CallbackToken mToken) { + final Intent launchIntent = getResolvedLaunchIntent(userId); if (launchIntent == null) { + if (DEBUG_USER) Log.w(TAG, "Failed getContextualSearchIntent: launchIntent is null"); return null; } @@ -341,6 +347,7 @@ public class ContextualSearchManagerService extends SystemService { TYPE_NAVIGATION_BAR_PANEL, TYPE_POINTER)); } else { + if (DEBUG_USER) Log.w(TAG, "Can't capture contextual screenshot: mWmInternal is null"); shb = null; } final Bitmap bm = shb != null ? shb.asBitmap() : null; @@ -444,7 +451,7 @@ public class ContextualSearchManagerService extends SystemService { @Override public void startContextualSearch(int entrypoint) { synchronized (this) { - if (DEBUG_USER) Log.d(TAG, "startContextualSearch"); + if (DEBUG_USER) Log.d(TAG, "startContextualSearch entrypoint: " + entrypoint); enforcePermission("startContextualSearch"); final int callingUserId = Binder.getCallingUserHandle().getIdentifier(); @@ -455,7 +462,8 @@ public class ContextualSearchManagerService extends SystemService { // server has READ_FRAME_BUFFER permission to get the screenshot and because only // the system server can invoke non-exported activities. Binder.withCleanCallingIdentity(() -> { - Intent launchIntent = getContextualSearchIntent(entrypoint, mToken); + Intent launchIntent = + getContextualSearchIntent(entrypoint, callingUserId, mToken); if (launchIntent != null) { int result = invokeContextualSearchIntent(launchIntent, callingUserId); if (DEBUG_USER) Log.d(TAG, "Launch result: " + result); diff --git a/services/core/Android.bp b/services/core/Android.bp index 6cfd44bb2d1a..3ccad16073a7 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -240,6 +240,7 @@ java_library_static { "aconfig_new_storage_flags_lib", "powerstats_flags_lib", "locksettings_flags_lib", + "profiling_flags_lib", ], javac_shard_size: 50, javacflags: [ @@ -255,6 +256,13 @@ java_library_static { "FlaggedApi", ], }, + jarjar_rules: ":services-jarjar-rules", + apex_available: ["//apex_available:platform"], +} + +filegroup { + name: "services-jarjar-rules", + srcs: ["services-jarjar-rules.txt"], } java_genrule { diff --git a/services/core/java/android/os/BatteryStatsInternal.java b/services/core/java/android/os/BatteryStatsInternal.java index 60b826b50045..289935acd5e2 100644 --- a/services/core/java/android/os/BatteryStatsInternal.java +++ b/services/core/java/android/os/BatteryStatsInternal.java @@ -132,4 +132,7 @@ public abstract class BatteryStatsInternal { * @param uids the uids of all apps that have any alarm in this batch. */ public abstract void noteWakingAlarmBatch(long elapsedMillis, int... uids); + + /** See PowerStatsUidResolver.mapUid(). */ + public abstract int getOwnerUid(int uid); } diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 9d27731cecd4..b7bc4e4827ef 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -96,6 +96,7 @@ import android.os.Looper; import android.os.Message; import android.os.ParcelFileDescriptor; import android.os.ParcelableException; +import android.os.PermissionEnforcer; import android.os.PersistableBundle; import android.os.Process; import android.os.RemoteCallbackList; @@ -3653,10 +3654,16 @@ class StorageManagerService extends IStorageManager.Stub return mInternalStorageSize; } - @EnforcePermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @Override public int getInternalStorageRemainingLifetime() throws RemoteException { - super.getInternalStorageRemainingLifetime_enforcePermission(); + PermissionEnforcer.fromContext(mContext) + .enforcePermissionAnyOf( + new String[] { + android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, + android.Manifest.permission.ALLOCATE_AGGRESSIVE + }, + getCallingPid(), + getCallingUid()); return mVold.getStorageRemainingLifetime(); } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 3e7bcb81c47f..b5dcdb1ac287 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -337,6 +337,8 @@ import android.os.PowerManager; import android.os.PowerManager.ServiceType; import android.os.PowerManagerInternal; import android.os.Process; +import android.os.ProfilingServiceHelper; +import android.os.ProfilingTrigger; import android.os.RemoteCallback; import android.os.RemoteCallbackList; import android.os.RemoteException; @@ -1089,7 +1091,18 @@ public class ActivityManagerService extends IActivityManager.Stub @Override public void onReportFullyDrawn(long id, long timestampNanos) { - mProcessList.getAppStartInfoTracker().onActivityReportFullyDrawn(id, timestampNanos); + ApplicationStartInfo startInfo = mProcessList.getAppStartInfoTracker() + .onActivityReportFullyDrawn(id, timestampNanos); + + if (android.os.profiling.Flags.systemTriggeredProfilingNew() + && startInfo != null + && startInfo.getStartType() == ApplicationStartInfo.START_TYPE_COLD + && startInfo.getPackageName() != null) { + ProfilingServiceHelper.getInstance().onProfilingTriggerOccurred( + startInfo.getRealUid(), + startInfo.getPackageName(), + ProfilingTrigger.TRIGGER_TYPE_APP_COLD_START_ACTIVITY); + } } }; @@ -11337,7 +11350,9 @@ public class ActivityManagerService extends IActivityManager.Stub } pw.println(" mFgsStartTempAllowList:"); final long currentTimeNow = System.currentTimeMillis(); - final long elapsedRealtimeNow = SystemClock.elapsedRealtime(); + final long tempAllowlistCurrentTime = + com.android.server.deviceidle.Flags.useCpuTimeForTempAllowlist() + ? SystemClock.uptimeMillis() : SystemClock.elapsedRealtime(); mFgsStartTempAllowList.forEach((uid, entry) -> { pw.print(" " + UserHandle.formatUid(uid) + ": "); entry.second.dump(pw); @@ -11345,7 +11360,7 @@ public class ActivityManagerService extends IActivityManager.Stub // Convert entry.mExpirationTime, which is an elapsed time since boot, // to a time since epoch (i.e. System.currentTimeMillis()-based time.) final long expirationInCurrentTime = - currentTimeNow - elapsedRealtimeNow + entry.first; + currentTimeNow - tempAllowlistCurrentTime + entry.first; TimeUtils.dumpTimeWithDelta(pw, expirationInCurrentTime, currentTimeNow); pw.println(); }); diff --git a/services/core/java/com/android/server/am/AnrHelper.java b/services/core/java/com/android/server/am/AnrHelper.java index 9fc0bf920969..6d594ac38187 100644 --- a/services/core/java/com/android/server/am/AnrHelper.java +++ b/services/core/java/com/android/server/am/AnrHelper.java @@ -20,7 +20,8 @@ import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME; import android.content.pm.ApplicationInfo; -import android.os.Process; +import android.os.ProfilingServiceHelper; +import android.os.ProfilingTrigger; import android.os.SystemClock; import android.os.Trace; import android.util.ArraySet; @@ -240,6 +241,15 @@ class AnrHelper { || startTime < SELF_ONLY_AFTER_BOOT_MS; r.appNotResponding(onlyDumpSelf); final long endTime = SystemClock.uptimeMillis(); + + if (android.os.profiling.Flags.systemTriggeredProfilingNew() && r.mAppInfo != null + && r.mAppInfo.packageName != null) { + ProfilingServiceHelper.getInstance().onProfilingTriggerOccurred( + r.mUid, + r.mAppInfo.packageName, + ProfilingTrigger.TRIGGER_TYPE_ANR); + } + Slog.d(TAG, "Completed ANR of " + r.mApp.processName + " in " + (endTime - startTime) + "ms, latency " + reportLatency + (onlyDumpSelf ? "ms (expired, only dump ANR app)" : "ms")); diff --git a/services/core/java/com/android/server/am/AppStartInfoTracker.java b/services/core/java/com/android/server/am/AppStartInfoTracker.java index aca6d0b0b967..3913d2f2ea92 100644 --- a/services/core/java/com/android/server/am/AppStartInfoTracker.java +++ b/services/core/java/com/android/server/am/AppStartInfoTracker.java @@ -22,6 +22,7 @@ import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME; import android.annotation.NonNull; +import android.annotation.Nullable; import android.app.ApplicationStartInfo; import android.app.Flags; import android.app.IApplicationStartInfoCompleteListener; @@ -419,23 +420,25 @@ public final class AppStartInfoTracker { * Should only be called for Activity launch sequences from an instance of * {@link ActivityMetricsLaunchObserver}. */ - void onActivityReportFullyDrawn(long id, long timestampNanos) { + @Nullable + ApplicationStartInfo onActivityReportFullyDrawn(long id, long timestampNanos) { synchronized (mLock) { if (!mEnabled) { - return; + return null; } int index = mInProgressRecords.indexOfKey(id); if (index < 0) { - return; + return null; } ApplicationStartInfo info = mInProgressRecords.valueAt(index); if (info == null) { mInProgressRecords.removeAt(index); - return; + return null; } info.addStartupTimestamp(ApplicationStartInfo.START_TIMESTAMP_FULLY_DRAWN, timestampNanos); mInProgressRecords.removeAt(index); + return info; } } diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 7c563abea22f..aa9ac6c36784 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -453,7 +453,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub com.android.internal.R.integer.config_accumulatedBatteryUsageStatsSpanSize); mBatteryUsageStatsProvider = new BatteryUsageStatsProvider(context, mPowerAttributor, mPowerProfile, mCpuScalingPolicies, - mPowerStatsStore, accumulatedBatteryUsageStatsSpanSize, Clock.SYSTEM_CLOCK); + mPowerStatsStore, accumulatedBatteryUsageStatsSpanSize, Clock.SYSTEM_CLOCK, + mMonotonicClock); mDumpHelper = new BatteryStatsDumpHelperImpl(mBatteryUsageStatsProvider); mCpuWakeupStats = new CpuWakeupStats(context, R.xml.irq_device_map, mHandler); mConfigFile = new AtomicFile(new File(systemDir, "battery_usage_stats_config")); @@ -759,6 +760,14 @@ public final class BatteryStatsService extends IBatteryStats.Stub public void noteWakingAlarmBatch(long elapsedMillis, int... uids) { noteCpuWakingActivity(CPU_WAKEUP_SUBSYSTEM_ALARM, elapsedMillis, uids); } + + @Override + public int getOwnerUid(int uid) { + if (Process.isSdkSandboxUid(uid)) { + return Process.getAppUidForSdkSandboxUid(uid); + } + return mPowerStatsUidResolver.mapUid(uid); + } } /** diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java index da5b1fd1c079..416c11090515 100644 --- a/services/core/java/com/android/server/am/CachedAppOptimizer.java +++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java @@ -101,7 +101,7 @@ import java.util.Random; import java.util.Set; import java.util.concurrent.Executor; -public class CachedAppOptimizer { +public final class CachedAppOptimizer { // Flags stored in the DeviceConfig API. @VisibleForTesting static final String KEY_USE_COMPACTION = "use_compaction"; diff --git a/services/core/java/com/android/server/am/FgsTempAllowList.java b/services/core/java/com/android/server/am/FgsTempAllowList.java index c28655655765..5569b6db3285 100644 --- a/services/core/java/com/android/server/am/FgsTempAllowList.java +++ b/services/core/java/com/android/server/am/FgsTempAllowList.java @@ -29,7 +29,7 @@ import java.util.function.BiConsumer; /** * List of keys that have expiration time. - * If the expiration time is less than current elapsedRealtime, the key has expired. + * If the expiration time is less than current uptime, the key has expired. * Otherwise it is valid (or allowed). * * <p>This is used for both FGS-BG-start restriction, and FGS-while-in-use permissions check.</p> @@ -42,7 +42,7 @@ public class FgsTempAllowList<E> { private static final int DEFAULT_MAX_SIZE = 100; /** - * The value is Pair type, Pair.first is the expirationTime(an elapsedRealtime), + * The value is Pair type, Pair.first is the expirationTime(in cpu uptime), * Pair.second is the optional information entry about this key. */ private final SparseArray<Pair<Long, E>> mTempAllowList = new SparseArray<>(); @@ -82,7 +82,9 @@ public class FgsTempAllowList<E> { } // The temp allowlist should be a short list with only a few entries in it. // for a very large list, HashMap structure should be used. - final long now = SystemClock.elapsedRealtime(); + final long now = com.android.server.deviceidle.Flags.useCpuTimeForTempAllowlist() + ? SystemClock.uptimeMillis() + : SystemClock.elapsedRealtime(); final int size = mTempAllowList.size(); if (size > mMaxSize) { Slog.w(TAG_AM, "FgsTempAllowList length:" + size + " exceeds maxSize" @@ -112,12 +114,15 @@ public class FgsTempAllowList<E> { final int index = mTempAllowList.indexOfKey(uid); if (index < 0) { return null; - } else if (mTempAllowList.valueAt(index).first < SystemClock.elapsedRealtime()) { + } + final long timeNow = com.android.server.deviceidle.Flags.useCpuTimeForTempAllowlist() + ? SystemClock.uptimeMillis() + : SystemClock.elapsedRealtime(); + if (mTempAllowList.valueAt(index).first < timeNow) { mTempAllowList.removeAt(index); return null; - } else { - return mTempAllowList.valueAt(index); } + return mTempAllowList.valueAt(index); } } diff --git a/services/core/java/com/android/server/am/OWNERS b/services/core/java/com/android/server/am/OWNERS index c1d55971bdce..ab7cd5f29660 100644 --- a/services/core/java/com/android/server/am/OWNERS +++ b/services/core/java/com/android/server/am/OWNERS @@ -63,6 +63,9 @@ per-file ProcessStateController.java = file:/OOM_ADJUSTER_OWNERS per-file SettingsToPropertiesMapper.java = omakoto@google.com, yamasani@google.com, dzshen@google.com, zhidou@google.com, tedbauer@google.com per-file CarUserSwitchingDialog.java = file:platform/packages/services/Car:/OWNERS +# Activity Security +per-file ActivityManager* = file:/ACTIVITY_SECURITY_OWNERS + # Londoners michaelwr@google.com #{LAST_RESORT_SUGGESTION} narayan@google.com #{LAST_RESORT_SUGGESTION} diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index a85f49614005..08632fe09b19 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -19,7 +19,6 @@ package com.android.server.am; import static android.app.ActivityManager.PROCESS_CAPABILITY_ALL; import static android.app.ActivityManager.PROCESS_CAPABILITY_ALL_IMPLICIT; import static android.app.ActivityManager.PROCESS_CAPABILITY_BFSL; -import static android.app.ActivityManager.PROCESS_CAPABILITY_CPU_TIME; import static android.app.ActivityManager.PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL; import static android.app.ActivityManager.PROCESS_CAPABILITY_FOREGROUND_CAMERA; import static android.app.ActivityManager.PROCESS_CAPABILITY_FOREGROUND_LOCATION; @@ -156,7 +155,6 @@ import android.os.Process; import android.os.RemoteException; import android.os.SystemClock; import android.os.Trace; -import android.os.UserHandle; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Slog; @@ -471,6 +469,7 @@ public class OomAdjuster { } Process.setThreadPriority(tid, priority); } + } // TODO(b/346822474): hook up global state usage. @@ -500,8 +499,7 @@ public class OomAdjuster { } OomAdjuster(ActivityManagerService service, ProcessList processList, ActiveUids activeUids, - ServiceThread adjusterThread, GlobalState globalState, - CachedAppOptimizer cachedAppOptimizer, Injector injector) { + ServiceThread adjusterThread, GlobalState globalState, Injector injector) { mService = service; mGlobalState = globalState; mInjector = injector; @@ -510,7 +508,7 @@ public class OomAdjuster { mActiveUids = activeUids; mConstants = mService.mConstants; - mCachedAppOptimizer = cachedAppOptimizer; + mCachedAppOptimizer = new CachedAppOptimizer(mService); mCacheOomRanker = new CacheOomRanker(service); mLogger = new OomAdjusterDebugLogger(this, mService.mConstants); @@ -2592,7 +2590,6 @@ public class OomAdjuster { } capability |= getDefaultCapability(app, procState); - capability |= getCpuCapability(app, now); // Procstates below BFGS should never have this capability. if (procState > PROCESS_STATE_BOUND_FOREGROUND_SERVICE) { @@ -2735,12 +2732,8 @@ public class OomAdjuster { if (app.mOptRecord.setShouldNotFreeze(true, dryRun, app.mOptRecord.shouldNotFreezeReason() | client.mOptRecord.shouldNotFreezeReason(), mAdjSeq)) { - if (Flags.useCpuTimeCapability()) { - // Do nothing, capability updated check will handle the dryrun output. - } else { - // Bail out early, as we only care about the return value for a dryrun. - return true; - } + // Bail out early, as we only care about the return value for a dryrun. + return true; } } @@ -2751,8 +2744,6 @@ public class OomAdjuster { // we check the final procstate, and remove it if the procsate is below BFGS. capability |= getBfslCapabilityFromClient(client); - capability |= getCpuCapabilityFromClient(client); - if (cr.notHasFlag(Context.BIND_WAIVE_PRIORITY)) { if (cr.hasFlag(Context.BIND_INCLUDE_CAPABILITIES)) { capability |= cstate.getCurCapability(); @@ -2811,14 +2802,9 @@ public class OomAdjuster { app.mOptRecord.shouldNotFreezeReason() | ProcessCachedOptimizerRecord .SHOULD_NOT_FREEZE_REASON_BINDER_ALLOW_OOM_MANAGEMENT, mAdjSeq)) { - if (Flags.useCpuTimeCapability()) { - // Do nothing, capability updated check will handle the dryrun output. - } else { - // Bail out early, as we only care about the return value for a dryrun. - return true; - } + // Bail out early, as we only care about the return value for a dryrun. + return true; } - capability |= PROCESS_CAPABILITY_CPU_TIME; } // Not doing bind OOM management, so treat // this guy more like a started service. @@ -3060,14 +3046,9 @@ public class OomAdjuster { app.mOptRecord.shouldNotFreezeReason() | ProcessCachedOptimizerRecord .SHOULD_NOT_FREEZE_REASON_BIND_WAIVE_PRIORITY, mAdjSeq)) { - if (Flags.useCpuTimeCapability()) { - // Do nothing, capability updated check will handle the dryrun output. - } else { - // Bail out early, as we only care about the return value for a dryrun. - return true; - } + // Bail out early, as we only care about the return value for a dryrun. + return true; } - capability |= PROCESS_CAPABILITY_CPU_TIME; } } if (cr.hasFlag(Context.BIND_TREAT_LIKE_ACTIVITY)) { @@ -3120,24 +3101,9 @@ public class OomAdjuster { capability &= ~PROCESS_CAPABILITY_BFSL; } if (!updated) { - if (adj < prevRawAdj || procState < prevProcState || schedGroup > prevSchedGroup) { - updated = true; - } - - if (Flags.useCpuTimeCapability()) { - if ((capability != prevCapability) - && ((capability & prevCapability) == prevCapability)) { - updated = true; - } - } else { - // Ignore PROCESS_CAPABILITY_CPU_TIME in capability comparison - final int curFiltered = capability & ~PROCESS_CAPABILITY_CPU_TIME; - final int prevFiltered = prevCapability & ~PROCESS_CAPABILITY_CPU_TIME; - if ((curFiltered != prevFiltered) - && ((curFiltered & prevFiltered) == prevFiltered)) { - updated = true; - } - } + updated = adj < prevRawAdj || procState < prevProcState || schedGroup > prevSchedGroup + || (capability != prevCapability + && (capability & prevCapability) == prevCapability); } if (dryRun) { @@ -3213,8 +3179,6 @@ public class OomAdjuster { // we check the final procstate, and remove it if the procsate is below BFGS. capability |= getBfslCapabilityFromClient(client); - capability |= getCpuCapabilityFromClient(client); - if (clientProcState >= PROCESS_STATE_CACHED_ACTIVITY) { // If the other app is cached for any reason, for purposes here // we are going to consider it empty. @@ -3225,12 +3189,8 @@ public class OomAdjuster { if (app.mOptRecord.setShouldNotFreeze(true, dryRun, app.mOptRecord.shouldNotFreezeReason() | client.mOptRecord.shouldNotFreezeReason(), mAdjSeq)) { - if (Flags.useCpuTimeCapability()) { - // Do nothing, capability updated check will handle the dryrun output. - } else { - // Bail out early, as we only care about the return value for a dryrun. - return true; - } + // Bail out early, as we only care about the return value for a dryrun. + return true; } } @@ -3306,25 +3266,10 @@ public class OomAdjuster { capability &= ~PROCESS_CAPABILITY_BFSL; } - if (dryRun) { - if (adj < prevRawAdj || procState < prevProcState || schedGroup > prevSchedGroup) { - return true; - } - - if (Flags.useCpuTimeCapability()) { - if ((capability != prevCapability) - && ((capability & prevCapability) == prevCapability)) { - return true; - } - } else { - // Ignore PROCESS_CAPABILITY_CPU_TIME in capability comparison - final int curFiltered = capability & ~PROCESS_CAPABILITY_CPU_TIME; - final int prevFiltered = prevCapability & ~PROCESS_CAPABILITY_CPU_TIME; - if ((curFiltered != prevFiltered) - && ((curFiltered & prevFiltered) == prevFiltered)) { - return true; - } - } + if (dryRun && (adj < prevRawAdj || procState < prevProcState || schedGroup > prevSchedGroup + || (capability != prevCapability + && (capability & prevCapability) == prevCapability))) { + return true; } if (adj < prevRawAdj) { @@ -3376,29 +3321,6 @@ public class OomAdjuster { return baseCapabilities | networkCapabilities; } - private static int getCpuCapability(ProcessRecord app, long nowUptime) { - final UidRecord uidRec = app.getUidRecord(); - if (uidRec != null && uidRec.isCurAllowListed()) { - // Process has user visible activities. - return PROCESS_CAPABILITY_CPU_TIME; - } - if (UserHandle.isCore(app.uid)) { - // Make sure all system components are not frozen. - return PROCESS_CAPABILITY_CPU_TIME; - } - if (app.mState.getCachedHasVisibleActivities()) { - // Process has user visible activities. - return PROCESS_CAPABILITY_CPU_TIME; - } - if (app.mServices.hasUndemotedShortForegroundService(nowUptime)) { - // It running a short fgs, just give it cpu time. - return PROCESS_CAPABILITY_CPU_TIME; - } - // TODO(b/370817323): Populate this method with all of the reasons to keep a process - // unfrozen. - return 0; - } - /** * @return the BFSL capability from a client (of a service binding or provider). */ @@ -3447,15 +3369,6 @@ public class OomAdjuster { } /** - * @return the CPU capability from a client (of a service binding or provider). - */ - private static int getCpuCapabilityFromClient(ProcessRecord client) { - // Just grant CPU capability every time - // TODO(b/370817323): Populate with reasons to not propagate cpu capability across bindings. - return client.mState.getCurCapability() & PROCESS_CAPABILITY_CPU_TIME; - } - - /** * Checks if for the given app and client, there's a cycle that should skip over the client * for now or use partial values to evaluate the effect of the client binding. * @param app @@ -4036,39 +3949,6 @@ public class OomAdjuster { mCacheOomRanker.dump(pw); } - /** - * Return whether or not a process should be frozen. - */ - boolean getFreezePolicy(ProcessRecord proc) { - // Reasons to not freeze: - if (Flags.useCpuTimeCapability()) { - if ((proc.mState.getCurCapability() & PROCESS_CAPABILITY_CPU_TIME) != 0) { - /// App is important enough (see {@link #getCpuCapability}) or bound by something - /// important enough to not be frozen. - return false; - } - } else { - // The CPU capability handling covers all setShouldNotFreeze paths. Must check - // shouldNotFreeze, if the CPU capability is not being used. - if (proc.mOptRecord.shouldNotFreeze()) { - return false; - } - } - - if (proc.mOptRecord.isFreezeExempt()) { - return false; - } - - // Reasons to freeze: - if (proc.mState.getCurAdj() >= FREEZER_CUTOFF_ADJ) { - // Oomscore is in a high enough state, it is safe to freeze. - return true; - } - - // Default, do not freeze a process. - return false; - } - @GuardedBy({"mService", "mProcLock"}) void updateAppFreezeStateLSP(ProcessRecord app, @OomAdjReason int oomAdjReason, boolean immediate, int oldOomAdj) { @@ -4083,44 +3963,43 @@ public class OomAdjuster { (state.getCurAdj() >= FREEZER_CUTOFF_ADJ ^ oldOomAdj >= FREEZER_CUTOFF_ADJ) || oldOomAdj == UNKNOWN_ADJ; final boolean shouldNotFreezeChanged = opt.shouldNotFreezeAdjSeq() == mAdjSeq; - final boolean hasCpuCapability = - (PROCESS_CAPABILITY_CPU_TIME & app.mState.getCurCapability()) - == PROCESS_CAPABILITY_CPU_TIME; - final boolean usedToHaveCpuCapability = - (PROCESS_CAPABILITY_CPU_TIME & app.mState.getSetCapability()) - == PROCESS_CAPABILITY_CPU_TIME; - final boolean cpuCapabilityChanged = hasCpuCapability != usedToHaveCpuCapability; - if ((oomAdjChanged || shouldNotFreezeChanged || cpuCapabilityChanged) + if ((oomAdjChanged || shouldNotFreezeChanged) && Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) { Trace.instantForTrack(Trace.TRACE_TAG_ACTIVITY_MANAGER, CachedAppOptimizer.ATRACE_FREEZER_TRACK, "updateAppFreezeStateLSP " + app.processName - + " pid: " + app.getPid() + " isFreezeExempt: " + opt.isFreezeExempt() + " isFrozen: " + opt.isFrozen() + " shouldNotFreeze: " + opt.shouldNotFreeze() + " shouldNotFreezeReason: " + opt.shouldNotFreezeReason() + " curAdj: " + state.getCurAdj() + " oldOomAdj: " + oldOomAdj - + " immediate: " + immediate - + " cpuCapability: " + hasCpuCapability); + + " immediate: " + immediate); } } - if (getFreezePolicy(app)) { - // This process should be frozen. - if (immediate && !opt.isFrozen()) { - // And it will be frozen immediately. - mCachedAppOptimizer.freezeAppAsyncAtEarliestLSP(app); - } else if (!opt.isFrozen() || !opt.isPendingFreeze()) { + if (app.mOptRecord.isFreezeExempt()) { + return; + } + + // if an app is already frozen and shouldNotFreeze becomes true, immediately unfreeze + if (opt.isFrozen() && opt.shouldNotFreeze()) { + mCachedAppOptimizer.unfreezeAppLSP(app, + CachedAppOptimizer.getUnfreezeReasonCodeFromOomAdjReason(oomAdjReason)); + return; + } + + // Use current adjustment when freezing, set adjustment when unfreezing. + if (state.getCurAdj() >= FREEZER_CUTOFF_ADJ && !opt.isFrozen() + && !opt.shouldNotFreeze()) { + if (!immediate) { mCachedAppOptimizer.freezeAppAsyncLSP(app); + } else { + mCachedAppOptimizer.freezeAppAsyncAtEarliestLSP(app); } - } else { - // This process should not be frozen. - if (opt.isFrozen() || opt.isPendingFreeze()) { - mCachedAppOptimizer.unfreezeAppLSP(app, - CachedAppOptimizer.getUnfreezeReasonCodeFromOomAdjReason(oomAdjReason)); - } + } else if (state.getSetAdj() < FREEZER_CUTOFF_ADJ) { + mCachedAppOptimizer.unfreezeAppLSP(app, + CachedAppOptimizer.getUnfreezeReasonCodeFromOomAdjReason(oomAdjReason)); } } @@ -4144,8 +4023,7 @@ public class OomAdjuster { final int size = processes.size(); for (int i = 0; i < size; i++) { ProcessRecord proc = processes.get(i); - mCachedAppOptimizer.unfreezeTemporarily(proc, - CachedAppOptimizer.getUnfreezeReasonCodeFromOomAdjReason(reason)); + mCachedAppOptimizer.unfreezeTemporarily(proc, reason); } processes.clear(); } diff --git a/services/core/java/com/android/server/am/OomAdjusterModernImpl.java b/services/core/java/com/android/server/am/OomAdjusterModernImpl.java index 1b7e8f0bd244..8b660559f550 100644 --- a/services/core/java/com/android/server/am/OomAdjusterModernImpl.java +++ b/services/core/java/com/android/server/am/OomAdjusterModernImpl.java @@ -758,9 +758,8 @@ public class OomAdjusterModernImpl extends OomAdjuster { OomAdjusterModernImpl(ActivityManagerService service, ProcessList processList, ActiveUids activeUids, ServiceThread adjusterThread, GlobalState globalState, - CachedAppOptimizer cachedAppOptimizer, Injector injector) { - super(service, processList, activeUids, adjusterThread, globalState, cachedAppOptimizer, - injector); + Injector injector) { + super(service, processList, activeUids, adjusterThread, globalState, injector); } private final ProcessRecordNodes mProcessRecordProcStateNodes = new ProcessRecordNodes( diff --git a/services/core/java/com/android/server/am/ProcessServiceRecord.java b/services/core/java/com/android/server/am/ProcessServiceRecord.java index 364497491785..5cb8b954a2ba 100644 --- a/services/core/java/com/android/server/am/ProcessServiceRecord.java +++ b/services/core/java/com/android/server/am/ProcessServiceRecord.java @@ -256,24 +256,18 @@ final class ProcessServiceRecord { } // Now we need to look at all short-FGS within the process and see if all of them are // procstate-timed-out or not. - return !hasUndemotedShortForegroundService(nowUptime); - } - - boolean hasUndemotedShortForegroundService(long nowUptime) { for (int i = mServices.size() - 1; i >= 0; i--) { final ServiceRecord sr = mServices.valueAt(i); if (!sr.isShortFgs() || !sr.hasShortFgsInfo()) { continue; } if (sr.getShortFgsInfo().getProcStateDemoteTime() >= nowUptime) { - // This short fgs has not timed out yet. - return true; + return false; } } - return false; + return true; } - int getReportedForegroundServiceTypes() { return mRepFgServiceTypes; } diff --git a/services/core/java/com/android/server/am/ProcessStateController.java b/services/core/java/com/android/server/am/ProcessStateController.java index 57899228e6ad..01468c640f6c 100644 --- a/services/core/java/com/android/server/am/ProcessStateController.java +++ b/services/core/java/com/android/server/am/ProcessStateController.java @@ -29,7 +29,6 @@ import android.util.Slog; import android.util.SparseArray; import com.android.internal.annotations.GuardedBy; -import com.android.internal.annotations.VisibleForTesting; import com.android.server.ServiceThread; /** @@ -45,14 +44,13 @@ public class ProcessStateController { private final GlobalState mGlobalState = new GlobalState(); private ProcessStateController(ActivityManagerService ams, ProcessList processList, - ActiveUids activeUids, ServiceThread handlerThread, - CachedAppOptimizer cachedAppOptimizer, OomAdjuster.Injector oomAdjInjector, + ActiveUids activeUids, ServiceThread handlerThread, OomAdjuster.Injector oomAdjInjector, boolean useOomAdjusterModernImpl) { mOomAdjuster = useOomAdjusterModernImpl ? new OomAdjusterModernImpl(ams, processList, activeUids, handlerThread, - mGlobalState, cachedAppOptimizer, oomAdjInjector) + mGlobalState, oomAdjInjector) : new OomAdjuster(ams, processList, activeUids, handlerThread, mGlobalState, - cachedAppOptimizer, oomAdjInjector); + oomAdjInjector); } /** @@ -596,7 +594,6 @@ public class ProcessStateController { private final ActiveUids mActiveUids; private ServiceThread mHandlerThread = null; - private CachedAppOptimizer mCachedAppOptimizer = null; private OomAdjuster.Injector mOomAdjInjector = null; private boolean mUseOomAdjusterModernImpl = false; @@ -613,38 +610,24 @@ public class ProcessStateController { if (mHandlerThread == null) { mHandlerThread = OomAdjuster.createAdjusterThread(); } - if (mCachedAppOptimizer == null) { - mCachedAppOptimizer = new CachedAppOptimizer(mAms); - } if (mOomAdjInjector == null) { mOomAdjInjector = new OomAdjuster.Injector(); } return new ProcessStateController(mAms, mProcessList, mActiveUids, mHandlerThread, - mCachedAppOptimizer, mOomAdjInjector, mUseOomAdjusterModernImpl); + mOomAdjInjector, mUseOomAdjusterModernImpl); } /** * For Testing Purposes. Set what thread OomAdjuster will offload tasks on to. */ - @VisibleForTesting public Builder setHandlerThread(ServiceThread handlerThread) { mHandlerThread = handlerThread; return this; } /** - * For Testing Purposes. Set the CachedAppOptimzer used by OomAdjuster. - */ - @VisibleForTesting - public Builder setCachedAppOptimizer(CachedAppOptimizer cachedAppOptimizer) { - mCachedAppOptimizer = cachedAppOptimizer; - return this; - } - - /** * For Testing Purposes. Set an injector for OomAdjuster. */ - @VisibleForTesting public Builder setOomAdjusterInjector(OomAdjuster.Injector injector) { mOomAdjInjector = injector; return this; diff --git a/services/core/java/com/android/server/am/flags.aconfig b/services/core/java/com/android/server/am/flags.aconfig index bde3ff61c239..7b4d6c7fff82 100644 --- a/services/core/java/com/android/server/am/flags.aconfig +++ b/services/core/java/com/android/server/am/flags.aconfig @@ -250,11 +250,4 @@ flag { is_fixed_read_only: true description: "Add +X to the prev scores according to their positions in the process LRU list" bug: "359912586" -} - -flag { - name: "use_cpu_time_capability" - namespace: "backstage_power" - description: "Use PROCESS_CAPABILITY_CPU_TIME to control unfreeze state." - bug: "370817323" -} +}
\ No newline at end of file diff --git a/services/core/java/com/android/server/audio/InputDeviceVolumeHelper.java b/services/core/java/com/android/server/audio/InputDeviceVolumeHelper.java index d094629cc57b..d7d1ac96d650 100644 --- a/services/core/java/com/android/server/audio/InputDeviceVolumeHelper.java +++ b/services/core/java/com/android/server/audio/InputDeviceVolumeHelper.java @@ -23,10 +23,10 @@ import android.annotation.Nullable; import android.content.ContentResolver; import android.media.AudioDeviceAttributes; import android.media.AudioDeviceInfo; -import android.media.AudioManager; import android.media.AudioSystem; import android.os.UserHandle; import android.util.IntArray; +import android.util.Log; import android.util.SparseIntArray; import java.util.HashSet; @@ -48,7 +48,7 @@ import java.util.Set; // A map between device internal type (e.g. AudioSystem.DEVICE_IN_BUILTIN_MIC) to its input gain // index. private final SparseIntArray mInputGainIndexMap; - private final Set<Integer> mSupportedDeviceTypes; + private final Set<Integer> mSupportedDeviceTypes = new HashSet<>(); InputDeviceVolumeHelper( SettingsAdapter settings, @@ -60,20 +60,16 @@ import java.util.Set; IntArray internalDeviceTypes = new IntArray(); int status = AudioSystem.getSupportedDeviceTypes(GET_DEVICES_INPUTS, internalDeviceTypes); - mInputGainIndexMap = - new SparseIntArray( - status == AudioManager.SUCCESS - ? internalDeviceTypes.size() - : AudioSystem.DEVICE_IN_ALL_SET.size()); - - if (status == AudioManager.SUCCESS) { - Set<Integer> supportedDeviceTypes = new HashSet<>(); - for (int i = 0; i < internalDeviceTypes.size(); i++) { - supportedDeviceTypes.add(internalDeviceTypes.get(i)); - } - mSupportedDeviceTypes = supportedDeviceTypes; - } else { - mSupportedDeviceTypes = AudioSystem.DEVICE_IN_ALL_SET; + if (status != AudioSystem.SUCCESS) { + Log.e(TAG, "AudioSystem.getSupportedDeviceTypes(GET_DEVICES_INPUTS) failed. status:" + + status); + } + + // Note that in a rare case, if AudioSystem.getSupportedDeviceTypes call fails, both + // mInputGainIndexMap and mSupportedDeviceTypes will be empty. + mInputGainIndexMap = new SparseIntArray(internalDeviceTypes.size()); + for (int i = 0; i < internalDeviceTypes.size(); i++) { + mSupportedDeviceTypes.add(internalDeviceTypes.get(i)); } readSettings(); diff --git a/services/core/java/com/android/server/biometrics/sensors/InvalidationClient.java b/services/core/java/com/android/server/biometrics/sensors/InvalidationClient.java index 6c933665a2e2..394b5617a813 100644 --- a/services/core/java/com/android/server/biometrics/sensors/InvalidationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/InvalidationClient.java @@ -77,6 +77,16 @@ public abstract class InvalidationClient<S extends BiometricAuthenticator.Identi } @Override + public void cancel() { + super.cancel(); + try { + mInvalidationCallback.onCompleted(); + } catch (RemoteException e) { + Slog.e(TAG, "Unable to complete invalidation client due to exception: " + e); + } + } + + @Override public int getProtoEnum() { return BiometricsProto.CM_INVALIDATE; } diff --git a/services/core/java/com/android/server/compat/CompatChange.java b/services/core/java/com/android/server/compat/CompatChange.java index a40dd7919402..c3d88e3e6eb1 100644 --- a/services/core/java/com/android/server/compat/CompatChange.java +++ b/services/core/java/com/android/server/compat/CompatChange.java @@ -50,6 +50,7 @@ import java.util.concurrent.ConcurrentHashMap; * * <p>Note, this class is not thread safe so callers must ensure thread safety. */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class CompatChange extends CompatibilityChangeInfo { /** diff --git a/services/core/java/com/android/server/compat/CompatConfig.java b/services/core/java/com/android/server/compat/CompatConfig.java index 79025d00d128..e89f43bd7196 100644 --- a/services/core/java/com/android/server/compat/CompatConfig.java +++ b/services/core/java/com/android/server/compat/CompatConfig.java @@ -42,6 +42,7 @@ import com.android.internal.compat.CompatibilityOverridesToRemoveByPackageConfig import com.android.internal.compat.CompatibilityOverridesToRemoveConfig; import com.android.internal.compat.IOverrideValidator; import com.android.internal.compat.OverrideAllowedState; +import com.android.internal.ravenwood.RavenwoodEnvironment; import com.android.server.compat.config.Change; import com.android.server.compat.config.Config; import com.android.server.compat.overrides.ChangeOverrides; @@ -63,6 +64,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.Predicate; import javax.xml.datatype.DatatypeConfigurationException; @@ -72,12 +74,16 @@ import javax.xml.datatype.DatatypeConfigurationException; * <p>It stores the default configuration for each change, and any per-package overrides that have * been configured. */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass final class CompatConfig { private static final String TAG = "CompatConfig"; private static final String APP_COMPAT_DATA_DIR = "/data/misc/appcompat"; private static final String STATIC_OVERRIDES_PRODUCT_DIR = "/product/etc/appcompat"; private static final String OVERRIDES_FILE = "compat_framework_overrides.xml"; + private static final String APP_COMPAT_DATA_DIR_RAVENWOOD = "/ravenwood-data/"; + private static final String OVERRIDES_FILE_RAVENWOOD = "compat-config.xml"; + private final ConcurrentHashMap<Long, CompatChange> mChanges = new ConcurrentHashMap<>(); private final OverrideValidatorImpl mOverrideValidator; @@ -98,19 +104,32 @@ final class CompatConfig { static CompatConfig create(AndroidBuildClassifier androidBuildClassifier, Context context) { CompatConfig config = new CompatConfig(androidBuildClassifier, context); - config.initConfigFromLib(Environment.buildPath( + config.loadConfigFiles(); + config.initOverrides(); + config.invalidateCache(); + return config; + } + + @android.ravenwood.annotation.RavenwoodReplace + private void loadConfigFiles() { + initConfigFromLib(Environment.buildPath( Environment.getRootDirectory(), "etc", "compatconfig")); - config.initConfigFromLib(Environment.buildPath( + initConfigFromLib(Environment.buildPath( Environment.getRootDirectory(), "system_ext", "etc", "compatconfig")); List<ApexManager.ActiveApexInfo> apexes = ApexManager.getInstance().getActiveApexInfos(); for (ApexManager.ActiveApexInfo apex : apexes) { - config.initConfigFromLib(Environment.buildPath( + initConfigFromLib(Environment.buildPath( apex.apexDirectory, "etc", "compatconfig")); } - config.initOverrides(); - config.invalidateCache(); - return config; + } + + @SuppressWarnings("unused") + private void loadConfigFiles$ravenwood() { + final var configDir = new File( + RavenwoodEnvironment.getInstance().getRavenwoodRuntimePath() + + APP_COMPAT_DATA_DIR_RAVENWOOD); + initConfigFromLib(configDir, (file) -> file.getName().endsWith(OVERRIDES_FILE_RAVENWOOD)); } /** @@ -678,12 +697,25 @@ final class CompatConfig { return changeInfos; } + /** + * Load all config files in a given directory. + */ void initConfigFromLib(File libraryDir) { + initConfigFromLib(libraryDir, (file) -> true); + } + + /** + * Load config files in a given directory, but only the ones that match {@code includingFilter}. + */ + void initConfigFromLib(File libraryDir, Predicate<File> includingFilter) { if (!libraryDir.exists() || !libraryDir.isDirectory()) { Slog.d(TAG, "No directory " + libraryDir + ", skipping"); return; } for (File f : libraryDir.listFiles()) { + if (!includingFilter.test(f)) { + continue; + } Slog.d(TAG, "Found a config file: " + f.getPath()); //TODO(b/138222363): Handle duplicate ids across config files. readConfig(f); diff --git a/services/core/java/com/android/server/compat/OverrideValidatorImpl.java b/services/core/java/com/android/server/compat/OverrideValidatorImpl.java index e3b6d032b7f0..362c69797161 100644 --- a/services/core/java/com/android/server/compat/OverrideValidatorImpl.java +++ b/services/core/java/com/android/server/compat/OverrideValidatorImpl.java @@ -45,6 +45,7 @@ import com.android.internal.compat.OverrideAllowedState; /** * Implementation of the policy for allowing compat change overrides. */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public class OverrideValidatorImpl extends IOverrideValidator.Stub { private AndroidBuildClassifier mAndroidBuildClassifier; diff --git a/services/core/java/com/android/server/compat/PlatformCompat.java b/services/core/java/com/android/server/compat/PlatformCompat.java index 8d64383b32b9..97f4a5c570b5 100644 --- a/services/core/java/com/android/server/compat/PlatformCompat.java +++ b/services/core/java/com/android/server/compat/PlatformCompat.java @@ -36,6 +36,7 @@ import android.content.pm.PackageManagerInternal; import android.net.Uri; import android.os.Binder; import android.os.Build; +import android.os.PermissionEnforcer; import android.os.Process; import android.os.RemoteException; import android.os.UserHandle; @@ -65,6 +66,7 @@ import java.util.Map; /** * System server internal API for gating and reporting compatibility changes. */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public class PlatformCompat extends IPlatformCompat.Stub { private static final String TAG = "Compatibility"; @@ -75,6 +77,7 @@ public class PlatformCompat extends IPlatformCompat.Stub { private final AndroidBuildClassifier mBuildClassifier; public PlatformCompat(Context context) { + super(PermissionEnforcer.fromContext(context)); mContext = context; mChangeReporter = new ChangeReporter(ChangeReporter.SOURCE_SYSTEM_SERVER); mBuildClassifier = new AndroidBuildClassifier(); @@ -85,6 +88,7 @@ public class PlatformCompat extends IPlatformCompat.Stub { PlatformCompat(Context context, CompatConfig compatConfig, AndroidBuildClassifier buildClassifier, ChangeReporter changeReporter) { + super(PermissionEnforcer.fromContext(context)); mContext = context; mChangeReporter = changeReporter; mCompatConfig = compatConfig; @@ -515,6 +519,7 @@ public class PlatformCompat extends IPlatformCompat.Stub { return appInfo; } + @android.ravenwood.annotation.RavenwoodReplace private void killPackage(String packageName) { int uid = LocalServices.getService(PackageManagerInternal.class).getPackageUid(packageName, 0, UserHandle.myUserId()); @@ -528,6 +533,13 @@ public class PlatformCompat extends IPlatformCompat.Stub { killUid(UserHandle.getAppId(uid)); } + @SuppressWarnings("unused") + private void killPackage$ravenwood(String packageName) { + // TODO Maybe crash if the package is the self. + Slog.w(TAG, "killPackage() is ignored on Ravenwood: packageName=" + packageName); + } + + @android.ravenwood.annotation.RavenwoodReplace private void killUid(int appId) { final long identity = Binder.clearCallingIdentity(); try { @@ -542,6 +554,12 @@ public class PlatformCompat extends IPlatformCompat.Stub { } } + @SuppressWarnings("unused") + private void killUid$ravenwood(int appId) { + // TODO Maybe crash if the UID is the self. + Slog.w(TAG, "killUid() is ignored on Ravenwood: appId=" + appId); + } + private void checkAllCompatOverridesAreOverridable(Collection<Long> changeIds) { for (Long changeId : changeIds) { if (isKnownChangeId(changeId) && !mCompatConfig.isOverridable(changeId)) { diff --git a/services/core/java/com/android/server/compat/PlatformCompatNative.java b/services/core/java/com/android/server/compat/PlatformCompatNative.java index 5d7af650db0b..7a3feb515706 100644 --- a/services/core/java/com/android/server/compat/PlatformCompatNative.java +++ b/services/core/java/com/android/server/compat/PlatformCompatNative.java @@ -23,6 +23,7 @@ import com.android.internal.compat.IPlatformCompatNative; /** * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public class PlatformCompatNative extends IPlatformCompatNative.Stub { private final PlatformCompat mPlatformCompat; diff --git a/services/core/java/com/android/server/compat/overrides/AppCompatOverridesParser.java b/services/core/java/com/android/server/compat/overrides/AppCompatOverridesParser.java index e8762a3e935c..0ec68792a886 100644 --- a/services/core/java/com/android/server/compat/overrides/AppCompatOverridesParser.java +++ b/services/core/java/com/android/server/compat/overrides/AppCompatOverridesParser.java @@ -46,6 +46,7 @@ import java.util.regex.Pattern; * * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass final class AppCompatOverridesParser { /** * Flag for specifying all compat change IDs owned by a namespace. See {@link diff --git a/services/core/java/com/android/server/compat/overrides/AppCompatOverridesService.java b/services/core/java/com/android/server/compat/overrides/AppCompatOverridesService.java index fe002ce00d32..8637d2dfe565 100644 --- a/services/core/java/com/android/server/compat/overrides/AppCompatOverridesService.java +++ b/services/core/java/com/android/server/compat/overrides/AppCompatOverridesService.java @@ -68,6 +68,7 @@ import java.util.Set; * * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class AppCompatOverridesService { private static final String TAG = "AppCompatOverridesService"; diff --git a/services/core/java/com/android/server/dreams/DreamManagerService.java b/services/core/java/com/android/server/dreams/DreamManagerService.java index 76e5ef011789..794eb8754820 100644 --- a/services/core/java/com/android/server/dreams/DreamManagerService.java +++ b/services/core/java/com/android/server/dreams/DreamManagerService.java @@ -64,12 +64,15 @@ import android.provider.Settings; import android.service.dreams.DreamManagerInternal; import android.service.dreams.DreamService; import android.service.dreams.IDreamManager; +import android.text.TextUtils; import android.util.Slog; +import android.util.SparseArray; import android.view.Display; import com.android.internal.R; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.content.PackageMonitor; import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.UiEventLoggerImpl; import com.android.internal.util.DumpUtils; @@ -86,6 +89,7 @@ import java.io.PrintWriter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; @@ -155,6 +159,10 @@ public final class DreamManagerService extends SystemService { private ComponentName mDreamOverlayServiceName; private final AmbientDisplayConfiguration mDozeConfig; + + /** Stores {@link PerUserPackageMonitor} to monitor dream uninstalls. */ + private final SparseArray<PackageMonitor> mPackageMonitors = new SparseArray<>(); + private final ActivityInterceptorCallback mActivityInterceptorCallback = new ActivityInterceptorCallback() { @Nullable @@ -218,6 +226,15 @@ public final class DreamManagerService extends SystemService { } } + private final class PerUserPackageMonitor extends PackageMonitor { + @Override + public void onPackageRemoved(String packageName, int uid) { + super.onPackageRemoved(packageName, uid); + final int userId = getChangingUserId(); + updateDreamOnPackageRemoved(packageName, userId); + } + } + public DreamManagerService(Context context) { this(context, new DreamHandler(FgThread.get().getLooper())); } @@ -333,6 +350,33 @@ public final class DreamManagerService extends SystemService { }); } + @Override + public void onUserStarting(@NonNull TargetUser user) { + super.onUserStarting(user); + mHandler.post(() -> { + final int userId = user.getUserIdentifier(); + if (!mPackageMonitors.contains(userId)) { + final PackageMonitor monitor = new PerUserPackageMonitor(); + monitor.register(mContext, UserHandle.of(userId), mHandler); + mPackageMonitors.put(userId, monitor); + } else { + Slog.w(TAG, "Package monitor already registered for " + userId); + } + }); + } + + @Override + public void onUserStopping(@NonNull TargetUser user) { + super.onUserStopping(user); + mHandler.post(() -> { + final PackageMonitor monitor = mPackageMonitors.removeReturnOld( + user.getUserIdentifier()); + if (monitor != null) { + monitor.unregister(); + } + }); + } + private void dumpInternal(PrintWriter pw) { synchronized (mLock) { pw.println("DREAM MANAGER (dumpsys dreams)"); @@ -664,6 +708,22 @@ public final class DreamManagerService extends SystemService { return validComponents.toArray(new ComponentName[validComponents.size()]); } + private void updateDreamOnPackageRemoved(String packageName, int userId) { + final ComponentName[] componentNames = componentsFromString( + Settings.Secure.getStringForUser(mContext.getContentResolver(), + Settings.Secure.SCREENSAVER_COMPONENTS, + userId)); + if (componentNames != null) { + // Filter out any components in the removed package. + final ComponentName[] filteredComponents = Arrays.stream(componentNames).filter( + (componentName -> !TextUtils.equals(componentName.getPackageName(), + packageName))).toArray(ComponentName[]::new); + if (filteredComponents.length != componentNames.length) { + setDreamComponentsForUser(userId, filteredComponents); + } + } + } + private void setDreamComponentsForUser(int userId, ComponentName[] componentNames) { Settings.Secure.putStringForUser(mContext.getContentResolver(), Settings.Secure.SCREENSAVER_COMPONENTS, diff --git a/services/core/java/com/android/server/input/InputGestureManager.java b/services/core/java/com/android/server/input/InputGestureManager.java index cf1cdaf55e5c..8cb51ce35a89 100644 --- a/services/core/java/com/android/server/input/InputGestureManager.java +++ b/services/core/java/com/android/server/input/InputGestureManager.java @@ -17,6 +17,8 @@ package com.android.server.input; import static android.hardware.input.InputGestureData.createKeyTrigger; + +import static com.android.hardware.input.Flags.enableTalkbackAndMagnifierKeyGestures; import static com.android.hardware.input.Flags.keyboardA11yShortcutControl; import static com.android.server.flags.Flags.newBugreportKeyboardShortcut; import static com.android.window.flags.Flags.enableMoveToNextDisplayShortcut; @@ -209,12 +211,12 @@ final class InputGestureManager { KeyGestureEvent.KEY_GESTURE_TYPE_MOVE_TO_NEXT_DISPLAY )); } - if (keyboardA11yShortcutControl()) { - systemShortcuts.add(createKeyGesture( - KeyEvent.KEYCODE_T, + if (enableTalkbackAndMagnifierKeyGestures()) { + systemShortcuts.add(createKeyGesture(KeyEvent.KEYCODE_T, KeyEvent.META_META_ON | KeyEvent.META_ALT_ON, - KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_TALKBACK - )); + KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_TALKBACK)); + } + if (keyboardA11yShortcutControl()) { if (InputSettings.isAccessibilityBounceKeysFeatureEnabled()) { systemShortcuts.add(createKeyGesture( KeyEvent.KEYCODE_3, @@ -362,6 +364,22 @@ final class InputGestureManager { } @Nullable + public InputGestureData getCustomGestureForTouchpadGesture(@UserIdInt int userId, + int touchpadGestureType) { + if (touchpadGestureType == InputGestureData.TOUCHPAD_GESTURE_TYPE_UNKNOWN) { + return null; + } + synchronized (mGestureLock) { + Map<InputGestureData.Trigger, InputGestureData> customGestures = + mCustomInputGestures.get(userId); + if (customGestures == null) { + return null; + } + return customGestures.get(InputGestureData.createTouchpadTrigger(touchpadGestureType)); + } + } + + @Nullable public InputGestureData getSystemShortcutForKeyEvent(KeyEvent event) { final int keyCode = event.getKeyCode(); if (keyCode == KeyEvent.KEYCODE_UNKNOWN) { diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index 78e3b846f9dc..e0f3a9bd427a 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -64,6 +64,7 @@ import android.hardware.input.IKeyboardBacklightListener; import android.hardware.input.IStickyModifierStateListener; import android.hardware.input.ITabletModeChangedListener; import android.hardware.input.InputDeviceIdentifier; +import android.hardware.input.InputGestureData; import android.hardware.input.InputManager; import android.hardware.input.InputSensorInfo; import android.hardware.input.InputSettings; @@ -2314,7 +2315,8 @@ public class InputManagerService extends IInputManager.Stub // Native callback. @SuppressWarnings("unused") private void notifyTouchpadThreeFingerTap() { - mKeyGestureController.handleTouchpadThreeFingerTap(); + mKeyGestureController.handleTouchpadGesture( + InputGestureData.TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP); } // Native callback. @@ -2995,35 +2997,35 @@ public class InputManagerService extends IInputManager.Stub @Override @PermissionManuallyEnforced - public int addCustomInputGesture(@NonNull AidlInputGestureData inputGestureData) { + public int addCustomInputGesture(@UserIdInt int userId, + @NonNull AidlInputGestureData inputGestureData) { enforceManageKeyGesturePermission(); Objects.requireNonNull(inputGestureData); - return mKeyGestureController.addCustomInputGesture(UserHandle.getCallingUserId(), - inputGestureData); + return mKeyGestureController.addCustomInputGesture(userId, inputGestureData); } @Override @PermissionManuallyEnforced - public int removeCustomInputGesture(@NonNull AidlInputGestureData inputGestureData) { + public int removeCustomInputGesture(@UserIdInt int userId, + @NonNull AidlInputGestureData inputGestureData) { enforceManageKeyGesturePermission(); Objects.requireNonNull(inputGestureData); - return mKeyGestureController.removeCustomInputGesture(UserHandle.getCallingUserId(), - inputGestureData); + return mKeyGestureController.removeCustomInputGesture(userId, inputGestureData); } @Override @PermissionManuallyEnforced - public void removeAllCustomInputGestures() { + public void removeAllCustomInputGestures(@UserIdInt int userId) { enforceManageKeyGesturePermission(); - mKeyGestureController.removeAllCustomInputGestures(UserHandle.getCallingUserId()); + mKeyGestureController.removeAllCustomInputGestures(userId); } @Override - public AidlInputGestureData[] getCustomInputGestures() { - return mKeyGestureController.getCustomInputGestures(UserHandle.getCallingUserId()); + public AidlInputGestureData[] getCustomInputGestures(@UserIdInt int userId) { + return mKeyGestureController.getCustomInputGestures(userId); } @Override diff --git a/services/core/java/com/android/server/input/KeyGestureController.java b/services/core/java/com/android/server/input/KeyGestureController.java index e0991ec20f9e..fc106404049c 100644 --- a/services/core/java/com/android/server/input/KeyGestureController.java +++ b/services/core/java/com/android/server/input/KeyGestureController.java @@ -847,6 +847,13 @@ final class KeyGestureController { /* appLaunchData = */null); } + private void handleTouchpadGesture(@KeyGestureEvent.KeyGestureType int keyGestureType, + @Nullable AppLaunchData appLaunchData) { + handleKeyGesture(KeyCharacterMap.VIRTUAL_KEYBOARD, new int[0], /* modifierState= */0, + keyGestureType, KeyGestureEvent.ACTION_GESTURE_COMPLETE, + Display.DEFAULT_DISPLAY, /* focusedToken = */null, /* flags = */0, appLaunchData); + } + @VisibleForTesting boolean handleKeyGesture(int deviceId, int[] keycodes, int modifierState, @KeyGestureEvent.KeyGestureType int gestureType, int action, int displayId, @@ -897,11 +904,18 @@ final class KeyGestureController { handleKeyGesture(event, null /*focusedToken*/); } - public void handleTouchpadThreeFingerTap() { - // TODO(b/365063048): trigger a custom shortcut based on the three-finger tap. - if (DEBUG) { - Slog.d(TAG, "Three-finger touchpad tap occurred"); + public void handleTouchpadGesture(int touchpadGestureType) { + // Handle custom shortcuts + InputGestureData customGesture; + synchronized (mUserLock) { + customGesture = mInputGestureManager.getCustomGestureForTouchpadGesture(mCurrentUserId, + touchpadGestureType); + } + if (customGesture == null) { + return; } + handleTouchpadGesture(customGesture.getAction().keyGestureType(), + customGesture.getAction().appLaunchData()); } @MainThread @@ -1214,6 +1228,7 @@ final class KeyGestureController { public void dump(IndentingPrintWriter ipw) { ipw.println("KeyGestureController:"); ipw.increaseIndent(); + ipw.println("mCurrentUserId = " + mCurrentUserId); ipw.println("mSystemPid = " + mSystemPid); ipw.println("mPendingMetaAction = " + mPendingMetaAction); ipw.println("mPendingCapsLockToggle = " + mPendingCapsLockToggle); diff --git a/services/core/java/com/android/server/notification/GroupHelper.java b/services/core/java/com/android/server/notification/GroupHelper.java index 6681e36e00ee..5febd5c07e3a 100644 --- a/services/core/java/com/android/server/notification/GroupHelper.java +++ b/services/core/java/com/android/server/notification/GroupHelper.java @@ -25,8 +25,10 @@ import static android.app.Notification.FLAG_ONGOING_EVENT; import static android.app.Notification.VISIBILITY_PRIVATE; import static android.app.Notification.VISIBILITY_PUBLIC; import static android.service.notification.Flags.notificationForceGrouping; +import static android.service.notification.Flags.notificationRegroupOnClassification; import android.annotation.FlaggedApi; +import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; @@ -49,6 +51,9 @@ import com.android.internal.R; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import java.io.PrintWriter; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -83,10 +88,22 @@ public class GroupHelper { // with less than this value, they will be forced grouped private static final int MIN_CHILD_COUNT_TO_AVOID_FORCE_GROUPING = 3; + // Regrouping needed because the channel was updated, ie. importance changed + static final int REGROUP_REASON_CHANNEL_UPDATE = 0; + // Regrouping needed because of notification bundling + static final int REGROUP_REASON_BUNDLE = 1; + + @IntDef(prefix = { "REGROUP_REASON_" }, value = { + REGROUP_REASON_CHANNEL_UPDATE, + REGROUP_REASON_BUNDLE, + }) + @Retention(RetentionPolicy.SOURCE) + @interface RegroupingReason {} private final Callback mCallback; private final int mAutoGroupAtCount; private final int mAutogroupSparseGroupsAtCount; + private final int mAutoGroupRegroupingAtCount; private final Context mContext; private final PackageManager mPackageManager; private boolean mIsTestHarnessExempted; @@ -173,6 +190,11 @@ public class GroupHelper { mContext = context; mPackageManager = packageManager; mAutogroupSparseGroupsAtCount = autoGroupSparseGroupsAtCount; + if (notificationRegroupOnClassification()) { + mAutoGroupRegroupingAtCount = 1; + } else { + mAutoGroupRegroupingAtCount = mAutoGroupAtCount; + } NOTIFICATION_SHADE_SECTIONS = getNotificationShadeSections(); } @@ -865,7 +887,8 @@ public class GroupHelper { } } - regroupNotifications(userId, pkgName, notificationsToCheck); + regroupNotifications(userId, pkgName, notificationsToCheck, + REGROUP_REASON_CHANNEL_UPDATE); } } @@ -883,13 +906,14 @@ public class GroupHelper { ArrayMap<String, NotificationRecord> notificationsToCheck = new ArrayMap<>(); notificationsToCheck.put(record.getKey(), record); regroupNotifications(record.getUserId(), record.getSbn().getPackageName(), - notificationsToCheck); + notificationsToCheck, REGROUP_REASON_BUNDLE); } } @GuardedBy("mAggregatedNotifications") private void regroupNotifications(int userId, String pkgName, - ArrayMap<String, NotificationRecord> notificationsToCheck) { + ArrayMap<String, NotificationRecord> notificationsToCheck, + @RegroupingReason int regroupingReason) { // The list of notification operations required after the channel update final ArrayList<NotificationMoveOp> notificationsToMove = new ArrayList<>(); @@ -904,12 +928,42 @@ public class GroupHelper { notificationsToMove.addAll( getUngroupedNotificationsMoveOps(userId, pkgName, notificationsToCheck)); + // Handle "grouped correctly" notifications that were re-classified (bundled) + if (notificationRegroupOnClassification()) { + if (regroupingReason == REGROUP_REASON_BUNDLE) { + notificationsToMove.addAll( + getReclassifiedNotificationsMoveOps(userId, pkgName, notificationsToCheck)); + } + } + // Batch move to new section if (!notificationsToMove.isEmpty()) { moveNotificationsToNewSection(userId, pkgName, notificationsToMove); } } + private List<NotificationMoveOp> getReclassifiedNotificationsMoveOps(int userId, + String pkgName, ArrayMap<String, NotificationRecord> notificationsToCheck) { + final ArrayList<NotificationMoveOp> notificationsToMove = new ArrayList<>(); + for (NotificationRecord record : notificationsToCheck.values()) { + if (isChildOfValidAppGroup(record)) { + // Check if section changes + NotificationSectioner sectioner = getSection(record); + if (sectioner != null) { + FullyQualifiedGroupKey newFullAggregateGroupKey = + new FullyQualifiedGroupKey(userId, pkgName, sectioner); + if (DEBUG) { + Slog.v(TAG, "Regroup after classification: " + record + " to: " + + newFullAggregateGroupKey); + } + notificationsToMove.add( + new NotificationMoveOp(record, null, newFullAggregateGroupKey)); + } + } + } + return notificationsToMove; + } + @GuardedBy("mAggregatedNotifications") private List<NotificationMoveOp> getAutogroupedNotificationsMoveOps(int userId, String pkgName, ArrayMap<String, NotificationRecord> notificationsToCheck) { @@ -1010,6 +1064,10 @@ public class GroupHelper { // Bundled operations to apply to groups affected by the channel update ArrayMap<FullyQualifiedGroupKey, GroupUpdateOp> groupsToUpdate = new ArrayMap<>(); + // App-provided (valid) groups of notifications that were classified (bundled). + // Summaries will be canceled if all child notifications have been bundled. + ArrayMap<String, String> originalGroupsOfBundledNotifications = new ArrayMap<>(); + for (NotificationMoveOp moveOp: notificationsToMove) { final NotificationRecord record = moveOp.record; final FullyQualifiedGroupKey oldFullAggregateGroupKey = moveOp.oldGroup; @@ -1035,6 +1093,13 @@ public class GroupHelper { groupsToUpdate.put(oldFullAggregateGroupKey, new GroupUpdateOp(oldFullAggregateGroupKey, record, true)); } + } else { + if (notificationRegroupOnClassification()) { + // Null "old aggregate group" => this notification was re-classified from + // a valid app-provided group => maybe cancel the original summary + // if no children are left + originalGroupsOfBundledNotifications.put(record.getKey(), record.getGroupKey()); + } } // Add moved notifications to the ungrouped list for new group and do grouping @@ -1076,7 +1141,7 @@ public class GroupHelper { NotificationRecord triggeringNotification = groupsToUpdate.get(groupKey).record; boolean hasSummary = groupsToUpdate.get(groupKey).hasSummary; //Group needs to be created/updated - if (ungrouped.size() >= mAutoGroupAtCount + if (ungrouped.size() >= mAutoGroupRegroupingAtCount || (hasSummary && !aggregatedNotificationsAttrs.isEmpty())) { NotificationSectioner sectioner = getSection(triggeringNotification); if (sectioner == null) { @@ -1092,6 +1157,18 @@ public class GroupHelper { } } } + + if (notificationRegroupOnClassification()) { + // Cancel the summary if it's the last notification of the original app-provided group + for (String triggeringKey : originalGroupsOfBundledNotifications.keySet()) { + NotificationRecord canceledSummary = + mCallback.removeAppProvidedSummaryOnClassification(triggeringKey, + originalGroupsOfBundledNotifications.getOrDefault(triggeringKey, null)); + if (canceledSummary != null) { + cacheCanceledSummary(canceledSummary); + } + } + } } static String getFullAggregateGroupKey(String pkgName, @@ -1113,6 +1190,42 @@ public class GroupHelper { return (record.mOriginalFlags & Notification.FLAG_AUTOGROUP_SUMMARY) != 0; } + private boolean isNotificationAggregatedInSection(NotificationRecord record, + NotificationSectioner sectioner) { + final FullyQualifiedGroupKey fullAggregateGroupKey = new FullyQualifiedGroupKey( + record.getUserId(), record.getSbn().getPackageName(), sectioner); + return record.getGroupKey().equals(fullAggregateGroupKey.toString()); + } + + private boolean isChildOfValidAppGroup(NotificationRecord record) { + final StatusBarNotification sbn = record.getSbn(); + if (!sbn.isAppGroup()) { + return false; + } + + if (!sbn.getNotification().isGroupChild()) { + return false; + } + + if (record.isCanceled) { + return false; + } + + final NotificationSectioner sectioner = getSection(record); + if (sectioner == null) { + if (DEBUG) { + Slog.i(TAG, "Skipping autogrouping for " + record + " no valid section found."); + } + return false; + } + + if (isNotificationAggregatedInSection(record, sectioner)) { + return false; + } + + return true; + } + private static int getNumChildrenForGroup(@NonNull final String groupKey, final List<NotificationRecord> notificationList) { //TODO (b/349072751): track grouping state in GroupHelper -> do not use notificationList @@ -1438,6 +1551,48 @@ public class GroupHelper { } } + protected void dump(PrintWriter pw, String prefix) { + synchronized (mAggregatedNotifications) { + if (!mUngroupedAbuseNotifications.isEmpty()) { + pw.println(prefix + "Ungrouped notifications:"); + for (FullyQualifiedGroupKey groupKey: mUngroupedAbuseNotifications.keySet()) { + if (!mUngroupedAbuseNotifications.getOrDefault(groupKey, new ArrayMap<>()) + .isEmpty()) { + pw.println(prefix + prefix + groupKey.toString()); + for (String notifKey : mUngroupedAbuseNotifications.get(groupKey) + .keySet()) { + pw.println(prefix + prefix + prefix + notifKey); + } + } + } + pw.println(""); + } + + if (!mAggregatedNotifications.isEmpty()) { + pw.println(prefix + "Autogrouped notifications:"); + for (FullyQualifiedGroupKey groupKey: mAggregatedNotifications.keySet()) { + if (!mAggregatedNotifications.getOrDefault(groupKey, new ArrayMap<>()) + .isEmpty()) { + pw.println(prefix + prefix + groupKey.toString()); + for (String notifKey : mAggregatedNotifications.get(groupKey).keySet()) { + pw.println(prefix + prefix + prefix + notifKey); + } + } + } + pw.println(""); + } + + if (!mCanceledSummaries.isEmpty()) { + pw.println(prefix + "Cached canceled summaries:"); + for (CachedSummary summary: mCanceledSummaries.values()) { + pw.println(prefix + prefix + prefix + summary.key + " -> " + + summary.originalGroupKey); + } + pw.println(""); + } + } + } + protected static class NotificationSectioner { final String mName; final int mSummaryId; @@ -1551,5 +1706,16 @@ public class GroupHelper { void removeNotificationFromCanceledGroup(int userId, String pkg, String groupKey, int cancelReason); + + /** + * Cancels the group summary of a notification that was regrouped because of classification + * (bundling). Only cancels if the summary is the last notification of the original group. + * @param triggeringKey the triggering child notification key + * @param groupKey the original group key + * @return the canceled group summary or null if the summary was not canceled + */ + @Nullable + NotificationRecord removeAppProvidedSummaryOnClassification(String triggeringKey, + @Nullable String groupKey); } } diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index dd6c59fbea18..4d0c7ec64317 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -474,6 +474,10 @@ public class NotificationManagerService extends SystemService { Adjustment.KEY_TYPE }; + static final Integer[] DEFAULT_ALLOWED_ADJUSTMENT_KEY_TYPES = new Integer[] { + TYPE_PROMOTION + }; + static final String[] NON_BLOCKABLE_DEFAULT_ROLES = new String[] { RoleManager.ROLE_DIALER, RoleManager.ROLE_EMERGENCY @@ -1929,6 +1933,12 @@ public class NotificationManagerService extends SystemService { hasSensitiveContent, lifespanMs); } + protected void logClassificationChannelAdjustmentReceived(boolean hasPosted, boolean isAlerting, + int classification, int lifespanMs) { + FrameworkStatsLog.write(FrameworkStatsLog.NOTIFICATION_CHANNEL_CLASSIFICATION, + hasPosted, isAlerting, classification, lifespanMs); + } + protected final BroadcastReceiver mLocaleChangeReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -2998,6 +3008,16 @@ public class NotificationManagerService extends SystemService { groupKey, REASON_APP_CANCEL, SystemClock.elapsedRealtime()); } } + + @Override + @Nullable + public NotificationRecord removeAppProvidedSummaryOnClassification(String triggeringKey, + @Nullable String oldGroupKey) { + synchronized (mNotificationLock) { + return removeAppProvidedSummaryOnClassificationLocked(triggeringKey, + oldGroupKey); + } + } }); } @@ -4189,6 +4209,22 @@ public class NotificationManagerService extends SystemService { } @Override + @FlaggedApi(android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION) + public @NonNull int[] getAllowedAdjustmentKeyTypes() { + checkCallerIsSystemOrSystemUiOrShell(); + return mAssistants.getAllowedAdjustmentKeyTypes(); + } + + @Override + @FlaggedApi(android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION) + public void setAssistantAdjustmentKeyTypeState(int type, boolean enabled) { + checkCallerIsSystemOrSystemUiOrShell(); + mAssistants.setAssistantAdjustmentKeyTypeState(type, enabled); + + handleSavePolicyFile(); + } + + @Override @FlaggedApi(android.app.Flags.FLAG_API_RICH_ONGOING) public boolean appCanBePromoted(String pkg, int uid) { checkCallerIsSystemOrSystemUiOrShell(); @@ -6977,19 +7013,30 @@ public class NotificationManagerService extends SystemService { if (!mAssistants.isAdjustmentAllowed(potentialKey)) { toRemove.add(potentialKey); } + if (notificationClassification() && adjustments.containsKey(KEY_TYPE)) { + if (!mAssistants.isAdjustmentKeyTypeAllowed(adjustments.getInt(KEY_TYPE))) { + toRemove.add(potentialKey); + } + } } for (String removeKey : toRemove) { adjustments.remove(removeKey); } - if (android.service.notification.Flags.notificationClassification() - && adjustments.containsKey(KEY_TYPE)) { + if (notificationClassification() && adjustments.containsKey(KEY_TYPE)) { final NotificationChannel newChannel = getClassificationChannelLocked(r, adjustments); if (newChannel == null || newChannel.getId().equals(r.getChannel().getId())) { adjustments.remove(KEY_TYPE); } else { + // Save the app-provided type for logging. + int classification = adjustments.getInt(KEY_TYPE); // swap app provided type with the real thing adjustments.putParcelable(KEY_TYPE, newChannel); + // Note that this value of isAlerting does not fully indicate whether a notif + // would make a sound or HUN on device; it is an approximation for metrics. + boolean isAlerting = r.getChannel().getImportance() >= IMPORTANCE_DEFAULT; + logClassificationChannelAdjustmentReceived(isPosted, isAlerting, classification, + r.getLifespanMs(System.currentTimeMillis())); } } r.addAdjustment(adjustment); @@ -7114,6 +7161,50 @@ public class NotificationManagerService extends SystemService { } @GuardedBy("mNotificationLock") + @Nullable + NotificationRecord removeAppProvidedSummaryOnClassificationLocked(String triggeringKey, + @Nullable String oldGroupKey) { + NotificationRecord canceledSummary = null; + NotificationRecord r = mNotificationsByKey.get(triggeringKey); + if (r == null || oldGroupKey == null) { + return null; + } + + if (r.getSbn().isAppGroup() && r.getNotification().isGroupChild()) { + NotificationRecord groupSummary = mSummaryByGroupKey.get(oldGroupKey); + // We only care about app-provided valid groups + if (groupSummary != null && !GroupHelper.isAggregatedGroup(groupSummary)) { + List<NotificationRecord> notificationsInGroup = + findGroupNotificationsLocked(r.getSbn().getPackageName(), + oldGroupKey, r.getUserId()); + // Remove the app-provided summary if only the summary is left in the + // original group, or summary + triggering notification that will be + // regrouped + boolean isOnlySummaryLeft = + (notificationsInGroup.size() <= 1) + || (notificationsInGroup.size() == 2 + && notificationsInGroup.contains(r) + && notificationsInGroup.contains(groupSummary)); + if (isOnlySummaryLeft) { + if (DBG) { + Slog.i(TAG, "Removing app summary (all children bundled): " + + groupSummary); + } + canceledSummary = groupSummary; + mSummaryByGroupKey.remove(oldGroupKey); + cancelNotification(Binder.getCallingUid(), Binder.getCallingPid(), + groupSummary.getSbn().getPackageName(), + groupSummary.getSbn().getTag(), + groupSummary.getSbn().getId(), 0, 0, false, groupSummary.getUserId(), + NotificationListenerService.REASON_GROUP_OPTIMIZATION, null); + } + } + } + + return canceledSummary; + } + + @GuardedBy("mNotificationLock") private boolean hasAutoGroupSummaryLocked(NotificationRecord record) { final String autbundledGroupKey; if (notificationForceGrouping()) { @@ -7493,6 +7584,11 @@ public class NotificationManagerService extends SystemService { mTtlHelper.dump(pw, " "); } } + + if (notificationForceGrouping()) { + pw.println("\n GroupHelper:"); + mGroupHelper.dump(pw, " "); + } } } @@ -11552,11 +11648,15 @@ public class NotificationManagerService extends SystemService { private static final String ATT_TYPES = "types"; private static final String ATT_DENIED = "denied_adjustments"; + private static final String ATT_ENABLED_TYPES = "enabled_key_types"; private static final String ATT_NAS_UNSUPPORTED = "unsupported_adjustments"; private final Object mLock = new Object(); @GuardedBy("mLock") + private Set<Integer> mAllowedAdjustmentKeyTypes = new ArraySet<>(); + + @GuardedBy("mLock") private Set<String> mAllowedAdjustments = new ArraySet<>(); @GuardedBy("mLock") @@ -11639,6 +11739,8 @@ public class NotificationManagerService extends SystemService { for (int i = 0; i < DEFAULT_ALLOWED_ADJUSTMENTS.length; i++) { mAllowedAdjustments.add(DEFAULT_ALLOWED_ADJUSTMENTS[i]); } + } else { + mAllowedAdjustmentKeyTypes.addAll(List.of(DEFAULT_ALLOWED_ADJUSTMENT_KEY_TYPES)); } } @@ -11726,6 +11828,42 @@ public class NotificationManagerService extends SystemService { } } + @FlaggedApi(android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION) + protected @NonNull boolean isAdjustmentKeyTypeAllowed(@Adjustment.Types int type) { + synchronized (mLock) { + if (notificationClassification()) { + return mAllowedAdjustmentKeyTypes.contains(type); + } + } + return false; + } + + @FlaggedApi(android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION) + protected @NonNull int[] getAllowedAdjustmentKeyTypes() { + synchronized (mLock) { + if (notificationClassification()) { + return mAllowedAdjustmentKeyTypes.stream() + .mapToInt(Integer::intValue).toArray(); + } + } + return new int[]{}; + } + + @FlaggedApi(android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION) + public void setAssistantAdjustmentKeyTypeState(@Adjustment.Types int type, + boolean enabled) { + if (!android.service.notification.Flags.notificationClassification()) { + return; + } + synchronized (mLock) { + if (enabled) { + mAllowedAdjustmentKeyTypes.add(type); + } else { + mAllowedAdjustmentKeyTypes.remove(type); + } + } + } + protected void onNotificationsSeenLocked(ArrayList<NotificationRecord> records) { for (final ManagedServiceInfo info : NotificationAssistants.this.getServices()) { ArrayList<String> keys = new ArrayList<>(records.size()); @@ -12165,27 +12303,46 @@ public class NotificationManagerService extends SystemService { @Override protected void writeExtraXmlTags(TypedXmlSerializer out) throws IOException { - if (!android.service.notification.Flags.notificationClassification()) { + if (!notificationClassification()) { return; } synchronized (mLock) { out.startTag(null, ATT_DENIED); out.attribute(null, ATT_TYPES, TextUtils.join(",", mDeniedAdjustments)); out.endTag(null, ATT_DENIED); + out.startTag(null, ATT_ENABLED_TYPES); + out.attribute(null, ATT_TYPES, + TextUtils.join(",", mAllowedAdjustmentKeyTypes)); + out.endTag(null, ATT_ENABLED_TYPES); } } @Override protected void readExtraTag(String tag, TypedXmlPullParser parser) throws IOException { - if (!android.service.notification.Flags.notificationClassification()) { + if (!notificationClassification()) { return; } if (ATT_DENIED.equals(tag)) { - final String types = XmlUtils.readStringAttribute(parser, ATT_TYPES); + final String keys = XmlUtils.readStringAttribute(parser, ATT_TYPES); synchronized (mLock) { mDeniedAdjustments.clear(); + if (!TextUtils.isEmpty(keys)) { + mDeniedAdjustments.addAll(Arrays.asList(keys.split(","))); + } + } + } else if (ATT_ENABLED_TYPES.equals(tag)) { + final String types = XmlUtils.readStringAttribute(parser, ATT_TYPES); + synchronized (mLock) { + mAllowedAdjustmentKeyTypes.clear(); if (!TextUtils.isEmpty(types)) { - mDeniedAdjustments.addAll(Arrays.asList(types.split(","))); + List<String> typeList = Arrays.asList(types.split(",")); + for (String type : typeList) { + try { + mAllowedAdjustmentKeyTypes.add(Integer.parseInt(type)); + } catch (NumberFormatException e) { + Slog.wtf(TAG, "Bad type specified", e); + } + } } } } diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index d5f13a8ff495..cfeacdf2bb0d 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -2422,7 +2422,7 @@ public class ZenModeHelper { || (mSuppressedEffects & SUPPRESSED_EFFECT_NOTIFICATIONS) != 0; // call restrictions final boolean muteCalls = zenAlarmsOnly - || (zenPriorityOnly && !(allowCalls || allowRepeatCallers)) + || (zenPriorityOnly && (!allowCalls || !allowRepeatCallers)) || (mSuppressedEffects & SUPPRESSED_EFFECT_CALLS) != 0; // alarm restrictions final boolean muteAlarms = zenPriorityOnly && !allowAlarms; diff --git a/services/core/java/com/android/server/om/OverlayActorEnforcer.java b/services/core/java/com/android/server/om/OverlayActorEnforcer.java index 015b7fd74211..38f39393a025 100644 --- a/services/core/java/com/android/server/om/OverlayActorEnforcer.java +++ b/services/core/java/com/android/server/om/OverlayActorEnforcer.java @@ -19,6 +19,7 @@ package com.android.server.om; import android.annotation.NonNull; import android.content.om.OverlayInfo; import android.content.om.OverlayableInfo; +import android.content.res.Flags; import android.net.Uri; import android.os.Process; import android.text.TextUtils; @@ -162,11 +163,15 @@ public class OverlayActorEnforcer { return ActorState.UNABLE_TO_GET_TARGET_OVERLAYABLE; } - if (targetOverlayable == null) { + // Framework doesn't have <overlayable> declaration by design, and we still want to be able + // to enable its overlays from the packages with the permission. + if (targetOverlayable == null + && !(Flags.rroControlForAndroidNoOverlayable() && targetPackageName.equals( + "android"))) { return ActorState.MISSING_OVERLAYABLE; } - String actor = targetOverlayable.actor; + final String actor = targetOverlayable == null ? null : targetOverlayable.actor; if (TextUtils.isEmpty(actor)) { // If there's no actor defined, fallback to the legacy permission check try { diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index 5653da07779b..2c0942337b1f 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -88,6 +88,7 @@ import android.content.pm.ShortcutServiceInternal; import android.content.pm.ShortcutServiceInternal.ShortcutChangeListener; import android.content.pm.UserInfo; import android.content.pm.UserProperties; +import android.database.ContentObserver; import android.graphics.Rect; import android.multiuser.Flags; import android.net.Uri; @@ -95,6 +96,7 @@ import android.os.Binder; import android.os.Bundle; import android.os.Handler; import android.os.IInterface; +import android.os.Looper; import android.os.ParcelFileDescriptor; import android.os.Process; import android.os.RemoteCallbackList; @@ -249,6 +251,7 @@ public class LauncherAppsService extends SystemService { private PackageInstallerService mPackageInstallerService; final LauncherAppsServiceInternal mInternal; + private SecureSettingsObserver mSecureSettingsObserver; @NonNull private final RemoteCallbackList<IDumpCallback> mDumpCallbacks = @@ -278,6 +281,7 @@ public class LauncherAppsService extends SystemService { mCallbackHandler = BackgroundThread.getHandler(); mDpm = (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE); mInternal = new LocalService(); + registerSettingsObserver(); } @VisibleForTesting @@ -2312,6 +2316,13 @@ public class LauncherAppsService extends SystemService { } } + void registerSettingsObserver() { + if (Flags.addLauncherUserConfig()) { + mSecureSettingsObserver = new SecureSettingsObserver(); + mSecureSettingsObserver.register(); + } + } + public static class ShortcutChangeHandler implements LauncherApps.ShortcutChangeCallback { private final UserManagerInternal mUserManagerInternal; @@ -2837,5 +2848,84 @@ public class LauncherAppsService extends SystemService { shortcutId, sourceBounds, startActivityOptions, targetUserId); } } + + class SecureSettingsObserver extends ContentObserver { + + SecureSettingsObserver() { + super(new Handler(Looper.getMainLooper())); + } + + @Override + public void onChange(boolean selfChange, Uri uri) { + super.onChange(selfChange, uri); + if (uri.equals( + Settings.Secure.getUriFor(Settings.Secure.HIDE_PRIVATESPACE_ENTRY_POINT))) { + + // This setting key only apply to private profile at the moment + UserHandle privateProfile = getPrivateProfile(); + if (privateProfile.getIdentifier() == UserHandle.USER_NULL) { + return; + } + + final int n = mListeners.beginBroadcast(); + try { + for (int i = 0; i < n; i++) { + final IOnAppsChangedListener listener = + mListeners.getBroadcastItem(i); + final BroadcastCookie cookie = + (BroadcastCookie) mListeners.getBroadcastCookie( + i); + if (!isEnabledProfileOf(cookie, privateProfile, + "onSecureSettingsChange")) { + Log.d(TAG, "onSecureSettingsChange: Skipping - profile not enabled" + + " or not accessible for package=" + cookie.packageName + + ", packageUid=" + cookie.callingUid); + } else { + try { + Log.d(TAG, + "onUserConfigChanged: triggering onUserConfigChanged"); + listener.onUserConfigChanged( + mUserManagerInternal.getLauncherUserInfo( + privateProfile.getIdentifier())); + } catch (RemoteException re) { + Slog.d(TAG, "onUserConfigChanged: Callback failed ", re); + } + } + } + } finally { + mListeners.finishBroadcast(); + } + } + } + + public void register() { + UserHandle privateProfile = getPrivateProfile(); + int parentUserId; + if (privateProfile.getIdentifier() == UserHandle.USER_NULL) { + // No private space available, register the observer for the current user + parentUserId = mContext.getUserId(); + } else { + parentUserId = mUserManagerInternal.getProfileParentId( + privateProfile.getIdentifier()); + } + mContext.getContentResolver().registerContentObserver( + Settings.Secure.getUriFor(Settings.Secure.HIDE_PRIVATESPACE_ENTRY_POINT), + true, this, parentUserId); + } + + public void unregister() { + mContext.getContentResolver().unregisterContentObserver(this); + } + + private UserHandle getPrivateProfile() { + UserInfo[] userInfos = mUserManagerInternal.getUserInfos(); + for (UserInfo u : userInfos) { + if (u.isPrivateProfile()) { + return UserHandle.of(u.id); + } + } + return UserHandle.of(UserHandle.USER_NULL); + } + } } } diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 498659427a21..06e29c2c1408 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -21,6 +21,7 @@ import static android.content.Intent.ACTION_SCREEN_ON; import static android.content.Intent.EXTRA_USER_ID; import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; +import static android.content.pm.LauncherUserInfo.PRIVATE_SPACE_ENTRYPOINT_HIDDEN; import static android.content.pm.PackageManager.FEATURE_AUTOMOTIVE; import static android.content.pm.PackageManager.FEATURE_EMBEDDED; import static android.content.pm.PackageManager.FEATURE_LEANBACK; @@ -32,6 +33,7 @@ import static android.os.UserManager.SYSTEM_USER_MODE_EMULATION_PROPERTY; import static android.os.UserManager.USER_OPERATION_ERROR_UNKNOWN; import static android.os.UserManager.USER_OPERATION_ERROR_USER_RESTRICTED; import static android.os.UserManager.USER_TYPE_PROFILE_PRIVATE; +import static android.provider.Settings.Secure.HIDE_PRIVATESPACE_ENTRY_POINT; import static com.android.internal.app.SetScreenLockDialogActivity.EXTRA_ORIGIN_USER_ID; import static com.android.internal.app.SetScreenLockDialogActivity.LAUNCH_REASON_DISABLE_QUIET_MODE; @@ -7946,11 +7948,25 @@ public class UserManagerService extends IUserManager.Stub { } if (userInfo != null) { final UserTypeDetails userDetails = getUserTypeDetails(userInfo); - final LauncherUserInfo uiInfo = new LauncherUserInfo.Builder( - userDetails.getName(), - userInfo.serialNumber) - .build(); - return uiInfo; + + if (Flags.addLauncherUserConfig()) { + Bundle config = new Bundle(); + if (userInfo.isPrivateProfile()) { + try { + int parentId = getProfileParentIdUnchecked(userId); + config.putBoolean(PRIVATE_SPACE_ENTRYPOINT_HIDDEN, + Settings.Secure.getIntForUser(mContext.getContentResolver(), + HIDE_PRIVATESPACE_ENTRY_POINT, parentId) == 1); + } catch (Settings.SettingNotFoundException e) { + throw new RuntimeException(e); + } + } + return new LauncherUserInfo.Builder(userDetails.getName(), + userInfo.serialNumber, config).build(); + } + + return new LauncherUserInfo.Builder(userDetails.getName(), + userInfo.serialNumber).build(); } else { return null; } diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java index 07fd1cb544f6..acf62dcdd1ce 100644 --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java @@ -235,6 +235,7 @@ final class DefaultPermissionGrantPolicy { NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.BLUETOOTH_SCAN); NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.UWB_RANGING); NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.NEARBY_WIFI_DEVICES); + NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.RANGING); } private static final Set<String> NOTIFICATION_PERMISSIONS = new ArraySet<>(); diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index fc24e62de04e..19406b46f5c0 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -84,6 +84,7 @@ import static android.view.WindowManagerGlobal.ADD_PERMISSION_DENIED; import static android.view.contentprotection.flags.Flags.createAccessibilityOverlayAppOpEnabled; import static com.android.hardware.input.Flags.emojiAndScreenshotKeycodesAvailable; +import static com.android.hardware.input.Flags.enableTalkbackAndMagnifierKeyGestures; import static com.android.hardware.input.Flags.keyboardA11yShortcutControl; import static com.android.hardware.input.Flags.modifierShortcutDump; import static com.android.hardware.input.Flags.useKeyGestureEventHandler; @@ -183,6 +184,7 @@ import android.provider.DeviceConfig; import android.provider.MediaStore; import android.provider.Settings; import android.provider.Settings.Secure; +import android.service.SensorPrivacyToggleSourceProto; import android.service.dreams.DreamManagerInternal; import android.service.dreams.DreamService; import android.service.dreams.IDreamManager; @@ -3612,7 +3614,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } break; case KeyEvent.KEYCODE_T: - if (keyboardA11yShortcutControl()) { + if (enableTalkbackAndMagnifierKeyGestures()) { if (firstDown && event.isMetaPressed() && event.isAltPressed()) { mTalkbackShortcutController.toggleTalkback(mCurrentUserId, TalkbackShortcutController.ShortcutSource.KEYBOARD); @@ -4112,7 +4114,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { return mDefaultDisplayPolicy.isAwake() && mAccessibilityShortcutController .isAccessibilityShortcutAvailable(false); case KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_TALKBACK: - return keyboardA11yShortcutControl(); + return enableTalkbackAndMagnifierKeyGestures(); case KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_SLOW_KEYS: return InputSettings.isAccessibilitySlowKeysFeatureFlagEnabled() && keyboardA11yShortcutControl(); @@ -4345,7 +4347,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } return true; case KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_TALKBACK: - if (keyboardA11yShortcutControl()) { + if (enableTalkbackAndMagnifierKeyGestures()) { if (complete) { mTalkbackShortcutController.toggleTalkback(mCurrentUserId, TalkbackShortcutController.ShortcutSource.KEYBOARD); @@ -4535,8 +4537,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { SensorPrivacyManager.TOGGLE_TYPE_SOFTWARE, SensorPrivacyManager.Sensors.MICROPHONE); - mSensorPrivacyManager.setSensorPrivacy(SensorPrivacyManager.Sensors.MICROPHONE, - !isEnabled); + mSensorPrivacyManager.setSensorPrivacy(SensorPrivacyToggleSourceProto.OTHER, + SensorPrivacyManager.Sensors.MICROPHONE, !isEnabled, mCurrentUserId); int toastTextResId; if (isEnabled) { diff --git a/services/core/java/com/android/server/power/FrameworkStatsLogger.java b/services/core/java/com/android/server/power/FrameworkStatsLogger.java new file mode 100644 index 000000000000..78ad30548075 --- /dev/null +++ b/services/core/java/com/android/server/power/FrameworkStatsLogger.java @@ -0,0 +1,62 @@ +/* + * 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 android.os.WorkSource.WorkChain; + +import com.android.internal.util.FrameworkStatsLog; + +public class FrameworkStatsLogger { + public enum WakelockEventType { + ACQUIRE, + RELEASE + } + + /** Log WakelockStateChanged push atom without a WorkChain. */ + public void wakelockStateChanged( + int ownerUid, String tag, int powerManagerWakeLockLevel, WakelockEventType eventType) { + int event = + (eventType == WakelockEventType.ACQUIRE) + ? FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE + : FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE; + FrameworkStatsLog.write_non_chained( + FrameworkStatsLog.WAKELOCK_STATE_CHANGED, + ownerUid, + null, + powerManagerWakeLockLevel, + tag, + event, + FrameworkStatsLog.WAKELOCK_STATE_CHANGED__PROCESS_STATE__PROCESS_STATE_UNKNOWN); + } + + /** Log WakelockStateChanged push atom with a WorkChain. */ + public void wakelockStateChanged( + String tag, WorkChain wc, int powerManagerWakeLockLevel, WakelockEventType eventType) { + int event = + (eventType == WakelockEventType.ACQUIRE) + ? FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE + : FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE; + FrameworkStatsLog.write( + FrameworkStatsLog.WAKELOCK_STATE_CHANGED, + wc.getUids(), + wc.getTags(), + powerManagerWakeLockLevel, + tag, + event, + FrameworkStatsLog.WAKELOCK_STATE_CHANGED__PROCESS_STATE__PROCESS_STATE_UNKNOWN); + } +} diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java index 8ba56c5320f2..0c3c46c75eee 100644 --- a/services/core/java/com/android/server/power/Notifier.java +++ b/services/core/java/com/android/server/power/Notifier.java @@ -33,6 +33,7 @@ import android.media.RingtoneManager; import android.metrics.LogMaker; import android.net.Uri; import android.os.BatteryStats; +import android.os.BatteryStatsInternal; import android.os.Bundle; import android.os.Handler; import android.os.IWakeLockCallback; @@ -48,6 +49,7 @@ import android.os.VibrationAttributes; import android.os.VibrationEffect; import android.os.Vibrator; import android.os.WorkSource; +import android.os.WorkSource.WorkChain; import android.provider.Settings; import android.telephony.TelephonyManager; import android.util.EventLog; @@ -66,10 +68,12 @@ import com.android.server.LocalServices; import com.android.server.input.InputManagerInternal; import com.android.server.inputmethod.InputMethodManagerInternal; import com.android.server.policy.WindowManagerPolicy; +import com.android.server.power.FrameworkStatsLogger.WakelockEventType; import com.android.server.power.feature.PowerManagerFlags; import com.android.server.statusbar.StatusBarManagerInternal; import java.io.PrintWriter; +import java.util.List; import java.util.UUID; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; @@ -195,6 +199,9 @@ public class Notifier { private final PowerManagerFlags mFlags; + private final BatteryStatsInternal mBatteryStatsInternal; + private final FrameworkStatsLogger mFrameworkStatsLogger; + public Notifier(Looper looper, Context context, IBatteryStats batteryStats, SuspendBlocker suspendBlocker, WindowManagerPolicy policy, FaceDownDetector faceDownDetector, ScreenUndimDetector screenUndimDetector, @@ -241,6 +248,14 @@ public class Notifier { } catch (RemoteException ex) { } FrameworkStatsLog.write(FrameworkStatsLog.INTERACTIVE_STATE_CHANGED, FrameworkStatsLog.INTERACTIVE_STATE_CHANGED__STATE__ON); + + if (mFlags.isMoveWscLoggingToNotifierEnabled()) { + mBatteryStatsInternal = mInjector.getBatteryStatsInternal(); + mFrameworkStatsLogger = mInjector.getFrameworkStatsLogger(); + } else { + mBatteryStatsInternal = null; + mFrameworkStatsLogger = null; + } } /** @@ -277,6 +292,7 @@ public class Notifier { + ", ownerUid=" + ownerUid + ", ownerPid=" + ownerPid + ", workSource=" + workSource); } + logWakelockStateChanged(flags, tag, ownerUid, workSource, WakelockEventType.ACQUIRE); notifyWakeLockListener(callback, tag, true, ownerUid, ownerPid, flags, workSource, packageName, historyTag); if (!mFlags.improveWakelockLatency()) { @@ -380,6 +396,10 @@ public class Notifier { + ", workSource=" + newWorkSource); } + logWakelockStateChanged(flags, tag, ownerUid, workSource, WakelockEventType.RELEASE); + logWakelockStateChanged( + newFlags, newTag, newOwnerUid, newWorkSource, WakelockEventType.ACQUIRE); + final boolean unimportantForLogging = newOwnerUid == Process.SYSTEM_UID && (newFlags & PowerManager.UNIMPORTANT_FOR_LOGGING) != 0; try { @@ -425,6 +445,7 @@ public class Notifier { + ", ownerUid=" + ownerUid + ", ownerPid=" + ownerPid + ", workSource=" + workSource); } + logWakelockStateChanged(flags, tag, ownerUid, workSource, WakelockEventType.RELEASE); notifyWakeLockListener(callback, tag, false, ownerUid, ownerPid, flags, workSource, packageName, historyTag); if (!mFlags.improveWakelockLatency()) { @@ -1258,6 +1279,44 @@ public class Notifier { } } + private void logWakelockStateChanged( + int flags, + String tag, + int ownerUid, + WorkSource workSource, + WakelockEventType eventType) { + if (mBatteryStatsInternal == null) { + return; + } + final int type = flags & PowerManager.WAKE_LOCK_LEVEL_MASK; + if (workSource == null || workSource.isEmpty()) { + final int mappedUid = mBatteryStatsInternal.getOwnerUid(ownerUid); + mFrameworkStatsLogger.wakelockStateChanged(mappedUid, tag, type, eventType); + } else { + for (int i = 0; i < workSource.size(); ++i) { + final int mappedUid = mBatteryStatsInternal.getOwnerUid(workSource.getUid(i)); + mFrameworkStatsLogger.wakelockStateChanged(mappedUid, tag, type, eventType); + } + + List<WorkChain> workChains = workSource.getWorkChains(); + if (workChains != null) { + for (WorkChain workChain : workChains) { + WorkChain mappedWorkChain = new WorkChain(); + // Cache getUids() and getTags() because they make an arraycopy. + int[] uids = workChain.getUids(); + String[] tags = workChain.getTags(); + + for (int i = 0; i < workChain.getSize(); ++i) { + final int mappedUid = mBatteryStatsInternal.getOwnerUid(uids[i]); + mappedWorkChain.addNode(mappedUid, tags[i]); + } + mFrameworkStatsLogger.wakelockStateChanged( + tag, mappedWorkChain, type, eventType); + } + } + } + } + public interface Injector { /** * Gets the current time in millis @@ -1273,9 +1332,15 @@ public class Notifier { * Gets the AppOpsManager system service */ AppOpsManager getAppOpsManager(Context context); + + /** Gets the BatteryStatsInternal object */ + BatteryStatsInternal getBatteryStatsInternal(); + + /** Get the FrameworkStatsLogger object */ + FrameworkStatsLogger getFrameworkStatsLogger(); } - static class RealInjector implements Injector { + class RealInjector implements Injector { @Override public long currentTimeMillis() { return System.currentTimeMillis(); @@ -1290,5 +1355,15 @@ public class Notifier { public AppOpsManager getAppOpsManager(Context context) { return context.getSystemService(AppOpsManager.class); } + + @Override + public BatteryStatsInternal getBatteryStatsInternal() { + return LocalServices.getService(BatteryStatsInternal.class); + } + + @Override + public FrameworkStatsLogger getFrameworkStatsLogger() { + return new FrameworkStatsLogger(); + } } } diff --git a/services/core/java/com/android/server/power/ThermalManagerService.java b/services/core/java/com/android/server/power/ThermalManagerService.java index 78bc06c27130..42dbb7974fe2 100644 --- a/services/core/java/com/android/server/power/ThermalManagerService.java +++ b/services/core/java/com/android/server/power/ThermalManagerService.java @@ -43,6 +43,7 @@ import android.os.Handler; import android.os.HwBinder; import android.os.IBinder; import android.os.IThermalEventListener; +import android.os.IThermalHeadroomListener; import android.os.IThermalService; import android.os.IThermalStatusListener; import android.os.PowerManager; @@ -59,6 +60,7 @@ import android.os.Trace; import android.util.ArrayMap; import android.util.EventLog; import android.util.Slog; +import android.util.SparseArray; import android.util.StatsEvent; import com.android.internal.annotations.GuardedBy; @@ -96,6 +98,15 @@ public class ThermalManagerService extends SystemService { /** Input range limits for getThermalHeadroom API */ public static final int MIN_FORECAST_SEC = 0; public static final int MAX_FORECAST_SEC = 60; + public static final int DEFAULT_FORECAST_SECONDS = 10; + public static final int HEADROOM_CALLBACK_MIN_INTERVAL_MILLIS = 5000; + // headroom to temperature conversion: 3C every 0.1 headroom difference + // if no throttling event, the temperature difference should be at least 0.9C (or 0.03 headroom) + // to make a callback + public static final float HEADROOM_CALLBACK_MIN_DIFFERENCE = 0.03f; + // if no throttling event, the threshold headroom difference should be at least 0.01 (or 0.3C) + // to make a callback + public static final float HEADROOM_THRESHOLD_CALLBACK_MIN_DIFFERENCE = 0.01f; /** Lock to protect listen list. */ private final Object mLock = new Object(); @@ -113,6 +124,15 @@ public class ThermalManagerService extends SystemService { private final RemoteCallbackList<IThermalStatusListener> mThermalStatusListeners = new RemoteCallbackList<>(); + /** Registered observers of the thermal headroom. */ + @GuardedBy("mLock") + private final RemoteCallbackList<IThermalHeadroomListener> mThermalHeadroomListeners = + new RemoteCallbackList<>(); + @GuardedBy("mLock") + private long mLastHeadroomCallbackTimeMillis; + @GuardedBy("mLock") + private HeadroomCallbackData mLastHeadroomCallbackData = null; + /** Current thermal status */ @GuardedBy("mLock") private int mStatus; @@ -133,7 +153,7 @@ public class ThermalManagerService extends SystemService { /** Watches temperatures to forecast when throttling will occur */ @VisibleForTesting - final TemperatureWatcher mTemperatureWatcher = new TemperatureWatcher(); + final TemperatureWatcher mTemperatureWatcher; private final ThermalHalWrapper.WrapperThermalChangedCallback mWrapperCallback = new ThermalHalWrapper.WrapperThermalChangedCallback() { @@ -151,8 +171,14 @@ public class ThermalManagerService extends SystemService { public void onThresholdChanged(TemperatureThreshold threshold) { final long token = Binder.clearCallingIdentity(); try { + final HeadroomCallbackData data; synchronized (mTemperatureWatcher.mSamples) { + Slog.d(TAG, "Updating skin threshold: " + threshold); mTemperatureWatcher.updateTemperatureThresholdLocked(threshold, true); + data = mTemperatureWatcher.getHeadroomCallbackDataLocked(); + } + synchronized (mLock) { + checkAndNotifyHeadroomListenersLocked(data); } } finally { Binder.restoreCallingIdentity(token); @@ -175,6 +201,7 @@ public class ThermalManagerService extends SystemService { halWrapper.setCallback(mWrapperCallback); } mStatus = Temperature.THROTTLING_NONE; + mTemperatureWatcher = new TemperatureWatcher(); } @Override @@ -231,32 +258,79 @@ public class ThermalManagerService extends SystemService { } } - private void postStatusListener(IThermalStatusListener listener) { + @GuardedBy("mLock") + private void postStatusListenerLocked(IThermalStatusListener listener) { final boolean thermalCallbackQueued = FgThread.getHandler().post(() -> { try { listener.onStatusChange(mStatus); } catch (RemoteException | RuntimeException e) { - Slog.e(TAG, "Thermal callback failed to call", e); + Slog.e(TAG, "Thermal status callback failed to call", e); } }); if (!thermalCallbackQueued) { - Slog.e(TAG, "Thermal callback failed to queue"); + Slog.e(TAG, "Thermal status callback failed to queue"); } } + @GuardedBy("mLock") private void notifyStatusListenersLocked() { final int length = mThermalStatusListeners.beginBroadcast(); try { for (int i = 0; i < length; i++) { final IThermalStatusListener listener = mThermalStatusListeners.getBroadcastItem(i); - postStatusListener(listener); + postStatusListenerLocked(listener); } } finally { mThermalStatusListeners.finishBroadcast(); } } + @GuardedBy("mLock") + private void postHeadroomListenerLocked(IThermalHeadroomListener listener, + HeadroomCallbackData data) { + if (!mHalReady.get()) { + return; + } + final boolean thermalCallbackQueued = FgThread.getHandler().post(() -> { + try { + if (Float.isNaN(data.mHeadroom)) { + return; + } + listener.onHeadroomChange(data.mHeadroom, data.mForecastHeadroom, + data.mForecastSeconds, data.mHeadroomThresholds); + } catch (RemoteException | RuntimeException e) { + Slog.e(TAG, "Thermal headroom callback failed to call", e); + } + }); + if (!thermalCallbackQueued) { + Slog.e(TAG, "Thermal headroom callback failed to queue"); + } + } + + @GuardedBy("mLock") + private void checkAndNotifyHeadroomListenersLocked(HeadroomCallbackData data) { + if (!data.isSignificantDifferentFrom(mLastHeadroomCallbackData) + && System.currentTimeMillis() + < mLastHeadroomCallbackTimeMillis + HEADROOM_CALLBACK_MIN_INTERVAL_MILLIS) { + // skip notifying the client with similar data within a short period + return; + } + mLastHeadroomCallbackTimeMillis = System.currentTimeMillis(); + mLastHeadroomCallbackData = data; + final int length = mThermalHeadroomListeners.beginBroadcast(); + try { + for (int i = 0; i < length; i++) { + final IThermalHeadroomListener listener = + mThermalHeadroomListeners.getBroadcastItem(i); + postHeadroomListenerLocked(listener, data); + } + } finally { + mThermalHeadroomListeners.finishBroadcast(); + } + } + + @GuardedBy("mLock") private void onTemperatureMapChangedLocked() { int newStatus = Temperature.THROTTLING_NONE; final int count = mTemperatureMap.size(); @@ -272,6 +346,7 @@ public class ThermalManagerService extends SystemService { } } + @GuardedBy("mLock") private void setStatusLocked(int newStatus) { if (newStatus != mStatus) { Trace.traceCounter(Trace.TRACE_TAG_POWER, "ThermalManagerService.status", newStatus); @@ -280,18 +355,18 @@ public class ThermalManagerService extends SystemService { } } - private void postEventListenerCurrentTemperatures(IThermalEventListener listener, + @GuardedBy("mLock") + private void postEventListenerCurrentTemperaturesLocked(IThermalEventListener listener, @Nullable Integer type) { - synchronized (mLock) { - final int count = mTemperatureMap.size(); - for (int i = 0; i < count; i++) { - postEventListener(mTemperatureMap.valueAt(i), listener, - type); - } + final int count = mTemperatureMap.size(); + for (int i = 0; i < count; i++) { + postEventListenerLocked(mTemperatureMap.valueAt(i), listener, + type); } } - private void postEventListener(Temperature temperature, + @GuardedBy("mLock") + private void postEventListenerLocked(Temperature temperature, IThermalEventListener listener, @Nullable Integer type) { // Skip if listener registered with a different type @@ -302,14 +377,15 @@ public class ThermalManagerService extends SystemService { try { listener.notifyThrottling(temperature); } catch (RemoteException | RuntimeException e) { - Slog.e(TAG, "Thermal callback failed to call", e); + Slog.e(TAG, "Thermal event callback failed to call", e); } }); if (!thermalCallbackQueued) { - Slog.e(TAG, "Thermal callback failed to queue"); + Slog.e(TAG, "Thermal event callback failed to queue"); } } + @GuardedBy("mLock") private void notifyEventListenersLocked(Temperature temperature) { final int length = mThermalEventListeners.beginBroadcast(); try { @@ -318,7 +394,7 @@ public class ThermalManagerService extends SystemService { mThermalEventListeners.getBroadcastItem(i); final Integer type = (Integer) mThermalEventListeners.getBroadcastCookie(i); - postEventListener(temperature, listener, type); + postEventListenerLocked(temperature, listener, type); } } finally { mThermalEventListeners.finishBroadcast(); @@ -348,17 +424,31 @@ public class ThermalManagerService extends SystemService { } } - private void onTemperatureChanged(Temperature temperature, boolean sendStatus) { + private void onTemperatureChanged(Temperature temperature, boolean sendCallback) { shutdownIfNeeded(temperature); synchronized (mLock) { Temperature old = mTemperatureMap.put(temperature.getName(), temperature); if (old == null || old.getStatus() != temperature.getStatus()) { notifyEventListenersLocked(temperature); } - if (sendStatus) { + if (sendCallback) { onTemperatureMapChangedLocked(); } } + if (sendCallback && Flags.allowThermalThresholdsCallback() + && temperature.getType() == Temperature.TYPE_SKIN) { + final HeadroomCallbackData data; + synchronized (mTemperatureWatcher.mSamples) { + Slog.d(TAG, "Updating new temperature: " + temperature); + mTemperatureWatcher.updateTemperatureSampleLocked(System.currentTimeMillis(), + temperature); + mTemperatureWatcher.mCachedHeadrooms.clear(); + data = mTemperatureWatcher.getHeadroomCallbackDataLocked(); + } + synchronized (mLock) { + checkAndNotifyHeadroomListenersLocked(data); + } + } } private void registerStatsCallbacks() { @@ -399,7 +489,7 @@ public class ThermalManagerService extends SystemService { return false; } // Notify its callback after new client registered. - postEventListenerCurrentTemperatures(listener, null); + postEventListenerCurrentTemperaturesLocked(listener, null); return true; } finally { Binder.restoreCallingIdentity(token); @@ -415,11 +505,11 @@ public class ThermalManagerService extends SystemService { synchronized (mLock) { final long token = Binder.clearCallingIdentity(); try { - if (!mThermalEventListeners.register(listener, new Integer(type))) { + if (!mThermalEventListeners.register(listener, type)) { return false; } // Notify its callback after new client registered. - postEventListenerCurrentTemperatures(listener, new Integer(type)); + postEventListenerCurrentTemperaturesLocked(listener, type); return true; } finally { Binder.restoreCallingIdentity(token); @@ -484,7 +574,7 @@ public class ThermalManagerService extends SystemService { return false; } // Notify its callback after new client registered. - postStatusListener(listener); + postStatusListenerLocked(listener); return true; } finally { Binder.restoreCallingIdentity(token); @@ -557,11 +647,50 @@ public class ThermalManagerService extends SystemService { } @Override + public boolean registerThermalHeadroomListener(IThermalHeadroomListener listener) { + if (!mHalReady.get()) { + return false; + } + synchronized (mLock) { + // Notify its callback after new client registered. + final long token = Binder.clearCallingIdentity(); + try { + if (!mThermalHeadroomListeners.register(listener)) { + return false; + } + } finally { + Binder.restoreCallingIdentity(token); + } + } + final HeadroomCallbackData data; + synchronized (mTemperatureWatcher.mSamples) { + data = mTemperatureWatcher.getHeadroomCallbackDataLocked(); + } + // Notify its callback after new client registered. + synchronized (mLock) { + postHeadroomListenerLocked(listener, data); + } + return true; + } + + @Override + public boolean unregisterThermalHeadroomListener(IThermalHeadroomListener listener) { + synchronized (mLock) { + final long token = Binder.clearCallingIdentity(); + try { + return mThermalHeadroomListeners.unregister(listener); + } finally { + Binder.restoreCallingIdentity(token); + } + } + } + + @Override public float getThermalHeadroom(int forecastSeconds) { if (!mHalReady.get()) { FrameworkStatsLog.write(FrameworkStatsLog.THERMAL_HEADROOM_CALLED, getCallingUid(), - FrameworkStatsLog.THERMAL_HEADROOM_CALLED__API_STATUS__HAL_NOT_READY, - Float.NaN, forecastSeconds); + FrameworkStatsLog.THERMAL_HEADROOM_CALLED__API_STATUS__HAL_NOT_READY, + Float.NaN, forecastSeconds); return Float.NaN; } @@ -570,8 +699,8 @@ public class ThermalManagerService extends SystemService { Slog.d(TAG, "Invalid forecastSeconds: " + forecastSeconds); } FrameworkStatsLog.write(FrameworkStatsLog.THERMAL_HEADROOM_CALLED, getCallingUid(), - FrameworkStatsLog.THERMAL_HEADROOM_CALLED__API_STATUS__INVALID_ARGUMENT, - Float.NaN, forecastSeconds); + FrameworkStatsLog.THERMAL_HEADROOM_CALLED__API_STATUS__INVALID_ARGUMENT, + Float.NaN, forecastSeconds); return Float.NaN; } @@ -592,13 +721,10 @@ public class ThermalManagerService extends SystemService { THERMAL_HEADROOM_THRESHOLDS_CALLED__API_STATUS__FEATURE_NOT_SUPPORTED); throw new UnsupportedOperationException("Thermal headroom thresholds not enabled"); } - synchronized (mTemperatureWatcher.mSamples) { - FrameworkStatsLog.write(FrameworkStatsLog.THERMAL_HEADROOM_THRESHOLDS_CALLED, - Binder.getCallingUid(), - THERMAL_HEADROOM_THRESHOLDS_CALLED__API_STATUS__SUCCESS); - return Arrays.copyOf(mTemperatureWatcher.mHeadroomThresholds, - mTemperatureWatcher.mHeadroomThresholds.length); - } + FrameworkStatsLog.write(FrameworkStatsLog.THERMAL_HEADROOM_THRESHOLDS_CALLED, + Binder.getCallingUid(), + THERMAL_HEADROOM_THRESHOLDS_CALLED__API_STATUS__SUCCESS); + return mTemperatureWatcher.getHeadroomThresholds(); } @Override @@ -711,7 +837,7 @@ public class ThermalManagerService extends SystemService { class ThermalShellCommand extends ShellCommand { @Override public int onCommand(String cmd) { - switch(cmd != null ? cmd : "") { + switch (cmd != null ? cmd : "") { case "inject-temperature": return runInjectTemperature(); case "override-status": @@ -1112,7 +1238,8 @@ public class ThermalManagerService extends SystemService { } @Override - @NonNull protected List<TemperatureThreshold> getTemperatureThresholds( + @NonNull + protected List<TemperatureThreshold> getTemperatureThresholds( boolean shouldFilter, int type) { synchronized (mHalLock) { final List<TemperatureThreshold> ret = new ArrayList<>(); @@ -1631,14 +1758,68 @@ public class ThermalManagerService extends SystemService { } } + private static final class HeadroomCallbackData { + float mHeadroom; + float mForecastHeadroom; + int mForecastSeconds; + float[] mHeadroomThresholds; + + HeadroomCallbackData(float headroom, float forecastHeadroom, int forecastSeconds, + @NonNull float[] headroomThresholds) { + mHeadroom = headroom; + mForecastHeadroom = forecastHeadroom; + mForecastSeconds = forecastSeconds; + mHeadroomThresholds = headroomThresholds; + } + + private boolean isSignificantDifferentFrom(HeadroomCallbackData other) { + if (other == null) return true; + // currently this is always the same as DEFAULT_FORECAST_SECONDS, when it's retried + // from thermal HAL, we may want to adjust this. + if (this.mForecastSeconds != other.mForecastSeconds) return true; + if (Math.abs(this.mHeadroom - other.mHeadroom) + >= HEADROOM_CALLBACK_MIN_DIFFERENCE) return true; + if (Math.abs(this.mForecastHeadroom - other.mForecastHeadroom) + >= HEADROOM_CALLBACK_MIN_DIFFERENCE) return true; + for (int i = 0; i < this.mHeadroomThresholds.length; i++) { + if (Float.isNaN(this.mHeadroomThresholds[i]) != Float.isNaN( + other.mHeadroomThresholds[i])) { + return true; + } + if (Math.abs(this.mHeadroomThresholds[i] - other.mHeadroomThresholds[i]) + >= HEADROOM_THRESHOLD_CALLBACK_MIN_DIFFERENCE) { + return true; + } + } + return false; + } + + @Override + public String toString() { + return "HeadroomCallbackData[mHeadroom=" + mHeadroom + ", mForecastHeadroom=" + + mForecastHeadroom + ", mForecastSeconds=" + mForecastSeconds + + ", mHeadroomThresholds=" + Arrays.toString(mHeadroomThresholds) + "]"; + } + } + @VisibleForTesting class TemperatureWatcher { + private static final int RING_BUFFER_SIZE = 30; + private static final int INACTIVITY_THRESHOLD_MILLIS = 10000; + @VisibleForTesting + long mInactivityThresholdMillis = INACTIVITY_THRESHOLD_MILLIS; + private final Handler mHandler = BackgroundThread.getHandler(); - /** Map of skin temperature sensor name to a corresponding list of samples */ + /** + * Map of skin temperature sensor name to a corresponding list of samples + * Updates to the samples should also clear the headroom cache. + */ @GuardedBy("mSamples") @VisibleForTesting final ArrayMap<String, ArrayList<Sample>> mSamples = new ArrayMap<>(); + @GuardedBy("mSamples") + private final SparseArray<Float> mCachedHeadrooms = new SparseArray<>(2); /** Map of skin temperature sensor name to the corresponding SEVERE temperature threshold */ @GuardedBy("mSamples") @@ -1650,13 +1831,9 @@ public class ThermalManagerService extends SystemService { @GuardedBy("mSamples") private long mLastForecastCallTimeMillis = 0; - private static final int INACTIVITY_THRESHOLD_MILLIS = 10000; - @VisibleForTesting - long mInactivityThresholdMillis = INACTIVITY_THRESHOLD_MILLIS; - void getAndUpdateThresholds() { List<TemperatureThreshold> thresholds = - mHalWrapper.getTemperatureThresholds(true, Temperature.TYPE_SKIN); + mHalWrapper.getTemperatureThresholds(true, Temperature.TYPE_SKIN); synchronized (mSamples) { if (Flags.allowThermalHeadroomThresholds()) { Arrays.fill(mHeadroomThresholds, Float.NaN); @@ -1684,6 +1861,8 @@ public class ThermalManagerService extends SystemService { return; } if (override) { + Slog.d(TAG, "Headroom cache cleared on threshold update " + threshold); + mCachedHeadrooms.clear(); Arrays.fill(mHeadroomThresholds, Float.NaN); } for (int severity = ThrottlingSeverity.LIGHT; @@ -1693,62 +1872,61 @@ public class ThermalManagerService extends SystemService { if (Float.isNaN(t)) { continue; } - synchronized (mSamples) { - if (severity == ThrottlingSeverity.SEVERE) { - mHeadroomThresholds[severity] = 1.0f; - continue; - } - float headroom = normalizeTemperature(t, severeThreshold); - if (Float.isNaN(mHeadroomThresholds[severity])) { - mHeadroomThresholds[severity] = headroom; - } else { - float lastHeadroom = mHeadroomThresholds[severity]; - mHeadroomThresholds[severity] = Math.min(lastHeadroom, headroom); - } + if (severity == ThrottlingSeverity.SEVERE) { + mHeadroomThresholds[severity] = 1.0f; + continue; + } + float headroom = normalizeTemperature(t, severeThreshold); + if (Float.isNaN(mHeadroomThresholds[severity])) { + mHeadroomThresholds[severity] = headroom; + } else { + float lastHeadroom = mHeadroomThresholds[severity]; + mHeadroomThresholds[severity] = Math.min(lastHeadroom, headroom); } } } } - private static final int RING_BUFFER_SIZE = 30; - - private void updateTemperature() { + private void getAndUpdateTemperatureSamples() { synchronized (mSamples) { if (SystemClock.elapsedRealtime() - mLastForecastCallTimeMillis < mInactivityThresholdMillis) { // Trigger this again after a second as long as forecast has been called more // recently than the inactivity timeout - mHandler.postDelayed(this::updateTemperature, 1000); + mHandler.postDelayed(this::getAndUpdateTemperatureSamples, 1000); } else { // Otherwise, we've been idle for at least 10 seconds, so we should // shut down mSamples.clear(); + mCachedHeadrooms.clear(); return; } long now = SystemClock.elapsedRealtime(); - List<Temperature> temperatures = mHalWrapper.getCurrentTemperatures(true, + final List<Temperature> temperatures = mHalWrapper.getCurrentTemperatures(true, Temperature.TYPE_SKIN); - - for (int t = 0; t < temperatures.size(); ++t) { - Temperature temperature = temperatures.get(t); - - // Filter out invalid temperatures. If this results in no values being stored at - // all, the mSamples.empty() check in getForecast() will catch it. - if (Float.isNaN(temperature.getValue())) { - continue; - } - - ArrayList<Sample> samples = mSamples.computeIfAbsent(temperature.getName(), - k -> new ArrayList<>(RING_BUFFER_SIZE)); - if (samples.size() == RING_BUFFER_SIZE) { - samples.removeFirst(); - } - samples.add(new Sample(now, temperature.getValue())); + for (Temperature temperature : temperatures) { + updateTemperatureSampleLocked(now, temperature); } + mCachedHeadrooms.clear(); } } + @GuardedBy("mSamples") + private void updateTemperatureSampleLocked(long timeNow, Temperature temperature) { + // Filter out invalid temperatures. If this results in no values being stored at + // all, the mSamples.empty() check in getForecast() will catch it. + if (Float.isNaN(temperature.getValue())) { + return; + } + ArrayList<Sample> samples = mSamples.computeIfAbsent(temperature.getName(), + k -> new ArrayList<>(RING_BUFFER_SIZE)); + if (samples.size() == RING_BUFFER_SIZE) { + samples.removeFirst(); + } + samples.add(new Sample(timeNow, temperature.getValue())); + } + /** * Calculates the trend using a linear regression. As the samples are degrees Celsius with * associated timestamps in milliseconds, the slope is in degrees Celsius per millisecond. @@ -1801,7 +1979,7 @@ public class ThermalManagerService extends SystemService { synchronized (mSamples) { mLastForecastCallTimeMillis = SystemClock.elapsedRealtime(); if (mSamples.isEmpty()) { - updateTemperature(); + getAndUpdateTemperatureSamples(); } // If somehow things take much longer than expected or there are no temperatures @@ -1826,6 +2004,14 @@ public class ThermalManagerService extends SystemService { return Float.NaN; } + if (mCachedHeadrooms.contains(forecastSeconds)) { + // TODO(b/360486877): replace with metrics + Slog.d(TAG, + "Headroom forecast in " + forecastSeconds + "s served from cache: " + + mCachedHeadrooms.get(forecastSeconds)); + return mCachedHeadrooms.get(forecastSeconds); + } + float maxNormalized = Float.NaN; int noThresholdSampleCount = 0; for (Map.Entry<String, ArrayList<Sample>> entry : mSamples.entrySet()) { @@ -1842,6 +2028,12 @@ public class ThermalManagerService extends SystemService { float currentTemperature = samples.getLast().temperature; if (samples.size() < MINIMUM_SAMPLE_COUNT) { + if (mSamples.size() == 1 && mCachedHeadrooms.contains(0)) { + // if only one sensor name exists, then try reading the cache + // TODO(b/360486877): replace with metrics + Slog.d(TAG, "Headroom forecast cached: " + mCachedHeadrooms.get(0)); + return mCachedHeadrooms.get(0); + } // Don't try to forecast, just use the latest one we have float normalized = normalizeTemperature(currentTemperature, threshold); if (Float.isNaN(maxNormalized) || normalized > maxNormalized) { @@ -1849,8 +2041,10 @@ public class ThermalManagerService extends SystemService { } continue; } - - float slope = getSlopeOf(samples); + float slope = 0.0f; + if (forecastSeconds > 0) { + slope = getSlopeOf(samples); + } float normalized = normalizeTemperature( currentTemperature + slope * forecastSeconds * 1000, threshold); if (Float.isNaN(maxNormalized) || normalized > maxNormalized) { @@ -1868,10 +2062,28 @@ public class ThermalManagerService extends SystemService { FrameworkStatsLog.THERMAL_HEADROOM_CALLED__API_STATUS__SUCCESS, maxNormalized, forecastSeconds); } + mCachedHeadrooms.put(forecastSeconds, maxNormalized); return maxNormalized; } } + float[] getHeadroomThresholds() { + synchronized (mSamples) { + return Arrays.copyOf(mHeadroomThresholds, mHeadroomThresholds.length); + } + } + + @GuardedBy("mSamples") + HeadroomCallbackData getHeadroomCallbackDataLocked() { + final HeadroomCallbackData data = new HeadroomCallbackData( + getForecast(0), + getForecast(DEFAULT_FORECAST_SECONDS), + DEFAULT_FORECAST_SECONDS, + Arrays.copyOf(mHeadroomThresholds, mHeadroomThresholds.length)); + Slog.d(TAG, "New headroom callback data: " + data); + return data; + } + @VisibleForTesting // Since Sample is inside an inner class, we can't make it static // This allows test code to create Sample objects via ThermalManagerService @@ -1880,7 +2092,7 @@ public class ThermalManagerService extends SystemService { } @VisibleForTesting - class Sample { + static class Sample { public long time; public float temperature; @@ -1888,6 +2100,11 @@ public class ThermalManagerService extends SystemService { this.time = time; this.temperature = temperature; } + + @Override + public String toString() { + return "Sample[temperature=" + temperature + ", time=" + time + "]"; + } } } } diff --git a/services/core/java/com/android/server/power/feature/PowerManagerFlags.java b/services/core/java/com/android/server/power/feature/PowerManagerFlags.java index 4ddf0c02c730..5cd7dee35e5f 100644 --- a/services/core/java/com/android/server/power/feature/PowerManagerFlags.java +++ b/services/core/java/com/android/server/power/feature/PowerManagerFlags.java @@ -55,6 +55,9 @@ public class PowerManagerFlags { Flags::policyReasonInDisplayPowerRequest ); + private final FlagState mMoveWscLoggingToNotifier = + new FlagState(Flags.FLAG_MOVE_WSC_LOGGING_TO_NOTIFIER, Flags::moveWscLoggingToNotifier); + /** Returns whether early-screen-timeout-detector is enabled on not. */ public boolean isEarlyScreenTimeoutDetectorEnabled() { return mEarlyScreenTimeoutDetectorFlagState.isEnabled(); @@ -89,6 +92,14 @@ public class PowerManagerFlags { } /** + * @return Whether we move WakelockStateChanged atom logging to Notifier (enabled) or leave it + * in BatteryStatsImpl (disabled). + */ + public boolean isMoveWscLoggingToNotifierEnabled() { + return mMoveWscLoggingToNotifier.isEnabled(); + } + + /** * dumps all flagstates * @param pw printWriter */ @@ -98,6 +109,7 @@ public class PowerManagerFlags { pw.println(" " + mImproveWakelockLatency); pw.println(" " + mPerDisplayWakeByTouch); pw.println(" " + mFrameworkWakelockInfo); + pw.println(" " + mMoveWscLoggingToNotifier); } private static class FlagState { diff --git a/services/core/java/com/android/server/power/feature/power_flags.aconfig b/services/core/java/com/android/server/power/feature/power_flags.aconfig index e27f8bb6fee6..a6948fcbae49 100644 --- a/services/core/java/com/android/server/power/feature/power_flags.aconfig +++ b/services/core/java/com/android/server/power/feature/power_flags.aconfig @@ -41,3 +41,10 @@ flag { bug: "364349703" is_fixed_read_only: true } + +flag { + name: "move_wsc_logging_to_notifier" + namespace: "power" + description: "Feature flag to move logging of WakelockStateChanged atoms from BatteryStatsImpl to Notifier." + bug: "352602149" +} diff --git a/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java index 940a5091a4be..677a2dea665b 100644 --- a/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java +++ b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java @@ -5155,10 +5155,11 @@ public class BatteryStatsImpl extends BatteryStats { Uid uidStats = getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs); uidStats.noteStartWakeLocked(pid, name, type, elapsedRealtimeMs); - - mFrameworkStatsLogger.wakelockStateChanged(mapIsolatedUid(uid), wc, name, - uidStats.mProcessState, true /* acquired */, - getPowerManagerWakeLockLevel(type)); + if (!mPowerManagerFlags.isMoveWscLoggingToNotifierEnabled()) { + mFrameworkStatsLogger.wakelockStateChanged(mapIsolatedUid(uid), wc, name, + uidStats.mProcessState, true /* acquired */, + getPowerManagerWakeLockLevel(type)); + } if (mPowerManagerFlags.isFrameworkWakelockInfoEnabled()) { mFrameworkEvents.noteStartWakeLock( mapIsolatedUid(uid), name, getPowerManagerWakeLockLevel(type), uptimeMs); @@ -5205,9 +5206,11 @@ public class BatteryStatsImpl extends BatteryStats { Uid uidStats = getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs); uidStats.noteStopWakeLocked(pid, name, type, elapsedRealtimeMs); - mFrameworkStatsLogger.wakelockStateChanged(mapIsolatedUid(uid), wc, name, - uidStats.mProcessState, false/* acquired */, - getPowerManagerWakeLockLevel(type)); + if (!mPowerManagerFlags.isMoveWscLoggingToNotifierEnabled()) { + mFrameworkStatsLogger.wakelockStateChanged(mapIsolatedUid(uid), wc, name, + uidStats.mProcessState, false/* acquired */, + getPowerManagerWakeLockLevel(type)); + } if (mPowerManagerFlags.isFrameworkWakelockInfoEnabled()) { mFrameworkEvents.noteStopWakeLock( mapIsolatedUid(uid), name, getPowerManagerWakeLockLevel(type), uptimeMs); diff --git a/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java b/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java index 600fe59215b6..606bd1dd0f3f 100644 --- a/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java +++ b/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java @@ -51,6 +51,7 @@ public class BatteryUsageStatsProvider { private final CpuScalingPolicies mCpuScalingPolicies; private final int mAccumulatedBatteryUsageStatsSpanSize; private final Clock mClock; + private final MonotonicClock mMonotonicClock; private final Object mLock = new Object(); private List<PowerCalculator> mPowerCalculators; private UserPowerCalculator mUserPowerCalculator; @@ -67,7 +68,7 @@ public class BatteryUsageStatsProvider { @NonNull PowerAttributor powerAttributor, @NonNull PowerProfile powerProfile, @NonNull CpuScalingPolicies cpuScalingPolicies, @NonNull PowerStatsStore powerStatsStore, int accumulatedBatteryUsageStatsSpanSize, - @NonNull Clock clock) { + @NonNull Clock clock, @NonNull MonotonicClock monotonicClock) { mContext = context; mPowerAttributor = powerAttributor; mPowerStatsStore = powerStatsStore; @@ -75,6 +76,7 @@ public class BatteryUsageStatsProvider { mCpuScalingPolicies = cpuScalingPolicies; mAccumulatedBatteryUsageStatsSpanSize = accumulatedBatteryUsageStatsSpanSize; mClock = clock; + mMonotonicClock = monotonicClock; mUserPowerCalculator = new UserPowerCalculator(); mPowerStatsStore.addSectionReader(new BatteryUsageStatsSection.Reader()); @@ -213,7 +215,7 @@ public class BatteryUsageStatsProvider { powerStatsSpan.addTimeFrame(accumulatedStats.startMonotonicTime, accumulatedStats.startWallClockTime, accumulatedStats.endMonotonicTime - accumulatedStats.startMonotonicTime); - stats.commitMonotonicClock(); + mMonotonicClock.write(); mPowerStatsStore.storePowerStatsSpanAsync(powerStatsSpan, accumulatedStats.builder::discard); } @@ -308,23 +310,29 @@ public class BatteryUsageStatsProvider { private void updateAccumulatedBatteryUsageStats(AccumulatedBatteryUsageStats accumulatedStats, BatteryStatsImpl stats, BatteryUsageStatsQuery query) { - // TODO(b/366493365): add the current batteryusagestats directly into - // `accumulatedStats.builder` to avoid allocating a second CursorWindow - BatteryUsageStats.Builder remainingBatteryUsageStats = computeBatteryUsageStats(stats, - query, accumulatedStats.endMonotonicTime, query.getMonotonicEndTime(), - mClock.currentTimeMillis()); + long startMonotonicTime = accumulatedStats.endMonotonicTime; + if (startMonotonicTime == MonotonicClock.UNDEFINED) { + startMonotonicTime = stats.getMonotonicStartTime(); + } + long endWallClockTime = mClock.currentTimeMillis(); + long endMonotonicTime = mMonotonicClock.monotonicTime(); if (accumulatedStats.builder == null) { - accumulatedStats.builder = remainingBatteryUsageStats; + accumulatedStats.builder = new BatteryUsageStats.Builder( + stats.getCustomEnergyConsumerNames(), false, true, true, true, 0); accumulatedStats.startWallClockTime = stats.getStartClockTime(); - accumulatedStats.startMonotonicTime = stats.getMonotonicStartTime(); - accumulatedStats.endMonotonicTime = accumulatedStats.startMonotonicTime - + accumulatedStats.builder.getStatsDuration(); - } else { - accumulatedStats.builder.add(remainingBatteryUsageStats.build()); - accumulatedStats.endMonotonicTime += remainingBatteryUsageStats.getStatsDuration(); - remainingBatteryUsageStats.discard(); + accumulatedStats.builder.setStatsStartTimestamp(accumulatedStats.startWallClockTime); } + + accumulatedStats.endMonotonicTime = endMonotonicTime; + + accumulatedStats.builder.setStatsEndTimestamp(endWallClockTime); + accumulatedStats.builder.setStatsDuration(endWallClockTime - startMonotonicTime); + + mPowerAttributor.estimatePowerConsumption(accumulatedStats.builder, stats.getHistory(), + startMonotonicTime, MonotonicClock.UNDEFINED); + + populateGeneralInfo(accumulatedStats.builder, stats); } private BatteryUsageStats.Builder computeBatteryUsageStats(BatteryStatsImpl stats, diff --git a/services/core/java/com/android/server/wm/OWNERS b/services/core/java/com/android/server/wm/OWNERS index e983edf0d5ae..2401f9072ea3 100644 --- a/services/core/java/com/android/server/wm/OWNERS +++ b/services/core/java/com/android/server/wm/OWNERS @@ -35,4 +35,5 @@ per-file *WindowTracing* = file:platform/development:/tools/winscope/OWNERS # Files related to activity security per-file ActivityStarter.java = file:/ACTIVITY_SECURITY_OWNERS +per-file ActivityStartController.java = file:/ACTIVITY_SECURITY_OWNERS per-file ActivityTaskManagerService.java = file:/ACTIVITY_SECURITY_OWNERS diff --git a/services/core/services-jarjar-rules.txt b/services/core/services-jarjar-rules.txt new file mode 100644 index 000000000000..0d296b238c7a --- /dev/null +++ b/services/core/services-jarjar-rules.txt @@ -0,0 +1,2 @@ +# For profiling flags +rule android.os.profiling.** android.internal.os.profiling.@1 diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 4ce18d232936..c6530381443f 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -3480,7 +3480,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { @GuardedBy("getLockObject()") private boolean maybeMigrateSuspendedPackagesLocked(String backupId) { Slog.i(LOG_TAG, "Migrating suspended packages to policy engine"); - if (!Flags.unmanagedModeMigration()) { + if (!Flags.suspendPackagesCoexistence()) { return false; } if (mOwners.isSuspendedPackagesMigrated()) { @@ -13092,7 +13092,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { @Override public String[] setPackagesSuspended(ComponentName who, String callerPackage, String[] packageNames, boolean suspended) { - if (!Flags.unmanagedModeMigration()) { + if (!Flags.suspendPackagesCoexistence()) { return setPackagesSuspendedPreCoexistence(who, callerPackage, packageNames, suspended); } @@ -13182,7 +13182,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { public boolean isPackageSuspended(ComponentName who, String callerPackage, String packageName) { final CallerIdentity caller = getCallerIdentity(who, callerPackage); - if (Flags.unmanagedModeMigration()) { + if (Flags.suspendPackagesCoexistence()) { enforcePermission( MANAGE_DEVICE_POLICY_PACKAGE_STATE, caller.getPackageName(), @@ -23795,17 +23795,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { maybeMigrateSecurityLoggingPolicyLocked(); // ID format: <sdk-int>.<auto_increment_id>.<descriptions>' String unmanagedBackupId = "35.1.unmanaged-mode"; - boolean unmanagedMigrated = false; - unmanagedMigrated = - unmanagedMigrated | maybeMigrateRequiredPasswordComplexityLocked(unmanagedBackupId); - unmanagedMigrated = - unmanagedMigrated | maybeMigrateSuspendedPackagesLocked(unmanagedBackupId); + boolean unmanagedMigrated = maybeMigrateRequiredPasswordComplexityLocked(unmanagedBackupId); if (unmanagedMigrated) { Slogf.i(LOG_TAG, "Backup made: " + unmanagedBackupId); } String supervisionBackupId = "36.2.supervision-support"; boolean supervisionMigrated = maybeMigrateResetPasswordTokenLocked(supervisionBackupId); + supervisionMigrated |= maybeMigrateSuspendedPackagesLocked(supervisionBackupId); if (supervisionMigrated) { Slogf.i(LOG_TAG, "Backup made: " + supervisionBackupId); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java b/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java index 952bbca58f3b..1cae924a8cd1 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java @@ -420,6 +420,8 @@ class OwnersData { if (Flags.unmanagedModeMigration()) { out.attributeBoolean(null, ATTR_REQUIRED_PASSWORD_COMPLEXITY_MIGRATED, mRequiredPasswordComplexityMigrated); + } + if (Flags.suspendPackagesCoexistence()) { out.attributeBoolean(null, ATTR_SUSPENDED_PACKAGES_MIGRATED, mSuspendedPackagesMigrated); @@ -499,7 +501,7 @@ class OwnersData { mRequiredPasswordComplexityMigrated = Flags.unmanagedModeMigration() && parser.getAttributeBoolean(null, ATTR_REQUIRED_PASSWORD_COMPLEXITY_MIGRATED, false); - mSuspendedPackagesMigrated = Flags.unmanagedModeMigration() + mSuspendedPackagesMigrated = Flags.suspendPackagesCoexistence() && parser.getAttributeBoolean(null, ATTR_SUSPENDED_PACKAGES_MIGRATED, false); mResetPasswordWithTokenMigrated = Flags.resetPasswordWithTokenCoexistence() diff --git a/services/tests/mockingservicestests/Android.bp b/services/tests/mockingservicestests/Android.bp index c81d6be43223..be698b2673ad 100644 --- a/services/tests/mockingservicestests/Android.bp +++ b/services/tests/mockingservicestests/Android.bp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. java_defaults { - name: "FrameworkMockingServicesTests-jni-defaults", + name: "FrameworksMockingServicesTests-jni-defaults", jni_libs: [ "libmockingservicestestjni", ], @@ -30,7 +30,7 @@ package { android_test { name: "FrameworksMockingServicesTests", defaults: [ - "FrameworkMockingServicesTests-jni-defaults", + "FrameworksMockingServicesTests-jni-defaults", "modules-utils-testable-device-config-defaults", ], @@ -77,7 +77,10 @@ android_test { "flag-junit", "am_flags_lib", "device_policy_aconfig_flags_lib", - ], + ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { + "true": ["service-crashrecovery.impl"], + default: [], + }), libs: [ "android.test.mock.stubs.system", diff --git a/services/tests/mockingservicestests/src/com/android/server/DeviceIdleControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/DeviceIdleControllerTest.java index cbc8538cf9fb..37d1c30f76f5 100644 --- a/services/tests/mockingservicestests/src/com/android/server/DeviceIdleControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/DeviceIdleControllerTest.java @@ -15,7 +15,12 @@ */ package com.android.server; +import static android.os.PowerExemptionManager.REASON_OTHER; +import static android.os.PowerExemptionManager.TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_ALLOWED; +import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.NULL_DEFAULT; + import static androidx.test.InstrumentationRegistry.getContext; + import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; @@ -31,6 +36,7 @@ import static com.android.server.DeviceIdleController.LIGHT_STATE_INACTIVE; import static com.android.server.DeviceIdleController.LIGHT_STATE_OVERRIDE; import static com.android.server.DeviceIdleController.LIGHT_STATE_WAITING_FOR_NETWORK; import static com.android.server.DeviceIdleController.MSG_REPORT_STATIONARY_STATUS; +import static com.android.server.DeviceIdleController.MSG_TEMP_APP_WHITELIST_TIMEOUT; import static com.android.server.DeviceIdleController.STATE_ACTIVE; import static com.android.server.DeviceIdleController.STATE_IDLE; import static com.android.server.DeviceIdleController.STATE_IDLE_MAINTENANCE; @@ -41,6 +47,7 @@ import static com.android.server.DeviceIdleController.STATE_QUICK_DOZE_DELAY; import static com.android.server.DeviceIdleController.STATE_SENSING; import static com.android.server.DeviceIdleController.lightStateToString; import static com.android.server.DeviceIdleController.stateToString; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -83,6 +90,8 @@ import android.os.PowerManagerInternal; import android.os.PowerSaveState; import android.os.SystemClock; import android.os.WearModeManagerInternal; +import android.platform.test.annotations.EnableFlags; +import android.platform.test.flag.junit.SetFlagsRule; import android.provider.DeviceConfig; import android.telephony.TelephonyCallback; import android.telephony.TelephonyManager; @@ -90,12 +99,16 @@ import android.telephony.emergency.EmergencyNumber; import androidx.test.runner.AndroidJUnit4; +import com.android.internal.app.IBatteryStats; +import com.android.server.am.BatteryStatsService; import com.android.server.deviceidle.ConstraintController; +import com.android.server.deviceidle.Flags; import com.android.server.net.NetworkPolicyManagerInternal; import com.android.server.wm.ActivityTaskManagerInternal; import org.junit.After; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -115,6 +128,9 @@ import java.util.concurrent.Executor; @SuppressWarnings("GuardedBy") @RunWith(AndroidJUnit4.class) public class DeviceIdleControllerTest { + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(NULL_DEFAULT); + private DeviceIdleController mDeviceIdleController; private DeviceIdleController.MyHandler mHandler; private AnyMotionDetectorForTest mAnyMotionDetector; @@ -157,7 +173,8 @@ public class DeviceIdleControllerTest { LocationManager locationManager; ConstraintController constraintController; // Freeze time for testing. - long nowElapsed; + volatile long nowElapsed; + volatile long nowUptime; boolean useMotionSensor = true; boolean isLocationPrefetchEnabled = true; @@ -193,6 +210,11 @@ public class DeviceIdleControllerTest { } @Override + long getUptimeMillis() { + return nowUptime; + } + + @Override LocationManager getLocationManager() { return locationManager; } @@ -314,11 +336,13 @@ public class DeviceIdleControllerTest { mMockingSession = mockitoSession() .initMocks(this) .strictness(Strictness.LENIENT) + .mockStatic(BatteryStatsService.class) .spyStatic(DeviceConfig.class) .spyStatic(LocalServices.class) .startMocking(); spyOn(getContext()); doReturn(null).when(getContext()).registerReceiver(any(), any()); + doReturn(mock(IBatteryStats.class)).when(() -> BatteryStatsService.getService()); doReturn(mock(ActivityManagerInternal.class)) .when(() -> LocalServices.getService(ActivityManagerInternal.class)); doReturn(mock(ActivityTaskManagerInternal.class)) @@ -401,6 +425,46 @@ public class DeviceIdleControllerTest { } @Test + @EnableFlags(Flags.FLAG_USE_CPU_TIME_FOR_TEMP_ALLOWLIST) + public void testTempAllowlistCountsUptime() { + doNothing().when(getContext()).sendBroadcastAsUser(any(), any(), any(), any()); + final int testUid = 12345; + final long durationMs = 4300; + final long startTime = 100; // Arbitrary starting point in time. + mInjector.nowUptime = mInjector.nowElapsed = startTime; + + mDeviceIdleController.addPowerSaveTempWhitelistAppDirectInternal(0, testUid, durationMs, + TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_ALLOWED, true, REASON_OTHER, "test"); + + assertEquals(startTime + durationMs, + mDeviceIdleController.mTempWhitelistAppIdEndTimes.get(testUid).first.value); + + final InOrder inorder = inOrder(mHandler); + // mHandler is already stubbed to do nothing on handleMessage. + inorder.verify(mHandler).sendMessageDelayed( + argThat(m -> m.what == MSG_TEMP_APP_WHITELIST_TIMEOUT && m.arg1 == testUid), + eq(durationMs)); + + mInjector.nowElapsed += durationMs; + mInjector.nowUptime += 2; + // Elapsed time moved past the expiration but not uptime. The check should be rescheduled. + mDeviceIdleController.checkTempAppWhitelistTimeout(testUid); + inorder.verify(mHandler).sendMessageDelayed( + argThat(m -> m.what == MSG_TEMP_APP_WHITELIST_TIMEOUT && m.arg1 == testUid), + eq(durationMs - 2)); + assertEquals(startTime + durationMs, + mDeviceIdleController.mTempWhitelistAppIdEndTimes.get(testUid).first.value); + + mInjector.nowUptime += durationMs; + // Uptime moved past the expiration time. Uid should be removed from the temp allowlist. + mDeviceIdleController.checkTempAppWhitelistTimeout(testUid); + inorder.verify(mHandler, never()).sendMessageDelayed( + argThat(m -> m.what == MSG_TEMP_APP_WHITELIST_TIMEOUT && m.arg1 == testUid), + anyLong()); + assertFalse(mDeviceIdleController.mTempWhitelistAppIdEndTimes.contains(testUid)); + } + + @Test public void testUpdateInteractivityLocked() { doReturn(false).when(mPowerManager).isInteractive(); mDeviceIdleController.updateInteractivityLocked(); diff --git a/services/tests/mockingservicestests/src/com/android/server/RescuePartyTest.java b/services/tests/mockingservicestests/src/com/android/server/RescuePartyTest.java index f2acbc31b008..f40d8038da3b 100644 --- a/services/tests/mockingservicestests/src/com/android/server/RescuePartyTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/RescuePartyTest.java @@ -45,13 +45,11 @@ import android.crashrecovery.flags.Flags; import android.os.RecoverySystem; import android.os.SystemProperties; import android.os.UserHandle; -import android.platform.test.annotations.DisableFlags; import android.platform.test.annotations.EnableFlags; import android.platform.test.flag.junit.FlagsParameterization; import android.platform.test.flag.junit.SetFlagsRule; import android.provider.DeviceConfig; import android.provider.Settings; -import android.util.ArraySet; import com.android.dx.mockito.inline.extended.ExtendedMockito; import com.android.server.PackageWatchdog.PackageHealthObserverImpact; @@ -74,11 +72,9 @@ import org.mockito.quality.Strictness; import org.mockito.stubbing.Answer; import java.lang.reflect.Field; -import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; @@ -250,37 +246,6 @@ public class RescuePartyTest { } @Test - @DisableFlags({Flags.FLAG_RECOVERABILITY_DETECTION, - Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS}) - public void testBootLoop() { - // this is old test where the flag needs to be disabled - RescueParty.onSettingsProviderPublished(mMockContext); - verify(() -> DeviceConfig.setMonitorCallback(eq(mMockContentResolver), - any(Executor.class), - mMonitorCallbackCaptor.capture())); - HashMap<String, Integer> verifiedTimesMap = new HashMap<String, Integer>(); - - noteBoot(1); - - // Record DeviceConfig accesses - RescuePartyObserver observer = RescuePartyObserver.getInstance(mMockContext); - DeviceConfig.MonitorCallback monitorCallback = mMonitorCallbackCaptor.getValue(); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE1, NAMESPACE1); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE1, NAMESPACE2); - - final String[] expectedAllResetNamespaces = new String[]{NAMESPACE1, NAMESPACE2}; - - noteBoot(2); - noteBoot(3); - - noteBoot(4); - assertTrue(RescueParty.isRebootPropertySet()); - - setCrashRecoveryPropAttemptingReboot(false); - noteBoot(5); - assertTrue(RescueParty.isFactoryResetPropertySet()); - } - @Test @EnableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) public void testBootLoopNoFlags() { // this is old test where the flag needs to be disabled @@ -293,61 +258,6 @@ public class RescuePartyTest { } @Test - @EnableFlags(Flags.FLAG_RECOVERABILITY_DETECTION) - @DisableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) - public void testBootLoopRecoverability() { - RescueParty.onSettingsProviderPublished(mMockContext); - verify(() -> DeviceConfig.setMonitorCallback(eq(mMockContentResolver), - any(Executor.class), - mMonitorCallbackCaptor.capture())); - HashMap<String, Integer> verifiedTimesMap = new HashMap<String, Integer>(); - - // Record DeviceConfig accesses - DeviceConfig.MonitorCallback monitorCallback = mMonitorCallbackCaptor.getValue(); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE1, NAMESPACE1); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE1, NAMESPACE2); - - final String[] expectedAllResetNamespaces = new String[]{NAMESPACE1, NAMESPACE2}; - - - noteBoot(1); - - noteBoot(2); - assertTrue(RescueParty.isRebootPropertySet()); - - noteBoot(3); - - verifyOnlySettingsReset(Settings.RESET_MODE_UNTRUSTED_DEFAULTS); - - noteBoot(4); - verifyOnlySettingsReset(Settings.RESET_MODE_UNTRUSTED_CHANGES); - - noteBoot(5); - verifyOnlySettingsReset(Settings.RESET_MODE_TRUSTED_DEFAULTS); - - setCrashRecoveryPropAttemptingReboot(false); - noteBoot(6); - assertTrue(RescueParty.isFactoryResetPropertySet()); - } - - @Test - @DisableFlags({Flags.FLAG_RECOVERABILITY_DETECTION, - Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS}) - public void testPersistentAppCrash() { - // this is old test where the flag needs to be disabled - noteAppCrash(1, true); - noteAppCrash(2, true); - noteAppCrash(3, true); - - noteAppCrash(4, true); - assertTrue(RescueParty.isRebootPropertySet()); - - setCrashRecoveryPropAttemptingReboot(false); - noteAppCrash(5, true); - assertTrue(RescueParty.isFactoryResetPropertySet()); - } - - @Test @EnableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) public void testPersistentAppCrashNoFlags() { // this is old test where the flag needs to be disabled @@ -360,98 +270,6 @@ public class RescuePartyTest { } @Test - @EnableFlags(Flags.FLAG_RECOVERABILITY_DETECTION) - @DisableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) - public void testPersistentAppCrashRecoverability() { - RescueParty.onSettingsProviderPublished(mMockContext); - verify(() -> DeviceConfig.setMonitorCallback(eq(mMockContentResolver), - any(Executor.class), - mMonitorCallbackCaptor.capture())); - HashMap<String, Integer> verifiedTimesMap = new HashMap<String, Integer>(); - - // Record DeviceConfig accesses - DeviceConfig.MonitorCallback monitorCallback = mMonitorCallbackCaptor.getValue(); - monitorCallback.onDeviceConfigAccess(PERSISTENT_PACKAGE, NAMESPACE1); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE1, NAMESPACE1); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE1, NAMESPACE2); - - final String[] expectedResetNamespaces = new String[]{NAMESPACE1}; - final String[] expectedAllResetNamespaces = new String[]{NAMESPACE1, NAMESPACE2}; - - noteAppCrash(1, true); - - noteAppCrash(2, true); - - noteAppCrash(3, true); - assertTrue(RescueParty.isRebootPropertySet()); - - noteAppCrash(4, true); - verifyOnlySettingsReset(Settings.RESET_MODE_UNTRUSTED_DEFAULTS); - - noteAppCrash(5, true); - verifyOnlySettingsReset(Settings.RESET_MODE_UNTRUSTED_CHANGES); - - noteAppCrash(6, true); - verifyOnlySettingsReset(Settings.RESET_MODE_TRUSTED_DEFAULTS); - - setCrashRecoveryPropAttemptingReboot(false); - noteAppCrash(7, true); - assertTrue(RescueParty.isFactoryResetPropertySet()); - } - - @Test - @DisableFlags({Flags.FLAG_RECOVERABILITY_DETECTION, - Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS}) - public void testNonPersistentApp() { - // this is old test where the flag needs to be disabled - noteAppCrash(1, false); - noteAppCrash(2, false); - noteAppCrash(3, false); - assertFalse(RescueParty.isRebootPropertySet()); - - noteAppCrash(5, false); - assertFalse(RescueParty.isFactoryResetPropertySet()); - } - - @Test - @EnableFlags(Flags.FLAG_RECOVERABILITY_DETECTION) - @DisableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) - public void testNonPersistentAppOnlyPerformsFlagResetsRecoverabilityDetection() { - RescueParty.onSettingsProviderPublished(mMockContext); - verify(() -> DeviceConfig.setMonitorCallback(eq(mMockContentResolver), - any(Executor.class), - mMonitorCallbackCaptor.capture())); - HashMap<String, Integer> verifiedTimesMap = new HashMap<String, Integer>(); - - // Record DeviceConfig accesses - DeviceConfig.MonitorCallback monitorCallback = mMonitorCallbackCaptor.getValue(); - monitorCallback.onDeviceConfigAccess(NON_PERSISTENT_PACKAGE, NAMESPACE1); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE1, NAMESPACE1); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE1, NAMESPACE2); - - final String[] expectedResetNamespaces = new String[]{NAMESPACE1}; - final String[] expectedAllResetNamespaces = new String[]{NAMESPACE1, NAMESPACE2}; - - noteAppCrash(1, false); - - noteAppCrash(2, false); - - noteAppCrash(3, false); - assertFalse(RescueParty.isRebootPropertySet()); - - noteAppCrash(4, false); - verifyNoSettingsReset(Settings.RESET_MODE_UNTRUSTED_DEFAULTS); - noteAppCrash(5, false); - verifyNoSettingsReset(Settings.RESET_MODE_UNTRUSTED_CHANGES); - noteAppCrash(6, false); - verifyNoSettingsReset(Settings.RESET_MODE_TRUSTED_DEFAULTS); - - setCrashRecoveryPropAttemptingReboot(false); - noteAppCrash(7, false); - assertFalse(RescueParty.isFactoryResetPropertySet()); - } - - @Test public void testIsRecoveryTriggeredReboot() { for (int i = 0; i < LEVEL_FACTORY_RESET; i++) { noteBoot(i + 1); @@ -522,6 +340,7 @@ public class RescuePartyTest { @Test public void testNotThrottlingAfterTimeoutOnAppCrash() { + when(mMockContext.getPackageManager()).thenReturn(mPackageManager); setCrashRecoveryPropAttemptingReboot(false); long now = System.currentTimeMillis(); long afterTimeout = now - TimeUnit.MINUTES.toMillis( @@ -534,30 +353,15 @@ public class RescuePartyTest { } @Test - @DisableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) - public void testNativeRescuePartyResets() { - doReturn(true).when(() -> SettingsToPropertiesMapper.isNativeFlagsResetPerformed()); - doReturn(FAKE_RESET_NATIVE_NAMESPACES).when( - () -> SettingsToPropertiesMapper.getResetNativeCategories()); - - RescueParty.onSettingsProviderPublished(mMockContext); - - verify(() -> DeviceConfig.resetToDefaults(Settings.RESET_MODE_TRUSTED_DEFAULTS, - FAKE_NATIVE_NAMESPACE1)); - verify(() -> DeviceConfig.resetToDefaults(Settings.RESET_MODE_TRUSTED_DEFAULTS, - FAKE_NATIVE_NAMESPACE2)); - } - - @Test public void testExplicitlyEnablingAndDisablingRescue() { SystemProperties.set(RescueParty.PROP_ENABLE_RESCUE, Boolean.toString(false)); SystemProperties.set(PROP_DISABLE_RESCUE, Boolean.toString(true)); - assertEquals(RescuePartyObserver.getInstance(mMockContext).execute(sFailingPackage, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 1), false); + assertEquals(RescuePartyObserver.getInstance(mMockContext).onExecuteHealthCheckMitigation( + sFailingPackage, PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 1), false); SystemProperties.set(RescueParty.PROP_ENABLE_RESCUE, Boolean.toString(true)); - assertTrue(RescuePartyObserver.getInstance(mMockContext).execute(sFailingPackage, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 1)); + assertTrue(RescuePartyObserver.getInstance(mMockContext).onExecuteHealthCheckMitigation( + sFailingPackage, PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 1)); } @Test @@ -565,8 +369,8 @@ public class RescuePartyTest { SystemProperties.set(RescueParty.PROP_ENABLE_RESCUE, Boolean.toString(false)); SystemProperties.set(PROP_DEVICE_CONFIG_DISABLE_FLAG, Boolean.toString(true)); - assertEquals(RescuePartyObserver.getInstance(mMockContext).execute(sFailingPackage, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 1), false); + assertEquals(RescuePartyObserver.getInstance(mMockContext).onExecuteHealthCheckMitigation( + sFailingPackage, PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 1), false); // Restore the property value initialized in SetUp() SystemProperties.set(RescueParty.PROP_ENABLE_RESCUE, Boolean.toString(true)); @@ -587,75 +391,6 @@ public class RescuePartyTest { } @Test - @DisableFlags({Flags.FLAG_RECOVERABILITY_DETECTION, - Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS}) - public void testHealthCheckLevels() { - // this is old test where the flag needs to be disabled - RescuePartyObserver observer = RescuePartyObserver.getInstance(mMockContext); - - // Ensure that no action is taken for cases where the failure reason is unknown - assertEquals(observer.onHealthCheckFailed(null, PackageWatchdog.FAILURE_REASON_UNKNOWN, 1), - PackageHealthObserverImpact.USER_IMPACT_LEVEL_0); - - // Ensure the correct user impact is returned for each mitigation count. - assertEquals(observer.onHealthCheckFailed(null, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 1), - PackageHealthObserverImpact.USER_IMPACT_LEVEL_10); - - assertEquals(observer.onHealthCheckFailed(null, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 2), - PackageHealthObserverImpact.USER_IMPACT_LEVEL_10); - - assertEquals(observer.onHealthCheckFailed(null, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 3), - PackageHealthObserverImpact.USER_IMPACT_LEVEL_50); - - assertEquals(observer.onHealthCheckFailed(null, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 4), - PackageHealthObserverImpact.USER_IMPACT_LEVEL_50); - } - - @Test - @DisableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) - @EnableFlags(Flags.FLAG_RECOVERABILITY_DETECTION) - public void testHealthCheckLevelsRecoverabilityDetection() { - RescuePartyObserver observer = RescuePartyObserver.getInstance(mMockContext); - - // Ensure that no action is taken for cases where the failure reason is unknown - assertEquals(observer.onHealthCheckFailed(sFailingPackage, - PackageWatchdog.FAILURE_REASON_UNKNOWN, 1), - PackageHealthObserverImpact.USER_IMPACT_LEVEL_0); - - // Ensure the correct user impact is returned for each mitigation count. - assertEquals(observer.onHealthCheckFailed(sFailingPackage, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 1), - PackageHealthObserverImpact.USER_IMPACT_LEVEL_10); - - assertEquals(observer.onHealthCheckFailed(sFailingPackage, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 2), - PackageHealthObserverImpact.USER_IMPACT_LEVEL_40); - - assertEquals(observer.onHealthCheckFailed(sFailingPackage, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 3), - PackageHealthObserverImpact.USER_IMPACT_LEVEL_40); - - assertEquals(observer.onHealthCheckFailed(sFailingPackage, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 4), - PackageHealthObserverImpact.USER_IMPACT_LEVEL_40); - - assertEquals(observer.onHealthCheckFailed(sFailingPackage, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 5), - PackageHealthObserverImpact.USER_IMPACT_LEVEL_40); - - assertEquals(observer.onHealthCheckFailed(sFailingPackage, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 6), - PackageHealthObserverImpact.USER_IMPACT_LEVEL_40); - - assertEquals(observer.onHealthCheckFailed(sFailingPackage, - PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 7), - PackageHealthObserverImpact.USER_IMPACT_LEVEL_40); - } - @Test @EnableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) public void testHealthCheckLevelsNoFlags() { // this is old test where the flag needs to be disabled @@ -674,36 +409,6 @@ public class RescuePartyTest { PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 2), PackageHealthObserverImpact.USER_IMPACT_LEVEL_100); } - @Test - @DisableFlags({Flags.FLAG_RECOVERABILITY_DETECTION, - Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS}) - public void testBootLoopLevels() { - // this is old test where the flag needs to be disabled - - - RescuePartyObserver observer = RescuePartyObserver.getInstance(mMockContext); - - assertEquals(observer.onBootLoop(0), PackageHealthObserverImpact.USER_IMPACT_LEVEL_0); - assertEquals(observer.onBootLoop(1), PackageHealthObserverImpact.USER_IMPACT_LEVEL_10); - assertEquals(observer.onBootLoop(2), PackageHealthObserverImpact.USER_IMPACT_LEVEL_10); - assertEquals(observer.onBootLoop(3), PackageHealthObserverImpact.USER_IMPACT_LEVEL_50); - assertEquals(observer.onBootLoop(4), PackageHealthObserverImpact.USER_IMPACT_LEVEL_50); - assertEquals(observer.onBootLoop(5), PackageHealthObserverImpact.USER_IMPACT_LEVEL_100); - } - - @Test - @DisableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) - @EnableFlags(Flags.FLAG_RECOVERABILITY_DETECTION) - public void testBootLoopLevelsRecoverabilityDetection() { - RescuePartyObserver observer = RescuePartyObserver.getInstance(mMockContext); - - assertEquals(observer.onBootLoop(1), PackageHealthObserverImpact.USER_IMPACT_LEVEL_40); - assertEquals(observer.onBootLoop(2), PackageHealthObserverImpact.USER_IMPACT_LEVEL_50); - assertEquals(observer.onBootLoop(3), PackageHealthObserverImpact.USER_IMPACT_LEVEL_71); - assertEquals(observer.onBootLoop(4), PackageHealthObserverImpact.USER_IMPACT_LEVEL_75); - assertEquals(observer.onBootLoop(5), PackageHealthObserverImpact.USER_IMPACT_LEVEL_80); - assertEquals(observer.onBootLoop(6), PackageHealthObserverImpact.USER_IMPACT_LEVEL_100); - } @Test @EnableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) @@ -714,129 +419,6 @@ public class RescuePartyTest { assertEquals(observer.onBootLoop(2), PackageHealthObserverImpact.USER_IMPACT_LEVEL_100); } - @Test - @DisableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) - public void testResetDeviceConfigForPackagesOnlyRuntimeMap() { - RescueParty.onSettingsProviderPublished(mMockContext); - verify(() -> DeviceConfig.setMonitorCallback(eq(mMockContentResolver), - any(Executor.class), - mMonitorCallbackCaptor.capture())); - - // Record DeviceConfig accesses - RescuePartyObserver observer = RescuePartyObserver.getInstance(mMockContext); - DeviceConfig.MonitorCallback monitorCallback = mMonitorCallbackCaptor.getValue(); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE1, NAMESPACE1); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE1, NAMESPACE2); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE2, NAMESPACE2); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE2, NAMESPACE3); - // Fake DeviceConfig value changes - monitorCallback.onNamespaceUpdate(NAMESPACE1); - monitorCallback.onNamespaceUpdate(NAMESPACE2); - monitorCallback.onNamespaceUpdate(NAMESPACE3); - - doReturn("").when(() -> DeviceConfig.getString( - eq(RescueParty.NAMESPACE_CONFIGURATION), - eq(RescueParty.NAMESPACE_TO_PACKAGE_MAPPING_FLAG), - eq(""))); - - RescueParty.resetDeviceConfigForPackages(Arrays.asList(new String[]{CALLING_PACKAGE1})); - ArraySet<String> expectedNamespacesWiped = new ArraySet<String>( - Arrays.asList(new String[]{NAMESPACE1, NAMESPACE2})); - assertEquals(mNamespacesWiped, expectedNamespacesWiped); - } - - @Test - @DisableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) - public void testResetDeviceConfigForPackagesOnlyPresetMap() { - RescueParty.onSettingsProviderPublished(mMockContext); - verify(() -> DeviceConfig.setMonitorCallback(eq(mMockContentResolver), - any(Executor.class), - mMonitorCallbackCaptor.capture())); - - String presetMapping = NAMESPACE1 + ":" + CALLING_PACKAGE1 + "," - + NAMESPACE2 + ":" + CALLING_PACKAGE2 + "," - + NAMESPACE3 + ":" + CALLING_PACKAGE1; - doReturn(presetMapping).when(() -> DeviceConfig.getString( - eq(RescueParty.NAMESPACE_CONFIGURATION), - eq(RescueParty.NAMESPACE_TO_PACKAGE_MAPPING_FLAG), - eq(""))); - - RescueParty.resetDeviceConfigForPackages(Arrays.asList(new String[]{CALLING_PACKAGE1})); - ArraySet<String> expectedNamespacesWiped = new ArraySet<String>( - Arrays.asList(new String[]{NAMESPACE1, NAMESPACE3})); - assertEquals(mNamespacesWiped, expectedNamespacesWiped); - } - - @Test - @DisableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) - public void testResetDeviceConfigForPackagesBothMaps() { - RescueParty.onSettingsProviderPublished(mMockContext); - verify(() -> DeviceConfig.setMonitorCallback(eq(mMockContentResolver), - any(Executor.class), - mMonitorCallbackCaptor.capture())); - - // Record DeviceConfig accesses - RescuePartyObserver observer = RescuePartyObserver.getInstance(mMockContext); - DeviceConfig.MonitorCallback monitorCallback = mMonitorCallbackCaptor.getValue(); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE1, NAMESPACE1); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE1, NAMESPACE2); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE2, NAMESPACE2); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE2, NAMESPACE3); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE3, NAMESPACE4); - // Fake DeviceConfig value changes - monitorCallback.onNamespaceUpdate(NAMESPACE1); - monitorCallback.onNamespaceUpdate(NAMESPACE2); - monitorCallback.onNamespaceUpdate(NAMESPACE3); - monitorCallback.onNamespaceUpdate(NAMESPACE4); - - String presetMapping = NAMESPACE1 + ":" + CALLING_PACKAGE1 + "," - + NAMESPACE2 + ":" + CALLING_PACKAGE2 + "," - + NAMESPACE4 + ":" + CALLING_PACKAGE3; - doReturn(presetMapping).when(() -> DeviceConfig.getString( - eq(RescueParty.NAMESPACE_CONFIGURATION), - eq(RescueParty.NAMESPACE_TO_PACKAGE_MAPPING_FLAG), - eq(""))); - - RescueParty.resetDeviceConfigForPackages( - Arrays.asList(new String[]{CALLING_PACKAGE1, CALLING_PACKAGE2})); - ArraySet<String> expectedNamespacesWiped = new ArraySet<String>( - Arrays.asList(new String[]{NAMESPACE1, NAMESPACE2, NAMESPACE3})); - assertEquals(mNamespacesWiped, expectedNamespacesWiped); - } - - @Test - @DisableFlags(Flags.FLAG_DEPRECATE_FLAGS_AND_SETTINGS_RESETS) - public void testResetDeviceConfigNoExceptionWhenFlagMalformed() { - RescueParty.onSettingsProviderPublished(mMockContext); - verify(() -> DeviceConfig.setMonitorCallback(eq(mMockContentResolver), - any(Executor.class), - mMonitorCallbackCaptor.capture())); - - // Record DeviceConfig accesses - RescuePartyObserver observer = RescuePartyObserver.getInstance(mMockContext); - DeviceConfig.MonitorCallback monitorCallback = mMonitorCallbackCaptor.getValue(); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE1, NAMESPACE1); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE2, NAMESPACE3); - monitorCallback.onDeviceConfigAccess(CALLING_PACKAGE3, NAMESPACE4); - // Fake DeviceConfig value changes - monitorCallback.onNamespaceUpdate(NAMESPACE1); - monitorCallback.onNamespaceUpdate(NAMESPACE2); - monitorCallback.onNamespaceUpdate(NAMESPACE3); - monitorCallback.onNamespaceUpdate(NAMESPACE4); - - String invalidPresetMapping = NAMESPACE2 + ":" + CALLING_PACKAGE2 + "," - + NAMESPACE1 + "." + CALLING_PACKAGE2; - doReturn(invalidPresetMapping).when(() -> DeviceConfig.getString( - eq(RescueParty.NAMESPACE_CONFIGURATION), - eq(RescueParty.NAMESPACE_TO_PACKAGE_MAPPING_FLAG), - eq(""))); - - RescueParty.resetDeviceConfigForPackages( - Arrays.asList(new String[]{CALLING_PACKAGE1, CALLING_PACKAGE2})); - ArraySet<String> expectedNamespacesWiped = new ArraySet<String>( - Arrays.asList(new String[]{NAMESPACE1, NAMESPACE3})); - assertEquals(mNamespacesWiped, expectedNamespacesWiped); - } private void verifySettingsResets(int resetMode, String[] resetNamespaces, HashMap<String, Integer> configResetVerifiedTimesMap) { @@ -858,13 +440,14 @@ public class RescuePartyTest { } private void noteBoot(int mitigationCount) { - RescuePartyObserver.getInstance(mMockContext).executeBootLoopMitigation(mitigationCount); + RescuePartyObserver.getInstance(mMockContext).onExecuteBootLoopMitigation(mitigationCount); } private void noteAppCrash(int mitigationCount, boolean isPersistent) { String packageName = isPersistent ? PERSISTENT_PACKAGE : NON_PERSISTENT_PACKAGE; - RescuePartyObserver.getInstance(mMockContext).execute(new VersionedPackage( - packageName, 1), PackageWatchdog.FAILURE_REASON_APP_CRASH, mitigationCount); + RescuePartyObserver.getInstance(mMockContext).onExecuteHealthCheckMitigation( + new VersionedPackage(packageName, 1), PackageWatchdog.FAILURE_REASON_APP_CRASH, + mitigationCount); } // Mock CrashRecoveryProperties as they cannot be accessed due to SEPolicy restrictions diff --git a/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java b/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java index f82a86092064..4a1315583ad4 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java @@ -109,7 +109,6 @@ import android.platform.test.annotations.Presubmit; import android.platform.test.flag.junit.SetFlagsRule; import android.util.ArrayMap; import android.util.SparseArray; -import android.util.SparseBooleanArray; import android.util.SparseIntArray; import com.android.server.LocalServices; @@ -176,7 +175,6 @@ public class MockingOomAdjusterTests { private ActiveUids mActiveUids; private PackageManagerInternal mPackageManagerInternal; private ActivityManagerService mService; - private TestCachedAppOptimizer mTestCachedAppOptimizer; private OomAdjusterInjector mInjector = new OomAdjusterInjector(); private int mUiTierSize; @@ -244,11 +242,9 @@ public class MockingOomAdjusterTests { doNothing().when(pr).enqueueProcessChangeItemLocked(anyInt(), anyInt(), anyInt(), anyBoolean()); mActiveUids = new ActiveUids(mService, false); - mTestCachedAppOptimizer = new TestCachedAppOptimizer(mService); mProcessStateController = new ProcessStateController.Builder(mService, mService.mProcessList, mActiveUids) .useModernOomAdjuster(mService.mConstants.ENABLE_NEW_OOMADJ) - .setCachedAppOptimizer(mTestCachedAppOptimizer) .setOomAdjusterInjector(mInjector) .build(); mService.mProcessStateController = mProcessStateController; @@ -3114,13 +3110,13 @@ public class MockingOomAdjusterTests { mProcessStateController.setUidTempAllowlistStateLSP(MOCKAPP_UID, true); assertEquals(true, app.getUidRecord().isSetAllowListed()); - assertFreezeState(app, false); - assertFreezeState(app2, false); + assertEquals(true, app.mOptRecord.shouldNotFreeze()); + assertEquals(true, app2.mOptRecord.shouldNotFreeze()); mProcessStateController.setUidTempAllowlistStateLSP(MOCKAPP_UID, false); assertEquals(false, app.getUidRecord().isSetAllowListed()); - assertFreezeState(app, true); - assertFreezeState(app2, true); + assertEquals(false, app.mOptRecord.shouldNotFreeze()); + assertEquals(false, app2.mOptRecord.shouldNotFreeze()); } @SuppressWarnings("GuardedBy") @@ -3142,25 +3138,25 @@ public class MockingOomAdjusterTests { assertEquals(true, app.getUidRecord().isSetAllowListed()); assertEquals(true, app2.getUidRecord().isSetAllowListed()); - assertFreezeState(app, false); - assertFreezeState(app2, false); - assertFreezeState(app3, false); + assertEquals(true, app.mOptRecord.shouldNotFreeze()); + assertEquals(true, app2.mOptRecord.shouldNotFreeze()); + assertEquals(true, app3.mOptRecord.shouldNotFreeze()); // Remove app1 from allowlist. mProcessStateController.setUidTempAllowlistStateLSP(MOCKAPP_UID, false); assertEquals(false, app.getUidRecord().isSetAllowListed()); assertEquals(true, app2.getUidRecord().isSetAllowListed()); - assertFreezeState(app, true); - assertFreezeState(app2, false); - assertFreezeState(app3, false); + assertEquals(false, app.mOptRecord.shouldNotFreeze()); + assertEquals(true, app2.mOptRecord.shouldNotFreeze()); + assertEquals(true, app3.mOptRecord.shouldNotFreeze()); // Now remove app2 from allowlist. mProcessStateController.setUidTempAllowlistStateLSP(MOCKAPP2_UID, false); assertEquals(false, app.getUidRecord().isSetAllowListed()); assertEquals(false, app2.getUidRecord().isSetAllowListed()); - assertFreezeState(app, true); - assertFreezeState(app2, true); - assertFreezeState(app3, true); + assertEquals(false, app.mOptRecord.shouldNotFreeze()); + assertEquals(false, app2.mOptRecord.shouldNotFreeze()); + assertEquals(false, app3.mOptRecord.shouldNotFreeze()); } @SuppressWarnings("GuardedBy") @@ -3374,14 +3370,6 @@ public class MockingOomAdjusterTests { assertEquals(expectedCached, state.isCached()); } - @SuppressWarnings("GuardedBy") - private void assertFreezeState(ProcessRecord app, boolean expectedFreezeState) { - boolean actualFreezeState = mTestCachedAppOptimizer.mLastSetFreezeState.get(app.getPid(), - false); - assertEquals("Unexcepted freeze state for " + app.processName, expectedFreezeState, - actualFreezeState); - } - private class ProcessRecordBuilder { @SuppressWarnings("UnusedVariable") int mPid; @@ -3525,39 +3513,6 @@ public class MockingOomAdjusterTests { return app; } } - private static final class TestProcessDependencies - implements CachedAppOptimizer.ProcessDependencies { - @Override - public long[] getRss(int pid) { - return new long[]{/*totalRSS*/ 0, /*fileRSS*/ 0, /*anonRSS*/ 0, /*swap*/ 0}; - } - - @Override - public void performCompaction(CachedAppOptimizer.CompactProfile action, int pid) {} - } - - private static class TestCachedAppOptimizer extends CachedAppOptimizer { - private SparseBooleanArray mLastSetFreezeState = new SparseBooleanArray(); - - TestCachedAppOptimizer(ActivityManagerService ams) { - super(ams, null, new TestProcessDependencies()); - } - - @Override - public boolean useFreezer() { - return true; - } - - @Override - public void freezeAppAsyncLSP(ProcessRecord app) { - mLastSetFreezeState.put(app.getPid(), true); - } - - @Override - public void unfreezeAppLSP(ProcessRecord app, @UnfreezeReason int reason) { - mLastSetFreezeState.put(app.getPid(), false); - } - } static class OomAdjusterInjector extends OomAdjuster.Injector { // Jump ahead in time by this offset amount. @@ -3569,6 +3524,7 @@ public class MockingOomAdjusterTests { mLastSetOomAdj.clear(); } + void jumpUptimeAheadTo(long uptimeMillis) { final long jumpMs = uptimeMillis - getUptimeMillis(); if (jumpMs <= 0) return; diff --git a/services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp b/services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp index 7ac7aca3fd59..1f88c29e2abc 100644 --- a/services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp +++ b/services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp @@ -36,7 +36,10 @@ android_test { "services.core", "truth", "flag-junit", - ], + ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { + "true": ["service-crashrecovery.impl"], + default: [], + }), libs: [ "android.test.mock.stubs.system", diff --git a/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp b/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp index 677ecf47355d..2f23e02f5737 100644 --- a/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp +++ b/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp @@ -34,7 +34,10 @@ android_test { "services.core", "truth", "flag-junit", - ], + ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { + "true": ["service-crashrecovery.impl"], + default: [], + }), libs: [ "android.test.mock.stubs.system", diff --git a/services/tests/mockingservicestests/src/com/android/server/rollback/RollbackPackageHealthObserverTest.java b/services/tests/mockingservicestests/src/com/android/server/rollback/RollbackPackageHealthObserverTest.java index e0c7bfe91890..347dc81c6734 100644 --- a/services/tests/mockingservicestests/src/com/android/server/rollback/RollbackPackageHealthObserverTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/rollback/RollbackPackageHealthObserverTest.java @@ -109,14 +109,11 @@ public class RollbackPackageHealthObserverTest { private static final String PROP_DISABLE_HIGH_IMPACT_ROLLBACK_FLAG = "persist.device_config.configuration.disable_high_impact_rollback"; - private SystemConfig mSysConfig; @Rule public TemporaryFolder mTemporaryFolder = new TemporaryFolder(); @Before public void setup() { - mSysConfig = new SystemConfigTestClass(); - mSession = ExtendedMockito.mockitoSession() .initMocks(this) .strictness(Strictness.LENIENT) @@ -184,7 +181,7 @@ public class RollbackPackageHealthObserverTest { @Test public void testHealthCheckLevels() { RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); VersionedPackage testFailedPackage = new VersionedPackage(APP_A, VERSION_CODE); VersionedPackage secondFailedPackage = new VersionedPackage(APP_B, VERSION_CODE); @@ -228,14 +225,14 @@ public class RollbackPackageHealthObserverTest { @Test public void testIsPersistent() { RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); assertTrue(observer.isPersistent()); } @Test public void testMayObservePackage_withoutAnyRollback() { RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); when(mRollbackManager.getAvailableRollbacks()).thenReturn(List.of()); assertFalse(observer.mayObservePackage(APP_A)); @@ -245,7 +242,7 @@ public class RollbackPackageHealthObserverTest { public void testMayObservePackage_forPersistentApp() throws PackageManager.NameNotFoundException { RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); ApplicationInfo info = new ApplicationInfo(); info.flags = ApplicationInfo.FLAG_PERSISTENT | ApplicationInfo.FLAG_SYSTEM; when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -260,7 +257,7 @@ public class RollbackPackageHealthObserverTest { public void testMayObservePackage_forNonPersistentApp() throws PackageManager.NameNotFoundException { RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); when(mRollbackManager.getAvailableRollbacks()).thenReturn(List.of(mRollbackInfo)); when(mRollbackInfo.getPackages()).thenReturn(List.of(mPackageRollbackInfo)); @@ -286,7 +283,7 @@ public class RollbackPackageHealthObserverTest { false, null, 111, PackageManager.ROLLBACK_USER_IMPACT_LOW); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); VersionedPackage secondFailedPackage = new VersionedPackage(APP_B, VERSION_CODE); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -317,7 +314,7 @@ public class RollbackPackageHealthObserverTest { false, null, 111, PackageManager.ROLLBACK_USER_IMPACT_HIGH); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); VersionedPackage secondFailedPackage = new VersionedPackage(APP_B, VERSION_CODE); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -348,7 +345,7 @@ public class RollbackPackageHealthObserverTest { false, null, 111, PackageManager.ROLLBACK_USER_IMPACT_ONLY_MANUAL); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); VersionedPackage secondFailedPackage = new VersionedPackage(APP_B, VERSION_CODE); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -386,7 +383,7 @@ public class RollbackPackageHealthObserverTest { false, null, 222, PackageManager.ROLLBACK_USER_IMPACT_HIGH); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); VersionedPackage failedPackage = new VersionedPackage(APP_C, VERSION_CODE); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -419,7 +416,7 @@ public class RollbackPackageHealthObserverTest { PackageManager.ROLLBACK_USER_IMPACT_LOW); VersionedPackage secondFailedPackage = new VersionedPackage(APP_B, VERSION_CODE); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); // Make the rollbacks available @@ -427,7 +424,7 @@ public class RollbackPackageHealthObserverTest { when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getModuleInfo(any(), eq(0))).thenReturn(null); - observer.execute(secondFailedPackage, + observer.onExecuteHealthCheckMitigation(secondFailedPackage, PackageWatchdog.FAILURE_REASON_NATIVE_CRASH, 1); waitForIdleHandler(observer.getHandler(), Duration.ofSeconds(10)); @@ -461,7 +458,7 @@ public class RollbackPackageHealthObserverTest { false, null, 222, PackageManager.ROLLBACK_USER_IMPACT_LOW); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); ArgumentCaptor<Integer> argument = ArgumentCaptor.forClass(Integer.class); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -471,7 +468,8 @@ public class RollbackPackageHealthObserverTest { when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getModuleInfo(any(), eq(0))).thenReturn(null); - observer.execute(appBFrom, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); + observer.onExecuteHealthCheckMitigation(appBFrom, PackageWatchdog.FAILURE_REASON_APP_CRASH, + 1); waitForIdleHandler(observer.getHandler(), Duration.ofSeconds(10)); verify(mRollbackManager).commitRollback(argument.capture(), any(), any()); @@ -506,7 +504,7 @@ public class RollbackPackageHealthObserverTest { PackageManager.ROLLBACK_USER_IMPACT_LOW); VersionedPackage failedPackage = new VersionedPackage(APP_C, VERSION_CODE); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); ArgumentCaptor<Integer> argument = ArgumentCaptor.forClass(Integer.class); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -516,7 +514,8 @@ public class RollbackPackageHealthObserverTest { when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getModuleInfo(any(), eq(0))).thenReturn(null); - observer.execute(failedPackage, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); + observer.onExecuteHealthCheckMitigation(failedPackage, + PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); waitForIdleHandler(observer.getHandler(), Duration.ofSeconds(10)); verify(mRollbackManager, times(2)).commitRollback( @@ -552,7 +551,7 @@ public class RollbackPackageHealthObserverTest { PackageManager.ROLLBACK_USER_IMPACT_HIGH); VersionedPackage failedPackage = new VersionedPackage(APP_C, VERSION_CODE); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); ArgumentCaptor<Integer> argument = ArgumentCaptor.forClass(Integer.class); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -562,7 +561,8 @@ public class RollbackPackageHealthObserverTest { when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getModuleInfo(any(), eq(0))).thenReturn(null); - observer.execute(failedPackage, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); + observer.onExecuteHealthCheckMitigation(failedPackage, + PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); waitForIdleHandler(observer.getHandler(), Duration.ofSeconds(10)); verify(mRollbackManager, times(1)).commitRollback( @@ -590,7 +590,7 @@ public class RollbackPackageHealthObserverTest { PackageManager.ROLLBACK_USER_IMPACT_HIGH); VersionedPackage failedPackage = new VersionedPackage(APP_C, VERSION_CODE); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); ArgumentCaptor<Integer> argument = ArgumentCaptor.forClass(Integer.class); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -599,7 +599,8 @@ public class RollbackPackageHealthObserverTest { when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getModuleInfo(any(), eq(0))).thenReturn(null); - observer.execute(failedPackage, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); + observer.onExecuteHealthCheckMitigation(failedPackage, + PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); waitForIdleHandler(observer.getHandler(), Duration.ofSeconds(10)); verify(mRollbackManager, never()).commitRollback(argument.capture(), any(), any()); @@ -621,7 +622,7 @@ public class RollbackPackageHealthObserverTest { false, null, 111, PackageManager.ROLLBACK_USER_IMPACT_LOW); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); // Make the rollbacks available @@ -646,7 +647,7 @@ public class RollbackPackageHealthObserverTest { false, null, 111, PackageManager.ROLLBACK_USER_IMPACT_HIGH); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); // Make the rollbacks available @@ -672,7 +673,7 @@ public class RollbackPackageHealthObserverTest { false, null, 111, PackageManager.ROLLBACK_USER_IMPACT_HIGH); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); // Make the rollbacks available @@ -701,7 +702,7 @@ public class RollbackPackageHealthObserverTest { false, null, 111, PackageManager.ROLLBACK_USER_IMPACT_ONLY_MANUAL); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); // Make the rollbacks available @@ -737,7 +738,7 @@ public class RollbackPackageHealthObserverTest { false, null, 222, PackageManager.ROLLBACK_USER_IMPACT_HIGH); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); // Make the rollbacks available @@ -776,7 +777,7 @@ public class RollbackPackageHealthObserverTest { false, null, 222, PackageManager.ROLLBACK_USER_IMPACT_LOW); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); ArgumentCaptor<Integer> argument = ArgumentCaptor.forClass(Integer.class); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -786,7 +787,7 @@ public class RollbackPackageHealthObserverTest { when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getModuleInfo(any(), eq(0))).thenReturn(null); - observer.executeBootLoopMitigation(1); + observer.onExecuteBootLoopMitigation(1); waitForIdleHandler(observer.getHandler(), Duration.ofSeconds(10)); verify(mRollbackManager, times(2)).commitRollback( @@ -821,7 +822,7 @@ public class RollbackPackageHealthObserverTest { false, null, 222, PackageManager.ROLLBACK_USER_IMPACT_HIGH); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); ArgumentCaptor<Integer> argument = ArgumentCaptor.forClass(Integer.class); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -831,7 +832,7 @@ public class RollbackPackageHealthObserverTest { when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getModuleInfo(any(), eq(0))).thenReturn(null); - observer.executeBootLoopMitigation(1); + observer.onExecuteBootLoopMitigation(1); waitForIdleHandler(observer.getHandler(), Duration.ofSeconds(10)); verify(mRollbackManager, times(1)).commitRollback( @@ -857,7 +858,7 @@ public class RollbackPackageHealthObserverTest { false, null, 111, PackageManager.ROLLBACK_USER_IMPACT_HIGH); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); ArgumentCaptor<Integer> argument = ArgumentCaptor.forClass(Integer.class); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -866,7 +867,7 @@ public class RollbackPackageHealthObserverTest { when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getModuleInfo(any(), eq(0))).thenReturn(null); - observer.executeBootLoopMitigation(1); + observer.onExecuteBootLoopMitigation(1); waitForIdleHandler(observer.getHandler(), Duration.ofSeconds(10)); verify(mRollbackManager, times(1)).commitRollback( @@ -902,7 +903,7 @@ public class RollbackPackageHealthObserverTest { PackageManager.ROLLBACK_USER_IMPACT_ONLY_MANUAL); VersionedPackage failedPackage = new VersionedPackage(APP_C, VERSION_CODE); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); ArgumentCaptor<Integer> argument = ArgumentCaptor.forClass(Integer.class); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -912,7 +913,8 @@ public class RollbackPackageHealthObserverTest { when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getModuleInfo(any(), eq(0))).thenReturn(null); - observer.execute(failedPackage, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); + observer.onExecuteHealthCheckMitigation(failedPackage, + PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); waitForIdleHandler(observer.getHandler(), Duration.ofSeconds(10)); verify(mRollbackManager, times(1)).commitRollback( @@ -938,7 +940,7 @@ public class RollbackPackageHealthObserverTest { PackageManager.ROLLBACK_USER_IMPACT_ONLY_MANUAL); VersionedPackage failedPackage = new VersionedPackage(APP_C, VERSION_CODE); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); ArgumentCaptor<Integer> argument = ArgumentCaptor.forClass(Integer.class); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -947,7 +949,8 @@ public class RollbackPackageHealthObserverTest { when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getModuleInfo(any(), eq(0))).thenReturn(null); - observer.execute(failedPackage, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); + observer.onExecuteHealthCheckMitigation(failedPackage, + PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); waitForIdleHandler(observer.getHandler(), Duration.ofSeconds(10)); verify(mRollbackManager, never()).commitRollback(argument.capture(), any(), any()); @@ -980,7 +983,7 @@ public class RollbackPackageHealthObserverTest { PackageManager.ROLLBACK_USER_IMPACT_HIGH); VersionedPackage failedPackage = new VersionedPackage(APP_C, VERSION_CODE); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); ArgumentCaptor<Integer> argument = ArgumentCaptor.forClass(Integer.class); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -990,7 +993,7 @@ public class RollbackPackageHealthObserverTest { when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getModuleInfo(any(), eq(0))).thenReturn(null); - observer.executeBootLoopMitigation(1); + observer.onExecuteBootLoopMitigation(1); waitForIdleHandler(observer.getHandler(), Duration.ofSeconds(10)); verify(mRollbackManager, times(1)).commitRollback( @@ -1026,7 +1029,7 @@ public class RollbackPackageHealthObserverTest { false, null, 111, PackageManager.ROLLBACK_USER_IMPACT_HIGH); RollbackPackageHealthObserver observer = - spy(new RollbackPackageHealthObserver(mMockContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mMockContext)); ArgumentCaptor<Integer> argument = ArgumentCaptor.forClass(Integer.class); when(mMockContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); @@ -1036,7 +1039,7 @@ public class RollbackPackageHealthObserverTest { when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getModuleInfo(any(), eq(0))).thenReturn(null); - observer.executeBootLoopMitigation(1); + observer.onExecuteBootLoopMitigation(1); waitForIdleHandler(observer.getHandler(), Duration.ofSeconds(10)); verify(mRollbackManager, never()).commitRollback( diff --git a/services/tests/powerservicetests/Android.bp b/services/tests/powerservicetests/Android.bp index f03043ea0ae0..2f0633139331 100644 --- a/services/tests/powerservicetests/Android.bp +++ b/services/tests/powerservicetests/Android.bp @@ -12,6 +12,7 @@ android_test { ], static_libs: [ + "truth", "flag-junit", "frameworks-base-testutils", "platform-compat-test-rules", diff --git a/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java b/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java index 1c7fc63efd41..96741e0b1e87 100644 --- a/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java +++ b/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java @@ -19,13 +19,17 @@ package com.android.server.power; import static android.os.PowerManagerInternal.WAKEFULNESS_ASLEEP; import static android.os.PowerManagerInternal.WAKEFULNESS_AWAKE; +import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -42,6 +46,7 @@ import android.hardware.SensorManager; import android.hardware.display.AmbientDisplayConfiguration; import android.hardware.display.DisplayManagerInternal; import android.os.BatteryStats; +import android.os.BatteryStatsInternal; import android.os.Handler; import android.os.IWakeLockCallback; import android.os.Looper; @@ -50,6 +55,7 @@ import android.os.RemoteException; import android.os.VibrationAttributes; import android.os.Vibrator; import android.os.WorkSource; +import android.os.WorkSource.WorkChain; import android.os.test.TestLooper; import android.provider.Settings; import android.testing.TestableContext; @@ -67,12 +73,15 @@ import com.android.server.LocalServices; import com.android.server.input.InputManagerInternal; import com.android.server.inputmethod.InputMethodManagerInternal; import com.android.server.policy.WindowManagerPolicy; +import com.android.server.power.FrameworkStatsLogger.WakelockEventType; import com.android.server.power.batterysaver.BatterySaverStateMachine; import com.android.server.power.feature.PowerManagerFlags; import com.android.server.statusbar.StatusBarManagerInternal; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -87,6 +96,14 @@ public class NotifierTest { private static final int DISPLAY_PORT = 0xFF; private static final long DISPLAY_MODEL = 0xEEEEEEEEL; + private static final int UID = 1234; + private static final int OWNER_UID = 1235; + private static final int WORK_SOURCE_UID_1 = 2345; + private static final int WORK_SOURCE_UID_2 = 2346; + private static final int OWNER_WORK_SOURCE_UID_1 = 3456; + private static final int OWNER_WORK_SOURCE_UID_2 = 3457; + private static final int PID = 5678; + @Mock private BatterySaverStateMachine mBatterySaverStateMachineMock; @Mock private PowerManagerService.NativeWrapper mNativeWrapperMock; @Mock private Notifier mNotifierMock; @@ -110,13 +127,15 @@ public class NotifierTest { @Mock private AppOpsManager mAppOpsManager; + @Mock private BatteryStatsInternal mBatteryStatsInternal; + @Mock private FrameworkStatsLogger mLogger; + private PowerManagerService mService; private Context mContextSpy; private Resources mResourcesSpy; private TestLooper mTestLooper = new TestLooper(); private FakeExecutor mTestExecutor = new FakeExecutor(); private Notifier mNotifier; - private DisplayInfo mDefaultDisplayInfo = new DisplayInfo(); @Before @@ -411,6 +430,246 @@ public class NotifierTest { } @Test + public void testOnWakeLockReleased_FrameworkStatsLogged_NoChains() { + when(mPowerManagerFlags.isMoveWscLoggingToNotifierEnabled()).thenReturn(true); + createNotifier(); + + clearInvocations(mLogger, mWakeLockLog, mBatteryStats, mAppOpsManager); + + when(mBatteryStatsInternal.getOwnerUid(UID)).thenReturn(OWNER_UID); + when(mBatteryStatsInternal.getOwnerUid(WORK_SOURCE_UID_1)) + .thenReturn(OWNER_WORK_SOURCE_UID_1); + + mNotifier.onWakeLockAcquired( + PowerManager.PARTIAL_WAKE_LOCK, + "wakelockTag", + "my.package.name", + UID, + PID, + /* workSource= */ null, + /* historyTag= */ null, + /* callback= */ null); + + WorkSource ws = new WorkSource(WORK_SOURCE_UID_1); + + mNotifier.onWakeLockChanging( + /* existing WakeLock params */ + PowerManager.PARTIAL_WAKE_LOCK, + "wakelockTag", + "my.package.name", + UID, + PID, + /* workSource= */ null, + /* historyTag= */ null, + /* callback= */ null, + /* updated WakeLock params */ + PowerManager.PARTIAL_WAKE_LOCK, + "wakelockTag", + "my.package.name", + UID, + PID, + ws, + /* historyTag= */ null, + /* callback= */ null); + + mNotifier.onWakeLockReleased( + PowerManager.PARTIAL_WAKE_LOCK, + "wakelockTag", + "my.package.name", + UID, + PID, + ws, + /* historyTag= */ null, + /* callback= */ null); + + verify(mBatteryStatsInternal, atLeast(1)).getOwnerUid(eq(UID)); + verify(mBatteryStatsInternal, atLeast(1)).getOwnerUid(eq(WORK_SOURCE_UID_1)); + + // ACQUIRE before RELEASE + InOrder inOrder1 = inOrder(mLogger); + inOrder1.verify(mLogger) + .wakelockStateChanged( + eq(OWNER_UID), + eq("wakelockTag"), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.ACQUIRE)); + inOrder1.verify(mLogger) + .wakelockStateChanged( + eq(OWNER_UID), + eq("wakelockTag"), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.RELEASE)); + + InOrder inOrder2 = inOrder(mLogger); + inOrder2.verify(mLogger) + .wakelockStateChanged( + eq(OWNER_WORK_SOURCE_UID_1), + eq("wakelockTag"), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.ACQUIRE)); + inOrder2.verify(mLogger) + .wakelockStateChanged( + eq(OWNER_WORK_SOURCE_UID_1), + eq("wakelockTag"), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.RELEASE)); + } + + @Test + public void testOnWakeLockReleased_FrameworkStatsLogged_MultipleWorkSourceUids() { + // UIDs stored directly in WorkSource + WorkSource ws = new WorkSource(WORK_SOURCE_UID_1); + ws.add(WORK_SOURCE_UID_2); + testWorkSource(ws); + + InOrder inOrder = inOrder(mLogger); + ArgumentCaptor<Integer> captorInt = ArgumentCaptor.forClass(int.class); + + // ACQUIRE + inOrder.verify(mLogger, times(2)) + .wakelockStateChanged( + /* uid= */ captorInt.capture(), + eq("wakelockTag"), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.ACQUIRE)); + assertThat(captorInt.getAllValues()) + .containsExactly(OWNER_WORK_SOURCE_UID_1, OWNER_WORK_SOURCE_UID_2); + + // RELEASE + captorInt = ArgumentCaptor.forClass(int.class); + inOrder.verify(mLogger, times(2)) + .wakelockStateChanged( + /* uid= */ captorInt.capture(), + eq("wakelockTag"), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.RELEASE)); + assertThat(captorInt.getAllValues()) + .containsExactly(OWNER_WORK_SOURCE_UID_1, OWNER_WORK_SOURCE_UID_2); + } + + @Test + public void testOnWakeLockReleased_FrameworkStatsLogged_OneChain() { + // UIDs stored in a WorkChain of the WorkSource + WorkSource ws = new WorkSource(); + WorkChain wc = ws.createWorkChain(); + wc.addNode(WORK_SOURCE_UID_1, "tag1"); + wc.addNode(WORK_SOURCE_UID_2, "tag2"); + testWorkSource(ws); + + WorkChain expectedWorkChain = new WorkChain(); + expectedWorkChain.addNode(OWNER_WORK_SOURCE_UID_1, "tag1"); + expectedWorkChain.addNode(OWNER_WORK_SOURCE_UID_2, "tag2"); + + InOrder inOrder = inOrder(mLogger); + + // ACQUIRE + inOrder.verify(mLogger) + .wakelockStateChanged( + eq("wakelockTag"), + eq(expectedWorkChain), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.ACQUIRE)); + // RELEASE + inOrder.verify(mLogger) + .wakelockStateChanged( + eq("wakelockTag"), + eq(expectedWorkChain), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.RELEASE)); + } + + @Test + public void testOnWakeLockReleased_FrameworkStatsLogged_OneUid_OneChain() { + WorkSource ws = new WorkSource(WORK_SOURCE_UID_1); + WorkChain wc = ws.createWorkChain(); + wc.addNode(WORK_SOURCE_UID_2, "someTag"); + testWorkSource(ws); + + WorkChain expectedWorkChain = new WorkChain(); + expectedWorkChain.addNode(OWNER_WORK_SOURCE_UID_2, "someTag"); + + InOrder inOrder1 = inOrder(mLogger); + InOrder inOrder2 = inOrder(mLogger); + + // ACQUIRE + inOrder1.verify(mLogger) + .wakelockStateChanged( + eq(OWNER_WORK_SOURCE_UID_1), + eq("wakelockTag"), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.ACQUIRE)); + inOrder2.verify(mLogger) + .wakelockStateChanged( + eq("wakelockTag"), + eq(expectedWorkChain), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.ACQUIRE)); + // RELEASE + inOrder1.verify(mLogger) + .wakelockStateChanged( + eq(OWNER_WORK_SOURCE_UID_1), + eq("wakelockTag"), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.RELEASE)); + inOrder2.verify(mLogger) + .wakelockStateChanged( + eq("wakelockTag"), + eq(expectedWorkChain), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.RELEASE)); + } + + @Test + public void testOnWakeLockReleased_FrameworkStatsLogged_TwoChains() { + // UIDs stored in a WorkChain of the WorkSource + WorkSource ws = new WorkSource(); + WorkChain wc1 = ws.createWorkChain(); + wc1.addNode(WORK_SOURCE_UID_1, "tag1"); + + WorkChain wc2 = ws.createWorkChain(); + wc2.addNode(WORK_SOURCE_UID_2, "tag2"); + + testWorkSource(ws); + + WorkChain expectedWorkChain1 = new WorkChain(); + expectedWorkChain1.addNode(OWNER_WORK_SOURCE_UID_1, "tag1"); + + WorkChain expectedWorkChain2 = new WorkChain(); + expectedWorkChain2.addNode(OWNER_WORK_SOURCE_UID_2, "tag2"); + + InOrder inOrder1 = inOrder(mLogger); + InOrder inOrder2 = inOrder(mLogger); + + // ACQUIRE + inOrder1.verify(mLogger) + .wakelockStateChanged( + eq("wakelockTag"), + eq(expectedWorkChain1), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.ACQUIRE)); + inOrder2.verify(mLogger) + .wakelockStateChanged( + eq("wakelockTag"), + eq(expectedWorkChain2), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.ACQUIRE)); + + // RELEASE + inOrder1.verify(mLogger) + .wakelockStateChanged( + eq("wakelockTag"), + eq(expectedWorkChain1), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.RELEASE)); + inOrder2.verify(mLogger) + .wakelockStateChanged( + eq("wakelockTag"), + eq(expectedWorkChain2), + eq(PowerManager.PARTIAL_WAKE_LOCK), + eq(WakelockEventType.RELEASE)); + } + + @Test public void testOnWakeLockListener_RemoteException_NoRethrow() throws RemoteException { when(mPowerManagerFlags.improveWakelockLatency()).thenReturn(true); createNotifier(); @@ -708,22 +967,33 @@ public class NotifierTest { } private void createNotifier() { - Notifier.Injector injector = new Notifier.Injector() { - @Override - public long currentTimeMillis() { - return 1; - } - - @Override - public WakeLockLog getWakeLockLog(Context context) { - return mWakeLockLog; - } - - @Override - public AppOpsManager getAppOpsManager(Context context) { - return mAppOpsManager; - } - }; + Notifier.Injector injector = + new Notifier.Injector() { + @Override + public long currentTimeMillis() { + return 1; + } + + @Override + public WakeLockLog getWakeLockLog(Context context) { + return mWakeLockLog; + } + + @Override + public AppOpsManager getAppOpsManager(Context context) { + return mAppOpsManager; + } + + @Override + public FrameworkStatsLogger getFrameworkStatsLogger() { + return mLogger; + } + + @Override + public BatteryStatsInternal getBatteryStatsInternal() { + return mBatteryStatsInternal; + } + }; mNotifier = new Notifier( mTestLooper.getLooper(), @@ -760,4 +1030,38 @@ public class NotifierTest { } } + private void testWorkSource(WorkSource ws) { + when(mPowerManagerFlags.isMoveWscLoggingToNotifierEnabled()).thenReturn(true); + createNotifier(); + clearInvocations( + mBatteryStatsInternal, mLogger, mWakeLockLog, mBatteryStats, mAppOpsManager); + + when(mBatteryStatsInternal.getOwnerUid(WORK_SOURCE_UID_1)) + .thenReturn(OWNER_WORK_SOURCE_UID_1); + when(mBatteryStatsInternal.getOwnerUid(WORK_SOURCE_UID_2)) + .thenReturn(OWNER_WORK_SOURCE_UID_2); + + mNotifier.onWakeLockAcquired( + PowerManager.PARTIAL_WAKE_LOCK, + "wakelockTag", + "my.package.name", + UID, + PID, + ws, + /* historyTag= */ null, + /* callback= */ null); + + mNotifier.onWakeLockReleased( + PowerManager.PARTIAL_WAKE_LOCK, + "wakelockTag", + "my.package.name", + UID, + PID, + ws, + /* historyTag= */ null, + /* callback= */ null); + + verify(mBatteryStatsInternal, atLeast(1)).getOwnerUid(eq(WORK_SOURCE_UID_1)); + verify(mBatteryStatsInternal, atLeast(1)).getOwnerUid(eq(WORK_SOURCE_UID_2)); + } } diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsImplTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsImplTest.java index f02a389a160e..d83dc110800a 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsImplTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsImplTest.java @@ -67,6 +67,7 @@ import com.android.internal.os.CpuScalingPolicies; import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidFreqTimeReader; import com.android.internal.os.KernelSingleUidTimeReader; import com.android.internal.os.LongArrayMultiStateCounter; +import com.android.internal.os.MonotonicClock; import com.android.internal.os.PowerProfile; import com.android.server.power.feature.flags.Flags; @@ -120,6 +121,7 @@ public class BatteryStatsImplTest { }}); private final MockClock mMockClock = new MockClock(); + private final MonotonicClock mMonotonicClock = new MonotonicClock(777666, mMockClock); private MockBatteryStatsImpl mBatteryStatsImpl; private Handler mHandler; private PowerStatsStore mPowerStatsStore; @@ -160,7 +162,7 @@ public class BatteryStatsImplTest { mPowerStatsStore = new PowerStatsStore(systemDir, mHandler); mBatteryUsageStatsProvider = new BatteryUsageStatsProvider(context, mPowerAttributor, mPowerProfile, mBatteryStatsImpl.getCpuScalingPolicies(), mPowerStatsStore, 0, - mMockClock); + mMockClock, mMonotonicClock); } @Test diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsAtomTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsAtomTest.java index 813dd841b2b9..5d50e6c9f715 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsAtomTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsAtomTest.java @@ -191,7 +191,7 @@ public class BatteryUsageStatsAtomTest { "cpu", 1650.0f, 9300.0f, - 8400L + 8300L ); verify(statsLogger).buildStatsEvent( 1000L, @@ -205,7 +205,7 @@ public class BatteryUsageStatsAtomTest { "cpu", 1650.0f, 9400.0f, - 0L + 8400L ); verify(statsLogger).buildStatsEvent( 1000L, @@ -502,17 +502,17 @@ public class BatteryUsageStatsAtomTest { .setPackageWithHighestDrain("myPackage0") .setTimeInProcessStateMs(BatteryConsumer.PROCESS_STATE_FOREGROUND, 1000) .setTimeInProcessStateMs(BatteryConsumer.PROCESS_STATE_BACKGROUND, 2000) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.POWER_COMPONENT_SCREEN, 300) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.POWER_COMPONENT_CPU, 400) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 450) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + 1, 500) - .setUsageDurationMillis( + .addUsageDurationMillis( BatteryConsumer.POWER_COMPONENT_CPU, 600) - .setUsageDurationMillis( + .addUsageDurationMillis( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + 1, 800); final BatteryConsumer.Key keyFg = uidBuilder.getKey(BatteryConsumer.POWER_COMPONENT_CPU, @@ -524,14 +524,14 @@ public class BatteryUsageStatsAtomTest { final BatteryConsumer.Key keyCached = uidBuilder.getKey(BatteryConsumer.POWER_COMPONENT_CPU, BatteryConsumer.PROCESS_STATE_CACHED); - uidBuilder.setConsumedPower(keyFg, 9100, BatteryConsumer.POWER_MODEL_POWER_PROFILE) - .setUsageDurationMillis(keyFg, 8100) - .setConsumedPower(keyBg, 9200, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION) - .setUsageDurationMillis(keyBg, 8200) - .setConsumedPower(keyFgs, 9300, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION) - .setUsageDurationMillis(keyFgs, 8300) - .setConsumedPower(keyCached, 9400, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION) - .setUsageDurationMillis(keyFgs, 8400); + uidBuilder.addConsumedPower(keyFg, 9100, BatteryConsumer.POWER_MODEL_POWER_PROFILE) + .addUsageDurationMillis(keyFg, 8100) + .addConsumedPower(keyBg, 9200, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION) + .addUsageDurationMillis(keyBg, 8200) + .addConsumedPower(keyFgs, 9300, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION) + .addUsageDurationMillis(keyFgs, 8300) + .addConsumedPower(keyCached, 9400, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION) + .addUsageDurationMillis(keyCached, 8400); final BatteryConsumer.Key keyCustomFg = uidBuilder.getKey( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, @@ -539,9 +539,9 @@ public class BatteryUsageStatsAtomTest { final BatteryConsumer.Key keyCustomBg = uidBuilder.getKey( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, BatteryConsumer.PROCESS_STATE_BACKGROUND); - uidBuilder.setConsumedPower( + uidBuilder.addConsumedPower( keyCustomFg, 100, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); - uidBuilder.setConsumedPower( + uidBuilder.addConsumedPower( keyCustomBg, 350, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); builder.getOrCreateUidBatteryConsumerBuilder(UID_1) @@ -549,36 +549,36 @@ public class BatteryUsageStatsAtomTest { .setTimeInProcessStateMs(BatteryConsumer.PROCESS_STATE_FOREGROUND, 1234); builder.getOrCreateUidBatteryConsumerBuilder(UID_2) - .setConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN, + .addConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN, 766); builder.getOrCreateUidBatteryConsumerBuilder(UID_3); builder.getAggregateBatteryConsumerBuilder(AGGREGATE_BATTERY_CONSUMER_SCOPE_DEVICE) - .setConsumedPower(30000) - .setConsumedPower( + .addConsumedPower(30000) + .addConsumedPower( BatteryConsumer.POWER_COMPONENT_CPU, 20100, BatteryConsumer.POWER_MODEL_POWER_PROFILE) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.POWER_COMPONENT_AUDIO, 0, BatteryConsumer.POWER_MODEL_POWER_PROFILE) // Empty - .setConsumedPower( + .addConsumedPower( BatteryConsumer.POWER_COMPONENT_CAMERA, 20150, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 20200) - .setUsageDurationMillis( + .addUsageDurationMillis( BatteryConsumer.POWER_COMPONENT_CPU, 20300) - .setUsageDurationMillis( + .addUsageDurationMillis( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 20400); // Not used; just to make sure extraneous data doesn't mess things up. builder.getAggregateBatteryConsumerBuilder( BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_ALL_APPS) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.POWER_COMPONENT_CPU, 10100, BatteryConsumer.POWER_MODEL_POWER_PROFILE) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 10200); return builder.build(); @@ -596,8 +596,8 @@ public class BatteryUsageStatsAtomTest { BatteryConsumer.PROCESS_STATE_FOREGROUND, 1 * 60 * 1000) .setTimeInProcessStateMs( BatteryConsumer.PROCESS_STATE_BACKGROUND, 2 * 60 * 1000) - .setConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN, 30) - .setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 40); + .addConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN, 30) + .addConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 40); } // Add a UID with much larger battery footprint @@ -605,16 +605,16 @@ public class BatteryUsageStatsAtomTest { builder.getOrCreateUidBatteryConsumerBuilder(largeConsumerUid) .setTimeInProcessStateMs(BatteryConsumer.PROCESS_STATE_FOREGROUND, 10 * 60 * 1000) .setTimeInProcessStateMs(BatteryConsumer.PROCESS_STATE_BACKGROUND, 20 * 60 * 1000) - .setConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN, 300) - .setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 400); + .addConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN, 300) + .addConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 400); // Add a UID with much larger usage duration final int highUsageUid = 3002; builder.getOrCreateUidBatteryConsumerBuilder(highUsageUid) .setTimeInProcessStateMs(BatteryConsumer.PROCESS_STATE_FOREGROUND, 60 * 60 * 1000) .setTimeInProcessStateMs(BatteryConsumer.PROCESS_STATE_BACKGROUND, 120 * 60 * 1000) - .setConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN, 3) - .setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 4); + .addConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN, 3) + .addConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 4); BatteryUsageStats batteryUsageStats = builder.build(); final byte[] bytes = batteryUsageStats.getStatsProto(); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsProviderTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsProviderTest.java index 8239e0955032..709f83ba907d 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsProviderTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsProviderTest.java @@ -47,6 +47,7 @@ import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; import com.android.internal.os.BatteryStatsHistoryIterator; +import com.android.internal.os.MonotonicClock; import com.android.internal.os.PowerProfile; import com.android.server.power.stats.processor.MultiStatePowerAttributor; @@ -80,6 +81,7 @@ public class BatteryUsageStatsProviderTest { .setAveragePower(PowerProfile.POWER_BATTERY_CAPACITY, 4000.0); private MockClock mMockClock = mStatsRule.getMockClock(); + private MonotonicClock mMonotonicClock = new MonotonicClock(666777, mMockClock); private Context mContext; @Before @@ -146,7 +148,8 @@ public class BatteryUsageStatsProviderTest { BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, mock(PowerAttributor.class), mStatsRule.getPowerProfile(), - mStatsRule.getCpuScalingPolicies(), mock(PowerStatsStore.class), 0, mMockClock); + mStatsRule.getCpuScalingPolicies(), mock(PowerStatsStore.class), 0, mMockClock, + mMonotonicClock); final BatteryUsageStats batteryUsageStats = provider.getBatteryUsageStats(batteryStats, @@ -273,7 +276,8 @@ public class BatteryUsageStatsProviderTest { BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, powerAttributor, mStatsRule.getPowerProfile(), - mStatsRule.getCpuScalingPolicies(), mock(PowerStatsStore.class), 0, mMockClock); + mStatsRule.getCpuScalingPolicies(), mock(PowerStatsStore.class), 0, mMockClock, + mMonotonicClock); return provider.getBatteryUsageStats(batteryStats, BatteryUsageStatsQuery.DEFAULT); } @@ -303,7 +307,8 @@ public class BatteryUsageStatsProviderTest { BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, mock(PowerAttributor.class), mStatsRule.getPowerProfile(), - mStatsRule.getCpuScalingPolicies(), mock(PowerStatsStore.class), 0, mMockClock); + mStatsRule.getCpuScalingPolicies(), mock(PowerStatsStore.class), 0, mMockClock, + mMonotonicClock); final BatteryUsageStats batteryUsageStats = provider.getBatteryUsageStats(batteryStats, @@ -396,7 +401,8 @@ public class BatteryUsageStatsProviderTest { BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, mock(PowerAttributor.class), mStatsRule.getPowerProfile(), - mStatsRule.getCpuScalingPolicies(), mock(PowerStatsStore.class), 0, mMockClock); + mStatsRule.getCpuScalingPolicies(), mock(PowerStatsStore.class), 0, mMockClock, + mMonotonicClock); final BatteryUsageStats batteryUsageStats = provider.getBatteryUsageStats(batteryStats, @@ -487,7 +493,8 @@ public class BatteryUsageStatsProviderTest { BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, mock(PowerAttributor.class), mStatsRule.getPowerProfile(), - mStatsRule.getCpuScalingPolicies(), powerStatsStore, 0, mMockClock); + mStatsRule.getCpuScalingPolicies(), powerStatsStore, 0, mMockClock, + mMonotonicClock); batteryStats.saveBatteryUsageStatsOnReset(provider, powerStatsStore, /* accumulateBatteryUsageStats */ false); @@ -590,7 +597,10 @@ public class BatteryUsageStatsProviderTest { private void accumulateBatteryUsageStats(int accumulatedBatteryUsageStatsSpanSize, int expectedNumberOfUpdates) throws Throwable { - BatteryStatsImpl batteryStats = mStatsRule.getBatteryStats(); + BatteryStatsImpl batteryStats = spy(mStatsRule.getBatteryStats()); + // Note - these two are in microseconds + when(batteryStats.computeBatteryTimeRemaining(anyLong())).thenReturn(111_000L); + when(batteryStats.computeChargeTimeRemaining(anyLong())).thenReturn(777_000L); batteryStats.forceRecordAllHistory(); setTime(5 * MINUTE_IN_MS); @@ -623,7 +633,7 @@ public class BatteryUsageStatsProviderTest { BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, powerAttributor, mStatsRule.getPowerProfile(), mStatsRule.getCpuScalingPolicies(), powerStatsStore, - accumulatedBatteryUsageStatsSpanSize, mMockClock); + accumulatedBatteryUsageStatsSpanSize, mMockClock, mMonotonicClock); provider.accumulateBatteryUsageStatsAsync(batteryStats, mStatsRule.getHandler()); @@ -677,9 +687,14 @@ public class BatteryUsageStatsProviderTest { BatteryUsageStats stats = provider.getBatteryUsageStats(batteryStats, new BatteryUsageStatsQuery.Builder().accumulated().build()); + assertThat(stats.getStatsStartTimestamp()).isEqualTo(5 * MINUTE_IN_MS); assertThat(stats.getStatsEndTimestamp()).isEqualTo(115 * MINUTE_IN_MS); + assertThat(stats.getBatteryTimeRemainingMs()).isEqualTo(111); + assertThat(stats.getChargeTimeRemainingMs()).isEqualTo(777); + assertThat(stats.getBatteryCapacity()).isEqualTo(4000); // from PowerProfile + // Total: 10 + 20 + 30 = 60 assertThat(stats.getAggregateBatteryConsumer( BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_DEVICE) @@ -729,7 +744,8 @@ public class BatteryUsageStatsProviderTest { BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, mock(PowerAttributor.class), mStatsRule.getPowerProfile(), - mStatsRule.getCpuScalingPolicies(), mock(PowerStatsStore.class), 0, mMockClock); + mStatsRule.getCpuScalingPolicies(), mock(PowerStatsStore.class), 0, mMockClock, + mMonotonicClock); PowerStatsStore powerStatsStore = mock(PowerStatsStore.class); doAnswer(invocation -> { @@ -796,7 +812,8 @@ public class BatteryUsageStatsProviderTest { BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, mock(PowerAttributor.class), mStatsRule.getPowerProfile(), - mStatsRule.getCpuScalingPolicies(), powerStatsStore, 0, mMockClock); + mStatsRule.getCpuScalingPolicies(), powerStatsStore, 0, mMockClock, + mMonotonicClock); BatteryUsageStatsQuery query = new BatteryUsageStatsQuery.Builder() .aggregateSnapshots(0, 3000) diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsTest.java index 1b6b8c49461e..9771da590e37 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsTest.java @@ -119,7 +119,7 @@ public class BatteryUsageStatsTest { BatteryStatsImpl.Uid mockUid = mock(BatteryStatsImpl.Uid.class); when(mockUid.getUid()).thenReturn(i); builder.getOrCreateUidBatteryConsumerBuilder(mockUid) - .setConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN, i * 100); + .addConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN, i * 100); } BatteryUsageStats outBatteryUsageStats = builder.build(); @@ -355,13 +355,13 @@ public class BatteryUsageStatsTest { if (includeUserBatteryConsumer) { builder.getOrCreateUserBatteryConsumerBuilder(USER_ID) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.POWER_COMPONENT_CPU, 10) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 20) - .setUsageDurationMillis( + .addUsageDurationMillis( BatteryConsumer.POWER_COMPONENT_CPU, 30) - .setUsageDurationMillis( + .addUsageDurationMillis( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 40); } return builder; @@ -422,15 +422,15 @@ public class BatteryUsageStatsTest { .setTimeInProcessStateMs(PROCESS_STATE_BACKGROUND, timeInProcessStateBackground) .setTimeInProcessStateMs(PROCESS_STATE_FOREGROUND_SERVICE, timeInProcessStateForegroundService) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.POWER_COMPONENT_SCREEN, screenPower, screenPowerModel) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.POWER_COMPONENT_CPU, cpuPower, cpuPowerModel) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, customComponentPower) - .setUsageDurationMillis( + .addUsageDurationMillis( BatteryConsumer.POWER_COMPONENT_CPU, cpuDuration) - .setUsageDurationMillis( + .addUsageDurationMillis( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, customComponentDuration); if (builder.isProcessStateDataNeeded()) { final BatteryConsumer.Key cpuFgKey = builder.isScreenStateDataNeeded() @@ -461,21 +461,21 @@ public class BatteryUsageStatsTest { BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, BatteryConsumer.PROCESS_STATE_BACKGROUND); uidBuilder - .setConsumedPower(cpuFgKey, cpuPowerForeground, + .addConsumedPower(cpuFgKey, cpuPowerForeground, BatteryConsumer.POWER_MODEL_POWER_PROFILE) - .setUsageDurationMillis(cpuFgKey, cpuDurationForeground) - .setConsumedPower(cpuBgKey, cpuPowerBackground, + .addUsageDurationMillis(cpuFgKey, cpuDurationForeground) + .addConsumedPower(cpuBgKey, cpuPowerBackground, BatteryConsumer.POWER_MODEL_POWER_PROFILE) - .setUsageDurationMillis(cpuBgKey, cpuDurationBackground) - .setConsumedPower(cpuFgsKey, cpuPowerFgs, + .addUsageDurationMillis(cpuBgKey, cpuDurationBackground) + .addConsumedPower(cpuFgsKey, cpuPowerFgs, BatteryConsumer.POWER_MODEL_POWER_PROFILE) - .setUsageDurationMillis(cpuFgsKey, cpuDurationFgs) - .setConsumedPower(cachedKey, cpuPowerCached, + .addUsageDurationMillis(cpuFgsKey, cpuDurationFgs) + .addConsumedPower(cachedKey, cpuPowerCached, BatteryConsumer.POWER_MODEL_POWER_PROFILE) - .setUsageDurationMillis(cachedKey, cpuDurationCached) - .setConsumedPower(customBgKey, customComponentPower, + .addUsageDurationMillis(cachedKey, cpuDurationCached) + .addConsumedPower(customBgKey, customComponentPower, BatteryConsumer.POWER_MODEL_UNDEFINED) - .setUsageDurationMillis(customBgKey, customComponentDuration); + .addUsageDurationMillis(customBgKey, customComponentDuration); } } @@ -486,15 +486,15 @@ public class BatteryUsageStatsTest { long cpuDurationChgScrOn, double cpuPowerChgScrOff, long cpuDurationChgScrOff) { final AggregateBatteryConsumer.Builder aggBuilder = builder.getAggregateBatteryConsumerBuilder(scope) - .setConsumedPower(consumedPower) - .setConsumedPower( + .addConsumedPower(consumedPower) + .addConsumedPower( BatteryConsumer.POWER_COMPONENT_CPU, cpuPower) - .setConsumedPower( + .addConsumedPower( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, customComponentPower) - .setUsageDurationMillis( + .addUsageDurationMillis( BatteryConsumer.POWER_COMPONENT_CPU, cpuDuration) - .setUsageDurationMillis( + .addUsageDurationMillis( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, customComponentDuration); if (builder.isPowerStateDataNeeded() || builder.isScreenStateDataNeeded()) { @@ -519,18 +519,18 @@ public class BatteryUsageStatsTest { BatteryConsumer.SCREEN_STATE_OTHER, BatteryConsumer.POWER_STATE_OTHER); aggBuilder - .setConsumedPower(cpuBatScrOn, cpuPowerBatScrOn, + .addConsumedPower(cpuBatScrOn, cpuPowerBatScrOn, BatteryConsumer.POWER_MODEL_POWER_PROFILE) - .setUsageDurationMillis(cpuBatScrOn, cpuDurationBatScrOn) - .setConsumedPower(cpuBatScrOff, cpuPowerBatScrOff, + .addUsageDurationMillis(cpuBatScrOn, cpuDurationBatScrOn) + .addConsumedPower(cpuBatScrOff, cpuPowerBatScrOff, BatteryConsumer.POWER_MODEL_POWER_PROFILE) - .setUsageDurationMillis(cpuBatScrOff, cpuDurationBatScrOff) - .setConsumedPower(cpuChgScrOn, cpuPowerChgScrOn, + .addUsageDurationMillis(cpuBatScrOff, cpuDurationBatScrOff) + .addConsumedPower(cpuChgScrOn, cpuPowerChgScrOn, BatteryConsumer.POWER_MODEL_POWER_PROFILE) - .setUsageDurationMillis(cpuChgScrOn, cpuDurationChgScrOn) - .setConsumedPower(cpuChgScrOff, cpuPowerChgScrOff, + .addUsageDurationMillis(cpuChgScrOn, cpuDurationChgScrOn) + .addConsumedPower(cpuChgScrOff, cpuPowerChgScrOff, BatteryConsumer.POWER_MODEL_POWER_PROFILE) - .setUsageDurationMillis(cpuChgScrOff, cpuDurationChgScrOff); + .addUsageDurationMillis(cpuChgScrOff, cpuDurationChgScrOff); } } diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 359755a7ad08..f1656678d3bd 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -96,7 +96,10 @@ android_test { "CtsVirtualDeviceCommonLib", "com_android_server_accessibility_flags_lib", "locksettings_flags_lib", - ], + ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { + "true": ["service-crashrecovery.impl"], + default: [], + }), libs: [ "android.hardware.power-V1-java", @@ -157,21 +160,49 @@ android_test { resource_zips: [":FrameworksServicesTests_apks_as_resources"], } -android_ravenwood_test { - name: "FrameworksServicesTestsRavenwood", +java_defaults { + name: "FrameworksServicesTestsRavenwood-defaults", libs: [ "android.test.mock.stubs.system", ], static_libs: [ "androidx.annotation_annotation", "androidx.test.rules", - "services.core", "flag-junit", ], + auto_gen_config: true, +} + +// Unit tests for UriGrantManager, running on ravenwood. +// Note UriGrantManager does not support Ravenwood (yet). We're just running the original +// unit tests as is on Ravenwood. So here, we use the original "services.core", because +// "services.core.ravenwood" doesn't have the target code. +// (Compare to FrameworksServicesTestsRavenwood_Compat, which does support Ravenwood.) +android_ravenwood_test { + name: "FrameworksServicesTestsRavenwood_Uri", + defaults: ["FrameworksServicesTestsRavenwood-defaults"], + team: "trendy_team_ravenwood", + static_libs: [ + "services.core", + ], srcs: [ "src/com/android/server/uri/**/*.java", ], - auto_gen_config: true, +} + +// Unit tests for compat-framework. +// Compat-framework does support Ravenwood, and it uses the ravenwood anottations, +// so we link "services.core.ravenwood". +android_ravenwood_test { + name: "FrameworksServicesTestsRavenwood_Compat", + defaults: ["FrameworksServicesTestsRavenwood-defaults"], + team: "trendy_team_ravenwood", + static_libs: [ + "services.core.ravenwood", + ], + srcs: [ + "src/com/android/server/compat/**/*.java", + ], } java_library { diff --git a/services/tests/servicestests/src/com/android/server/audio/AudioServiceTest.java b/services/tests/servicestests/src/com/android/server/audio/AudioServiceTest.java index c9e9f00985f1..c418151b9946 100644 --- a/services/tests/servicestests/src/com/android/server/audio/AudioServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/audio/AudioServiceTest.java @@ -16,6 +16,7 @@ package com.android.server.audio; import static android.media.AudioDeviceInfo.TYPE_BUILTIN_MIC; +import static android.media.AudioManager.GET_DEVICES_INPUTS; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; @@ -34,7 +35,9 @@ import android.media.AudioSystem; import android.os.Looper; import android.os.PermissionEnforcer; import android.os.UserHandle; +import android.os.test.TestLooper; import android.platform.test.annotations.EnableFlags; +import android.util.IntArray; import android.util.Log; import androidx.test.InstrumentationRegistry; @@ -80,12 +83,15 @@ public class AudioServiceTest { private static boolean sLooperPrepared = false; + private TestLooper mTestLooper; + @Before public void setUp() throws Exception { if (!sLooperPrepared) { Looper.prepare(); sLooperPrepared = true; } + mTestLooper = new TestLooper(); mContext = InstrumentationRegistry.getTargetContext(); mSpyAudioSystem = spy(new NoOpAudioSystemAdapter()); mSettingsAdapter = new NoOpSettingsAdapter(); @@ -93,8 +99,11 @@ public class AudioServiceTest { when(mMockAppOpsManager.noteOp(anyInt(), anyInt(), anyString(), anyString(), anyString())) .thenReturn(AppOpsManager.MODE_ALLOWED); mAudioService = new AudioService(mContext, mSpyAudioSystem, mSpySystemServer, - mSettingsAdapter, mAudioVolumeGroupHelper, mMockAudioPolicy, null, - mMockAppOpsManager, mMockPermissionEnforcer, mMockPermissionProvider, r -> r.run()); + mSettingsAdapter, mAudioVolumeGroupHelper, mMockAudioPolicy, + mTestLooper.getLooper(), mMockAppOpsManager, mMockPermissionEnforcer, + mMockPermissionProvider, r -> r.run()); + + mTestLooper.dispatchAll(); } /** @@ -216,7 +225,19 @@ public class AudioServiceTest { public void testInputGainIndex() throws Exception { Log.i(TAG, "running testInputGainIndex"); Assert.assertNotNull(mAudioService); - Thread.sleep(MAX_MESSAGE_HANDLING_DELAY_MS); // wait for full AudioService initialization + + IntArray internalDeviceTypes = new IntArray(); + int status = AudioSystem.getSupportedDeviceTypes(GET_DEVICES_INPUTS, internalDeviceTypes); + if (status != AudioSystem.SUCCESS) { + Log.e(TAG, "AudioSystem.getSupportedDeviceTypes(GET_DEVICES_INPUTS) failed. status:" + + status); + } + + // Make sure TYPE_BUILTIN_MIC, aka DEVICE_IN_BUILTIN_MIC in terms of internal device type, + // is supported. + if (!internalDeviceTypes.contains(AudioSystem.DEVICE_IN_BUILTIN_MIC)) { + return; + } AudioDeviceAttributes ada = new AudioDeviceAttributes( @@ -229,6 +250,8 @@ public class AudioServiceTest { int inputGainIndex = 20; mAudioService.setInputGainIndex(ada, inputGainIndex); + mTestLooper.dispatchAll(); + Assert.assertEquals( "input gain index reporting wrong value", inputGainIndex, diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceInvalidationClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceInvalidationClientTest.java new file mode 100644 index 000000000000..405fb44ca97e --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceInvalidationClientTest.java @@ -0,0 +1,97 @@ +/* + * 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.biometrics.sensors.face.aidl; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.hardware.biometrics.IInvalidationCallback; +import android.hardware.biometrics.face.V1_0.IBiometricsFace; +import android.hardware.biometrics.face.V1_0.OptionalUint64; +import android.os.RemoteException; +import android.platform.test.annotations.Presubmit; +import android.testing.TestableContext; + +import androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; + +import com.android.server.biometrics.log.BiometricContext; +import com.android.server.biometrics.log.BiometricLogger; +import com.android.server.biometrics.sensors.ClientMonitorCallback; + +import org.junit.Rule; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; +import org.mockito.stubbing.Answer; + +import java.util.HashMap; + +@Presubmit +@SmallTest +public class FaceInvalidationClientTest { + + private static final int SENSOR_ID = 4; + private static final int USER_ID = 0; + + + @Rule + public final TestableContext mContext = new TestableContext( + InstrumentationRegistry.getInstrumentation().getTargetContext(), null); + @Rule + public final MockitoRule mockito = MockitoJUnit.rule(); + + @Mock + private IBiometricsFace mFace; + @Mock + private AidlResponseHandler mAidlResponseHandler; + @Mock + private BiometricLogger mBiometricLogger; + @Mock + private BiometricContext mBiometricContext; + @Mock + private IInvalidationCallback mInvalidationCallback; + @Mock + private ClientMonitorCallback mClientMonitorCallback; + + @Test + public void testStartInvalidationClient_whenHalIsHidl() throws RemoteException { + final OptionalUint64 halId = new OptionalUint64(); + + when(mFace.setCallback(any())).thenReturn(halId); + + final AidlSession aidlSession = new AidlSession(mContext, () -> mFace, USER_ID, + mAidlResponseHandler); + final FaceInvalidationClient faceInvalidationClient = + new FaceInvalidationClient(mContext, () -> aidlSession, USER_ID, + SENSOR_ID, mBiometricLogger, mBiometricContext, new HashMap<>(), + mInvalidationCallback); + + doAnswer((Answer<Void>) invocationOnMock -> { + faceInvalidationClient.cancel(); + return null; + }).when(mAidlResponseHandler).onUnsupportedClientScheduled(); + + faceInvalidationClient.start(mClientMonitorCallback); + + verify(mInvalidationCallback).onCompleted(); + } +} + diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInvalidationClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInvalidationClientTest.java new file mode 100644 index 000000000000..1ee2fd1e8af9 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInvalidationClientTest.java @@ -0,0 +1,90 @@ +/* + * 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.biometrics.sensors.fingerprint.aidl; + +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.verify; + +import android.hardware.biometrics.IInvalidationCallback; +import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint; +import android.os.RemoteException; +import android.platform.test.annotations.Presubmit; +import android.testing.TestableContext; + +import androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; + +import com.android.server.biometrics.log.BiometricContext; +import com.android.server.biometrics.log.BiometricLogger; +import com.android.server.biometrics.sensors.ClientMonitorCallback; + +import org.junit.Rule; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; +import org.mockito.stubbing.Answer; + +import java.util.HashMap; + +@Presubmit +@SmallTest +public class FingerprintInvalidationClientTest { + + private static final int SENSOR_ID = 4; + private static final int USER_ID = 0; + + + @Rule + public final TestableContext mContext = new TestableContext( + InstrumentationRegistry.getInstrumentation().getTargetContext(), null); + @Rule + public final MockitoRule mockito = MockitoJUnit.rule(); + + @Mock + private IBiometricsFingerprint mFingerprint; + @Mock + private AidlResponseHandler mAidlResponseHandler; + @Mock + private BiometricLogger mBiometricLogger; + @Mock + private BiometricContext mBiometricContext; + @Mock + private IInvalidationCallback mInvalidationCallback; + @Mock + private ClientMonitorCallback mClientMonitorCallback; + + @Test + public void testStartInvalidationClient_whenHalIsHidl() throws RemoteException { + final AidlSession aidlSession = new AidlSession( + () -> mFingerprint, USER_ID, mAidlResponseHandler); + final FingerprintInvalidationClient fingerprintInvalidationClient = + new FingerprintInvalidationClient(mContext, () -> aidlSession, USER_ID, + SENSOR_ID, mBiometricLogger, mBiometricContext, new HashMap<>(), + mInvalidationCallback); + + doAnswer((Answer<Void>) invocationOnMock -> { + fingerprintInvalidationClient.cancel(); + return null; + }).when(mAidlResponseHandler).onUnsupportedClientScheduled( + FingerprintInvalidationClient.class); + + fingerprintInvalidationClient.start(mClientMonitorCallback); + + verify(mInvalidationCallback).onCompleted(); + } +} diff --git a/services/tests/servicestests/src/com/android/server/compat/CompatConfigTest.java b/services/tests/servicestests/src/com/android/server/compat/CompatConfigTest.java index 36b163ec84b6..3d695a68f1f9 100644 --- a/services/tests/servicestests/src/com/android/server/compat/CompatConfigTest.java +++ b/services/tests/servicestests/src/com/android/server/compat/CompatConfigTest.java @@ -18,12 +18,12 @@ package com.android.server.compat; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.testng.Assert.assertThrows; import android.app.compat.ChangeIdStateCache; import android.app.compat.PackageOverride; diff --git a/services/tests/servicestests/src/com/android/server/compat/PlatformCompatTest.java b/services/tests/servicestests/src/com/android/server/compat/PlatformCompatTest.java index 1d075401832d..95d601f69344 100644 --- a/services/tests/servicestests/src/com/android/server/compat/PlatformCompatTest.java +++ b/services/tests/servicestests/src/com/android/server/compat/PlatformCompatTest.java @@ -18,6 +18,7 @@ package com.android.server.compat; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyLong; @@ -26,9 +27,9 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.internal.verification.VerificationModeFactory.times; -import static org.testng.Assert.assertThrows; import android.compat.Compatibility.ChangeConfig; +import android.content.AttributionSource; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -39,6 +40,8 @@ import android.os.Process; import android.platform.test.annotations.DisableFlags; import android.platform.test.annotations.EnableFlags; import android.platform.test.flag.junit.SetFlagsRule; +import android.os.PermissionEnforcer; +import android.permission.PermissionCheckerManager; import androidx.test.runner.AndroidJUnit4; @@ -90,6 +93,22 @@ public class PlatformCompatTest { .thenReturn(-1); when(mPackageManager.getApplicationInfo(eq(PACKAGE_NAME), anyInt())) .thenThrow(new PackageManager.NameNotFoundException()); + + var allGrantingPermissionEnforcer = new PermissionEnforcer() { + @Override + protected int checkPermission(String permission, AttributionSource source) { + return PermissionCheckerManager.PERMISSION_GRANTED; + } + + @Override + protected int checkPermission(String permission, int pid, int uid) { + return PermissionCheckerManager.PERMISSION_GRANTED; + } + }; + + when(mContext.getSystemService(eq(Context.PERMISSION_ENFORCER_SERVICE))) + .thenReturn(allGrantingPermissionEnforcer); + mCompatConfig = new CompatConfig(mBuildClassifier, mContext); mPlatformCompat = new PlatformCompat(mContext, mCompatConfig, mBuildClassifier, mChangeReporter); diff --git a/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java index cfe3d84140df..2ed71cecd79d 100644 --- a/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java @@ -22,10 +22,12 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertTrue; +import static org.mockito.AdditionalMatchers.aryEq; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; @@ -39,14 +41,18 @@ import android.content.pm.PackageManager; import android.hardware.thermal.TemperatureThreshold; import android.hardware.thermal.ThrottlingSeverity; import android.os.CoolingDevice; +import android.os.Flags; import android.os.IBinder; import android.os.IPowerManager; import android.os.IThermalEventListener; +import android.os.IThermalHeadroomListener; import android.os.IThermalService; import android.os.IThermalStatusListener; import android.os.PowerManager; import android.os.RemoteException; import android.os.Temperature; +import android.platform.test.annotations.EnableFlags; +import android.platform.test.flag.junit.SetFlagsRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -56,6 +62,8 @@ import com.android.server.power.ThermalManagerService.TemperatureWatcher; import com.android.server.power.ThermalManagerService.ThermalHalWrapper; import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -78,6 +86,11 @@ import java.util.Map; @SmallTest @RunWith(AndroidJUnit4.class) public class ThermalManagerServiceTest { + @ClassRule + public static final SetFlagsRule.ClassRule mSetFlagsClassRule = new SetFlagsRule.ClassRule(); + @Rule + public final SetFlagsRule mSetFlagsRule = mSetFlagsClassRule.createSetFlagsRule(); + private static final long CALLBACK_TIMEOUT_MILLI_SEC = 5000; private ThermalManagerService mService; private ThermalHalFake mFakeHal; @@ -89,6 +102,8 @@ public class ThermalManagerServiceTest { @Mock private IThermalService mIThermalServiceMock; @Mock + private IThermalHeadroomListener mHeadroomListener; + @Mock private IThermalEventListener mEventListener1; @Mock private IThermalEventListener mEventListener2; @@ -102,22 +117,23 @@ public class ThermalManagerServiceTest { */ private class ThermalHalFake extends ThermalHalWrapper { private static final int INIT_STATUS = Temperature.THROTTLING_NONE; - private ArrayList<Temperature> mTemperatureList = new ArrayList<>(); - private ArrayList<CoolingDevice> mCoolingDeviceList = new ArrayList<>(); - private ArrayList<TemperatureThreshold> mTemperatureThresholdList = initializeThresholds(); + private List<Temperature> mTemperatureList = new ArrayList<>(); + private List<Temperature> mOverrideTemperatures = null; + private List<CoolingDevice> mCoolingDeviceList = new ArrayList<>(); + private List<TemperatureThreshold> mTemperatureThresholdList = initializeThresholds(); - private Temperature mSkin1 = new Temperature(0, Temperature.TYPE_SKIN, "skin1", + private Temperature mSkin1 = new Temperature(28, Temperature.TYPE_SKIN, "skin1", INIT_STATUS); - private Temperature mSkin2 = new Temperature(0, Temperature.TYPE_SKIN, "skin2", + private Temperature mSkin2 = new Temperature(31, Temperature.TYPE_SKIN, "skin2", INIT_STATUS); - private Temperature mBattery = new Temperature(0, Temperature.TYPE_BATTERY, "batt", + private Temperature mBattery = new Temperature(34, Temperature.TYPE_BATTERY, "batt", INIT_STATUS); - private Temperature mUsbPort = new Temperature(0, Temperature.TYPE_USB_PORT, "usbport", + private Temperature mUsbPort = new Temperature(37, Temperature.TYPE_USB_PORT, "usbport", INIT_STATUS); - private CoolingDevice mCpu = new CoolingDevice(0, CoolingDevice.TYPE_BATTERY, "cpu"); - private CoolingDevice mGpu = new CoolingDevice(0, CoolingDevice.TYPE_BATTERY, "gpu"); + private CoolingDevice mCpu = new CoolingDevice(40, CoolingDevice.TYPE_BATTERY, "cpu"); + private CoolingDevice mGpu = new CoolingDevice(43, CoolingDevice.TYPE_BATTERY, "gpu"); - private ArrayList<TemperatureThreshold> initializeThresholds() { + private List<TemperatureThreshold> initializeThresholds() { ArrayList<TemperatureThreshold> thresholds = new ArrayList<>(); TemperatureThreshold skinThreshold = new TemperatureThreshold(); @@ -157,6 +173,14 @@ public class ThermalManagerServiceTest { mCoolingDeviceList.add(mGpu); } + void setOverrideTemperatures(List<Temperature> temperatures) { + mOverrideTemperatures = temperatures; + } + + void resetOverrideTemperatures() { + mOverrideTemperatures = null; + } + @Override protected List<Temperature> getCurrentTemperatures(boolean shouldFilter, int type) { List<Temperature> ret = new ArrayList<>(); @@ -221,22 +245,36 @@ public class ThermalManagerServiceTest { when(mContext.getSystemService(PowerManager.class)).thenReturn(mPowerManager); resetListenerMock(); mService = new ThermalManagerService(mContext, mFakeHal); - // Register callbacks before AMS ready and no callback sent + mService.onBootPhase(SystemService.PHASE_ACTIVITY_MANAGER_READY); + } + + private void resetListenerMock() { + reset(mEventListener1); + reset(mStatusListener1); + reset(mEventListener2); + reset(mStatusListener2); + reset(mHeadroomListener); + doReturn(mock(IBinder.class)).when(mEventListener1).asBinder(); + doReturn(mock(IBinder.class)).when(mStatusListener1).asBinder(); + doReturn(mock(IBinder.class)).when(mEventListener2).asBinder(); + doReturn(mock(IBinder.class)).when(mStatusListener2).asBinder(); + doReturn(mock(IBinder.class)).when(mHeadroomListener).asBinder(); + } + + @Test + public void testRegister() throws Exception { + mService = new ThermalManagerService(mContext, mFakeHal); + // Register callbacks before AMS ready and verify they are called after AMS is ready assertTrue(mService.mService.registerThermalEventListener(mEventListener1)); assertTrue(mService.mService.registerThermalStatusListener(mStatusListener1)); assertTrue(mService.mService.registerThermalEventListenerWithType(mEventListener2, Temperature.TYPE_SKIN)); assertTrue(mService.mService.registerThermalStatusListener(mStatusListener2)); - verify(mEventListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) - .times(0)).notifyThrottling(any(Temperature.class)); - verify(mStatusListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) - .times(1)).onStatusChange(Temperature.THROTTLING_NONE); - verify(mEventListener2, timeout(CALLBACK_TIMEOUT_MILLI_SEC) - .times(0)).notifyThrottling(any(Temperature.class)); - verify(mStatusListener2, timeout(CALLBACK_TIMEOUT_MILLI_SEC) - .times(1)).onStatusChange(Temperature.THROTTLING_NONE); + Thread.sleep(CALLBACK_TIMEOUT_MILLI_SEC); resetListenerMock(); mService.onBootPhase(SystemService.PHASE_ACTIVITY_MANAGER_READY); + assertTrue(mService.mService.registerThermalHeadroomListener(mHeadroomListener)); + ArgumentCaptor<Temperature> captor = ArgumentCaptor.forClass(Temperature.class); verify(mEventListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) .times(4)).notifyThrottling(captor.capture()); @@ -251,31 +289,18 @@ public class ThermalManagerServiceTest { captor.getAllValues()); verify(mStatusListener2, timeout(CALLBACK_TIMEOUT_MILLI_SEC) .times(0)).onStatusChange(Temperature.THROTTLING_NONE); - } - - private void resetListenerMock() { - reset(mEventListener1); - reset(mStatusListener1); - reset(mEventListener2); - reset(mStatusListener2); - doReturn(mock(IBinder.class)).when(mEventListener1).asBinder(); - doReturn(mock(IBinder.class)).when(mStatusListener1).asBinder(); - doReturn(mock(IBinder.class)).when(mEventListener2).asBinder(); - doReturn(mock(IBinder.class)).when(mStatusListener2).asBinder(); - } - - @Test - public void testRegister() throws RemoteException { resetListenerMock(); - // Register callbacks and verify they are called + + // Register callbacks after AMS ready and verify they are called assertTrue(mService.mService.registerThermalEventListener(mEventListener1)); assertTrue(mService.mService.registerThermalStatusListener(mStatusListener1)); - ArgumentCaptor<Temperature> captor = ArgumentCaptor.forClass(Temperature.class); + captor = ArgumentCaptor.forClass(Temperature.class); verify(mEventListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) .times(4)).notifyThrottling(captor.capture()); assertListEqualsIgnoringOrder(mFakeHal.mTemperatureList, captor.getAllValues()); verify(mStatusListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) .times(1)).onStatusChange(Temperature.THROTTLING_NONE); + // Register new callbacks and verify old ones are not called (remained same) while new // ones are called assertTrue(mService.mService.registerThermalEventListenerWithType(mEventListener2, @@ -296,7 +321,15 @@ public class ThermalManagerServiceTest { } @Test - public void testNotifyThrottling() throws RemoteException { + public void testNotifyThrottling() throws Exception { + assertTrue(mService.mService.registerThermalEventListener(mEventListener1)); + assertTrue(mService.mService.registerThermalStatusListener(mStatusListener1)); + assertTrue(mService.mService.registerThermalEventListenerWithType(mEventListener2, + Temperature.TYPE_SKIN)); + assertTrue(mService.mService.registerThermalStatusListener(mStatusListener2)); + Thread.sleep(CALLBACK_TIMEOUT_MILLI_SEC); + resetListenerMock(); + int status = Temperature.THROTTLING_SEVERE; // Should only notify event not status Temperature newBattery = new Temperature(50, Temperature.TYPE_BATTERY, "batt", status); @@ -349,6 +382,57 @@ public class ThermalManagerServiceTest { } @Test + @EnableFlags({Flags.FLAG_ALLOW_THERMAL_THRESHOLDS_CALLBACK}) + public void testNotifyThrottling_headroomCallback() throws Exception { + assertTrue(mService.mService.registerThermalHeadroomListener(mHeadroomListener)); + Thread.sleep(CALLBACK_TIMEOUT_MILLI_SEC); + resetListenerMock(); + int status = Temperature.THROTTLING_SEVERE; + mFakeHal.setOverrideTemperatures(new ArrayList<>()); + + // Should not notify on non-skin type + Temperature newBattery = new Temperature(37, Temperature.TYPE_BATTERY, "batt", status); + mFakeHal.mCallback.onTemperatureChanged(newBattery); + verify(mHeadroomListener, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(0)).onHeadroomChange(anyFloat(), anyFloat(), anyInt(), any()); + resetListenerMock(); + + // Notify headroom on skin temperature change + Temperature newSkin = new Temperature(37, Temperature.TYPE_SKIN, "skin1", status); + mFakeHal.mCallback.onTemperatureChanged(newSkin); + verify(mHeadroomListener, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(1)).onHeadroomChange(eq(0.9f), anyFloat(), anyInt(), + eq(new float[]{Float.NaN, 0.6666667f, 0.8333333f, 1.0f, 1.1666666f, 1.3333334f, + 1.5f})); + resetListenerMock(); + + // Same or similar temperature should not trigger in a short period + mFakeHal.mCallback.onTemperatureChanged(newSkin); + newSkin = new Temperature(36.9f, Temperature.TYPE_SKIN, "skin1", status); + mFakeHal.mCallback.onTemperatureChanged(newSkin); + newSkin = new Temperature(37.1f, Temperature.TYPE_SKIN, "skin1", status); + mFakeHal.mCallback.onTemperatureChanged(newSkin); + verify(mHeadroomListener, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(0)).onHeadroomChange(anyFloat(), anyFloat(), anyInt(), any()); + resetListenerMock(); + + // Significant temperature should trigger in a short period + newSkin = new Temperature(34f, Temperature.TYPE_SKIN, "skin1", status); + mFakeHal.mCallback.onTemperatureChanged(newSkin); + verify(mHeadroomListener, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(1)).onHeadroomChange(eq(0.8f), anyFloat(), anyInt(), + eq(new float[]{Float.NaN, 0.6666667f, 0.8333333f, 1.0f, 1.1666666f, 1.3333334f, + 1.5f})); + resetListenerMock(); + newSkin = new Temperature(40f, Temperature.TYPE_SKIN, "skin1", status); + mFakeHal.mCallback.onTemperatureChanged(newSkin); + verify(mHeadroomListener, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(1)).onHeadroomChange(eq(1.0f), anyFloat(), anyInt(), + eq(new float[]{Float.NaN, 0.6666667f, 0.8333333f, 1.0f, 1.1666666f, 1.3333334f, + 1.5f})); + } + + @Test public void testGetCurrentTemperatures() throws RemoteException { assertListEqualsIgnoringOrder(mFakeHal.getCurrentTemperatures(false, 0), Arrays.asList(mService.mService.getCurrentTemperatures())); @@ -388,13 +472,28 @@ public class ThermalManagerServiceTest { // Do no call onActivityManagerReady to skip connect HAL assertTrue(mService.mService.registerThermalEventListener(mEventListener1)); assertTrue(mService.mService.registerThermalStatusListener(mStatusListener1)); - assertTrue(mService.mService.unregisterThermalEventListener(mEventListener1)); - assertTrue(mService.mService.unregisterThermalStatusListener(mStatusListener1)); + assertTrue(mService.mService.registerThermalEventListenerWithType(mEventListener2, + Temperature.TYPE_SKIN)); + assertFalse(mService.mService.registerThermalHeadroomListener(mHeadroomListener)); + verify(mEventListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(0)).notifyThrottling(any(Temperature.class)); + verify(mStatusListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(1)).onStatusChange(Temperature.THROTTLING_NONE); + verify(mEventListener2, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(0)).notifyThrottling(any(Temperature.class)); + verify(mHeadroomListener, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(0)).onHeadroomChange(anyFloat(), anyFloat(), anyInt(), any()); + assertEquals(0, Arrays.asList(mService.mService.getCurrentTemperatures()).size()); assertEquals(0, Arrays.asList(mService.mService.getCurrentTemperaturesWithType( - Temperature.TYPE_SKIN)).size()); + Temperature.TYPE_SKIN)).size()); assertEquals(Temperature.THROTTLING_NONE, mService.mService.getCurrentThermalStatus()); assertTrue(Float.isNaN(mService.mService.getThermalHeadroom(0))); + + assertTrue(mService.mService.unregisterThermalEventListener(mEventListener1)); + assertTrue(mService.mService.unregisterThermalEventListener(mEventListener2)); + assertTrue(mService.mService.unregisterThermalStatusListener(mStatusListener1)); + assertFalse(mService.mService.unregisterThermalHeadroomListener(mHeadroomListener)); } @Test @@ -419,35 +518,45 @@ public class ThermalManagerServiceTest { } @Test - public void testTemperatureWatcherUpdateSevereThresholds() { + @EnableFlags({Flags.FLAG_ALLOW_THERMAL_THRESHOLDS_CALLBACK, + Flags.FLAG_ALLOW_THERMAL_HEADROOM_THRESHOLDS}) + public void testTemperatureWatcherUpdateSevereThresholds() throws Exception { + assertTrue(mService.mService.registerThermalHeadroomListener(mHeadroomListener)); + verify(mHeadroomListener, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(1)).onHeadroomChange(eq(0.6f), eq(0.6f), anyInt(), + aryEq(new float[]{Float.NaN, 0.6666667f, 0.8333333f, 1.0f, 1.1666666f, 1.3333334f, + 1.5f})); + resetListenerMock(); TemperatureWatcher watcher = mService.mTemperatureWatcher; + TemperatureThreshold newThreshold = new TemperatureThreshold(); + newThreshold.name = "skin1"; + newThreshold.type = Temperature.TYPE_SKIN; + // significant change in threshold (> 0.3C) should trigger a callback + newThreshold.hotThrottlingThresholds = new float[]{ + Float.NaN, 43.0f, 46.0f, 49.0f, Float.NaN, Float.NaN, Float.NaN + }; + mFakeHal.mCallback.onThresholdChanged(newThreshold); synchronized (watcher.mSamples) { - watcher.mSevereThresholds.erase(); - watcher.getAndUpdateThresholds(); - assertEquals(1, watcher.mSevereThresholds.size()); - assertEquals("skin1", watcher.mSevereThresholds.keyAt(0)); Float threshold = watcher.mSevereThresholds.get("skin1"); assertNotNull(threshold); - assertEquals(40.0f, threshold, 0.0f); - assertArrayEquals("Got" + Arrays.toString(watcher.mHeadroomThresholds), - new float[]{Float.NaN, 0.6667f, 0.8333f, 1.0f, 1.166f, 1.3333f, - 1.5f}, - watcher.mHeadroomThresholds, 0.01f); - - TemperatureThreshold newThreshold = new TemperatureThreshold(); - newThreshold.name = "skin1"; - newThreshold.hotThrottlingThresholds = new float[] { - Float.NaN, 44.0f, 47.0f, 50.0f, Float.NaN, Float.NaN, Float.NaN - }; - mFakeHal.mCallback.onThresholdChanged(newThreshold); - threshold = watcher.mSevereThresholds.get("skin1"); - assertNotNull(threshold); - assertEquals(50.0f, threshold, 0.0f); + assertEquals(49.0f, threshold, 0.0f); assertArrayEquals("Got" + Arrays.toString(watcher.mHeadroomThresholds), - new float[]{Float.NaN, 0.8f, 0.9f, 1.0f, Float.NaN, Float.NaN, - Float.NaN}, + new float[]{Float.NaN, 0.8f, 0.9f, 1.0f, Float.NaN, Float.NaN, Float.NaN}, watcher.mHeadroomThresholds, 0.01f); } + verify(mHeadroomListener, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(1)).onHeadroomChange(eq(0.3f), eq(0.3f), anyInt(), + aryEq(new float[]{Float.NaN, 0.8f, 0.9f, 1.0f, Float.NaN, Float.NaN, Float.NaN})); + resetListenerMock(); + + // same or similar threshold callback data within a second should not trigger callback + mFakeHal.mCallback.onThresholdChanged(newThreshold); + newThreshold.hotThrottlingThresholds = new float[]{ + Float.NaN, 43.1f, 45.9f, 49.0f, Float.NaN, Float.NaN, Float.NaN + }; + mFakeHal.mCallback.onThresholdChanged(newThreshold); + verify(mHeadroomListener, timeout(CALLBACK_TIMEOUT_MILLI_SEC) + .times(0)).onHeadroomChange(anyFloat(), anyFloat(), anyInt(), any()); } @Test @@ -475,28 +584,34 @@ public class ThermalManagerServiceTest { } @Test - public void testGetThermalHeadroomThresholdsOnlyReadOnce() throws Exception { + public void testGetThermalHeadroomThresholds() throws Exception { float[] expected = new float[]{Float.NaN, 0.1f, 0.2f, 0.3f, 0.4f, Float.NaN, 0.6f}; when(mIThermalServiceMock.getThermalHeadroomThresholds()).thenReturn(expected); Map<Integer, Float> thresholds1 = mPowerManager.getThermalHeadroomThresholds(); verify(mIThermalServiceMock, times(1)).getThermalHeadroomThresholds(); + checkHeadroomThresholds(expected, thresholds1); + + reset(mIThermalServiceMock); + expected = new float[]{Float.NaN, 0.2f, 0.3f, 0.4f, 0.4f, Float.NaN, 0.6f}; + when(mIThermalServiceMock.getThermalHeadroomThresholds()).thenReturn(expected); + Map<Integer, Float> thresholds2 = mPowerManager.getThermalHeadroomThresholds(); + verify(mIThermalServiceMock, times(1)).getThermalHeadroomThresholds(); + checkHeadroomThresholds(expected, thresholds2); + } + + private void checkHeadroomThresholds(float[] expected, Map<Integer, Float> thresholds) { for (int status = PowerManager.THERMAL_STATUS_LIGHT; status <= PowerManager.THERMAL_STATUS_SHUTDOWN; status++) { if (Float.isNaN(expected[status])) { - assertFalse(thresholds1.containsKey(status)); + assertFalse(thresholds.containsKey(status)); } else { - assertEquals(expected[status], thresholds1.get(status), 0.01f); + assertEquals(expected[status], thresholds.get(status), 0.01f); } } - reset(mIThermalServiceMock); - Map<Integer, Float> thresholds2 = mPowerManager.getThermalHeadroomThresholds(); - verify(mIThermalServiceMock, times(0)).getThermalHeadroomThresholds(); - assertNotSame(thresholds1, thresholds2); - assertEquals(thresholds1, thresholds2); } @Test - public void testGetThermalHeadroomThresholdsOnDefaultHalResult() throws Exception { + public void testGetThermalHeadroomThresholdsOnDefaultHalResult() throws Exception { TemperatureWatcher watcher = mService.mTemperatureWatcher; ArrayList<TemperatureThreshold> thresholds = new ArrayList<>(); mFakeHal.mTemperatureThresholdList = thresholds; @@ -510,8 +625,8 @@ public class ThermalManagerServiceTest { TemperatureThreshold nanThresholds = new TemperatureThreshold(); nanThresholds.name = "nan"; nanThresholds.type = Temperature.TYPE_SKIN; - nanThresholds.hotThrottlingThresholds = new float[ThrottlingSeverity.SHUTDOWN + 1]; - nanThresholds.coldThrottlingThresholds = new float[ThrottlingSeverity.SHUTDOWN + 1]; + nanThresholds.hotThrottlingThresholds = new float[ThrottlingSeverity.SHUTDOWN + 1]; + nanThresholds.coldThrottlingThresholds = new float[ThrottlingSeverity.SHUTDOWN + 1]; Arrays.fill(nanThresholds.hotThrottlingThresholds, Float.NaN); Arrays.fill(nanThresholds.coldThrottlingThresholds, Float.NaN); thresholds.add(nanThresholds); @@ -607,7 +722,13 @@ public class ThermalManagerServiceTest { } @Test - public void testDump() { + public void testDump() throws Exception { + assertTrue(mService.mService.registerThermalEventListener(mEventListener1)); + assertTrue(mService.mService.registerThermalStatusListener(mStatusListener1)); + assertTrue(mService.mService.registerThermalEventListenerWithType(mEventListener2, + Temperature.TYPE_SKIN)); + assertTrue(mService.mService.registerThermalStatusListener(mStatusListener2)); + when(mContext.checkCallingOrSelfPermission(android.Manifest.permission.DUMP)) .thenReturn(PackageManager.PERMISSION_GRANTED); final StringWriter out = new StringWriter(); @@ -628,22 +749,22 @@ public class ThermalManagerServiceTest { assertThat(dumpStr).contains("Thermal Status: 0"); assertThat(dumpStr).contains( "Cached temperatures:\n" - + "\tTemperature{mValue=0.0, mType=4, mName=usbport, mStatus=0}\n" - + "\tTemperature{mValue=0.0, mType=2, mName=batt, mStatus=0}\n" - + "\tTemperature{mValue=0.0, mType=3, mName=skin1, mStatus=0}\n" - + "\tTemperature{mValue=0.0, mType=3, mName=skin2, mStatus=0}" + + "\tTemperature{mValue=37.0, mType=4, mName=usbport, mStatus=0}\n" + + "\tTemperature{mValue=34.0, mType=2, mName=batt, mStatus=0}\n" + + "\tTemperature{mValue=28.0, mType=3, mName=skin1, mStatus=0}\n" + + "\tTemperature{mValue=31.0, mType=3, mName=skin2, mStatus=0}" ); assertThat(dumpStr).contains("HAL Ready: true\n" + "HAL connection:\n" + "\tThermalHAL AIDL 1 connected: yes"); assertThat(dumpStr).contains("Current temperatures from HAL:\n" - + "\tTemperature{mValue=0.0, mType=3, mName=skin1, mStatus=0}\n" - + "\tTemperature{mValue=0.0, mType=3, mName=skin2, mStatus=0}\n" - + "\tTemperature{mValue=0.0, mType=2, mName=batt, mStatus=0}\n" - + "\tTemperature{mValue=0.0, mType=4, mName=usbport, mStatus=0}\n"); + + "\tTemperature{mValue=28.0, mType=3, mName=skin1, mStatus=0}\n" + + "\tTemperature{mValue=31.0, mType=3, mName=skin2, mStatus=0}\n" + + "\tTemperature{mValue=34.0, mType=2, mName=batt, mStatus=0}\n" + + "\tTemperature{mValue=37.0, mType=4, mName=usbport, mStatus=0}\n"); assertThat(dumpStr).contains("Current cooling devices from HAL:\n" - + "\tCoolingDevice{mValue=0, mType=1, mName=cpu}\n" - + "\tCoolingDevice{mValue=0, mType=1, mName=gpu}\n"); + + "\tCoolingDevice{mValue=40, mType=1, mName=cpu}\n" + + "\tCoolingDevice{mValue=43, mType=1, mName=gpu}\n"); assertThat(dumpStr).contains("Temperature static thresholds from HAL:\n" + "\tTemperatureThreshold{mType=3, mName=skin1, mHotThrottlingThresholds=[25.0, " + "30.0, 35.0, 40.0, 45.0, 50.0, 55.0], mColdThrottlingThresholds=[0.0, 0.0, 0.0," diff --git a/services/tests/servicestests/src/com/android/server/uri/UriGrantsManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/uri/UriGrantsManagerServiceTest.java index 24abc183cad1..f5494534716a 100644 --- a/services/tests/servicestests/src/com/android/server/uri/UriGrantsManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/uri/UriGrantsManagerServiceTest.java @@ -61,7 +61,6 @@ import android.os.Process; import android.os.UserHandle; import android.platform.test.flag.junit.FlagsParameterization; import android.platform.test.flag.junit.SetFlagsRule; -import android.platform.test.ravenwood.RavenwoodRule; import android.util.ArraySet; import org.junit.Before; @@ -77,9 +76,6 @@ import java.util.Set; @RunWith(Parameterized.class) public class UriGrantsManagerServiceTest { - @Rule - public final RavenwoodRule mRavenwood = new RavenwoodRule(); - /** * Why this class needs to test all combinations of * {@link android.security.Flags#FLAG_CONTENT_URI_PERMISSION_APIS}: diff --git a/services/tests/servicestests/src/com/android/server/uri/UriPermissionTest.java b/services/tests/servicestests/src/com/android/server/uri/UriPermissionTest.java index 611c51463246..fe66f738487d 100644 --- a/services/tests/servicestests/src/com/android/server/uri/UriPermissionTest.java +++ b/services/tests/servicestests/src/com/android/server/uri/UriPermissionTest.java @@ -37,18 +37,13 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import android.os.SystemClock; -import android.platform.test.ravenwood.RavenwoodRule; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; public class UriPermissionTest { - @Rule - public final RavenwoodRule mRavenwood = new RavenwoodRule(); - @Mock private UriGrantsManagerInternal mService; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java index 22a4f85758eb..0b89c11a11f4 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java @@ -34,10 +34,12 @@ import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION; import static android.service.notification.Flags.FLAG_NOTIFICATION_FORCE_GROUPING; +import static android.service.notification.Flags.FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION; import static android.service.notification.NotificationListenerService.REASON_APP_CANCEL; import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT; import static com.android.server.notification.Flags.FLAG_NOTIFICATION_FORCE_GROUP_CONVERSATIONS; +import static com.android.server.notification.Flags.FLAG_NOTIFICATION_FORCE_GROUP_SINGLETONS; import static com.android.server.notification.GroupHelper.AGGREGATE_GROUP_KEY; import static com.android.server.notification.GroupHelper.AUTOGROUP_KEY; import static com.android.server.notification.GroupHelper.BASE_FLAGS; @@ -2217,6 +2219,7 @@ public class GroupHelperTest extends UiServiceTestCase { @Test @EnableFlags(FLAG_NOTIFICATION_FORCE_GROUPING) + @DisableFlags(FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION) public void testMoveAggregateGroups_updateChannel_multipleChannels() { final String pkg = "package"; final String expectedGroupKey_alerting = GroupHelper.getFullAggregateGroupKey(pkg, @@ -2265,16 +2268,17 @@ public class GroupHelperTest extends UiServiceTestCase { mGroupHelper.onChannelUpdated(UserHandle.SYSTEM.getIdentifier(), pkg, channel1, notificationList); - // Check that channel1's notifications are moved to the silent section group - // But not enough to auto-group => remove override group key - verify(mCallback, never()).addAutoGroupSummary(anyInt(), eq(pkg), anyString(), - anyString(), anyInt(), any()); - verify(mCallback, never()).addAutoGroup(anyString(), anyString(), anyBoolean()); + // Check that the override group key was cleared for (NotificationRecord record: notificationList) { if (record.getChannel().getId().equals(channel1.getId())) { assertThat(record.getSbn().getOverrideGroupKey()).isNull(); } } + // Check that channel1's notifications are moved to the silent section group + // and a group summary is created + notifications are added to the group + verify(mCallback, never()).addAutoGroupSummary(anyInt(), eq(pkg), anyString(), anyString(), + anyInt(), any()); + verify(mCallback, never()).addAutoGroup(anyString(), anyString(), anyBoolean()); // Check that the alerting section group is not removed, only updated expectedSummaryAttr = new NotificationAttributes(BASE_FLAGS, @@ -2287,6 +2291,357 @@ public class GroupHelperTest extends UiServiceTestCase { } @Test + @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING, FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION}) + public void testMoveAggregateGroups_updateChannel_multipleChannels_regroupOnClassifEnabled() { + final String pkg = "package"; + final String expectedGroupKey_alerting = GroupHelper.getFullAggregateGroupKey(pkg, + AGGREGATE_GROUP_KEY + "AlertingSection", UserHandle.SYSTEM.getIdentifier()); + int numNotificationChannel1 = 0; + final NotificationChannel channel1 = new NotificationChannel("TEST_CHANNEL_ID1", + "TEST_CHANNEL_ID1", IMPORTANCE_DEFAULT); + final NotificationChannel channel2 = new NotificationChannel("TEST_CHANNEL_ID2", + "TEST_CHANNEL_ID2", IMPORTANCE_DEFAULT); + final List<NotificationRecord> notificationList = new ArrayList<>(); + final ArrayMap<String, NotificationRecord> summaryByGroup = new ArrayMap<>(); + // Post notifications with different channels that autogroup within the same section + NotificationRecord r; + for (int i = 0; i < AUTOGROUP_AT_COUNT; i++) { + if (i % 2 == 0) { + r = getNotificationRecord(pkg, i, String.valueOf(i), + UserHandle.SYSTEM, "testGrp " + i, false, channel1); + numNotificationChannel1++; + } else { + r = getNotificationRecord(pkg, i, String.valueOf(i), + UserHandle.SYSTEM, "testGrp " + i, false, channel2); + } + notificationList.add(r); + mGroupHelper.onNotificationPostedWithDelay(r, notificationList, summaryByGroup); + } + NotificationAttributes expectedSummaryAttr = new NotificationAttributes(BASE_FLAGS, + mSmallIcon, COLOR_DEFAULT, DEFAULT_VISIBILITY, DEFAULT_GROUP_ALERT, + "TEST_CHANNEL_ID1"); + verify(mCallback, times(1)).addAutoGroupSummary(anyInt(), eq(pkg), anyString(), + eq(expectedGroupKey_alerting), anyInt(), eq(expectedSummaryAttr)); + verify(mCallback, times(AUTOGROUP_AT_COUNT)).addAutoGroup(anyString(), + eq(expectedGroupKey_alerting), eq(true)); + verify(mCallback, never()).removeAutoGroup(anyString()); + verify(mCallback, never()).removeAutoGroupSummary(anyInt(), anyString(), anyString()); + verify(mCallback, never()).updateAutogroupSummary(anyInt(), anyString(), anyString(), + any()); + Mockito.reset(mCallback); + + // Update channel1's importance + final String expectedGroupKey_silent = GroupHelper.getFullAggregateGroupKey(pkg, + AGGREGATE_GROUP_KEY + "SilentSection", UserHandle.SYSTEM.getIdentifier()); + channel1.setImportance(IMPORTANCE_LOW); + for (NotificationRecord record: notificationList) { + if (record.getChannel().getId().equals(channel1.getId())) { + record.updateNotificationChannel(channel1); + } + } + mGroupHelper.onChannelUpdated(UserHandle.SYSTEM.getIdentifier(), pkg, channel1, + notificationList); + + // Check that the override group key was cleared + for (NotificationRecord record: notificationList) { + if (record.getChannel().getId().equals(channel1.getId())) { + assertThat(record.getSbn().getOverrideGroupKey()).isNull(); + } + } + // Check that channel1's notifications are moved to the silent section group + // and a group summary is created + notifications are added to the group + verify(mCallback, times(1)).addAutoGroupSummary(anyInt(), eq(pkg), anyString(), + eq(expectedGroupKey_silent), anyInt(), any()); + verify(mCallback, times(numNotificationChannel1)).addAutoGroup(anyString(), + eq(expectedGroupKey_silent), anyBoolean()); + + // Check that the alerting section group is not removed, only updated + expectedSummaryAttr = new NotificationAttributes(BASE_FLAGS, + mSmallIcon, COLOR_DEFAULT, DEFAULT_VISIBILITY, DEFAULT_GROUP_ALERT, + "TEST_CHANNEL_ID2"); + verify(mCallback, never()).removeAutoGroupSummary(anyInt(), eq(pkg), + eq(expectedGroupKey_alerting)); + verify(mCallback, times(1)).updateAutogroupSummary(anyInt(), eq(pkg), + eq(expectedGroupKey_alerting), eq(expectedSummaryAttr)); + } + + @Test + @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING, FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION}) + public void testMoveSections_notificationBundled() { + final List<NotificationRecord> notificationList = new ArrayList<>(); + final String pkg = "package"; + final int summaryId = 0; + final int numChildNotif = 4; + + // Create an app-provided group: summary + child notifications + final NotificationChannel channel1 = new NotificationChannel("TEST_CHANNEL_ID1", + "TEST_CHANNEL_ID1", IMPORTANCE_DEFAULT); + NotificationRecord summary = getNotificationRecord(pkg, summaryId, + String.valueOf(summaryId), UserHandle.SYSTEM, "testGrp " + summaryId, + true, channel1); + notificationList.add(summary); + final String originalAppGroupKey = summary.getGroupKey(); + for (int i = 0; i < numChildNotif; i++) { + NotificationRecord child = getNotificationRecord(pkg, i + 42, String.valueOf(i + 42), + UserHandle.SYSTEM, "testGrp " + summaryId, false, channel1); + notificationList.add(child); + } + + // Classify/bundle child notifications + final NotificationChannel socialChannel = new NotificationChannel( + NotificationChannel.SOCIAL_MEDIA_ID, NotificationChannel.SOCIAL_MEDIA_ID, + IMPORTANCE_DEFAULT); + final String expectedGroupKey_social = GroupHelper.getFullAggregateGroupKey(pkg, + AGGREGATE_GROUP_KEY + "SocialSection", UserHandle.SYSTEM.getIdentifier()); + final NotificationAttributes expectedSummaryAttr_social = new NotificationAttributes( + BASE_FLAGS, mSmallIcon, COLOR_DEFAULT, DEFAULT_VISIBILITY, DEFAULT_GROUP_ALERT, + NotificationChannel.SOCIAL_MEDIA_ID); + final NotificationChannel newsChannel = new NotificationChannel( + NotificationChannel.NEWS_ID, NotificationChannel.NEWS_ID, + IMPORTANCE_DEFAULT); + final String expectedGroupKey_news = GroupHelper.getFullAggregateGroupKey(pkg, + AGGREGATE_GROUP_KEY + "NewsSection", UserHandle.SYSTEM.getIdentifier()); + final NotificationAttributes expectedSummaryAttr_news = new NotificationAttributes( + BASE_FLAGS, mSmallIcon, COLOR_DEFAULT, DEFAULT_VISIBILITY, DEFAULT_GROUP_ALERT, + NotificationChannel.NEWS_ID); + for (NotificationRecord record: notificationList) { + if (record.getChannel().getId().equals(channel1.getId()) + && record.getSbn().getId() % 2 == 0) { + record.updateNotificationChannel(socialChannel); + mGroupHelper.onChannelUpdated(record); + } + if (record.getChannel().getId().equals(channel1.getId()) + && record.getSbn().getId() % 2 != 0) { + record.updateNotificationChannel(newsChannel); + mGroupHelper.onChannelUpdated(record); + } + } + + // Check that 2 autogroup summaries were created for the news & social sections + verify(mCallback, times(1)).addAutoGroupSummary(anyInt(), eq(pkg), anyString(), + eq(expectedGroupKey_social), anyInt(), eq(expectedSummaryAttr_social)); + verify(mCallback, times(1)).addAutoGroupSummary(anyInt(), eq(pkg), anyString(), + eq(expectedGroupKey_news), anyInt(), eq(expectedSummaryAttr_news)); + // Check that half of the child notifications were grouped in each new section + verify(mCallback, times(numChildNotif / 2)).addAutoGroup(anyString(), + eq(expectedGroupKey_news), eq(true)); + verify(mCallback, times(numChildNotif / 2)).addAutoGroup(anyString(), + eq(expectedGroupKey_social), eq(true)); + verify(mCallback, never()).removeAutoGroup(anyString()); + verify(mCallback, never()).removeAutoGroupSummary(anyInt(), anyString(), anyString()); + verify(mCallback, times(numChildNotif / 2)).updateAutogroupSummary(anyInt(), anyString(), + anyString(), any()); + verify(mCallback, times(numChildNotif)).removeAppProvidedSummaryOnClassification( + anyString(), eq(originalAppGroupKey)); + } + + @Test + @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING, FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION}) + public void testCacheAndCancelAppSummary_notificationBundled() { + // check that the original app summary is canceled & cached on classification regrouping + final List<NotificationRecord> notificationList = new ArrayList<>(); + final String pkg = "package"; + final int summaryId = 0; + final int numChildNotif = 4; + + // Create an app-provided group: summary + child notifications + final NotificationChannel channel1 = new NotificationChannel("TEST_CHANNEL_ID1", + "TEST_CHANNEL_ID1", IMPORTANCE_DEFAULT); + NotificationRecord summary = getNotificationRecord(pkg, summaryId, + String.valueOf(summaryId), UserHandle.SYSTEM, "testGrp " + summaryId, + true, channel1); + notificationList.add(summary); + final String originalAppGroupKey = summary.getGroupKey(); + final String originalAppGroupName = summary.getNotification().getGroup(); + for (int i = 0; i < numChildNotif; i++) { + NotificationRecord child = getNotificationRecord(pkg, i + 42, String.valueOf(i + 42), + UserHandle.SYSTEM, "testGrp " + summaryId, false, channel1); + notificationList.add(child); + } + + // Last regrouped notification will trigger summary cancellation in NMS + when(mCallback.removeAppProvidedSummaryOnClassification(anyString(), + eq(originalAppGroupKey))).thenReturn(summary); + + // Classify/bundle child notifications + final NotificationChannel socialChannel = new NotificationChannel( + NotificationChannel.SOCIAL_MEDIA_ID, NotificationChannel.SOCIAL_MEDIA_ID, + IMPORTANCE_DEFAULT); + for (NotificationRecord record: notificationList) { + if (record.getChannel().getId().equals(channel1.getId())) { + record.updateNotificationChannel(socialChannel); + mGroupHelper.onChannelUpdated(record); + } + } + + // Check that the original app summary was cached + CachedSummary cachedSummary = mGroupHelper.findCanceledSummary(pkg, + String.valueOf(summaryId), summaryId, UserHandle.SYSTEM.getIdentifier()); + assertThat(cachedSummary.originalGroupKey()).isEqualTo(originalAppGroupName); + assertThat(cachedSummary.key()).isEqualTo(summary.getKey()); + + // App cancels the original summary + reset(mCallback); + mGroupHelper.maybeCancelGroupChildrenForCanceledSummary(pkg, String.valueOf(summaryId), + summaryId, UserHandle.SYSTEM.getIdentifier(), REASON_APP_CANCEL); + // Check that child notifications are removed and cache is cleared + verify(mCallback, times(1)).removeNotificationFromCanceledGroup( + eq(UserHandle.SYSTEM.getIdentifier()), eq(pkg), eq(originalAppGroupName), + eq(REASON_APP_CANCEL)); + cachedSummary = mGroupHelper.findCanceledSummary(pkg, String.valueOf(summaryId), summaryId, + UserHandle.SYSTEM.getIdentifier()); + assertThat(cachedSummary).isNull(); + } + + @Test + @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING, + FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION, + FLAG_NOTIFICATION_FORCE_GROUP_SINGLETONS}) + public void testSingletonGroupsRegrouped_notificationBundledBeforeDelayTimeout() { + // Check that singleton group notifications are regrouped if classification is done + // before onNotificationPostedWithDelay + final List<NotificationRecord> notificationList = new ArrayList<>(); + final ArrayMap<String, NotificationRecord> summaryByGroup = new ArrayMap<>(); + final String pkg = "package"; + + // Post singleton groups, above forced group limit + for (int i = 0; i < AUTOGROUP_SINGLETONS_AT_COUNT; i++) { + NotificationRecord summary = getNotificationRecord(pkg, i, + String.valueOf(i), UserHandle.SYSTEM, "testGrp " + i, true); + notificationList.add(summary); + NotificationRecord child = getNotificationRecord(pkg, i + 42, String.valueOf(i + 42), + UserHandle.SYSTEM, "testGrp " + i, false); + notificationList.add(child); + summaryByGroup.put(summary.getGroupKey(), summary); + } + + // Classify/bundle child notifications + final NotificationChannel socialChannel = new NotificationChannel( + NotificationChannel.SOCIAL_MEDIA_ID, NotificationChannel.SOCIAL_MEDIA_ID, + IMPORTANCE_DEFAULT); + final String expectedGroupKey_social = GroupHelper.getFullAggregateGroupKey(pkg, + AGGREGATE_GROUP_KEY + "SocialSection", UserHandle.SYSTEM.getIdentifier()); + final NotificationAttributes expectedSummaryAttr_social = new NotificationAttributes( + BASE_FLAGS, mSmallIcon, COLOR_DEFAULT, DEFAULT_VISIBILITY, DEFAULT_GROUP_ALERT, + NotificationChannel.SOCIAL_MEDIA_ID); + for (NotificationRecord record: notificationList) { + if (record.getOriginalGroupKey().contains("testGrp")) { + record.updateNotificationChannel(socialChannel); + mGroupHelper.onChannelUpdated(record); + } + } + + // Check that notifications are forced grouped and app-provided summaries are canceled + verify(mCallback, times(1)).addAutoGroupSummary(anyInt(), eq(pkg), anyString(), + eq(expectedGroupKey_social), anyInt(), eq(expectedSummaryAttr_social)); + verify(mCallback, times(AUTOGROUP_SINGLETONS_AT_COUNT)).addAutoGroup(anyString(), + eq(expectedGroupKey_social), eq(true)); + verify(mCallback, never()).removeAutoGroup(anyString()); + verify(mCallback, never()).removeAutoGroupSummary(anyInt(), anyString(), anyString()); + verify(mCallback, times(1)).updateAutogroupSummary(anyInt(), anyString(), anyString(), + any()); + verify(mCallback, times(2)).removeAppProvidedSummaryOnClassification( + anyString(), anyString()); + + // Adjust group key and cancel summaries + for (NotificationRecord record: notificationList) { + if (record.getNotification().isGroupSummary()) { + record.isCanceled = true; + } else { + record.setOverrideGroupKey(expectedGroupKey_social); + } + } + + // Check that after onNotificationPostedWithDelay there is no change in the grouping + reset(mCallback); + for (NotificationRecord record: notificationList) { + mGroupHelper.onNotificationPostedWithDelay(record, notificationList, summaryByGroup); + } + + verify(mCallback, never()).addAutoGroupSummary(anyInt(), anyString(), anyString(), + anyString(), anyInt(), any()); + verify(mCallback, never()).addAutoGroup(anyString(), anyString(), anyBoolean()); + verify(mCallback, never()).removeAutoGroup(anyString()); + verify(mCallback, never()).removeAutoGroupSummary(anyInt(), anyString(), anyString()); + verify(mCallback, never()).updateAutogroupSummary(anyInt(), anyString(), anyString(), + any()); + } + + @Test + @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING, + FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION, + FLAG_NOTIFICATION_FORCE_GROUP_SINGLETONS}) + public void testSingletonGroupsRegrouped_notificationBundledAfterDelayTimeout() { + // Check that singleton group notifications are regrouped if classification is done + // after onNotificationPostedWithDelay + final List<NotificationRecord> notificationList = new ArrayList<>(); + final ArrayMap<String, NotificationRecord> summaryByGroup = new ArrayMap<>(); + final String pkg = "package"; + final String expectedGroupKey_alerting = GroupHelper.getFullAggregateGroupKey(pkg, + AGGREGATE_GROUP_KEY + "AlertingSection", UserHandle.SYSTEM.getIdentifier()); + String expectedTriggeringKey = null; + // Post singleton groups, above forced group limit + for (int i = 0; i < AUTOGROUP_SINGLETONS_AT_COUNT; i++) { + NotificationRecord summary = getNotificationRecord(pkg, i, + String.valueOf(i), UserHandle.SYSTEM, "testGrp " + i, true); + notificationList.add(summary); + NotificationRecord child = getNotificationRecord(pkg, i + 42, + String.valueOf(i + 42), UserHandle.SYSTEM, "testGrp " + i, false); + notificationList.add(child); + expectedTriggeringKey = child.getKey(); + summaryByGroup.put(summary.getGroupKey(), summary); + mGroupHelper.onNotificationPostedWithDelay(child, notificationList, summaryByGroup); + summary.isCanceled = true; // simulate removing the app summary + mGroupHelper.onNotificationPostedWithDelay(summary, notificationList, summaryByGroup); + } + + // Check that notifications are forced grouped and app-provided summaries are canceled + verify(mCallback, times(1)).addAutoGroupSummary(anyInt(), eq(pkg), + eq(expectedTriggeringKey), eq(expectedGroupKey_alerting), anyInt(), + eq(getNotificationAttributes(BASE_FLAGS))); + verify(mCallback, times(AUTOGROUP_SINGLETONS_AT_COUNT)).addAutoGroup(anyString(), + eq(expectedGroupKey_alerting), eq(true)); + verify(mCallback, never()).removeAutoGroup(anyString()); + verify(mCallback, never()).removeAutoGroupSummary(anyInt(), anyString(), anyString()); + verify(mCallback, never()).updateAutogroupSummary(anyInt(), anyString(), anyString(), + any()); + verify(mCallback, times(AUTOGROUP_SINGLETONS_AT_COUNT)).removeAppProvidedSummary( + anyString()); + assertThat(mGroupHelper.findCanceledSummary(pkg, String.valueOf(0), 0, + UserHandle.SYSTEM.getIdentifier())).isNotNull(); + assertThat(mGroupHelper.findCanceledSummary(pkg, String.valueOf(1), 1, + UserHandle.SYSTEM.getIdentifier())).isNotNull(); + + // Classify/bundle child notifications + reset(mCallback); + final NotificationChannel socialChannel = new NotificationChannel( + NotificationChannel.SOCIAL_MEDIA_ID, NotificationChannel.SOCIAL_MEDIA_ID, + IMPORTANCE_DEFAULT); + final String expectedGroupKey_social = GroupHelper.getFullAggregateGroupKey(pkg, + AGGREGATE_GROUP_KEY + "SocialSection", UserHandle.SYSTEM.getIdentifier()); + final NotificationAttributes expectedSummaryAttr_social = new NotificationAttributes( + BASE_FLAGS, mSmallIcon, COLOR_DEFAULT, DEFAULT_VISIBILITY, DEFAULT_GROUP_ALERT, + NotificationChannel.SOCIAL_MEDIA_ID); + for (NotificationRecord record: notificationList) { + if (record.getOriginalGroupKey().contains("testGrp")) { + record.updateNotificationChannel(socialChannel); + mGroupHelper.onChannelUpdated(record); + } + } + + // Check that all notifications are moved to the social section group + verify(mCallback, times(1)).addAutoGroupSummary(anyInt(), eq(pkg), anyString(), + eq(expectedGroupKey_social), anyInt(), eq(expectedSummaryAttr_social)); + verify(mCallback, times(AUTOGROUP_SINGLETONS_AT_COUNT)).addAutoGroup(anyString(), + eq(expectedGroupKey_social), eq(true)); + // Check that the alerting section group is removed + verify(mCallback, times(1)).removeAutoGroupSummary(anyInt(), eq(pkg), + eq(expectedGroupKey_alerting)); + verify(mCallback, times(AUTOGROUP_SINGLETONS_AT_COUNT)).updateAutogroupSummary(anyInt(), + anyString(), anyString(), any()); + } + + @Test @EnableFlags(FLAG_NOTIFICATION_FORCE_GROUPING) public void testMoveAggregateGroups_updateChannel_groupsUngrouped() { final String pkg = "package"; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAssistantsTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAssistantsTest.java index 0f7de7d78ccf..6eb2f718a0e9 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAssistantsTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAssistantsTest.java @@ -17,6 +17,9 @@ package com.android.server.notification; import static android.os.UserHandle.USER_ALL; import static android.service.notification.Adjustment.KEY_IMPORTANCE; +import static android.service.notification.Adjustment.TYPE_CONTENT_RECOMMENDATION; +import static android.service.notification.Adjustment.TYPE_NEWS; +import static android.service.notification.Adjustment.TYPE_PROMOTION; import static com.android.server.notification.NotificationManagerService.DEFAULT_ALLOWED_ADJUSTMENTS; @@ -57,6 +60,8 @@ import android.testing.TestableContext; import android.util.ArrayMap; import android.util.ArraySet; import android.util.IntArray; +import android.util.Log; +import android.util.Slog; import android.util.Xml; import androidx.test.runner.AndroidJUnit4; @@ -680,4 +685,47 @@ public class NotificationAssistantsTest extends UiServiceTestCase { assertThat(mAssistants.getAllowedAssistantAdjustments()) .containsExactlyElementsIn(DEFAULT_ALLOWED_ADJUSTMENTS); } + + @Test + @EnableFlags(android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION) + public void testSetAssistantAdjustmentKeyTypeState_allow() { + assertThat(mAssistants.getAllowedAdjustmentKeyTypes()).asList() + .containsExactly(TYPE_PROMOTION); + + mAssistants.setAssistantAdjustmentKeyTypeState(TYPE_CONTENT_RECOMMENDATION, true); + + assertThat(mAssistants.getAllowedAdjustmentKeyTypes()).asList() + .containsExactlyElementsIn(List.of(TYPE_PROMOTION, TYPE_CONTENT_RECOMMENDATION)); + } + + @Test + @EnableFlags(android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION) + public void testSetAssistantAdjustmentKeyTypeState_disallow() { + mAssistants.setAssistantAdjustmentKeyTypeState(TYPE_PROMOTION, false); + assertThat(mAssistants.getAllowedAdjustmentKeyTypes()).isEmpty(); + } + + @Test + @EnableFlags(android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION) + public void testDisallowAdjustmentKeyType_readWriteXml() throws Exception { + mAssistants.loadDefaultsFromConfig(true); + mAssistants.setAssistantAdjustmentKeyTypeState(TYPE_PROMOTION, false); + mAssistants.setAssistantAdjustmentKeyTypeState(TYPE_NEWS, true); + mAssistants.setAssistantAdjustmentKeyTypeState(TYPE_CONTENT_RECOMMENDATION, true); + + writeXmlAndReload(USER_ALL); + + assertThat(mAssistants.getAllowedAdjustmentKeyTypes()).asList() + .containsExactlyElementsIn(List.of(TYPE_NEWS, TYPE_CONTENT_RECOMMENDATION)); + } + + @Test + public void testDefaultAllowedKeyAdjustments_readWriteXml() throws Exception { + mAssistants.loadDefaultsFromConfig(true); + + writeXmlAndReload(USER_ALL); + + assertThat(mAssistants.getAllowedAdjustmentKeyTypes()).asList() + .containsExactly(TYPE_PROMOTION); + } }
\ No newline at end of file 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 d33317a7168e..eae587bc0187 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -113,6 +113,7 @@ import static android.service.notification.Condition.STATE_TRUE; import static android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION; import static android.service.notification.Flags.FLAG_NOTIFICATION_CONVERSATION_CHANNEL_MANAGEMENT; import static android.service.notification.Flags.FLAG_NOTIFICATION_FORCE_GROUPING; +import static android.service.notification.Flags.FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION; import static android.service.notification.Flags.FLAG_REDACT_SENSITIVE_NOTIFICATIONS_FROM_UNTRUSTED_LISTENERS; import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING; import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS; @@ -2683,6 +2684,41 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { } @Test + @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING, FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION}) + public void testAggregateGroups_RemoveAppSummary_onClassification() throws Exception { + final String originalGroupName = "originalGroup"; + final int summaryId = 0; + final NotificationRecord r1 = generateNotificationRecord(mTestNotificationChannel, + summaryId + 1, originalGroupName, false); + mService.addNotification(r1); + final NotificationRecord r2 = generateNotificationRecord(mTestNotificationChannel, + summaryId + 2, originalGroupName, false); + mService.addNotification(r2); + final NotificationRecord summary = generateNotificationRecord(mTestNotificationChannel, + summaryId, originalGroupName, true); + mService.addNotification(summary); + final String originalGroupKey = summary.getGroupKey(); + assertThat(mService.mSummaryByGroupKey).containsEntry(originalGroupKey, summary); + + // Regroup first child notification + r1.setOverrideGroupKey("newGroup"); + // Check that removeAppProvidedSummaryOnClassificationLocked is null + // => there is still one child left in the original group + assertThat(mService.removeAppProvidedSummaryOnClassificationLocked(r1.getKey(), + originalGroupKey)).isNull(); + + // Regroup last child notification + r2.setOverrideGroupKey("newGroup"); + // Check that removeAppProvidedSummaryOnClassificationLocked returns the original summary + // and that the original app-provided summary is canceled + assertThat(mService.removeAppProvidedSummaryOnClassificationLocked(r2.getKey(), + originalGroupKey)).isEqualTo(summary); + waitForIdle(); + verify(mWorkerHandler, times(1)).scheduleCancelNotification(any(), eq(summaryId)); + assertThat(mService.mSummaryByGroupKey).doesNotContainKey(originalGroupKey); + } + + @Test @EnableFlags(FLAG_NOTIFICATION_FORCE_GROUPING) public void testUngroupingAggregateSummary() throws Exception { final String originalGroupName = "originalGroup"; @@ -7478,6 +7514,64 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { } @Test + @EnableFlags(FLAG_NOTIFICATION_CLASSIFICATION) + public void testClassificationChannelAdjustmentsLogged() throws Exception { + NotificationManagerService.WorkerHandler handler = mock( + NotificationManagerService.WorkerHandler.class); + mService.setHandler(handler); + when(mAssistants.isSameUser(any(), anyInt())).thenReturn(true); + when(mAssistants.isServiceTokenValidLocked(any())).thenReturn(true); + when(mAssistants.isAdjustmentKeyTypeAllowed(anyInt())).thenReturn(true); + + // Set up notifications that will be adjusted + final NotificationRecord r1 = spy(generateNotificationRecord( + mTestNotificationChannel, 1, null, true)); + when(r1.getLifespanMs(anyLong())).thenReturn(234); + + r1.getSbn().setInstanceId(mNotificationInstanceIdSequence.newInstanceId()); + // Enqueues the notification to be posted, so hasPosted will be false. + mService.addEnqueuedNotification(r1); + + // Test an adjustment for an enqueued notification + Bundle signals = new Bundle(); + signals.putInt(Adjustment.KEY_TYPE, Adjustment.TYPE_NEWS); + Adjustment adjustment1 = new Adjustment( + r1.getSbn().getPackageName(), r1.getKey(), signals, "", + r1.getUser().getIdentifier()); + mBinderService.applyEnqueuedAdjustmentFromAssistant(null, adjustment1); + assertTrue(mService.checkLastClassificationChannelLog(false /*hasPosted*/, + true /*isAlerting*/, 3 /*TYPE_NEWS*/, 234)); + + // Set up notifications that will be adjusted + // This notification starts on a low importance channel, so isAlerting is false. + NotificationChannel mLowImportanceNotificationChannel = new NotificationChannel( + TEST_CHANNEL_ID, TEST_CHANNEL_ID, IMPORTANCE_LOW); + final NotificationRecord r2 = spy(generateNotificationRecord( + mLowImportanceNotificationChannel, 1, null, true)); + when(r2.getLifespanMs(anyLong())).thenReturn(345); + + r2.getSbn().setInstanceId(mNotificationInstanceIdSequence.newInstanceId()); + // Adds the notification as already posted, so hasPosted will be true. + mService.addNotification(r2); + // The signal is removed when used so it has to be readded. + signals.putInt(Adjustment.KEY_TYPE, Adjustment.TYPE_NEWS); + Adjustment adjustment2 = new Adjustment( + r2.getSbn().getPackageName(), r2.getKey(), signals, "", + r2.getUser().getIdentifier()); + mBinderService.applyEnqueuedAdjustmentFromAssistant(null, adjustment2); + assertTrue(mService.checkLastClassificationChannelLog(true /*hasPosted*/, + false /*isAlerting*/, 3 /*TYPE_NEWS*/, 345)); // currently failing + + signals.putInt(Adjustment.KEY_TYPE, Adjustment.TYPE_PROMOTION); + Adjustment adjustment3 = new Adjustment( + r2.getSbn().getPackageName(), r2.getKey(), signals, "", + r2.getUser().getIdentifier()); + mBinderService.applyEnqueuedAdjustmentFromAssistant(null, adjustment3); + assertTrue(mService.checkLastClassificationChannelLog(true /*hasPosted*/, + false /*isAlerting*/, 1 /*TYPE_PROMOTION*/, 345)); + } + + @Test public void testAdjustmentToImportanceNone_cancelsNotification() throws Exception { NotificationManagerService.WorkerHandler handler = mock( NotificationManagerService.WorkerHandler.class); @@ -17099,6 +17193,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationManagerService.WorkerHandler handler = mock( NotificationManagerService.WorkerHandler.class); mService.setHandler(handler); + when(mAssistants.isAdjustmentKeyTypeAllowed(anyInt())).thenReturn(true); Bundle signals = new Bundle(); signals.putInt(KEY_TYPE, TYPE_NEWS); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/TestableNotificationManagerService.java b/services/tests/uiservicestests/src/com/android/server/notification/TestableNotificationManagerService.java index 07d25dfd814e..ba91ca2323af 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/TestableNotificationManagerService.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/TestableNotificationManagerService.java @@ -52,6 +52,14 @@ public class TestableNotificationManagerService extends NotificationManagerServi } public SensitiveLog lastSensitiveLog = null; + private static class ClassificationChannelLog { + public boolean hasPosted; + public boolean isAlerting; + public long classification; + public long lifetime; + } + public ClassificationChannelLog lastClassificationChannelLog = null; + TestableNotificationManagerService(Context context, NotificationRecordLogger logger, InstanceIdSequence notificationInstanceIdSequence) { super(context, logger, notificationInstanceIdSequence); @@ -211,4 +219,29 @@ public class TestableNotificationManagerService extends NotificationManagerServi public interface ComponentPermissionChecker { int check(String permission, int uid, int owningUid, boolean exported); } + + @Override + protected void logClassificationChannelAdjustmentReceived(boolean hasPosted, boolean isAlerting, + int classification, int lifetimeMs) { + lastClassificationChannelLog = new ClassificationChannelLog(); + lastClassificationChannelLog.hasPosted = hasPosted; + lastClassificationChannelLog.isAlerting = isAlerting; + lastClassificationChannelLog.classification = classification; + lastClassificationChannelLog.lifetime = lifetimeMs; + } + + /** + * Returns true if the last recorded classification channel log has all the values specified. + */ + public boolean checkLastClassificationChannelLog(boolean hasPosted, boolean isAlerting, + int classification, int lifetime) { + if (lastClassificationChannelLog == null) { + return false; + } + + return hasPosted == lastClassificationChannelLog.hasPosted + && isAlerting == lastClassificationChannelLog.isAlerting + && classification == lastClassificationChannelLog.classification + && lifetime == lastClassificationChannelLog.lifetime; + } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java index 0019b3e45e7b..4b94e103b9f4 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java @@ -493,6 +493,22 @@ public class ZenModeHelperTest extends UiServiceTestCase { } @Test + public void testZenOn_RepeatCallers_CallTypesBlocked() { + mZenModeHelper.mZenMode = ZEN_MODE_IMPORTANT_INTERRUPTIONS; + mZenModeHelper.setPriorityOnlyDndExemptPackages(new String[]{PKG_O}); + // Any call allowed but no repeat callers + mZenModeHelper.mConsolidatedPolicy = new Policy(PRIORITY_CATEGORY_CALLS, + PRIORITY_SENDERS_ANY, 0, 0, 0); + mZenModeHelper.applyRestrictions(); + + verifyApplyRestrictions(true, true, + AudioAttributes.USAGE_NOTIFICATION_RINGTONE); + verifyApplyRestrictions(true, true, + AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_REQUEST); + } + + + @Test public void testZenOn_StarredCallers_CallTypesBlocked() { mZenModeHelper.mZenMode = ZEN_MODE_IMPORTANT_INTERRUPTIONS; mZenModeHelper.setPriorityOnlyDndExemptPackages(new String[]{PKG_O}); @@ -501,7 +517,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { | PRIORITY_CATEGORY_MEDIA | PRIORITY_CATEGORY_MESSAGES | PRIORITY_CATEGORY_CONVERSATIONS | PRIORITY_CATEGORY_CALLS | PRIORITY_CATEGORY_ALARMS | PRIORITY_CATEGORY_EVENTS | PRIORITY_CATEGORY_REMINDERS - | PRIORITY_CATEGORY_SYSTEM, + | PRIORITY_CATEGORY_SYSTEM | PRIORITY_CATEGORY_REPEAT_CALLERS, PRIORITY_SENDERS_STARRED, PRIORITY_SENDERS_ANY, 0, CONVERSATION_SENDERS_ANYONE); mZenModeHelper.applyRestrictions(); diff --git a/services/tests/wmtests/src/com/android/server/policy/KeyGestureEventTests.java b/services/tests/wmtests/src/com/android/server/policy/KeyGestureEventTests.java index 25a8db6e6b9c..1e9038ee1769 100644 --- a/services/tests/wmtests/src/com/android/server/policy/KeyGestureEventTests.java +++ b/services/tests/wmtests/src/com/android/server/policy/KeyGestureEventTests.java @@ -397,7 +397,7 @@ public class KeyGestureEventTests extends ShortcutKeyTestBase { } @Test - @EnableFlags(Flags.FLAG_KEYBOARD_A11Y_SHORTCUT_CONTROL) + @EnableFlags(Flags.FLAG_ENABLE_TALKBACK_AND_MAGNIFIER_KEY_GESTURES) @DisableFlags(com.android.hardware.input.Flags.FLAG_USE_KEY_GESTURE_EVENT_HANDLER) public void testToggleTalkbackPress() { testShortcutInternal("Meta + Alt + T -> Toggle talkback", @@ -745,7 +745,7 @@ public class KeyGestureEventTests extends ShortcutKeyTestBase { } @Test - @EnableFlags(com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_SHORTCUT_CONTROL) + @EnableFlags(com.android.hardware.input.Flags.FLAG_ENABLE_TALKBACK_AND_MAGNIFIER_KEY_GESTURES) public void testKeyGestureToggleTalkback() { Assert.assertTrue( sendKeyGestureEventComplete(KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_TALKBACK)); diff --git a/tests/BatteryStatsPerfTest/src/com/android/internal/os/BatteryUsageStatsPerfTest.java b/tests/BatteryStatsPerfTest/src/com/android/internal/os/BatteryUsageStatsPerfTest.java index 30cc002b4144..bfce3d276a2d 100644 --- a/tests/BatteryStatsPerfTest/src/com/android/internal/os/BatteryUsageStatsPerfTest.java +++ b/tests/BatteryStatsPerfTest/src/com/android/internal/os/BatteryUsageStatsPerfTest.java @@ -168,32 +168,28 @@ public class BatteryUsageStatsPerfTest { builder.getAggregateBatteryConsumerBuilder( BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_ALL_APPS) - .setConsumedPower(123) - .setConsumedPower( - BatteryConsumer.POWER_COMPONENT_CPU, 10100) - .setConsumedPower( - BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 10200) - .setUsageDurationMillis( - BatteryConsumer.POWER_COMPONENT_CPU, 10300) - .setUsageDurationMillis( - BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 10400); + .addConsumedPower(123) + .addConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 10100) + .addConsumedPower(BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 10200) + .addUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_CPU, 10300) + .addUsageDurationMillis(BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 10400); for (int i = 0; i < 1000; i++) { final UidBatteryConsumer.Builder consumerBuilder = builder.getOrCreateUidBatteryConsumerBuilder(i) .setPackageWithHighestDrain("example.packagename" + i) - .setTimeInStateMs(UidBatteryConsumer.STATE_FOREGROUND, i * 2000) - .setTimeInStateMs(UidBatteryConsumer.STATE_BACKGROUND, i * 1000); + .setTimeInProcessStateMs(UidBatteryConsumer.STATE_FOREGROUND, i * 2000) + .setTimeInProcessStateMs(UidBatteryConsumer.STATE_BACKGROUND, i * 1000); for (int componentId = 0; componentId < BatteryConsumer.POWER_COMPONENT_COUNT; componentId++) { - consumerBuilder.setConsumedPower(componentId, componentId * 123.0, + consumerBuilder.addConsumedPower(componentId, componentId * 123.0, BatteryConsumer.POWER_MODEL_POWER_PROFILE); - consumerBuilder.setUsageDurationMillis(componentId, componentId * 1000); + consumerBuilder.addUsageDurationMillis(componentId, componentId * 1000); } consumerBuilder - .setConsumedPower(BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 1234) - .setUsageDurationMillis(BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 4321); + .addConsumedPower(BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 1234) + .addUsageDurationMillis(BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 4321); } return builder.build(); } diff --git a/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt b/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt index 6c9f764bbdee..1574d1b7ce6f 100644 --- a/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt +++ b/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt @@ -1260,24 +1260,102 @@ class KeyGestureControllerTests { testKeyGestureInternal(test) } + class TouchpadTestData( + val name: String, + val touchpadGestureType: Int, + val expectedKeyGestureType: Int, + val expectedAction: Int, + val expectedAppLaunchData: AppLaunchData? = null, + ) { + override fun toString(): String = name + } + + @Keep + private fun customTouchpadGesturesTestArguments(): Array<TouchpadTestData> { + return arrayOf( + TouchpadTestData( + "3 Finger Tap -> Go Home", + InputGestureData.TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP, + KeyGestureEvent.KEY_GESTURE_TYPE_HOME, + KeyGestureEvent.ACTION_GESTURE_COMPLETE + ), + TouchpadTestData( + "3 Finger Tap -> Launch app", + InputGestureData.TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP, + KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_APPLICATION, + KeyGestureEvent.ACTION_GESTURE_COMPLETE, + AppLaunchData.createLaunchDataForComponent("com.test", "com.test.BookmarkTest") + ), + ) + } + + @Test + @Parameters(method = "customTouchpadGesturesTestArguments") + fun testCustomTouchpadGesture(test: TouchpadTestData) { + setupKeyGestureController() + val builder = InputGestureData.Builder() + .setKeyGestureType(test.expectedKeyGestureType) + .setTrigger(InputGestureData.createTouchpadTrigger(test.touchpadGestureType)) + if (test.expectedAppLaunchData != null) { + builder.setAppLaunchData(test.expectedAppLaunchData) + } + val inputGestureData = builder.build() + + keyGestureController.addCustomInputGesture(0, inputGestureData.aidlData) + + val handledEvents = mutableListOf<KeyGestureEvent>() + val handler = KeyGestureHandler { event, _ -> + handledEvents.add(KeyGestureEvent(event)) + true + } + keyGestureController.registerKeyGestureHandler(handler, 0) + handledEvents.clear() + + keyGestureController.handleTouchpadGesture(test.touchpadGestureType) + + assertEquals( + "Test: $test doesn't produce correct number of key gesture events", + 1, + handledEvents.size + ) + val event = handledEvents[0] + assertEquals( + "Test: $test doesn't produce correct key gesture type", + test.expectedKeyGestureType, + event.keyGestureType + ) + assertEquals( + "Test: $test doesn't produce correct key gesture action", + test.expectedAction, + event.action + ) + assertEquals( + "Test: $test doesn't produce correct app launch data", + test.expectedAppLaunchData, + event.appLaunchData + ) + + keyGestureController.unregisterKeyGestureHandler(handler, 0) + } + private fun testKeyGestureInternal(test: TestData) { - var handleEvents = mutableListOf<KeyGestureEvent>() + val handledEvents = mutableListOf<KeyGestureEvent>() val handler = KeyGestureHandler { event, _ -> - handleEvents.add(KeyGestureEvent(event)) + handledEvents.add(KeyGestureEvent(event)) true } keyGestureController.registerKeyGestureHandler(handler, 0) - handleEvents.clear() + handledEvents.clear() sendKeys(test.keys) assertEquals( "Test: $test doesn't produce correct number of key gesture events", test.expectedActions.size, - handleEvents.size + handledEvents.size ) - for (i in handleEvents.indices) { - val event = handleEvents[i] + for (i in handledEvents.indices) { + val event = handledEvents[i] assertArrayEquals( "Test: $test doesn't produce correct key gesture keycodes", test.expectedKeys, @@ -1309,16 +1387,16 @@ class KeyGestureControllerTests { } private fun testKeyGestureNotProduced(testName: String, testKeys: IntArray) { - var handleEvents = mutableListOf<KeyGestureEvent>() + var handledEvents = mutableListOf<KeyGestureEvent>() val handler = KeyGestureHandler { event, _ -> - handleEvents.add(KeyGestureEvent(event)) + handledEvents.add(KeyGestureEvent(event)) true } keyGestureController.registerKeyGestureHandler(handler, 0) - handleEvents.clear() + handledEvents.clear() sendKeys(testKeys) - assertEquals("Test: $testName should not produce Key gesture", 0, handleEvents.size) + assertEquals("Test: $testName should not produce Key gesture", 0, handledEvents.size) } private fun sendKeys(testKeys: IntArray, assertNotSentToApps: Boolean = false) { diff --git a/tests/PackageWatchdog/Android.bp b/tests/PackageWatchdog/Android.bp index 096555eb3056..91483eb41387 100644 --- a/tests/PackageWatchdog/Android.bp +++ b/tests/PackageWatchdog/Android.bp @@ -35,7 +35,13 @@ android_test { "services.core", "services.net", "truth", - ], + ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { + "true": [ + "service-crashrecovery.impl", + "framework-crashrecovery.impl", + ], + default: [], + }), libs: ["android.test.runner.stubs.system"], jni_libs: [ // mockito-target-extended dependencies diff --git a/tests/PackageWatchdog/src/com/android/server/CrashRecoveryTest.java b/tests/PackageWatchdog/src/com/android/server/CrashRecoveryTest.java index 8d143b69d124..05a0f8f34337 100644 --- a/tests/PackageWatchdog/src/com/android/server/CrashRecoveryTest.java +++ b/tests/PackageWatchdog/src/com/android/server/CrashRecoveryTest.java @@ -224,39 +224,39 @@ public class CrashRecoveryTest { PackageWatchdog watchdog = createWatchdog(); RescuePartyObserver rescuePartyObserver = setUpRescuePartyObserver(watchdog); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(1); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(1); for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT; i++) { watchdog.noteBoot(); } - verify(rescuePartyObserver).executeBootLoopMitigation(1); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(2); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(1); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); watchdog.noteBoot(); - verify(rescuePartyObserver).executeBootLoopMitigation(2); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(3); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(2); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(3); watchdog.noteBoot(); - verify(rescuePartyObserver).executeBootLoopMitigation(3); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(4); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(3); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(4); watchdog.noteBoot(); - verify(rescuePartyObserver).executeBootLoopMitigation(4); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(5); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(4); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(5); watchdog.noteBoot(); - verify(rescuePartyObserver).executeBootLoopMitigation(5); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(6); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(5); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(6); watchdog.noteBoot(); - verify(rescuePartyObserver).executeBootLoopMitigation(6); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(7); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(6); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(7); } @Test @@ -265,14 +265,14 @@ public class CrashRecoveryTest { RollbackPackageHealthObserver rollbackObserver = setUpRollbackPackageHealthObserver(watchdog); - verify(rollbackObserver, never()).executeBootLoopMitigation(1); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(1); for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT; i++) { watchdog.noteBoot(); } - verify(rollbackObserver).executeBootLoopMitigation(1); - verify(rollbackObserver, never()).executeBootLoopMitigation(2); + verify(rollbackObserver).onExecuteBootLoopMitigation(1); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); // Update the list of available rollbacks after executing bootloop mitigation once when(mRollbackManager.getAvailableRollbacks()).thenReturn(List.of(ROLLBACK_INFO_HIGH, @@ -280,15 +280,15 @@ public class CrashRecoveryTest { watchdog.noteBoot(); - verify(rollbackObserver).executeBootLoopMitigation(2); - verify(rollbackObserver, never()).executeBootLoopMitigation(3); + verify(rollbackObserver).onExecuteBootLoopMitigation(2); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(3); // Update the list of available rollbacks after executing bootloop mitigation once when(mRollbackManager.getAvailableRollbacks()).thenReturn(List.of(ROLLBACK_INFO_MANUAL)); watchdog.noteBoot(); - verify(rollbackObserver, never()).executeBootLoopMitigation(3); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(3); } @Test @@ -299,61 +299,61 @@ public class CrashRecoveryTest { RollbackPackageHealthObserver rollbackObserver = setUpRollbackPackageHealthObserver(watchdog); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(1); - verify(rollbackObserver, never()).executeBootLoopMitigation(1); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(1); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(1); for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT; i++) { watchdog.noteBoot(); } - verify(rescuePartyObserver).executeBootLoopMitigation(1); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(2); - verify(rollbackObserver, never()).executeBootLoopMitigation(1); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(1); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(1); watchdog.noteBoot(); - verify(rescuePartyObserver).executeBootLoopMitigation(2); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(3); - verify(rollbackObserver, never()).executeBootLoopMitigation(2); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(2); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(3); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); watchdog.noteBoot(); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(3); - verify(rollbackObserver).executeBootLoopMitigation(1); - verify(rollbackObserver, never()).executeBootLoopMitigation(2); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(3); + verify(rollbackObserver).onExecuteBootLoopMitigation(1); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); // Update the list of available rollbacks after executing bootloop mitigation once when(mRollbackManager.getAvailableRollbacks()).thenReturn(List.of(ROLLBACK_INFO_HIGH, ROLLBACK_INFO_MANUAL)); watchdog.noteBoot(); - verify(rescuePartyObserver).executeBootLoopMitigation(3); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(4); - verify(rollbackObserver, never()).executeBootLoopMitigation(2); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(3); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(4); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); watchdog.noteBoot(); - verify(rescuePartyObserver).executeBootLoopMitigation(4); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(5); - verify(rollbackObserver, never()).executeBootLoopMitigation(2); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(4); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(5); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); watchdog.noteBoot(); - verify(rescuePartyObserver).executeBootLoopMitigation(5); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(6); - verify(rollbackObserver, never()).executeBootLoopMitigation(2); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(5); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(6); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); watchdog.noteBoot(); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(6); - verify(rollbackObserver).executeBootLoopMitigation(2); - verify(rollbackObserver, never()).executeBootLoopMitigation(3); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(6); + verify(rollbackObserver).onExecuteBootLoopMitigation(2); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(3); // Update the list of available rollbacks after executing bootloop mitigation when(mRollbackManager.getAvailableRollbacks()).thenReturn(List.of(ROLLBACK_INFO_MANUAL)); watchdog.noteBoot(); - verify(rescuePartyObserver).executeBootLoopMitigation(6); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(7); - verify(rollbackObserver, never()).executeBootLoopMitigation(3); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(6); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(7); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(3); moveTimeForwardAndDispatch(PackageWatchdog.DEFAULT_DEESCALATION_WINDOW_MS + 1); Mockito.reset(rescuePartyObserver); @@ -361,8 +361,8 @@ public class CrashRecoveryTest { for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT; i++) { watchdog.noteBoot(); } - verify(rescuePartyObserver).executeBootLoopMitigation(1); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(2); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(1); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); } @Test @@ -373,37 +373,37 @@ public class CrashRecoveryTest { RollbackPackageHealthObserver rollbackObserver = setUpRollbackPackageHealthObserver(watchdog); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(1); - verify(rollbackObserver, never()).executeBootLoopMitigation(1); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(1); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(1); for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT; i++) { watchdog.noteBoot(); } - verify(rescuePartyObserver).executeBootLoopMitigation(1); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(2); - verify(rollbackObserver, never()).executeBootLoopMitigation(1); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(1); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(1); watchdog.noteBoot(); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(2); - verify(rollbackObserver).executeBootLoopMitigation(1); - verify(rollbackObserver, never()).executeBootLoopMitigation(2); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); + verify(rollbackObserver).onExecuteBootLoopMitigation(1); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); // Update the list of available rollbacks after executing bootloop mitigation once when(mRollbackManager.getAvailableRollbacks()).thenReturn(List.of(ROLLBACK_INFO_HIGH, ROLLBACK_INFO_MANUAL)); watchdog.noteBoot(); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(2); - verify(rollbackObserver).executeBootLoopMitigation(2); - verify(rollbackObserver, never()).executeBootLoopMitigation(3); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); + verify(rollbackObserver).onExecuteBootLoopMitigation(2); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(3); // Update the list of available rollbacks after executing bootloop mitigation when(mRollbackManager.getAvailableRollbacks()).thenReturn(List.of(ROLLBACK_INFO_MANUAL)); watchdog.noteBoot(); - verify(rescuePartyObserver).executeBootLoopMitigation(2); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(3); - verify(rollbackObserver, never()).executeBootLoopMitigation(3); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(2); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(3); + verify(rollbackObserver, never()).onExecuteBootLoopMitigation(3); moveTimeForwardAndDispatch(PackageWatchdog.DEFAULT_DEESCALATION_WINDOW_MS + 1); Mockito.reset(rescuePartyObserver); @@ -411,8 +411,8 @@ public class CrashRecoveryTest { for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT; i++) { watchdog.noteBoot(); } - verify(rescuePartyObserver).executeBootLoopMitigation(1); - verify(rescuePartyObserver, never()).executeBootLoopMitigation(2); + verify(rescuePartyObserver).onExecuteBootLoopMitigation(1); + verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); } @Test @@ -435,46 +435,46 @@ public class CrashRecoveryTest { Arrays.asList(versionedPackageA), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: SCOPED_DEVICE_CONFIG_RESET - verify(rescuePartyObserver).execute(versionedPackageA, + verify(rescuePartyObserver).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); - verify(rescuePartyObserver, never()).execute(versionedPackageA, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); - verify(rollbackObserver, never()).execute(versionedPackageA, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(versionedPackageA), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: ALL_DEVICE_CONFIG_RESET - verify(rescuePartyObserver).execute(versionedPackageA, + verify(rescuePartyObserver).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); - verify(rescuePartyObserver, never()).execute(versionedPackageA, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 3); - verify(rollbackObserver, never()).execute(versionedPackageA, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(versionedPackageA), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: WARM_REBOOT - verify(rescuePartyObserver).execute(versionedPackageA, + verify(rescuePartyObserver).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 3); - verify(rescuePartyObserver, never()).execute(versionedPackageA, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 4); - verify(rollbackObserver, never()).execute(versionedPackageA, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(versionedPackageA), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: Low impact rollback - verify(rollbackObserver).execute(versionedPackageA, + verify(rollbackObserver).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); - verify(rescuePartyObserver, never()).execute(versionedPackageA, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 4); // update available rollbacks to mock rollbacks being applied after the call to - // rollbackObserver.execute + // rollbackObserver.onExecuteHealthCheckMitigation when(mRollbackManager.getAvailableRollbacks()).thenReturn( List.of(ROLLBACK_INFO_HIGH, ROLLBACK_INFO_MANUAL)); @@ -482,9 +482,9 @@ public class CrashRecoveryTest { Arrays.asList(versionedPackageA), PackageWatchdog.FAILURE_REASON_APP_CRASH); // DEFAULT_MAJOR_USER_IMPACT_LEVEL_THRESHOLD reached. No more mitigations applied - verify(rescuePartyObserver, never()).execute(versionedPackageA, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 4); - verify(rollbackObserver, never()).execute(versionedPackageA, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); } @@ -510,24 +510,24 @@ public class CrashRecoveryTest { Arrays.asList(versionedPackageA), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: WARM_REBOOT - verify(rescuePartyObserver).execute(versionedPackageA, + verify(rescuePartyObserver).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); - verify(rescuePartyObserver, never()).execute(versionedPackageA, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); - verify(rollbackObserver, never()).execute(versionedPackageA, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(versionedPackageA), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: Low impact rollback - verify(rollbackObserver).execute(versionedPackageA, + verify(rollbackObserver).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); - verify(rescuePartyObserver, never()).execute(versionedPackageA, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); // update available rollbacks to mock rollbacks being applied after the call to - // rollbackObserver.execute + // rollbackObserver.onExecuteHealthCheckMitigation when(mRollbackManager.getAvailableRollbacks()).thenReturn( List.of(ROLLBACK_INFO_HIGH, ROLLBACK_INFO_MANUAL)); @@ -535,9 +535,9 @@ public class CrashRecoveryTest { Arrays.asList(versionedPackageA), PackageWatchdog.FAILURE_REASON_APP_CRASH); // DEFAULT_MAJOR_USER_IMPACT_LEVEL_THRESHOLD reached. No more mitigations applied - verify(rescuePartyObserver, never()).execute(versionedPackageA, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); - verify(rollbackObserver, never()).execute(versionedPackageA, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageA, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); } @@ -567,48 +567,48 @@ public class CrashRecoveryTest { Arrays.asList(versionedPackageUi), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: SCOPED_DEVICE_CONFIG_RESET - verify(rescuePartyObserver).execute(versionedPackageUi, + verify(rescuePartyObserver).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); - verify(rescuePartyObserver, never()).execute(versionedPackageUi, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); - verify(rollbackObserver, never()).execute(versionedPackageUi, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(versionedPackageUi), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: ALL_DEVICE_CONFIG_RESET - verify(rescuePartyObserver).execute(versionedPackageUi, + verify(rescuePartyObserver).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); - verify(rescuePartyObserver, never()).execute(versionedPackageUi, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 3); - verify(rollbackObserver, never()).execute(versionedPackageUi, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(versionedPackageUi), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: WARM_REBOOT - verify(rescuePartyObserver).execute(versionedPackageUi, + verify(rescuePartyObserver).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 3); - verify(rescuePartyObserver, never()).execute(versionedPackageUi, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 4); - verify(rollbackObserver, never()).execute(versionedPackageUi, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(versionedPackageUi), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: Low impact rollback - verify(rollbackObserver).execute(versionedPackageUi, + verify(rollbackObserver).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); - verify(rescuePartyObserver, never()).execute(versionedPackageUi, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 4); - verify(rollbackObserver, never()).execute(versionedPackageUi, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); // update available rollbacks to mock rollbacks being applied after the call to - // rollbackObserver.execute + // rollbackObserver.onExecuteHealthCheckMitigation when(mRollbackManager.getAvailableRollbacks()).thenReturn( List.of(ROLLBACK_INFO_HIGH, ROLLBACK_INFO_MANUAL)); @@ -616,44 +616,44 @@ public class CrashRecoveryTest { Arrays.asList(versionedPackageUi), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: RESET_SETTINGS_UNTRUSTED_DEFAULTS - verify(rescuePartyObserver).execute(versionedPackageUi, + verify(rescuePartyObserver).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 4); - verify(rescuePartyObserver, never()).execute(versionedPackageUi, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 5); - verify(rollbackObserver, never()).execute(versionedPackageUi, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(versionedPackageUi), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: RESET_SETTINGS_UNTRUSTED_CHANGES - verify(rescuePartyObserver).execute(versionedPackageUi, + verify(rescuePartyObserver).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 5); - verify(rescuePartyObserver, never()).execute(versionedPackageUi, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 6); - verify(rollbackObserver, never()).execute(versionedPackageUi, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(versionedPackageUi), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: RESET_SETTINGS_TRUSTED_DEFAULTS - verify(rescuePartyObserver).execute(versionedPackageUi, + verify(rescuePartyObserver).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 6); - verify(rescuePartyObserver, never()).execute(versionedPackageUi, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 7); - verify(rollbackObserver, never()).execute(versionedPackageUi, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(versionedPackageUi), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: Factory reset. High impact rollbacks are performed only for boot loops. - verify(rescuePartyObserver).execute(versionedPackageUi, + verify(rescuePartyObserver).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 7); - verify(rescuePartyObserver, never()).execute(versionedPackageUi, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 8); - verify(rollbackObserver, never()).execute(versionedPackageUi, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); } @@ -685,26 +685,26 @@ public class CrashRecoveryTest { Arrays.asList(versionedPackageUi), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: WARM_REBOOT - verify(rescuePartyObserver).execute(versionedPackageUi, + verify(rescuePartyObserver).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); - verify(rescuePartyObserver, never()).execute(versionedPackageUi, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); - verify(rollbackObserver, never()).execute(versionedPackageUi, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(versionedPackageUi), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: Low impact rollback - verify(rollbackObserver).execute(versionedPackageUi, + verify(rollbackObserver).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 1); - verify(rescuePartyObserver, never()).execute(versionedPackageUi, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); - verify(rollbackObserver, never()).execute(versionedPackageUi, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); // update available rollbacks to mock rollbacks being applied after the call to - // rollbackObserver.execute + // rollbackObserver.onExecuteHealthCheckMitigation when(mRollbackManager.getAvailableRollbacks()).thenReturn( List.of(ROLLBACK_INFO_HIGH, ROLLBACK_INFO_MANUAL)); @@ -712,17 +712,17 @@ public class CrashRecoveryTest { Arrays.asList(versionedPackageUi), PackageWatchdog.FAILURE_REASON_APP_CRASH); // Mitigation: Factory reset. High impact rollbacks are performed only for boot loops. - verify(rescuePartyObserver).execute(versionedPackageUi, + verify(rescuePartyObserver).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); - verify(rescuePartyObserver, never()).execute(versionedPackageUi, + verify(rescuePartyObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 3); - verify(rollbackObserver, never()).execute(versionedPackageUi, + verify(rollbackObserver, never()).onExecuteHealthCheckMitigation(versionedPackageUi, PackageWatchdog.FAILURE_REASON_APP_CRASH, 2); } RollbackPackageHealthObserver setUpRollbackPackageHealthObserver(PackageWatchdog watchdog) { RollbackPackageHealthObserver rollbackObserver = - spy(new RollbackPackageHealthObserver(mSpyContext, mApexManager)); + spy(new RollbackPackageHealthObserver(mSpyContext)); when(mSpyContext.getSystemService(RollbackManager.class)).thenReturn(mRollbackManager); when(mRollbackManager.getAvailableRollbacks()).thenReturn(List.of(ROLLBACK_INFO_LOW, ROLLBACK_INFO_HIGH, ROLLBACK_INFO_MANUAL)); @@ -785,7 +785,7 @@ public class CrashRecoveryTest { Handler handler = new Handler(mTestLooper.getLooper()); PackageWatchdog watchdog = new PackageWatchdog(mSpyContext, policyFile, handler, handler, controller, - mConnectivityModuleConnector, mTestClock); + mTestClock); mockCrashRecoveryProperties(watchdog); // Verify controller is not automatically started diff --git a/tests/PackageWatchdog/src/com/android/server/ExplicitHealthCheckServiceTest.java b/tests/PackageWatchdog/src/com/android/server/ExplicitHealthCheckServiceTest.java index 2fbfeba47b13..cd2ab86d6444 100644 --- a/tests/PackageWatchdog/src/com/android/server/ExplicitHealthCheckServiceTest.java +++ b/tests/PackageWatchdog/src/com/android/server/ExplicitHealthCheckServiceTest.java @@ -35,6 +35,8 @@ public class ExplicitHealthCheckServiceTest { private ExplicitHealthCheckService mExplicitHealthCheckService; private static final String PACKAGE_NAME = "com.test.package"; + private static final String EXTRA_HEALTH_CHECK_PASSED_PACKAGE = + "android.service.watchdog.extra.health_check_passed_package"; @Before public void setup() throws Exception { @@ -50,7 +52,7 @@ public class ExplicitHealthCheckServiceTest { IBinder binder = mExplicitHealthCheckService.onBind(new Intent()); CountDownLatch countDownLatch = new CountDownLatch(1); RemoteCallback callback = new RemoteCallback(result -> { - assertThat(result.get(ExplicitHealthCheckService.EXTRA_HEALTH_CHECK_PASSED_PACKAGE)) + assertThat(result.get(EXTRA_HEALTH_CHECK_PASSED_PACKAGE)) .isEqualTo(PACKAGE_NAME); countDownLatch.countDown(); }); diff --git a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java index 0364781ab064..a540a8d567a1 100644 --- a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java +++ b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java @@ -1754,7 +1754,7 @@ public class PackageWatchdogTest { Handler handler = new Handler(mTestLooper.getLooper()); PackageWatchdog watchdog = new PackageWatchdog(mSpyContext, policyFile, handler, handler, controller, - mConnectivityModuleConnector, mTestClock); + mTestClock); mockCrashRecoveryProperties(watchdog); // Verify controller is not automatically started @@ -1869,8 +1869,8 @@ public class PackageWatchdogTest { return mImpact; } - public boolean execute(VersionedPackage versionedPackage, int failureReason, - int mitigationCount) { + public boolean onExecuteHealthCheckMitigation(VersionedPackage versionedPackage, + int failureReason, int mitigationCount) { mMitigatedPackages.add(versionedPackage.getPackageName()); mMitigationCounts.add(mitigationCount); mLastFailureReason = failureReason; @@ -1893,7 +1893,7 @@ public class PackageWatchdogTest { return mImpact; } - public boolean executeBootLoopMitigation(int level) { + public boolean onExecuteBootLoopMitigation(int level) { mMitigatedBootLoop = true; mBootMitigationCounts.add(level); return true; |