diff options
495 files changed, 12929 insertions, 7805 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp index 7f5d4a3fd504..038ee6501ded 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -81,7 +81,6 @@ stubs_defaults { ":framework-adservices-sources", ":framework-appsearch-sources", - ":framework-auxiliary-sources", ":framework-connectivity-sources", ":framework-bluetooth-sources", ":framework-connectivity-tiramisu-updatable-sources", diff --git a/ProtoLibraries.bp b/ProtoLibraries.bp index db5ba2fd031f..fb650319e061 100644 --- a/ProtoLibraries.bp +++ b/ProtoLibraries.bp @@ -33,6 +33,7 @@ gensrcs { "&& $(location soong_zip) -jar -o $(out) -C $(genDir)/$(in) -D $(genDir)/$(in)", srcs: [ + ":framework-connectivity-protos", ":ipconnectivity-proto-src", ":libstats_atom_enum_protos", ":libstats_atom_message_protos", @@ -63,6 +64,7 @@ gensrcs { " $(in)", srcs: [ + ":framework-connectivity-protos", ":ipconnectivity-proto-src", ":libstats_atom_enum_protos", ":libstats_atom_message_protos", @@ -78,6 +80,7 @@ gensrcs { java_library_host { name: "platformprotos", srcs: [ + ":framework-connectivity-protos", ":ipconnectivity-proto-src", ":libstats_atom_enum_protos", ":libstats_atom_message_protos", @@ -117,6 +120,7 @@ java_library { ], sdk_version: "9", srcs: [ + ":framework-connectivity-protos", ":ipconnectivity-proto-src", ":libstats_atom_enum_protos", ":libstats_atom_message_protos", @@ -139,6 +143,7 @@ java_library { }, srcs: [ + ":framework-connectivity-protos", ":ipconnectivity-proto-src", ":libstats_atom_enum_protos", ":libstats_atom_message_protos", @@ -176,6 +181,7 @@ cc_defaults { ], srcs: [ + ":framework-connectivity-protos", ":ipconnectivity-proto-src", ":libstats_atom_enum_protos", ":libstats_atom_message_protos", diff --git a/StubLibraries.bp b/StubLibraries.bp index fef95e813ec7..32101c791242 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -208,6 +208,16 @@ droidstubs { ///////////////////////////////////////////////////////////////////// java_defaults { + name: "android.jar_defaults", + sdk_version: "none", + system_modules: "none", + java_version: "1.8", + compile_dex: true, + defaults_visibility: ["//visibility:private"], + visibility: ["//visibility:public"], +} + +java_defaults { name: "android-non-updatable_defaults_stubs_current", libs: ["stub-annotations"], static_libs: ["framework-res-package-jar"], // Export package of framework-res diff --git a/apex/jobscheduler/service/java/com/android/server/tare/DeviceIdleModifier.java b/apex/jobscheduler/service/java/com/android/server/tare/DeviceIdleModifier.java index 37b0aa8f4862..8a64238f1f17 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/DeviceIdleModifier.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/DeviceIdleModifier.java @@ -103,7 +103,7 @@ class DeviceIdleModifier extends Modifier { mIrs.onDeviceStateChanged(); } } else if (PowerManager.ACTION_LIGHT_DEVICE_IDLE_MODE_CHANGED.equals(action)) { - if (mDeviceIdle != mPowerManager.isLightDeviceIdleMode()) { + if (mDeviceLightIdle != mPowerManager.isLightDeviceIdleMode()) { mDeviceLightIdle = mPowerManager.isLightDeviceIdleMode(); mIrs.onDeviceStateChanged(); } diff --git a/boot/Android.bp b/boot/Android.bp index 00e44f8e9143..5b265a5dc9de 100644 --- a/boot/Android.bp +++ b/boot/Android.bp @@ -60,10 +60,6 @@ platform_bootclasspath { module: "art-bootclasspath-fragment", }, { - apex: "com.android.auxiliary", - module: "com.android.auxiliary-bootclasspath-fragment", - }, - { apex: "com.android.bluetooth", module: "com.android.bluetooth-bootclasspath-fragment", }, diff --git a/core/api/current.txt b/core/api/current.txt index f0b86df676e1..542221c3fcc9 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -8,6 +8,9 @@ package android { public static final class Manifest.permission { ctor public Manifest.permission(); field public static final String ACCEPT_HANDOVER = "android.permission.ACCEPT_HANDOVER"; + field public static final String ACCESS_ADSERVICES_ATTRIBUTION = "android.permission.ACCESS_ADSERVICES_ATTRIBUTION"; + field public static final String ACCESS_ADSERVICES_CUSTOM_AUDIENCES = "android.permission.ACCESS_ADSERVICES_CUSTOM_AUDIENCES"; + field public static final String ACCESS_ADSERVICES_TOPICS = "android.permission.ACCESS_ADSERVICES_TOPICS"; field public static final String ACCESS_BACKGROUND_LOCATION = "android.permission.ACCESS_BACKGROUND_LOCATION"; field public static final String ACCESS_BLOBS_ACROSS_USERS = "android.permission.ACCESS_BLOBS_ACROSS_USERS"; field public static final String ACCESS_CHECKIN_PROPERTIES = "android.permission.ACCESS_CHECKIN_PROPERTIES"; @@ -17,7 +20,6 @@ package android { field public static final String ACCESS_MEDIA_LOCATION = "android.permission.ACCESS_MEDIA_LOCATION"; field public static final String ACCESS_NETWORK_STATE = "android.permission.ACCESS_NETWORK_STATE"; field public static final String ACCESS_NOTIFICATION_POLICY = "android.permission.ACCESS_NOTIFICATION_POLICY"; - field public static final String ACCESS_SUPPLEMENTAL_APIS = "android.permission.ACCESS_SUPPLEMENTAL_APIS"; field public static final String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE"; field public static final String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER"; field public static final String ACTIVITY_RECOGNITION = "android.permission.ACTIVITY_RECOGNITION"; @@ -979,8 +981,8 @@ package android { field public static final int left = 16843181; // 0x10101ad field public static final int letterSpacing = 16843958; // 0x10104b6 field public static final int level = 16844032; // 0x1010500 - field public static final int lineBreakStyle = 16844365; // 0x101064d - field public static final int lineBreakWordStyle = 16844366; // 0x101064e + field public static final int lineBreakStyle; + field public static final int lineBreakWordStyle; field public static final int lineHeight = 16844159; // 0x101057f field public static final int lineSpacingExtra = 16843287; // 0x1010217 field public static final int lineSpacingMultiplier = 16843288; // 0x1010218 @@ -2094,12 +2096,8 @@ package android { field public static final int accessibilityActionScrollUp = 16908344; // 0x1020038 field public static final int accessibilityActionSetProgress = 16908349; // 0x102003d field public static final int accessibilityActionShowOnScreen = 16908342; // 0x1020036 - field public static final int accessibilityActionShowSuggestions; + field public static final int accessibilityActionShowTextSuggestions; field public static final int accessibilityActionShowTooltip = 16908356; // 0x1020044 - field public static final int accessibilityActionSwipeDown; - field public static final int accessibilityActionSwipeLeft; - field public static final int accessibilityActionSwipeRight; - field public static final int accessibilityActionSwipeUp; field public static final int accessibilitySystemActionBack = 16908363; // 0x102004b field public static final int accessibilitySystemActionHome = 16908364; // 0x102004c field public static final int accessibilitySystemActionLockScreen = 16908370; // 0x1020052 @@ -51931,12 +51929,8 @@ package android.view.accessibility { field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_SELECTION; field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_TEXT; field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_ON_SCREEN; - field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_SUGGESTIONS; + field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_TEXT_SUGGESTIONS; field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_TOOLTIP; - field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_DOWN; - field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_LEFT; - field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_RIGHT; - field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_UP; field @NonNull public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction> CREATOR; } diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 5bc5bbc08074..27ca6a2794b9 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -20,10 +20,6 @@ package android.app { method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String); } - public class ActivityOptions { - method @NonNull public static android.app.ActivityOptions fromBundle(@NonNull android.os.Bundle); - } - public class AppOpsManager { field public static final String OPSTR_NO_ISOLATED_STORAGE = "android:no_isolated_storage"; } @@ -54,22 +50,6 @@ package android.app { method public void onCanceled(@NonNull android.app.PendingIntent); } - public class PropertyInvalidatedCache<Query, Result> { - ctor public PropertyInvalidatedCache(int, @NonNull String, @NonNull String, @NonNull String, @NonNull android.app.PropertyInvalidatedCache.QueryHandler<Query,Result>); - method public final void disableForCurrentProcess(); - method public final void invalidateCache(); - method public static void invalidateCache(@NonNull String, @NonNull String); - method @Nullable public final Result query(@NonNull Query); - field public static final String MODULE_BLUETOOTH = "bluetooth"; - field public static final String MODULE_TELEPHONY = "telephony"; - } - - public abstract static class PropertyInvalidatedCache.QueryHandler<Q, R> { - ctor public PropertyInvalidatedCache.QueryHandler(); - method @Nullable public abstract R apply(@NonNull Q); - method public boolean shouldBypassCache(@NonNull Q); - } - public class StatusBarManager { method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setExpansionDisabledForSimNetworkLock(boolean); } @@ -358,6 +338,22 @@ package android.os { field public static final int DEVICE_INITIAL_SDK_INT; } + public class IpcDataCache<Query, Result> { + ctor public IpcDataCache(int, @NonNull String, @NonNull String, @NonNull String, @NonNull android.os.IpcDataCache.QueryHandler<Query,Result>); + method public void disableForCurrentProcess(); + method public static void disableForCurrentProcess(@NonNull String); + method public void invalidateCache(); + method public static void invalidateCache(@NonNull String, @NonNull String); + method @Nullable public Result query(@NonNull Query); + field public static final String MODULE_BLUETOOTH = "bluetooth"; + } + + public abstract static class IpcDataCache.QueryHandler<Q, R> { + ctor public IpcDataCache.QueryHandler(); + method @Nullable public abstract R apply(@NonNull Q); + method public boolean shouldBypassCache(@NonNull Q); + } + public interface Parcelable { method public default int getStability(); } diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 15666017f431..5a6e8ee22128 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -234,6 +234,7 @@ package android { field public static final String POWER_SAVER = "android.permission.POWER_SAVER"; field public static final String PROVIDE_RESOLVER_RANKER_SERVICE = "android.permission.PROVIDE_RESOLVER_RANKER_SERVICE"; field public static final String PROVIDE_TRUST_AGENT = "android.permission.PROVIDE_TRUST_AGENT"; + field public static final String PROVISION_DEMO_DEVICE = "android.permission.PROVISION_DEMO_DEVICE"; field public static final String QUERY_ADMIN_POLICY = "android.permission.QUERY_ADMIN_POLICY"; field public static final String QUERY_TIME_ZONE_RULES = "android.permission.QUERY_TIME_ZONE_RULES"; field public static final String QUERY_USERS = "android.permission.QUERY_USERS"; @@ -1101,7 +1102,7 @@ package android.app.admin { method @RequiresPermission("android.permission.NOTIFY_PENDING_SYSTEM_UPDATE") public void notifyPendingSystemUpdate(long); method @RequiresPermission("android.permission.NOTIFY_PENDING_SYSTEM_UPDATE") public void notifyPendingSystemUpdate(long, boolean); method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean packageHasActiveAdmins(String); - method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void provisionFullyManagedDevice(@NonNull android.app.admin.FullyManagedDeviceProvisioningParams) throws android.app.admin.ProvisioningException; + method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS, android.Manifest.permission.PROVISION_DEMO_DEVICE}) public void provisionFullyManagedDevice(@NonNull android.app.admin.FullyManagedDeviceProvisioningParams) throws android.app.admin.ProvisioningException; method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetDrawables(@NonNull String[]); method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetStrings(@NonNull String[]); method @RequiresPermission(android.Manifest.permission.SEND_LOST_MODE_LOCATION_UPDATES) public void sendLostModeLocationUpdate(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>); @@ -1254,6 +1255,7 @@ package android.app.admin { method @Nullable public java.util.Locale getLocale(); method @NonNull public String getOwnerName(); method @Nullable public String getTimeZone(); + method public boolean isDemoDevice(); method public boolean isLeaveAllSystemAppsEnabled(); method public void writeToParcel(@NonNull android.os.Parcel, @Nullable int); field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.FullyManagedDeviceProvisioningParams> CREATOR; @@ -1264,6 +1266,7 @@ package android.app.admin { method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams build(); method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setAdminExtras(@NonNull android.os.PersistableBundle); method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setCanDeviceOwnerGrantSensorsPermissions(boolean); + method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setDemoDevice(boolean); method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setLeaveAllSystemAppsEnabled(boolean); method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setLocalTime(long); method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setLocale(@Nullable java.util.Locale); diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 1b627b2adfc9..c5cce35d988e 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -154,7 +154,6 @@ package android.app { } public class ActivityOptions { - method @NonNull public static android.app.ActivityOptions fromBundle(@NonNull android.os.Bundle); method public boolean isEligibleForLegacyPermissionPrompt(); method @NonNull public static android.app.ActivityOptions makeCustomAnimation(@NonNull android.content.Context, int, int, int, @Nullable android.os.Handler, @Nullable android.app.ActivityOptions.OnAnimationStartedListener, @Nullable android.app.ActivityOptions.OnAnimationFinishedListener); method @NonNull @RequiresPermission(android.Manifest.permission.START_TASKS_FROM_RECENTS) public static android.app.ActivityOptions makeCustomTaskAnimation(@NonNull android.content.Context, int, int, @Nullable android.os.Handler, @Nullable android.app.ActivityOptions.OnAnimationStartedListener, @Nullable android.app.ActivityOptions.OnAnimationFinishedListener); @@ -374,16 +373,17 @@ package android.app { public class PropertyInvalidatedCache<Query, Result> { ctor public PropertyInvalidatedCache(int, @NonNull String, @NonNull String, @NonNull String, @NonNull android.app.PropertyInvalidatedCache.QueryHandler<Query,Result>); method @NonNull public static String createPropertyName(@NonNull String, @NonNull String); - method public final void disableForCurrentProcess(); + method public void disableForCurrentProcess(); + method public static void disableForCurrentProcess(@NonNull String); method public static void disableForTestMode(); method public final void disableInstance(); method public final void disableSystemWide(); method public final void forgetDisableLocal(); method public boolean getDisabledState(); - method public final void invalidateCache(); + method public void invalidateCache(); method public static void invalidateCache(@NonNull String, @NonNull String); method public final boolean isDisabled(); - method @Nullable public final Result query(@NonNull Query); + method @Nullable public Result query(@NonNull Query); method public static void setTestMode(boolean); method public void testPropertyName(); field public static final String MODULE_BLUETOOTH = "bluetooth"; @@ -1466,6 +1466,7 @@ package android.media { method @NonNull @RequiresPermission(android.Manifest.permission.CALL_AUDIO_INTERCEPTION) public android.media.AudioTrack getCallUplinkInjectionAudioTrack(@NonNull android.media.AudioFormat); method @Nullable public static android.media.AudioDeviceInfo getDeviceInfoFromType(int); method @IntRange(from=0) @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public long getFadeOutDurationOnFocusLossMillis(@NonNull android.media.AudioAttributes); + method @Nullable public static String getHalVersion(); method public static final int[] getPublicStreamTypes(); method @NonNull public java.util.List<java.lang.Integer> getReportedSurroundFormats(); method public int getStreamMinVolumeInt(int); @@ -1726,6 +1727,19 @@ package android.os { method @NonNull public static byte[] digest(@NonNull java.io.InputStream, @NonNull String) throws java.io.IOException, java.security.NoSuchAlgorithmException; } + public class IpcDataCache<Query, Result> extends android.app.PropertyInvalidatedCache<Query,Result> { + ctor public IpcDataCache(int, @NonNull String, @NonNull String, @NonNull String, @NonNull android.os.IpcDataCache.QueryHandler<Query,Result>); + method public static void disableForCurrentProcess(@NonNull String); + method public static void invalidateCache(@NonNull String, @NonNull String); + field public static final String MODULE_BLUETOOTH = "bluetooth"; + field public static final String MODULE_SYSTEM = "system_server"; + field public static final String MODULE_TEST = "test"; + } + + public abstract static class IpcDataCache.QueryHandler<Q, R> extends android.app.PropertyInvalidatedCache.QueryHandler<Q,R> { + ctor public IpcDataCache.QueryHandler(); + } + public final class MessageQueue { method public int postSyncBarrier(); method public void removeSyncBarrier(int); @@ -2163,6 +2177,7 @@ package android.provider { field @Deprecated public static final String NOTIFICATION_BUBBLES = "notification_bubbles"; field public static final String OVERLAY_DISPLAY_DEVICES = "overlay_display_devices"; field public static final String SHOW_FIRST_CRASH_DIALOG = "show_first_crash_dialog"; + field public static final String STYLUS_HANDWRITING_ENABLED = "stylus_handwriting_enabled"; field public static final String USER_DISABLED_HDR_FORMATS = "user_disabled_hdr_formats"; field public static final String USER_PREFERRED_REFRESH_RATE = "user_preferred_refresh_rate"; field public static final String USER_PREFERRED_RESOLUTION_HEIGHT = "user_preferred_resolution_height"; @@ -2876,6 +2891,7 @@ package android.view { method public static int getHoverTooltipHideTimeout(); method public static int getHoverTooltipShowTimeout(); method public static int getLongPressTooltipHideTimeout(); + method public int getPreferKeepClearForFocusDelay(); } public class ViewDebug { diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 87ac6cb1fe4c..0178fa143445 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -1421,17 +1421,9 @@ public class ActivityOptions extends ComponentOptions { return mRemoteTransition; } - /** - * Creates an ActivityOptions from the Bundle generated from {@link ActivityOptions#toBundle()}. - * Returns an instance of ActivityOptions populated with options with known keys from the - * provided Bundle, stripping out unknown entries. - * @hide - */ - @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) - @TestApi - @NonNull - public static ActivityOptions fromBundle(@NonNull Bundle bOptions) { - return new ActivityOptions(bOptions); + /** @hide */ + public static ActivityOptions fromBundle(Bundle bOptions) { + return bOptions != null ? new ActivityOptions(bOptions) : null; } /** @hide */ diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl index a82ecce2dc04..4fbe232556ed 100644 --- a/core/java/android/app/INotificationManager.aidl +++ b/core/java/android/app/INotificationManager.aidl @@ -116,7 +116,7 @@ interface INotificationManager ParceledListSlice getNotificationChannelGroups(String pkg); boolean onlyHasDefaultChannel(String pkg, int uid); boolean areChannelsBypassingDnd(); - ParceledListSlice getNotificationChannelsBypassingDnd(String pkg, int userId); + ParceledListSlice getNotificationChannelsBypassingDnd(String pkg, int uid); boolean isPackagePaused(String pkg); void deleteNotificationHistoryItem(String pkg, int uid, long postedTime); boolean isPermissionFixed(String pkg, int userId); diff --git a/core/java/android/app/PropertyInvalidatedCache.java b/core/java/android/app/PropertyInvalidatedCache.java index 2f202d95e0e3..df7bf7b94700 100644 --- a/core/java/android/app/PropertyInvalidatedCache.java +++ b/core/java/android/app/PropertyInvalidatedCache.java @@ -18,7 +18,6 @@ package android.app; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Handler; import android.os.Looper; @@ -137,6 +136,26 @@ import java.util.concurrent.atomic.AtomicLong; * With this cache, clients perform a binder call to birthdayd if asking for a user's birthday * for the first time; on subsequent queries, we return the already-known Birthday object. * + * The second parameter to the IpcDataCache constructor is a string that identifies the "module" + * that owns the cache. There are some well-known modules (such as {@code MODULE_SYSTEM} but any + * string is permitted. The third parameters is the name of the API being cached; this, too, can + * any value. The fourth is the name of the cache. The cache is usually named after th API. + * Some things you must know about the three strings: + * <list> + * <ul> The system property that controls the cache is named {@code cache_key.<module>.<api>}. + * Usually, the SELinux rules permit a process to write a system property (and therefore + * invalidate a cache) based on the wildcard {@code cache_key.<module>.*}. This means that + * although the cache can be constructed with any module string, whatever string is chosen must be + * consistent with the SELinux configuration. + * <ul> The API name can be any string of alphanumeric characters. All caches with the same API + * are invalidated at the same time. If a server supports several caches and all are invalidated + * in common, then it is most efficient to assign the same API string to every cache. + * <ul> The cache name can be any string. In debug output, the name is used to distiguish between + * caches with the same API name. The cache name is also used when disabling caches in the + * current process. So, invalidation is based on the module+api but disabling (which is generally + * a once-per-process operation) is based on the cache name. + * </list> + * * User birthdays do occasionally change, so we have to modify the server to invalidate this * cache when necessary. That invalidation code looks like this: * @@ -192,25 +211,23 @@ import java.util.concurrent.atomic.AtomicLong; * <pre> * public class ActivityThread { * ... - * private static final int BDAY_CACHE_MAX = 8; // Maximum birthdays to cache - * private static final String BDAY_CACHE_KEY = "cache_key.birthdayd"; - * private final PropertyInvalidatedCache<Integer, Birthday%> mBirthdayCache = new - * PropertyInvalidatedCache<Integer, Birthday%>(BDAY_CACHE_MAX, BDAY_CACHE_KEY) { - * {@literal @}Override - * protected Birthday recompute(Integer userId) { - * return GetService("birthdayd").getUserBirthday(userId); - * } - * {@literal @}Override - * protected boolean bypass(Integer userId) { - * return userId == NEXT_BIRTHDAY; - * } - * }; + * private final IpcDataCache.QueryHandler<Integer, Birthday> mBirthdayQuery = + * new IpcDataCache.QueryHandler<Integer, Birthday>() { + * {@literal @}Override + * public Birthday apply(Integer) { + * return GetService("birthdayd").getUserBirthday(userId); + * } + * {@literal @}Override + * public boolean shouldBypassQuery(Integer userId) { + * return userId == NEXT_BIRTHDAY; + * } + * }; * ... * } * </pre> * - * If the {@code bypass()} method returns true then the cache is not used for that - * particular query. The {@code bypass()} method is not abstract and the default + * If the {@code shouldBypassQuery()} method returns true then the cache is not used for that + * particular query. The {@code shouldBypassQuery()} method is not abstract and the default * implementation returns false. * * For security, there is a allowlist of processes that are allowed to invalidate a cache. @@ -231,14 +248,12 @@ import java.util.concurrent.atomic.AtomicLong; * @param <Result> The class holding cache entries; use a boxed primitive if possible * @hide */ -@SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) @TestApi public class PropertyInvalidatedCache<Query, Result> { /** * This is a configuration class that customizes a cache instance. * @hide */ - @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) @TestApi public static abstract class QueryHandler<Q,R> { /** @@ -285,7 +300,6 @@ public class PropertyInvalidatedCache<Query, Result> { * The module used for bluetooth caches. * @hide */ - @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) @TestApi public static final String MODULE_BLUETOOTH = "bluetooth"; @@ -533,7 +547,6 @@ public class PropertyInvalidatedCache<Query, Result> { * @param computer The code to compute values that are not in the cache. * @hide */ - @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) @TestApi public PropertyInvalidatedCache(int maxEntries, @NonNull String module, @NonNull String api, @NonNull String cacheName, @NonNull QueryHandler<Query, Result> computer) { @@ -792,7 +805,7 @@ public class PropertyInvalidatedCache<Query, Result> { * TODO(216112648) Remove this in favor of disableForCurrentProcess(). * @hide */ - public final void disableLocal() { + public void disableLocal() { disableForCurrentProcess(); } @@ -802,12 +815,17 @@ public class PropertyInvalidatedCache<Query, Result> { * property. * @hide */ - @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) @TestApi - public final void disableForCurrentProcess() { + public void disableForCurrentProcess() { disableLocal(mCacheName); } + /** @hide */ + @TestApi + public static void disableForCurrentProcess(@NonNull String cacheName) { + disableLocal(cacheName); + } + /** * Return whether a cache instance is disabled. * @hide @@ -821,9 +839,8 @@ public class PropertyInvalidatedCache<Query, Result> { * Get a value from the cache or recompute it. * @hide */ - @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) @TestApi - public final @Nullable Result query(@NonNull Query query) { + public @Nullable Result query(@NonNull Query query) { // Let access to mDisabled race: it's atomic anyway. long currentNonce = (!isDisabled()) ? getCurrentNonce() : NONCE_DISABLED; if (bypass(query)) { @@ -964,9 +981,8 @@ public class PropertyInvalidatedCache<Query, Result> { * PropertyInvalidatedCache is keyed on a particular property value. * @hide */ - @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) @TestApi - public final void invalidateCache() { + public void invalidateCache() { invalidateCache(mPropertyName); } @@ -974,7 +990,6 @@ public class PropertyInvalidatedCache<Query, Result> { * Invalidate caches in all processes that are keyed for the module and api. * @hide */ - @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) @TestApi public static void invalidateCache(@NonNull String module, @NonNull String api) { invalidateCache(createPropertyName(module, api)); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index b436f6e7374f..8d4e0d6c1f42 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1413,6 +1413,9 @@ public class DevicePolicyManager { * admin app when performing the admin-integrated provisioning flow as a result of the * {@link #ACTION_GET_PROVISIONING_MODE} activity. * + * <p>This extra may also be provided to the admin app via an intent extra for {@link + * #ACTION_GET_PROVISIONING_MODE}. + * * @see #ACTION_GET_PROVISIONING_MODE */ public static final String EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT = @@ -3062,6 +3065,8 @@ public class DevicePolicyManager { * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}</li> * <li>{@link #EXTRA_PROVISIONING_IMEI}</li> * <li>{@link #EXTRA_PROVISIONING_SERIAL_NUMBER}</li> + * <li>{@link #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES}</li> + * <li>{@link #EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT}</li> * </ul> * * <p>The target activity should return one of the following values in @@ -3085,8 +3090,22 @@ public class DevicePolicyManager { * activity, along with the values of the {@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE} extra * that are already supplied to this activity. * - * @see #EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION - * @see #EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED + * <p>Other extras the target activity may include in the intent result: + * <ul> + * <li>{@link #EXTRA_PROVISIONING_DISCLAIMERS}</li> + * <li>{@link #EXTRA_PROVISIONING_SKIP_ENCRYPTION}</li> + * <li>{@link #EXTRA_PROVISIONING_KEEP_SCREEN_ON}</li> + * <li>{@link #EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION} for work profile + * provisioning</li> + * <li>{@link #EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED} for work profile + * provisioning</li> + * <li>{@link #EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT} for fully-managed + * device provisioning</li> + * <li>{@link #EXTRA_PROVISIONING_LOCALE} for fully-managed device provisioning</li> + * <li>{@link #EXTRA_PROVISIONING_LOCAL_TIME} for fully-managed device provisioning</li> + * <li>{@link #EXTRA_PROVISIONING_TIME_ZONE} for fully-managed device provisioning</li> + * </ul> + * * @see #ACTION_ADMIN_POLICY_COMPLIANCE */ public static final String ACTION_GET_PROVISIONING_MODE = @@ -14776,17 +14795,20 @@ public class DevicePolicyManager { * <p>The method {@link #checkProvisioningPrecondition} must be returning {@link #STATUS_OK} * before calling this method. * + * <p>Holders of {@link android.Manifest.permission#PROVISION_DEMO_DEVICE} can call this API + * only if {@link FullyManagedDeviceProvisioningParams#isDemoDevice()} is {@code true}.</p> + * * @param provisioningParams Params required to provision a fully managed device, * see {@link FullyManagedDeviceProvisioningParams}. * - * @throws SecurityException if the caller does not hold - * {@link android.Manifest.permission#MANAGE_PROFILE_AND_DEVICE_OWNERS}. * @throws ProvisioningException if an error occurred during provisioning. * * @hide */ @SystemApi - @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) + @RequiresPermission(anyOf = { + android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS, + android.Manifest.permission.PROVISION_DEMO_DEVICE}) public void provisionFullyManagedDevice( @NonNull FullyManagedDeviceProvisioningParams provisioningParams) throws ProvisioningException { diff --git a/core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java b/core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java index 1f7ae4ad35de..49992452df86 100644 --- a/core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java +++ b/core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java @@ -26,6 +26,7 @@ import android.content.ComponentName; import android.os.Parcel; import android.os.Parcelable; import android.os.PersistableBundle; +import android.provider.Settings; import android.stats.devicepolicy.DevicePolicyEnums; import java.util.Locale; @@ -44,6 +45,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { "CAN_DEVICE_OWNER_GRANT_SENSOR_PERMISSIONS"; private static final String TIME_ZONE_PROVIDED_PARAM = "TIME_ZONE_PROVIDED"; private static final String LOCALE_PROVIDED_PARAM = "LOCALE_PROVIDED"; + private static final String DEMO_DEVICE = "DEMO_DEVICE"; @NonNull private final ComponentName mDeviceAdminComponentName; @NonNull private final String mOwnerName; @@ -54,6 +56,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { @Nullable private final Locale mLocale; private final boolean mDeviceOwnerCanGrantSensorsPermissions; @NonNull private final PersistableBundle mAdminExtras; + private final boolean mDemoDevice; + private FullyManagedDeviceProvisioningParams( @NonNull ComponentName deviceAdminComponentName, @@ -63,7 +67,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { long localTime, @Nullable @SuppressLint("UseIcu") Locale locale, boolean deviceOwnerCanGrantSensorsPermissions, - @NonNull PersistableBundle adminExtras) { + @NonNull PersistableBundle adminExtras, + boolean demoDevice) { this.mDeviceAdminComponentName = requireNonNull(deviceAdminComponentName); this.mOwnerName = requireNonNull(ownerName); this.mLeaveAllSystemAppsEnabled = leaveAllSystemAppsEnabled; @@ -73,6 +78,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { this.mDeviceOwnerCanGrantSensorsPermissions = deviceOwnerCanGrantSensorsPermissions; this.mAdminExtras = adminExtras; + this.mDemoDevice = demoDevice; } private FullyManagedDeviceProvisioningParams( @@ -83,7 +89,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { long localTime, @Nullable String localeStr, boolean deviceOwnerCanGrantSensorsPermissions, - @Nullable PersistableBundle adminExtras) { + @Nullable PersistableBundle adminExtras, + boolean demoDevice) { this(deviceAdminComponentName, ownerName, leaveAllSystemAppsEnabled, @@ -91,7 +98,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { localTime, getLocale(localeStr), deviceOwnerCanGrantSensorsPermissions, - adminExtras); + adminExtras, + demoDevice); } @Nullable @@ -166,6 +174,14 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { } /** + * @return true if this device is being setup as a retail demo device, see + * {@link Settings.Global#DEVICE_DEMO_MODE}. + */ + public boolean isDemoDevice() { + return mDemoDevice; + } + + /** * Logs the provisioning params using {@link DevicePolicyEventLogger}. * * @hide @@ -178,6 +194,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { mDeviceOwnerCanGrantSensorsPermissions); logParam(callerPackage, TIME_ZONE_PROVIDED_PARAM, /* value= */ mTimeZone != null); logParam(callerPackage, LOCALE_PROVIDED_PARAM, /* value= */ mLocale != null); + logParam(callerPackage, DEMO_DEVICE, mDemoDevice); } private void logParam(String callerPackage, String param, boolean value) { @@ -204,6 +221,9 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { // Default to allowing control over sensor permission grants. boolean mDeviceOwnerCanGrantSensorsPermissions = true; @NonNull private PersistableBundle mAdminExtras; + // Default is normal user devices + boolean mDemoDevice = false; + /** * Initialize a new {@link Builder} to construct a @@ -289,6 +309,16 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { } /** + * Marks the device as a demo device, see {@link Settings.Global#DEVICE_DEMO_MODE}. The + * default value if unset is {@code false}. + */ + @NonNull + public Builder setDemoDevice(boolean demoDevice) { + this.mDemoDevice = demoDevice; + return this; + } + + /** * Combines all of the attributes that have been set on this {@code Builder} * * @return a new {@link FullyManagedDeviceProvisioningParams} object. @@ -303,7 +333,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { mLocalTime, mLocale, mDeviceOwnerCanGrantSensorsPermissions, - mAdminExtras); + mAdminExtras, + mDemoDevice); } } @@ -327,6 +358,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { + ", mDeviceOwnerCanGrantSensorsPermissions=" + mDeviceOwnerCanGrantSensorsPermissions + ", mAdminExtras=" + mAdminExtras + + ", mDemoDevice=" + mDemoDevice + '}'; } @@ -340,6 +372,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { dest.writeString(mLocale == null ? null : mLocale.toLanguageTag()); dest.writeBoolean(mDeviceOwnerCanGrantSensorsPermissions); dest.writePersistableBundle(mAdminExtras); + dest.writeBoolean(mDemoDevice); } @NonNull @@ -355,6 +388,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { String locale = in.readString(); boolean deviceOwnerCanGrantSensorsPermissions = in.readBoolean(); PersistableBundle adminExtras = in.readPersistableBundle(); + boolean demoDevice = in.readBoolean(); return new FullyManagedDeviceProvisioningParams( componentName, @@ -364,7 +398,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { localtime, locale, deviceOwnerCanGrantSensorsPermissions, - adminExtras); + adminExtras, + demoDevice); } @Override diff --git a/core/java/android/app/servertransaction/ActivityTransactionItem.java b/core/java/android/app/servertransaction/ActivityTransactionItem.java index 6a6d76d20259..469a9bfe59ef 100644 --- a/core/java/android/app/servertransaction/ActivityTransactionItem.java +++ b/core/java/android/app/servertransaction/ActivityTransactionItem.java @@ -64,11 +64,11 @@ public abstract class ActivityTransactionItem extends ClientTransactionItem { final ActivityClientRecord r = client.getActivityClient(token); if (r == null) { throw new IllegalArgumentException("Activity client record must not be null to execute " - + "transaction item"); + + "transaction item: " + this); } if (client.getActivity(token) == null) { throw new IllegalArgumentException("Activity must not be null to execute " - + "transaction item"); + + "transaction item: " + this); } return r; } diff --git a/core/java/android/app/servertransaction/LaunchActivityItem.java b/core/java/android/app/servertransaction/LaunchActivityItem.java index abf1058f45a2..d7e09519bfb7 100644 --- a/core/java/android/app/servertransaction/LaunchActivityItem.java +++ b/core/java/android/app/servertransaction/LaunchActivityItem.java @@ -179,7 +179,7 @@ public class LaunchActivityItem extends ClientTransactionItem { in.readPersistableBundle(getClass().getClassLoader()), in.createTypedArrayList(ResultInfo.CREATOR), in.createTypedArrayList(ReferrerIntent.CREATOR), - readActivityOptions(in), in.readBoolean(), + ActivityOptions.fromBundle(in.readBundle()), in.readBoolean(), in.readTypedObject(ProfilerInfo.CREATOR), in.readStrongBinder(), IActivityClientController.Stub.asInterface(in.readStrongBinder()), @@ -187,11 +187,6 @@ public class LaunchActivityItem extends ClientTransactionItem { in.readBoolean()); } - private static ActivityOptions readActivityOptions(Parcel in) { - Bundle bundle = in.readBundle(); - return bundle != null ? ActivityOptions.fromBundle(bundle) : null; - } - public static final @NonNull Creator<LaunchActivityItem> CREATOR = new Creator<LaunchActivityItem>() { public LaunchActivityItem createFromParcel(Parcel in) { diff --git a/core/java/android/app/servertransaction/StartActivityItem.java b/core/java/android/app/servertransaction/StartActivityItem.java index f267060d1be6..15f65f6d9d26 100644 --- a/core/java/android/app/servertransaction/StartActivityItem.java +++ b/core/java/android/app/servertransaction/StartActivityItem.java @@ -23,7 +23,6 @@ import android.annotation.Nullable; import android.app.ActivityOptions; import android.app.ActivityThread.ActivityClientRecord; import android.app.ClientTransactionHandler; -import android.os.Bundle; import android.os.Parcel; import android.os.Trace; @@ -84,8 +83,7 @@ public class StartActivityItem extends ActivityLifecycleItem { /** Read from Parcel. */ private StartActivityItem(Parcel in) { - Bundle bundle = in.readBundle(); - mActivityOptions = bundle != null ? ActivityOptions.fromBundle(bundle) : null; + mActivityOptions = ActivityOptions.fromBundle(in.readBundle()); } public static final @NonNull Creator<StartActivityItem> CREATOR = diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 673127e9f808..2961b5505794 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -2084,7 +2084,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { splitNames = source.createString8Array(); splitSourceDirs = source.createString8Array(); splitPublicSourceDirs = source.createString8Array(); - splitDependencies = source.readSparseArray(null); + splitDependencies = source.readSparseArray(null, int[].class); nativeLibraryDir = source.readString8(); secondaryNativeLibraryDir = source.readString8(); nativeLibraryRootDir = source.readString8(); diff --git a/core/java/android/content/pm/IPackageInstallerSession.aidl b/core/java/android/content/pm/IPackageInstallerSession.aidl index 18e205f2e79e..8d6c8e8d9f62 100644 --- a/core/java/android/content/pm/IPackageInstallerSession.aidl +++ b/core/java/android/content/pm/IPackageInstallerSession.aidl @@ -57,4 +57,5 @@ interface IPackageInstallerSession { int getParentSessionId(); boolean isStaged(); + int getInstallFlags(); } diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index 67a2dc84728d..3bdef50c26f5 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -1586,6 +1586,18 @@ public class PackageInstaller { } /** + * @return Session's {@link SessionParams#installFlags}. + * @hide + */ + public int getInstallFlags() { + try { + return mSession.getInstallFlags(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * @return the session ID of the multi-package session that this belongs to or * {@link SessionInfo#INVALID_ID} if it does not belong to a multi-package session. */ diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index f4bc1616da2b..2915d852cc26 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -121,6 +121,9 @@ public abstract class PackageManager { /** {@hide} */ public static final boolean APPLY_DEFAULT_TO_DEVICE_PROTECTED_STORAGE = true; + /** {@hide} */ + public static final boolean ENABLE_SHARED_UID_MIGRATION = true; + /** * This exception is thrown when a given package, application, or component * name cannot be found. diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index e914432630f7..4d4a57db84be 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -1944,19 +1944,26 @@ public class PackageParser { TypedArray sa = res.obtainAttributes(parser, com.android.internal.R.styleable.AndroidManifest); - String str = sa.getNonConfigurationString( - com.android.internal.R.styleable.AndroidManifest_sharedUserId, 0); - if (str != null && str.length() > 0) { - String nameError = validateName(str, true, true); - if (nameError != null && !"android".equals(pkg.packageName)) { - outError[0] = "<manifest> specifies bad sharedUserId name \"" - + str + "\": " + nameError; - mParseError = PackageManager.INSTALL_PARSE_FAILED_BAD_SHARED_USER_ID; - return null; + int maxSdkVersion = 0; + if (PackageManager.ENABLE_SHARED_UID_MIGRATION) { + maxSdkVersion = sa.getInteger( + com.android.internal.R.styleable.AndroidManifest_sharedUserMaxSdkVersion, 0); + } + if (maxSdkVersion == 0 || maxSdkVersion >= Build.VERSION.RESOURCES_SDK_INT) { + String str = sa.getNonConfigurationString( + com.android.internal.R.styleable.AndroidManifest_sharedUserId, 0); + if (str != null && str.length() > 0) { + String nameError = validateName(str, true, true); + if (nameError != null && !"android".equals(pkg.packageName)) { + outError[0] = "<manifest> specifies bad sharedUserId name \"" + + str + "\": " + nameError; + mParseError = PackageManager.INSTALL_PARSE_FAILED_BAD_SHARED_USER_ID; + return null; + } + pkg.mSharedUserId = str.intern(); + pkg.mSharedUserLabel = sa.getResourceId( + com.android.internal.R.styleable.AndroidManifest_sharedUserLabel, 0); } - pkg.mSharedUserId = str.intern(); - pkg.mSharedUserLabel = sa.getResourceId( - com.android.internal.R.styleable.AndroidManifest_sharedUserLabel, 0); } pkg.installLocation = sa.getInteger( diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java index af57f793bf73..02302a20fe38 100644 --- a/core/java/android/inputmethodservice/IInputMethodWrapper.java +++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java @@ -40,6 +40,7 @@ import android.view.inputmethod.InputMethodSubtype; import com.android.internal.inputmethod.CancellationGroup; import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; +import com.android.internal.inputmethod.InputMethodNavButtonFlags; import com.android.internal.os.HandlerCaller; import com.android.internal.os.SomeArgs; import com.android.internal.view.IInlineSuggestionsRequestCallback; @@ -70,7 +71,7 @@ class IInputMethodWrapper extends IInputMethod.Stub private static final int DO_SET_INPUT_CONTEXT = 20; private static final int DO_UNSET_INPUT_CONTEXT = 30; private static final int DO_START_INPUT = 32; - private static final int DO_ON_SHOULD_SHOW_IME_SWITCHER_WHEN_IME_IS_SHOWN_CHANGED = 35; + private static final int DO_ON_NAV_BUTTON_FLAGS_CHANGED = 35; private static final int DO_CREATE_SESSION = 40; private static final int DO_SET_SESSION_ENABLED = 45; private static final int DO_SHOW_SOFT_INPUT = 60; @@ -176,7 +177,7 @@ class IInputMethodWrapper extends IInputMethod.Stub try { inputMethod.initializeInternal((IBinder) args.arg1, (IInputMethodPrivilegedOperations) args.arg2, msg.arg1, - (boolean) args.arg3, msg.arg2 != 0); + (boolean) args.arg3, msg.arg2); } finally { args.recycle(); } @@ -196,22 +197,20 @@ class IInputMethodWrapper extends IInputMethod.Stub final EditorInfo info = (EditorInfo) args.arg3; final CancellationGroup cancellationGroup = (CancellationGroup) args.arg4; final boolean restarting = args.argi5 == 1; - final boolean shouldShowImeSwitcherWhenImeIsShown = args.argi6 != 0; + @InputMethodNavButtonFlags + final int navButtonFlags = args.argi6; final InputConnection ic = inputContext != null ? new RemoteInputConnection(mTarget, inputContext, cancellationGroup) : null; info.makeCompatible(mTargetSdkVersion); inputMethod.dispatchStartInputWithToken(ic, info, restarting, startInputToken, - shouldShowImeSwitcherWhenImeIsShown); + navButtonFlags); args.recycle(); return; } - case DO_ON_SHOULD_SHOW_IME_SWITCHER_WHEN_IME_IS_SHOWN_CHANGED: { - final boolean shouldShowImeSwitcherWhenImeIsShown = msg.arg1 != 0; - inputMethod.onShouldShowImeSwitcherWhenImeIsShownChanged( - shouldShowImeSwitcherWhenImeIsShown); + case DO_ON_NAV_BUTTON_FLAGS_CHANGED: + inputMethod.onNavButtonFlagsChanged(msg.arg1); return; - } case DO_CREATE_SESSION: { SomeArgs args = (SomeArgs)msg.obj; inputMethod.createSession(new InputMethodSessionCallbackWrapper( @@ -301,10 +300,9 @@ class IInputMethodWrapper extends IInputMethod.Stub @Override public void initializeInternal(IBinder token, IInputMethodPrivilegedOperations privOps, int configChanges, boolean stylusHwSupported, - boolean shouldShowImeSwitcherWhenImeIsShown) { + @InputMethodNavButtonFlags int navButtonFlags) { mCaller.executeOrSendMessage(mCaller.obtainMessageIIOOO(DO_INITIALIZE_INTERNAL, - configChanges, shouldShowImeSwitcherWhenImeIsShown ? 1 : 0, token, privOps, - stylusHwSupported)); + configChanges, navButtonFlags, token, privOps, stylusHwSupported)); } @BinderThread @@ -344,23 +342,21 @@ class IInputMethodWrapper extends IInputMethod.Stub @BinderThread @Override public void startInput(IBinder startInputToken, IInputContext inputContext, - EditorInfo attribute, boolean restarting, boolean shouldShowImeSwitcherWhenImeIsShown) { + EditorInfo attribute, boolean restarting, + @InputMethodNavButtonFlags int navButtonFlags) { if (mCancellationGroup == null) { Log.e(TAG, "startInput must be called after bindInput."); mCancellationGroup = new CancellationGroup(); } mCaller.executeOrSendMessage(mCaller.obtainMessageOOOOII(DO_START_INPUT, startInputToken, - inputContext, attribute, mCancellationGroup, restarting ? 1 : 0, - shouldShowImeSwitcherWhenImeIsShown ? 1 : 0)); + inputContext, attribute, mCancellationGroup, restarting ? 1 : 0, navButtonFlags)); } @BinderThread @Override - public void onShouldShowImeSwitcherWhenImeIsShownChanged( - boolean shouldShowImeSwitcherWhenImeIsShown) { - mCaller.executeOrSendMessage(mCaller.obtainMessageI( - DO_ON_SHOULD_SHOW_IME_SWITCHER_WHEN_IME_IS_SHOWN_CHANGED, - shouldShowImeSwitcherWhenImeIsShown ? 1 : 0)); + public void onNavButtonFlagsChanged(@InputMethodNavButtonFlags int navButtonFlags) { + mCaller.executeOrSendMessage( + mCaller.obtainMessageI(DO_ON_NAV_BUTTON_FLAGS_CHANGED, navButtonFlags)); } @BinderThread diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index fbc0732affe1..60cd4181e933 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -140,6 +140,7 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.inputmethod.IInputContentUriToken; import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; import com.android.internal.inputmethod.ImeTracing; +import com.android.internal.inputmethod.InputMethodNavButtonFlags; import com.android.internal.inputmethod.InputMethodPrivilegedOperations; import com.android.internal.inputmethod.InputMethodPrivilegedOperationsRegistry; import com.android.internal.view.IInlineSuggestionsRequestCallback; @@ -660,7 +661,7 @@ public class InputMethodService extends AbstractInputMethodService { @Override public final void initializeInternal(@NonNull IBinder token, IInputMethodPrivilegedOperations privilegedOperations, int configChanges, - boolean stylusHwSupported, boolean shouldShowImeSwitcherWhenImeIsShown) { + boolean stylusHwSupported, @InputMethodNavButtonFlags int navButtonFlags) { if (mDestroyed) { Log.i(TAG, "The InputMethodService has already onDestroyed()." + "Ignore the initialization."); @@ -673,8 +674,7 @@ public class InputMethodService extends AbstractInputMethodService { if (stylusHwSupported) { mInkWindow = new InkWindow(mWindow.getContext()); } - mNavigationBarController.setShouldShowImeSwitcherWhenImeIsShown( - shouldShowImeSwitcherWhenImeIsShown); + mNavigationBarController.onNavButtonFlagsChanged(navButtonFlags); attachToken(token); Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); } @@ -784,10 +784,9 @@ public class InputMethodService extends AbstractInputMethodService { @Override public final void dispatchStartInputWithToken(@Nullable InputConnection inputConnection, @NonNull EditorInfo editorInfo, boolean restarting, - @NonNull IBinder startInputToken, boolean shouldShowImeSwitcherWhenImeIsShown) { + @NonNull IBinder startInputToken, @InputMethodNavButtonFlags int navButtonFlags) { mPrivOps.reportStartInputAsync(startInputToken); - mNavigationBarController.setShouldShowImeSwitcherWhenImeIsShown( - shouldShowImeSwitcherWhenImeIsShown); + mNavigationBarController.onNavButtonFlagsChanged(navButtonFlags); if (restarting) { restartInput(inputConnection, editorInfo); } else { @@ -801,10 +800,8 @@ public class InputMethodService extends AbstractInputMethodService { */ @MainThread @Override - public void onShouldShowImeSwitcherWhenImeIsShownChanged( - boolean shouldShowImeSwitcherWhenImeIsShown) { - mNavigationBarController.setShouldShowImeSwitcherWhenImeIsShown( - shouldShowImeSwitcherWhenImeIsShown); + public void onNavButtonFlagsChanged(@InputMethodNavButtonFlags int navButtonFlags) { + mNavigationBarController.onNavButtonFlagsChanged(navButtonFlags); } /** diff --git a/core/java/android/inputmethodservice/NavigationBarController.java b/core/java/android/inputmethodservice/NavigationBarController.java index 19fa01de4a5f..0f9075b498ae 100644 --- a/core/java/android/inputmethodservice/NavigationBarController.java +++ b/core/java/android/inputmethodservice/NavigationBarController.java @@ -16,7 +16,6 @@ package android.inputmethodservice; -import static android.content.Intent.ACTION_OVERLAY_CHANGED; import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS; import android.animation.ValueAnimator; @@ -24,18 +23,12 @@ import android.annotation.FloatRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.StatusBarManager; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.res.Resources; import android.graphics.Color; import android.graphics.Insets; import android.graphics.Rect; import android.graphics.Region; import android.inputmethodservice.navigationbar.NavigationBarFrame; import android.inputmethodservice.navigationbar.NavigationBarView; -import android.os.PatternMatcher; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -49,6 +42,8 @@ import android.view.animation.Interpolator; import android.view.animation.PathInterpolator; import android.widget.FrameLayout; +import com.android.internal.inputmethod.InputMethodNavButtonFlags; + import java.util.Objects; /** @@ -77,8 +72,7 @@ final class NavigationBarController { default void onDestroy() { } - default void setShouldShowImeSwitcherWhenImeIsShown( - boolean shouldShowImeSwitcherWhenImeIsShown) { + default void onNavButtonFlagsChanged(@InputMethodNavButtonFlags int navButtonFlags) { } default String toDebugString() { @@ -117,8 +111,8 @@ final class NavigationBarController { mImpl.onDestroy(); } - void setShouldShowImeSwitcherWhenImeIsShown(boolean shouldShowImeSwitcherWhenImeIsShown) { - mImpl.setShouldShowImeSwitcherWhenImeIsShown(shouldShowImeSwitcherWhenImeIsShown); + void onNavButtonFlagsChanged(@InputMethodNavButtonFlags int navButtonFlags) { + mImpl.onNavButtonFlagsChanged(navButtonFlags); } String toDebugString() { @@ -144,9 +138,6 @@ final class NavigationBarController { @Nullable Insets mLastInsets; - @Nullable - private BroadcastReceiver mSystemOverlayChangedReceiver; - private boolean mShouldShowImeSwitcherWhenImeIsShown; @Appearance @@ -359,14 +350,6 @@ final class NavigationBarController { }); } - private boolean imeDrawsImeNavBar() { - final Resources resources = mService.getResources(); - if (resources == null) { - return false; - } - return resources.getBoolean(com.android.internal.R.bool.config_imeDrawsImeNavBar); - } - @Override public void onSoftInputWindowCreated(@NonNull SoftInputWindow softInputWindow) { final Window window = softInputWindow.getWindow(); @@ -379,27 +362,6 @@ final class NavigationBarController { if (mDestroyed) { return; } - mImeDrawsImeNavBar = imeDrawsImeNavBar(); - if (mSystemOverlayChangedReceiver == null) { - final IntentFilter intentFilter = new IntentFilter(ACTION_OVERLAY_CHANGED); - intentFilter.addDataScheme(IntentFilter.SCHEME_PACKAGE); - intentFilter.addDataSchemeSpecificPart("android", PatternMatcher.PATTERN_LITERAL); - mSystemOverlayChangedReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if (mDestroyed) { - return; - } - mImeDrawsImeNavBar = imeDrawsImeNavBar(); - if (mImeDrawsImeNavBar) { - installNavigationBarFrameIfNecessary(); - } else { - uninstallNavigationBarFrameIfNecessary(); - } - } - }; - mService.registerReceiver(mSystemOverlayChangedReceiver, intentFilter); - } installNavigationBarFrameIfNecessary(); } @@ -412,10 +374,6 @@ final class NavigationBarController { mTintAnimator.cancel(); mTintAnimator = null; } - if (mSystemOverlayChangedReceiver != null) { - mService.unregisterReceiver(mSystemOverlayChangedReceiver); - mSystemOverlayChangedReceiver = null; - } mDestroyed = true; } @@ -448,28 +406,43 @@ final class NavigationBarController { } @Override - public void setShouldShowImeSwitcherWhenImeIsShown( - boolean shouldShowImeSwitcherWhenImeIsShown) { + public void onNavButtonFlagsChanged(@InputMethodNavButtonFlags int navButtonFlags) { if (mDestroyed) { return; } - if (mShouldShowImeSwitcherWhenImeIsShown == shouldShowImeSwitcherWhenImeIsShown) { - return; - } + + final boolean imeDrawsImeNavBar = + (navButtonFlags & InputMethodNavButtonFlags.IME_DRAWS_IME_NAV_BAR) != 0; + final boolean shouldShowImeSwitcherWhenImeIsShown = + (navButtonFlags & InputMethodNavButtonFlags.SHOW_IME_SWITCHER_WHEN_IME_IS_SHOWN) + != 0; + + mImeDrawsImeNavBar = imeDrawsImeNavBar; + final boolean prevShouldShowImeSwitcherWhenImeIsShown = + mShouldShowImeSwitcherWhenImeIsShown; mShouldShowImeSwitcherWhenImeIsShown = shouldShowImeSwitcherWhenImeIsShown; - if (mNavigationBarFrame == null) { - return; - } - final NavigationBarView navigationBarView = - mNavigationBarFrame.findViewByPredicate(NavigationBarView.class::isInstance); - if (navigationBarView == null) { - return; + if (imeDrawsImeNavBar) { + installNavigationBarFrameIfNecessary(); + if (mNavigationBarFrame == null) { + return; + } + if (mShouldShowImeSwitcherWhenImeIsShown + == prevShouldShowImeSwitcherWhenImeIsShown) { + return; + } + final NavigationBarView navigationBarView = mNavigationBarFrame.findViewByPredicate( + NavigationBarView.class::isInstance); + if (navigationBarView == null) { + return; + } + final int hints = StatusBarManager.NAVIGATION_HINT_BACK_ALT + | (shouldShowImeSwitcherWhenImeIsShown + ? StatusBarManager.NAVIGATION_HINT_IME_SWITCHER_SHOWN : 0); + navigationBarView.setNavigationIconHints(hints); + } else { + uninstallNavigationBarFrameIfNecessary(); } - final int hints = StatusBarManager.NAVIGATION_HINT_BACK_ALT - | (shouldShowImeSwitcherWhenImeIsShown - ? StatusBarManager.NAVIGATION_HINT_IME_SWITCHER_SHOWN : 0); - navigationBarView.setNavigationIconHints(hints); } @Override diff --git a/core/java/android/nfc/Tag.java b/core/java/android/nfc/Tag.java index 0ce9c70569b5..731d1ba78299 100644 --- a/core/java/android/nfc/Tag.java +++ b/core/java/android/nfc/Tag.java @@ -142,9 +142,13 @@ public final class Tag implements Parcelable { mTagService = tagService; mConnectedTechnology = -1; + mCookie = SystemClock.elapsedRealtime(); + + if (tagService == null) { + return; + } try { - mCookie = SystemClock.elapsedRealtime(); tagService.setTagUpToDate(mCookie); } catch (RemoteException e) { throw e.rethrowAsRuntimeException(); @@ -370,6 +374,10 @@ public final class Tag implements Parcelable { /** @hide */ @UnsupportedAppUsage public INfcTag getTagService() { + if (mTagService == null) { + return null; + } + try { if (!mTagService.isTagUpToDate(mCookie)) { String id_str = ""; diff --git a/core/java/android/os/ExternalVibration.java b/core/java/android/os/ExternalVibration.java index 4e0995fb8792..db5bc7024e0b 100644 --- a/core/java/android/os/ExternalVibration.java +++ b/core/java/android/os/ExternalVibration.java @@ -47,7 +47,13 @@ public class ExternalVibration implements Parcelable { this(uid, pkg, attrs, controller, new Binder()); } - private ExternalVibration(int uid, @NonNull String pkg, @NonNull AudioAttributes attrs, + /** + * Full constructor, but exposed to construct the ExternalVibration with an explicit binder + * token (for mocks). + * + * @hide + */ + public ExternalVibration(int uid, @NonNull String pkg, @NonNull AudioAttributes attrs, @NonNull IExternalVibrationController controller, @NonNull IBinder token) { mUid = uid; mPkg = Preconditions.checkNotNull(pkg); @@ -166,7 +172,7 @@ public class ExternalVibration implements Parcelable { + "pkg=" + mPkg + ", " + "attrs=" + mAttrs + ", " + "controller=" + mController - + "token=" + mController + + "token=" + mToken + "}"; } diff --git a/core/java/android/os/IpcDataCache.java b/core/java/android/os/IpcDataCache.java new file mode 100644 index 000000000000..00734c806b7e --- /dev/null +++ b/core/java/android/os/IpcDataCache.java @@ -0,0 +1,364 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.os; + +import android.app.PropertyInvalidatedCache; +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.SystemApi; +import android.annotation.TestApi; +import android.text.TextUtils; +import android.util.Log; + +import com.android.internal.annotations.GuardedBy; +import com.android.internal.util.FastPrintWriter; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Random; +import java.util.Set; +import java.util.WeakHashMap; +import java.util.concurrent.atomic.AtomicLong; + +/** + * LRU cache that's invalidated when an opaque value in a property changes. Self-synchronizing, + * but doesn't hold a lock across data fetches on query misses. + * + * The intended use case is caching frequently-read, seldom-changed information normally retrieved + * across interprocess communication. Imagine that you've written a user birthday information + * daemon called "birthdayd" that exposes an {@code IUserBirthdayService} interface over + * binder. That binder interface looks something like this: + * + * <pre> + * parcelable Birthday { + * int month; + * int day; + * } + * interface IUserBirthdayService { + * Birthday getUserBirthday(int userId); + * } + * </pre> + * + * Suppose the service implementation itself looks like this... + * + * <pre> + * public class UserBirthdayServiceImpl implements IUserBirthdayService { + * private final HashMap<Integer, Birthday%> mUidToBirthday; + * {@literal @}Override + * public synchronized Birthday getUserBirthday(int userId) { + * return mUidToBirthday.get(userId); + * } + * private synchronized void updateBirthdays(Map<Integer, Birthday%> uidToBirthday) { + * mUidToBirthday.clear(); + * mUidToBirthday.putAll(uidToBirthday); + * } + * } + * </pre> + * + * ... and we have a client in frameworks (loaded into every app process) that looks like this: + * + * <pre> + * public class ActivityThread { + * ... + * public Birthday getUserBirthday(int userId) { + * return GetService("birthdayd").getUserBirthday(userId); + * } + * ... + * } + * </pre> + * + * With this code, every time an app calls {@code getUserBirthday(uid)}, we make a binder call to + * the birthdayd process and consult its database of birthdays. If we query user birthdays + * frequently, we do a lot of work that we don't have to do, since user birthdays change + * infrequently. + * + * IpcDataCache is part of a pattern for optimizing this kind of information-querying code. Using + * {@code IpcDataCache}, you'd write the client this way: + * + * <pre> + * public class ActivityThread { + * ... + * private final IpcDataCache.QueryHandler<Integer, Birthday> mBirthdayQuery = + * new IpcDataCache.QueryHandler<Integer, Birthday>() { + * {@literal @}Override + * public Birthday apply(Integer) { + * return GetService("birthdayd").getUserBirthday(userId); + * } + * }; + * private static final int BDAY_CACHE_MAX = 8; // Maximum birthdays to cache + * private static final String BDAY_API = "getUserBirthday"; + * private final IpcDataCache<Integer, Birthday%> mBirthdayCache = new + * IpcDataCache<Integer, Birthday%>( + * BDAY_CACHE_MAX, MODULE_SYSTEM, BDAY_API, BDAY_API, mBirthdayQuery); + * + * public void disableUserBirthdayCache() { + * mBirthdayCache.disableForCurrentProcess(); + * } + * public void invalidateUserBirthdayCache() { + * mBirthdayCache.invalidateCache(); + * } + * public Birthday getUserBirthday(int userId) { + * return mBirthdayCache.query(userId); + * } + * ... + * } + * </pre> + * + * With this cache, clients perform a binder call to birthdayd if asking for a user's birthday + * for the first time; on subsequent queries, we return the already-known Birthday object. + * + * The second parameter to the IpcDataCache constructor is a string that identifies the "module" + * that owns the cache. There are some well-known modules (such as {@code MODULE_SYSTEM} but any + * string is permitted. The third parameters is the name of the API being cached; this, too, can + * any value. The fourth is the name of the cache. The cache is usually named after th API. + * Some things you must know about the three strings: + * <list> + * <ul> The system property that controls the cache is named {@code cache_key.<module>.<api>}. + * Usually, the SELinux rules permit a process to write a system property (and therefore + * invalidate a cache) based on the wildcard {@code cache_key.<module>.*}. This means that + * although the cache can be constructed with any module string, whatever string is chosen must be + * consistent with the SELinux configuration. + * <ul> The API name can be any string of alphanumeric characters. All caches with the same API + * are invalidated at the same time. If a server supports several caches and all are invalidated + * in common, then it is most efficient to assign the same API string to every cache. + * <ul> The cache name can be any string. In debug output, the name is used to distiguish between + * caches with the same API name. The cache name is also used when disabling caches in the + * current process. So, invalidation is based on the module+api but disabling (which is generally + * a once-per-process operation) is based on the cache name. + * </list> + * + * User birthdays do occasionally change, so we have to modify the server to invalidate this + * cache when necessary. That invalidation code looks like this: + * + * <pre> + * public class UserBirthdayServiceImpl { + * ... + * public UserBirthdayServiceImpl() { + * ... + * ActivityThread.currentActivityThread().disableUserBirthdayCache(); + * ActivityThread.currentActivityThread().invalidateUserBirthdayCache(); + * } + * + * private synchronized void updateBirthdays(Map<Integer, Birthday%> uidToBirthday) { + * mUidToBirthday.clear(); + * mUidToBirthday.putAll(uidToBirthday); + * ActivityThread.currentActivityThread().invalidateUserBirthdayCache(); + * } + * ... + * } + * </pre> + * + * The call to {@code IpcDataCache.invalidateCache()} guarantees that all clients will re-fetch + * birthdays from binder during consequent calls to + * {@code ActivityThread.getUserBirthday()}. Because the invalidate call happens with the lock + * held, we maintain consistency between different client views of the birthday state. The use of + * IpcDataCache in this idiomatic way introduces no new race conditions. + * + * IpcDataCache has a few other features for doing things like incremental enhancement of cached + * values and invalidation of multiple caches (that all share the same property key) at once. + * + * {@code BDAY_CACHE_KEY} is the name of a property that we set to an opaque unique value each + * time we update the cache. SELinux configuration must allow everyone to read this property + * and it must allow any process that needs to invalidate the cache (here, birthdayd) to write + * the property. (These properties conventionally begin with the "cache_key." prefix.) + * + * The {@code UserBirthdayServiceImpl} constructor calls {@code disableUserBirthdayCache()} so + * that calls to {@code getUserBirthday} from inside birthdayd don't go through the cache. In this + * local case, there's no IPC, so use of the cache is (depending on exact circumstance) + * unnecessary. + * + * There may be queries for which it is more efficient to bypass the cache than to cache the + * result. This would be true, for example, if some queries would require frequent cache + * invalidation while other queries require infrequent invalidation. To expand on the birthday + * example, suppose that there is a userId that signifies "the next birthday". When passed this + * userId, the server returns the next birthday among all users - this value changes as time + * advances. The userId value can be cached, but the cache must be invalidated whenever a + * birthday occurs, and this invalidates all birthdays. If there is a large number of users, + * invalidation will happen so often that the cache provides no value. + * + * The class provides a bypass mechanism to handle this situation. + * <pre> + * public class ActivityThread { + * ... + * private final IpcDataCache.QueryHandler<Integer, Birthday> mBirthdayQuery = + * new IpcDataCache.QueryHandler<Integer, Birthday>() { + * {@literal @}Override + * public Birthday apply(Integer) { + * return GetService("birthdayd").getUserBirthday(userId); + * } + * {@literal @}Override + * public boolean shouldBypassQuery(Integer userId) { + * return userId == NEXT_BIRTHDAY; + * } + * }; + * ... + * } + * </pre> + * + * If the {@code shouldBypassQuery()} method returns true then the cache is not used for that + * particular query. The {@code shouldBypassQuery()} method is not abstract and the default + * implementation returns false. + * + * For security, there is a allowlist of processes that are allowed to invalidate a cache. The + * allowlist includes normal runtime processes but does not include test processes. Test + * processes must call {@code IpcDataCache.disableForTestMode()} to disable all cache activity in + * that process. + * + * Caching can be disabled completely by initializing {@code sEnabled} to false and rebuilding. + * + * To test a binder cache, create one or more tests that exercise the binder method. This should + * be done twice: once with production code and once with a special image that sets {@code DEBUG} + * and {@code VERIFY} true. In the latter case, verify that no cache inconsistencies are + * reported. If a cache inconsistency is reported, however, it might be a false positive. This + * happens if the server side data can be read and written non-atomically with respect to cache + * invalidation. + * + * @param <Query> The class used to index cache entries: must be hashable and comparable + * @param <Result> The class holding cache entries; use a boxed primitive if possible + * @hide + */ +@TestApi +@SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) +public class IpcDataCache<Query, Result> extends PropertyInvalidatedCache<Query, Result> { + /** + * {@inheritDoc} + * @hide + */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + public static abstract class QueryHandler<Q,R> + extends PropertyInvalidatedCache.QueryHandler<Q,R> { + /** + * Compute a result given a query. The semantics are those of Functor. + */ + public abstract @Nullable R apply(@NonNull Q query); + + /** + * Return true if a query should not use the cache. The default implementation + * always uses the cache. + */ + public boolean shouldBypassCache(@NonNull Q query) { + return false; + } + }; + + /** + * The module used for unit tests and cts tests. It is expected that no process in + * the system has permissions to write properties with this module. + * @hide + */ + @TestApi + public static final String MODULE_TEST = PropertyInvalidatedCache.MODULE_TEST; + + /** + * The module used for system server/framework caches. This is not visible outside + * the system processes. + * @hide + */ + @TestApi + public static final String MODULE_SYSTEM = PropertyInvalidatedCache.MODULE_SYSTEM; + + /** + * The module used for bluetooth caches. + * @hide + */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + public static final String MODULE_BLUETOOTH = PropertyInvalidatedCache.MODULE_BLUETOOTH; + + /** + * Make a new property invalidated cache. The key is computed from the module and api + * parameters. + * + * @param maxEntries Maximum number of entries to cache; LRU discard + * @param module The module under which the cache key should be placed. + * @param api The api this cache front-ends. The api must be a Java identifier but + * need not be an actual api. + * @param cacheName Name of this cache in debug and dumpsys + * @param computer The code to compute values that are not in the cache. + * @hide + */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + public IpcDataCache(int maxEntries, @NonNull String module, @NonNull String api, + @NonNull String cacheName, @NonNull QueryHandler<Query, Result> computer) { + super(maxEntries, module, api, cacheName, computer); + } + + /** + * {@inheritDoc} + * @hide + */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + @Override + public void disableForCurrentProcess() { + super.disableForCurrentProcess(); + } + + /** + * {@inheritDoc} + * @hide + */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + public static void disableForCurrentProcess(@NonNull String cacheName) { + PropertyInvalidatedCache.disableForCurrentProcess(cacheName); + } + + /** + * {@inheritDoc} + * @hide + */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + @Override + public @Nullable Result query(@NonNull Query query) { + return super.query(query); + } + + /** + * {@inheritDoc} + * @hide + */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + @Override + public void invalidateCache() { + super.invalidateCache(); + } + + /** + * Invalidate caches in all processes that are keyed for the module and api. + * @hide + */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + public static void invalidateCache(@NonNull String module, @NonNull String api) { + PropertyInvalidatedCache.invalidateCache(module, api); + } +} diff --git a/core/java/android/os/storage/IStorageManager.aidl b/core/java/android/os/storage/IStorageManager.aidl index 722cdbc620a7..7832dccd93a5 100644 --- a/core/java/android/os/storage/IStorageManager.aidl +++ b/core/java/android/os/storage/IStorageManager.aidl @@ -54,13 +54,13 @@ interface IStorageManager { */ void shutdown(IStorageShutdownObserver observer) = 19; /** - * Mounts an Opaque Binary Blob (OBB) with the specified decryption key and - * only allows the calling process's UID access to the contents. - * StorageManagerService will call back to the supplied IObbActionListener to inform - * it of the terminal state of the call. + * Mounts an Opaque Binary Blob (OBB). Only allows the calling process's UID + * access to the contents. StorageManagerService will call back to the + * supplied IObbActionListener to inform it of the terminal state of the + * call. */ - void mountObb(in String rawPath, in String canonicalPath, in String key, - IObbActionListener token, int nonce, in ObbInfo obbInfo) = 21; + void mountObb(in String rawPath, in String canonicalPath, IObbActionListener token, + int nonce, in ObbInfo obbInfo) = 21; /** * Unmounts an Opaque Binary Blob (OBB). When the force flag is specified, * any program using it will be forcibly killed to unmount the image. diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 48e2827f19e1..b501730f1eeb 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -273,12 +273,15 @@ public class StorageManager { public static final int FLAG_STORAGE_CE = IInstalld.FLAG_STORAGE_CE; /** {@hide} */ public static final int FLAG_STORAGE_EXTERNAL = IInstalld.FLAG_STORAGE_EXTERNAL; + /** @hide */ + public static final int FLAG_STORAGE_SDK = IInstalld.FLAG_STORAGE_SDK; /** {@hide} */ @IntDef(prefix = "FLAG_STORAGE_", value = { FLAG_STORAGE_DE, FLAG_STORAGE_CE, - FLAG_STORAGE_EXTERNAL + FLAG_STORAGE_EXTERNAL, + FLAG_STORAGE_SDK, }) @Retention(RetentionPolicy.SOURCE) public @interface StorageFlags {} @@ -677,9 +680,7 @@ public class StorageManager { } /** - * Mount an Opaque Binary Blob (OBB) file. If a <code>key</code> is - * specified, it is supplied to the mounting process to be used in any - * encryption used in the OBB. + * Mount an Opaque Binary Blob (OBB) file. * <p> * The OBB will remain mounted for as long as the StorageManager reference * is held by the application. As soon as this reference is lost, the OBBs @@ -692,19 +693,22 @@ public class StorageManager { * application's OBB that shares its UID. * * @param rawPath the path to the OBB file - * @param key secret used to encrypt the OBB; may be <code>null</code> if no - * encryption was used on the OBB. + * @param key must be <code>null</code>. Previously, some Android device + * implementations accepted a non-<code>null</code> key to mount + * an encrypted OBB file. However, this never worked reliably and + * is no longer supported. * @param listener will receive the success or failure of the operation * @return whether the mount call was successfully queued or not */ public boolean mountObb(String rawPath, String key, OnObbStateChangeListener listener) { Preconditions.checkNotNull(rawPath, "rawPath cannot be null"); + Preconditions.checkArgument(key == null, "mounting encrypted OBBs is no longer supported"); Preconditions.checkNotNull(listener, "listener cannot be null"); try { final String canonicalPath = new File(rawPath).getCanonicalPath(); final int nonce = mObbActionListener.addListener(listener); - mStorageManager.mountObb(rawPath, canonicalPath, key, mObbActionListener, nonce, + mStorageManager.mountObb(rawPath, canonicalPath, mObbActionListener, nonce, getObbInfo(canonicalPath)); return true; } catch (IOException e) { diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f2137b30350a..cfef7adb240f 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -85,8 +85,10 @@ import android.util.ArraySet; import android.util.Log; import android.util.MemoryIntArray; import android.view.Display; +import android.view.MotionEvent; import android.view.Window; import android.view.WindowManager.LayoutParams; +import android.widget.Editor; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.Preconditions; @@ -15518,6 +15520,17 @@ public final class Settings { public static final String AUTOFILL_MAX_VISIBLE_DATASETS = "autofill_max_visible_datasets"; /** + * Toggle for enabling stylus handwriting. When enabled, current Input method receives + * stylus {@link MotionEvent}s if an {@link Editor} is focused. + * + * @hide + */ + @TestApi + @Readable + @SuppressLint("NoSettingsProvider") + public static final String STYLUS_HANDWRITING_ENABLED = "stylus_handwriting_enabled"; + + /** * Exemptions to the hidden API blacklist. * * @hide diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java index 86707598255d..db622d39b785 100644 --- a/core/java/android/service/dreams/DreamService.java +++ b/core/java/android/service/dreams/DreamService.java @@ -231,7 +231,7 @@ public class DreamService extends Service implements Window.Callback { * The default value for whether to show complications on the overlay. * @hide */ - public static final boolean DEFAULT_SHOW_COMPLICATIONS = false; + public static final boolean DEFAULT_SHOW_COMPLICATIONS = true; private final IDreamManager mDreamManager; private final Handler mHandler = new Handler(Looper.getMainLooper()); diff --git a/core/java/android/service/dreams/OWNERS b/core/java/android/service/dreams/OWNERS index f8318054ddfc..489a5f62b49d 100644 --- a/core/java/android/service/dreams/OWNERS +++ b/core/java/android/service/dreams/OWNERS @@ -1,3 +1,8 @@ # Bug component: 78010 +brycelee@google.com dsandler@google.com +galinap@google.com +jjaggi@google.com +michaelwr@google.com +santoscordon@google.com diff --git a/core/java/android/util/NtpTrustedTime.java b/core/java/android/util/NtpTrustedTime.java index 40beab323576..aebc5e86605a 100644 --- a/core/java/android/util/NtpTrustedTime.java +++ b/core/java/android/util/NtpTrustedTime.java @@ -33,6 +33,9 @@ import android.text.TextUtils; import com.android.internal.annotations.GuardedBy; +import java.io.PrintWriter; +import java.time.Duration; +import java.time.Instant; import java.util.Objects; import java.util.function.Supplier; @@ -96,8 +99,8 @@ public class NtpTrustedTime implements TrustedTime { @Override public String toString() { return "TimeResult{" - + "mTimeMillis=" + mTimeMillis - + ", mElapsedRealtimeMillis=" + mElapsedRealtimeMillis + + "mTimeMillis=" + Instant.ofEpochMilli(mTimeMillis) + + ", mElapsedRealtimeMillis=" + Duration.ofMillis(mElapsedRealtimeMillis) + ", mCertaintyMillis=" + mCertaintyMillis + '}'; } @@ -131,6 +134,14 @@ public class NtpTrustedTime implements TrustedTime { } }; + /** An in-memory config override for use during tests. */ + @Nullable + private String mHostnameForTests; + + /** An in-memory config override for use during tests. */ + @Nullable + private Duration mTimeoutForTests; + // Declared volatile and accessed outside of synchronized blocks to avoid blocking reads during // forceRefresh(). private volatile TimeResult mTimeResult; @@ -148,12 +159,23 @@ public class NtpTrustedTime implements TrustedTime { return sSingleton; } + /** + * Overrides the NTP server config for tests. Passing {@code null} to a parameter clears the + * test value, i.e. so the normal value will be used next time. + */ + public void setServerConfigForTests(@Nullable String hostname, @Nullable Duration timeout) { + synchronized (this) { + mHostnameForTests = hostname; + mTimeoutForTests = timeout; + } + } + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean forceRefresh() { synchronized (this) { NtpConnectionInfo connectionInfo = getNtpConnectionInfo(); if (connectionInfo == null) { - // missing server config, so no trusted time available + // missing server config, so no NTP time available if (LOGD) Log.d(TAG, "forceRefresh: invalid server config"); return false; } @@ -290,6 +312,14 @@ public class NtpTrustedTime implements TrustedTime { int getTimeoutMillis() { return mTimeoutMillis; } + + @Override + public String toString() { + return "NtpConnectionInfo{" + + "mServer='" + mServer + '\'' + + ", mTimeoutMillis=" + mTimeoutMillis + + '}'; + } } @GuardedBy("this") @@ -297,17 +327,41 @@ public class NtpTrustedTime implements TrustedTime { final ContentResolver resolver = mContext.getContentResolver(); final Resources res = mContext.getResources(); - final String defaultServer = res.getString( - com.android.internal.R.string.config_ntpServer); - final int defaultTimeoutMillis = res.getInteger( - com.android.internal.R.integer.config_ntpTimeout); - - final String secureServer = Settings.Global.getString( - resolver, Settings.Global.NTP_SERVER); - final int timeoutMillis = Settings.Global.getInt( - resolver, Settings.Global.NTP_TIMEOUT, defaultTimeoutMillis); - - final String server = secureServer != null ? secureServer : defaultServer; - return TextUtils.isEmpty(server) ? null : new NtpConnectionInfo(server, timeoutMillis); + + final String hostname; + if (mHostnameForTests != null) { + hostname = mHostnameForTests; + } else { + String serverGlobalSetting = + Settings.Global.getString(resolver, Settings.Global.NTP_SERVER); + if (serverGlobalSetting != null) { + hostname = serverGlobalSetting; + } else { + hostname = res.getString(com.android.internal.R.string.config_ntpServer); + } + } + + final int timeoutMillis; + if (mTimeoutForTests != null) { + timeoutMillis = (int) mTimeoutForTests.toMillis(); + } else { + int defaultTimeoutMillis = + res.getInteger(com.android.internal.R.integer.config_ntpTimeout); + timeoutMillis = Settings.Global.getInt( + resolver, Settings.Global.NTP_TIMEOUT, defaultTimeoutMillis); + } + return TextUtils.isEmpty(hostname) ? null : new NtpConnectionInfo(hostname, timeoutMillis); + } + + /** Prints debug information. */ + public void dump(PrintWriter pw) { + synchronized (this) { + pw.println("getNtpConnectionInfo()=" + getNtpConnectionInfo()); + pw.println("mTimeResult=" + mTimeResult); + if (mTimeResult != null) { + pw.println("mTimeResult.getAgeMillis()=" + + Duration.ofMillis(mTimeResult.getAgeMillis())); + } + } } } diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 3f29e3f3078e..a35a195c50b1 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -201,7 +201,12 @@ interface IWindowManager boolean isKeyguardSecure(int userId); void dismissKeyguard(IKeyguardDismissCallback callback, CharSequence message); + @JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest" + + ".permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE)") void addKeyguardLockedStateListener(in IKeyguardLockedStateListener listener); + + @JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest" + + ".permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE)") void removeKeyguardLockedStateListener(in IKeyguardLockedStateListener listener); // Requires INTERACT_ACROSS_USERS_FULL permission diff --git a/core/java/android/view/InputWindowHandle.java b/core/java/android/view/InputWindowHandle.java index 2b579d09d3a2..ef0c19c8dc02 100644 --- a/core/java/android/view/InputWindowHandle.java +++ b/core/java/android/view/InputWindowHandle.java @@ -16,20 +16,57 @@ package android.view; +import android.annotation.IntDef; import android.annotation.Nullable; import android.graphics.Matrix; import android.graphics.Region; import android.gui.TouchOcclusionMode; import android.os.IBinder; +import android.os.InputConfig; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.ref.WeakReference; /** - * Functions as a handle for a window that can receive input. - * Enables the native input dispatcher to refer indirectly to the window manager's window state. + * Functions as a handle for a window that can receive input, and allows for the behavior of the + * input window to be configured. * @hide */ public final class InputWindowHandle { + + /** + * An internal annotation for all the {@link android.os.InputConfig} flags that can be + * specified to {@link #inputConfig} to control the behavior of an input window. Only the + * flags listed here are valid for use in Java. + * + * The default flag value is 0, which is what we expect for a normal application window. Adding + * a flag indicates that the window's behavior deviates from that of a normal application + * window. + * + * The flags are defined as an AIDL enum to keep it in sync with native code. + * {@link android.os.InputConfig} flags that are not listed here should not be used in Java, and + * are only meant to be used in native code. + */ + @Retention(RetentionPolicy.SOURCE) + @IntDef(flag = true, value = { + InputConfig.DEFAULT, + InputConfig.NO_INPUT_CHANNEL, + InputConfig.NOT_FOCUSABLE, + InputConfig.NOT_TOUCHABLE, + InputConfig.PREVENT_SPLITTING, + InputConfig.DUPLICATE_TOUCH_TO_WALLPAPER, + InputConfig.IS_WALLPAPER, + InputConfig.PAUSE_DISPATCHING, + InputConfig.TRUSTED_OVERLAY, + InputConfig.WATCH_OUTSIDE_TOUCH, + InputConfig.SLIPPERY, + InputConfig.DISABLE_USER_ACTIVITY, + InputConfig.SPY, + InputConfig.INTERCEPTS_STYLUS, + }) + public @interface InputConfigFlags {} + // Pointer to the native input window handle. // This field is lazily initialized via JNI. @SuppressWarnings("unused") @@ -56,7 +93,8 @@ public final class InputWindowHandle { // The window name. public String name; - // Window layout params attributes. (WindowManager.LayoutParams) + // Window layout params attributes. (WindowManager.LayoutParams) + // These values do not affect any input configurations. Use {@link #inputConfig} instead. public int layoutParamsFlags; public int layoutParamsType; @@ -78,20 +116,9 @@ public final class InputWindowHandle { // Window touchable region. public final Region touchableRegion = new Region(); - // Window is visible. - public boolean visible; - - // Window can be focused. - public boolean focusable; - - // Window has wallpaper. (window is the current wallpaper target) - public boolean hasWallpaper; - - // Input event dispatching is paused. - public boolean paused; - - // Window is trusted overlay. - public boolean trustedOverlay; + // Flags that specify the behavior of this input window. See {@link #InputConfigFlags}. + @InputConfigFlags + public int inputConfig; // What effect this window has on touch occlusion if it lets touches pass through // By default windows will block touches if they are untrusted and from a different UID due to @@ -105,25 +132,21 @@ public final class InputWindowHandle { // Owner package of the window public String packageName; - // Window input features. - public int inputFeatures; - - // Display this input is on. + // Display this input window is on. public int displayId; /** - * Crops the touchable region to the bounds of the surface provided. + * Crops the {@link #touchableRegion} to the bounds of the surface provided. * - * This can be used in cases where the window is not - * {@link android.view.WindowManager#FLAG_NOT_TOUCH_MODAL} but should be constrained to the - * bounds of a parent window. That is the window should receive touch events outside its - * window but be limited to its stack bounds, such as in the case of split screen. + * This can be used in cases where the window should be constrained to the bounds of a parent + * window. That is, the window should receive touch events outside its window frame, but be + * limited to its stack bounds, such as in the case of split screen. */ public WeakReference<SurfaceControl> touchableRegionSurfaceControl = new WeakReference<>(null); /** - * Replace {@link touchableRegion} with the bounds of {@link touchableRegionSurfaceControl}. If - * the handle is {@code null}, the bounds of the surface associated with this window is used + * Replace {@link #touchableRegion} with the bounds of {@link #touchableRegionSurfaceControl}. + * If the handle is {@code null}, the bounds of the surface associated with this window is used * as the touchable region. */ public boolean replaceTouchableRegionWithCrop; @@ -147,7 +170,6 @@ public final class InputWindowHandle { .append(", frame=[").append(frameLeft).append(",").append(frameTop).append(",") .append(frameRight).append(",").append(frameBottom).append("]") .append(", touchableRegion=").append(touchableRegion) - .append(", visible=").append(visible) .append(", scaleFactor=").append(scaleFactor) .append(", transform=").append(transform) .append(", windowToken=").append(windowToken) @@ -165,11 +187,11 @@ public final class InputWindowHandle { } /** - * Set the window touchable region to the bounds of {@link touchableRegionBounds} ignoring any - * touchable region provided. + * Set the window's touchable region to the bounds of {@link #touchableRegionSurfaceControl} + * and ignore the value of {@link #touchableRegion}. * - * @param bounds surface to set the touchable region to. Set to {@code null} to set the bounds - * to the current surface. + * @param bounds surface to set the touchable region to. Set to {@code null} to set the + * touchable region as the current surface bounds. */ public void replaceTouchableRegionWithCrop(@Nullable SurfaceControl bounds) { setTouchableRegionCrop(bounds); @@ -195,4 +217,17 @@ public final class InputWindowHandle { window = IWindow.Stub.asInterface(windowToken); return window; } + + /** + * Set the provided inputConfig flag values. + * @param inputConfig the flag values to change + * @param value the provided flag values are set when true, and cleared when false + */ + public void setInputConfig(@InputConfigFlags int inputConfig, boolean value) { + if (value) { + this.inputConfig |= inputConfig; + return; + } + this.inputConfig &= ~inputConfig; + } } diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index 0ef585478346..cc93adc32541 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -1877,7 +1877,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { float x, float y, float pressure, float size, int metaState, float xPrecision, float yPrecision, int deviceId, int edgeFlags) { return obtain(downTime, eventTime, action, x, y, pressure, size, metaState, - xPrecision, yPrecision, deviceId, edgeFlags, InputDevice.SOURCE_UNKNOWN, + xPrecision, yPrecision, deviceId, edgeFlags, InputDevice.SOURCE_CLASS_POINTER, DEFAULT_DISPLAY); } diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index 5775944b4e97..ebc409e470e9 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -1104,6 +1104,7 @@ public class ViewConfiguration { * clear, or -1 if Views should not set themselves as preferred to keep clear. * @hide */ + @TestApi public int getPreferKeepClearForFocusDelay() { return mPreferKeepClearForFocusDelay; } diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index dbfae46a6e72..45169efd7d35 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -106,7 +106,6 @@ import android.graphics.Region; import android.os.Build; import android.os.Bundle; import android.os.IBinder; -import android.os.IInputConstants; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -3360,8 +3359,7 @@ public interface WindowManager extends ViewManager { * * @hide */ - public static final int INPUT_FEATURE_NO_INPUT_CHANNEL = - IInputConstants.InputFeature.NO_INPUT_CHANNEL; + public static final int INPUT_FEATURE_NO_INPUT_CHANNEL = 1 << 0; /** * When this window has focus, does not call user activity for all input events so @@ -3374,58 +3372,43 @@ public interface WindowManager extends ViewManager { * @hide */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) - public static final int INPUT_FEATURE_DISABLE_USER_ACTIVITY = - IInputConstants.InputFeature.DISABLE_USER_ACTIVITY; + public static final int INPUT_FEATURE_DISABLE_USER_ACTIVITY = 1 << 1; /** * An input spy window. This window will receive all pointer events within its touchable - * area, but will will not stop events from being sent to other windows below it in z-order. + * area, but will not stop events from being sent to other windows below it in z-order. * An input event will be dispatched to all spy windows above the top non-spy window at the * event's coordinates. - * @hide - */ - public static final int INPUT_FEATURE_SPY = - IInputConstants.InputFeature.SPY; - - /** - * When used with the window flag {@link #FLAG_NOT_TOUCHABLE}, this window will continue - * to receive events from a stylus device within its touchable region. All other pointer - * events, such as from a mouse or touchscreen, will be dispatched to the windows behind it. - * - * This input feature has no effect when the window flag {@link #FLAG_NOT_TOUCHABLE} is - * not set. - * - * The window must be a trusted overlay to use this input feature. - * - * @see #FLAG_NOT_TOUCHABLE * * @hide */ - public static final int INPUT_FEATURE_INTERCEPTS_STYLUS = - IInputConstants.InputFeature.INTERCEPTS_STYLUS; + @RequiresPermission(permission.MONITOR_INPUT) + public static final int INPUT_FEATURE_SPY = 1 << 2; /** * An internal annotation for flags that can be specified to {@link #inputFeatures}. * + * NOTE: These are not the same as {@link android.os.InputConfig} flags. + * * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, prefix = { "INPUT_FEATURE_" }, value = { - INPUT_FEATURE_NO_INPUT_CHANNEL, - INPUT_FEATURE_DISABLE_USER_ACTIVITY, - INPUT_FEATURE_SPY, - INPUT_FEATURE_INTERCEPTS_STYLUS, + @IntDef(flag = true, prefix = {"INPUT_FEATURE_"}, value = { + INPUT_FEATURE_NO_INPUT_CHANNEL, + INPUT_FEATURE_DISABLE_USER_ACTIVITY, + INPUT_FEATURE_SPY, }) - public @interface InputFeatureFlags {} + public @interface InputFeatureFlags { + } /** - * Control special features of the input subsystem. + * Control a set of features of the input subsystem that are exposed to the app process. + * + * WARNING: Do NOT use {@link android.os.InputConfig} flags! This must be set to flag values + * included in {@link InputFeatureFlags}. * - * @see #INPUT_FEATURE_NO_INPUT_CHANNEL - * @see #INPUT_FEATURE_DISABLE_USER_ACTIVITY - * @see #INPUT_FEATURE_SPY - * @see #INPUT_FEATURE_INTERCEPTS_STYLUS * @hide + * @see InputFeatureFlags */ @InputFeatureFlags @UnsupportedAppUsage @@ -4845,10 +4828,6 @@ public interface WindowManager extends ViewManager { inputFeatures &= ~INPUT_FEATURE_SPY; features.add("INPUT_FEATURE_SPY"); } - if ((inputFeatures & INPUT_FEATURE_INTERCEPTS_STYLUS) != 0) { - inputFeatures &= ~INPUT_FEATURE_INTERCEPTS_STYLUS; - features.add("INPUT_FEATURE_INTERCEPTS_STYLUS"); - } if (inputFeatures != 0) { features.add(Integer.toHexString(inputFeatures)); } diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index aeef76c3d048..0008aa64efa4 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -4487,8 +4487,8 @@ public class AccessibilityNodeInfo implements Parcelable { case R.id.accessibilityActionDragDrop: return "ACTION_DROP"; default: { - if (action == R.id.accessibilityActionShowSuggestions) { - return "ACTION_SHOW_SUGGESTIONS"; + if (action == R.id.accessibilityActionShowTextSuggestions) { + return "ACTION_SHOW_TEXT_SUGGESTIONS"; } return "ACTION_UNKNOWN"; } @@ -5189,34 +5189,10 @@ public class AccessibilityNodeInfo implements Parcelable { new AccessibilityAction(R.id.accessibilityActionDragCancel); /** - * Action to perform a left swipe. - */ - @NonNull public static final AccessibilityAction ACTION_SWIPE_LEFT = - new AccessibilityAction(R.id.accessibilityActionSwipeLeft); - - /** - * Action to perform a right swipe. - */ - @NonNull public static final AccessibilityAction ACTION_SWIPE_RIGHT = - new AccessibilityAction(R.id.accessibilityActionSwipeRight); - - /** - * Action to perform an up swipe. - */ - @NonNull public static final AccessibilityAction ACTION_SWIPE_UP = - new AccessibilityAction(R.id.accessibilityActionSwipeUp); - - /** - * Action to perform a down swipe. - */ - @NonNull public static final AccessibilityAction ACTION_SWIPE_DOWN = - new AccessibilityAction(R.id.accessibilityActionSwipeDown); - - /** * Action to show suggestions for editable text. */ - @NonNull public static final AccessibilityAction ACTION_SHOW_SUGGESTIONS = - new AccessibilityAction(R.id.accessibilityActionShowSuggestions); + @NonNull public static final AccessibilityAction ACTION_SHOW_TEXT_SUGGESTIONS = + new AccessibilityAction(R.id.accessibilityActionShowTextSuggestions); private final int mActionId; private final CharSequence mLabel; diff --git a/core/java/android/view/inputmethod/InputMethod.java b/core/java/android/view/inputmethod/InputMethod.java index 69ad739608b2..fd336a27bb67 100644 --- a/core/java/android/view/inputmethod/InputMethod.java +++ b/core/java/android/view/inputmethod/InputMethod.java @@ -31,6 +31,7 @@ import android.view.MotionEvent; import android.view.View; import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; +import com.android.internal.inputmethod.InputMethodNavButtonFlags; import com.android.internal.view.IInlineSuggestionsRequestCallback; import com.android.internal.view.InlineSuggestionsRequestInfo; @@ -105,14 +106,13 @@ public interface InputMethod { * current IME. * @param configChanges {@link InputMethodInfo#getConfigChanges()} declared by IME. * @param stylusHwSupported {@link InputMethodInfo#supportsStylusHandwriting()} declared by IME. - * @param shouldShowImeSwitcherWhenImeIsShown {@code true} If the IME switcher is expected to be - * shown while the IME is shown. + * @param navButtonFlags The initial state of {@link InputMethodNavButtonFlags}. * @hide */ @MainThread default void initializeInternal(IBinder token, IInputMethodPrivilegedOperations privilegedOperations, int configChanges, - boolean stylusHwSupported, boolean shouldShowImeSwitcherWhenImeIsShown) { + boolean stylusHwSupported, @InputMethodNavButtonFlags int navButtonFlags) { attachToken(token); } @@ -231,8 +231,7 @@ public interface InputMethod { * the next {@link #startInput(InputConnection, EditorInfo, IBinder)} as * long as your implementation of {@link InputMethod} relies on such * IPCs - * @param shouldShowImeSwitcherWhenImeIsShown {@code true} If the IME switcher is expected to be - * shown while the IME is shown. + * @param navButtonFlags {@link InputMethodNavButtonFlags} in the initial state of this session. * @see #startInput(InputConnection, EditorInfo) * @see #restartInput(InputConnection, EditorInfo) * @see EditorInfo @@ -241,7 +240,7 @@ public interface InputMethod { @MainThread default void dispatchStartInputWithToken(@Nullable InputConnection inputConnection, @NonNull EditorInfo editorInfo, boolean restarting, - @NonNull IBinder startInputToken, boolean shouldShowImeSwitcherWhenImeIsShown) { + @NonNull IBinder startInputToken, @InputMethodNavButtonFlags int navButtonFlags) { if (restarting) { restartInput(inputConnection, editorInfo); } else { @@ -250,15 +249,13 @@ public interface InputMethod { } /** - * Notifies that whether the IME should show the IME switcher or not is being changed. + * Notifies that {@link InputMethodNavButtonFlags} have been updated. * - * @param shouldShowImeSwitcherWhenImeIsShown {@code true} If the IME switcher is expected to be - * shown while the IME is shown. + * @param navButtonFlags The new {@link InputMethodNavButtonFlags}. * @hide */ @MainThread - default void onShouldShowImeSwitcherWhenImeIsShownChanged( - boolean shouldShowImeSwitcherWhenImeIsShown) { + default void onNavButtonFlagsChanged(@InputMethodNavButtonFlags int navButtonFlags) { } /** diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 248025190b3e..da20e336627c 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -1919,10 +1919,17 @@ public final class InputMethodManager { if (fallbackImm != null) { fallbackImm.startStylusHandwriting(view); } + Objects.requireNonNull(view); + + if (Settings.Global.getInt(view.getContext().getContentResolver(), + Settings.Global.STYLUS_HANDWRITING_ENABLED, 0) == 0) { + Log.d(TAG, "Ignoring startStylusHandwriting(view) as stylus handwriting is disabled"); + return; + } checkFocus(); synchronized (mH) { - if (view == null || !hasServedByInputMethodLocked(view)) { + if (!hasServedByInputMethodLocked(view)) { Log.w(TAG, "Ignoring startStylusHandwriting() as view=" + view + " is not served."); return; @@ -3251,10 +3258,11 @@ public final class InputMethodManager { * @return Something that is not well-defined. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(trackingBug = 204906124, maxTargetSdk = Build.VERSION_CODES.TIRAMISU, + publicAlternatives = "Use {@link android.view.WindowInsets} instead") public int getInputMethodWindowVisibleHeight() { try { - return mService.getInputMethodWindowVisibleHeight(); + return mService.getInputMethodWindowVisibleHeight(mClient); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/view/selectiontoolbar/SelectionToolbarManager.java b/core/java/android/view/selectiontoolbar/SelectionToolbarManager.java index ef04b2c52282..6de031628768 100644 --- a/core/java/android/view/selectiontoolbar/SelectionToolbarManager.java +++ b/core/java/android/view/selectiontoolbar/SelectionToolbarManager.java @@ -105,7 +105,7 @@ public final class SelectionToolbarManager { private boolean isRemoteSelectionToolbarEnabled() { return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SELECTION_TOOLBAR, - REMOTE_SELECTION_TOOLBAR_ENABLED, true); + REMOTE_SELECTION_TOOLBAR_ENABLED, false); } /** diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index b00a3829f468..fbad38f27a23 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -6681,7 +6681,13 @@ public class RemoteViews implements Parcelable, Filter { opts = ActivityOptions.makeBasic(); opts.setPendingIntentLaunchFlags(Intent.FLAG_ACTIVITY_NEW_TASK); } - opts.setLaunchDisplayId(view.getDisplay().getDisplayId()); + if (view.getDisplay() != null) { + opts.setLaunchDisplayId(view.getDisplay().getDisplayId()); + } else { + // TODO(b/218409359): Remove once bug is fixed. + Log.w(LOG_TAG, "getLaunchOptions: view.getDisplay() is null!", + new Exception()); + } return Pair.create(intent, opts); } } diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index c207af53fab7..b076d399d44a 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -12313,7 +12313,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener info.addAction(AccessibilityNodeInfo.ACTION_CUT); } if (canReplace()) { - info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_SHOW_SUGGESTIONS); + info.addAction( + AccessibilityNodeInfo.AccessibilityAction.ACTION_SHOW_TEXT_SUGGESTIONS); } if (canShare()) { info.addAction(new AccessibilityNodeInfo.AccessibilityAction( @@ -12634,7 +12635,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener default: { // New ids have static blocks to assign values, so they can't be used in a case // block. - if (action == R.id.accessibilityActionShowSuggestions) { + if (action == R.id.accessibilityActionShowTextSuggestions) { return isFocused() && canReplace() && onTextContextMenuItem(ID_REPLACE); } return super.performAccessibilityActionInternal(action, arguments); diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index e336e96d577e..fd5eac8071bd 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -1603,6 +1603,11 @@ public class ResolverActivity extends Activity implements List<DisplayResolveInfo> otherProfileList = mMultiProfilePagerAdapter.getInactiveListAdapter().mDisplayList; + if (sameProfileList.isEmpty()) { + Log.d(TAG, "No targets in the current profile"); + return false; + } + if (otherProfileList.size() != 1) { Log.d(TAG, "Found " + otherProfileList.size() + " resolvers in the other profile"); return false; diff --git a/core/java/com/android/internal/inputmethod/InputMethodNavButtonFlags.java b/core/java/com/android/internal/inputmethod/InputMethodNavButtonFlags.java new file mode 100644 index 000000000000..728a42907cc4 --- /dev/null +++ b/core/java/com/android/internal/inputmethod/InputMethodNavButtonFlags.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.inputmethod; + +import static java.lang.annotation.RetentionPolicy.SOURCE; + +import android.annotation.IntDef; + +import java.lang.annotation.Retention; + +/** + * A set of flags notified from {@link com.android.server.inputmethod.InputMethodManagerService} to + * {@link android.inputmethodservice.InputMethodService} regarding how + * {@link android.inputmethodservice.NavigationBarController} should behave. + * + * <p>These flags will take effect when and only when + * {@link android.inputmethodservice.InputMethodService#canImeRenderGesturalNavButtons} returns + * {@code true}.</p> + */ +@Retention(SOURCE) +@IntDef(flag = true, value = { + InputMethodNavButtonFlags.IME_DRAWS_IME_NAV_BAR, + InputMethodNavButtonFlags.SHOW_IME_SWITCHER_WHEN_IME_IS_SHOWN, +}) +public @interface InputMethodNavButtonFlags { + /** + * When set, the IME process needs to render and handle the navigation bar buttons such as the + * back button and the IME switcher button. + */ + int IME_DRAWS_IME_NAV_BAR = 1; + /** + * When set, the IME switcher icon needs to be shown on the navigation bar. + */ + int SHOW_IME_SWITCHER_WHEN_IME_IS_SHOWN = 2; +} diff --git a/core/java/com/android/internal/net/VpnConfig.java b/core/java/com/android/internal/net/VpnConfig.java index ec95baae8c19..2784da00a02e 100644 --- a/core/java/com/android/internal/net/VpnConfig.java +++ b/core/java/com/android/internal/net/VpnConfig.java @@ -106,6 +106,7 @@ public class VpnConfig implements Parcelable { public boolean allowIPv6; public boolean isMetered = true; public boolean requiresInternetValidation = false; + public boolean excludeLocalRoutes = false; public Network[] underlyingNetworks; public ProxyInfo proxyInfo; @@ -133,6 +134,7 @@ public class VpnConfig implements Parcelable { allowIPv6 = other.allowIPv6; isMetered = other.isMetered; requiresInternetValidation = other.requiresInternetValidation; + excludeLocalRoutes = other.excludeLocalRoutes; underlyingNetworks = other.underlyingNetworks != null ? Arrays.copyOf( other.underlyingNetworks, other.underlyingNetworks.length) : null; proxyInfo = other.proxyInfo; @@ -192,6 +194,7 @@ public class VpnConfig implements Parcelable { out.writeInt(allowIPv6 ? 1 : 0); out.writeInt(isMetered ? 1 : 0); out.writeInt(requiresInternetValidation ? 1 : 0); + out.writeInt(excludeLocalRoutes ? 1 : 0); out.writeTypedArray(underlyingNetworks, flags); out.writeParcelable(proxyInfo, flags); } @@ -220,6 +223,7 @@ public class VpnConfig implements Parcelable { config.allowIPv6 = in.readInt() != 0; config.isMetered = in.readInt() != 0; config.requiresInternetValidation = in.readInt() != 0; + config.excludeLocalRoutes = in.readInt() != 0; config.underlyingNetworks = in.createTypedArray(Network.CREATOR); config.proxyInfo = in.readParcelable(null, android.net.ProxyInfo.class); return config; @@ -253,7 +257,8 @@ public class VpnConfig implements Parcelable { .append(", allowIPv4=").append(allowIPv4) .append(", allowIPv6=").append(allowIPv6) .append(", isMetered=").append(isMetered) - .append(", requiresInternetValidation").append(requiresInternetValidation) + .append(", requiresInternetValidation=").append(requiresInternetValidation) + .append(", excludeLocalRoutes=").append(excludeLocalRoutes) .append(", underlyingNetworks=").append(Arrays.toString(underlyingNetworks)) .append(", proxyInfo=").append(proxyInfo) .append("}") diff --git a/core/java/com/android/internal/policy/TransitionAnimation.java b/core/java/com/android/internal/policy/TransitionAnimation.java index 37c96e71a0a8..7ee1f17b34df 100644 --- a/core/java/com/android/internal/policy/TransitionAnimation.java +++ b/core/java/com/android/internal/policy/TransitionAnimation.java @@ -312,9 +312,9 @@ public class TransitionAnimation { /** Load animation by attribute Id from android package. */ @Nullable - public Animation loadDefaultAnimationAttr(int animAttr) { + public Animation loadDefaultAnimationAttr(int animAttr, boolean translucent) { return loadAnimationAttr(DEFAULT_PACKAGE, mDefaultWindowAnimationStyleResId, animAttr, - false /* translucent */); + translucent); } @Nullable diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl index 9163b6d6215e..1d60c501a88b 100644 --- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl +++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl @@ -70,7 +70,7 @@ interface IStatusBarService void onPanelRevealed(boolean clearNotificationEffects, int numItems); void onPanelHidden(); // Mark current notifications as "seen" and stop ringing, vibrating, blinking. - void clearNotificationEffects(); + oneway void clearNotificationEffects(); void onNotificationClick(String key, in NotificationVisibility nv); void onNotificationActionClick(String key, int actionIndex, in Notification.Action action, in NotificationVisibility nv, boolean generatedByAssistant); void onNotificationError(String pkg, String tag, int id, diff --git a/core/java/com/android/internal/view/IInputMethod.aidl b/core/java/com/android/internal/view/IInputMethod.aidl index d2bc3442ed36..273c5f170812 100644 --- a/core/java/com/android/internal/view/IInputMethod.aidl +++ b/core/java/com/android/internal/view/IInputMethod.aidl @@ -37,8 +37,7 @@ import com.android.internal.view.InlineSuggestionsRequestInfo; */ oneway interface IInputMethod { void initializeInternal(IBinder token, IInputMethodPrivilegedOperations privOps, - int configChanges, boolean stylusHwSupported, - boolean shouldShowImeSwitcherWhenImeIsShown); + int configChanges, boolean stylusHwSupported, int navigationBarFlags); void onCreateInlineSuggestionsRequest(in InlineSuggestionsRequestInfo requestInfo, in IInlineSuggestionsRequestCallback cb); @@ -48,10 +47,9 @@ oneway interface IInputMethod { void unbindInput(); void startInput(in IBinder startInputToken, in IInputContext inputContext, - in EditorInfo attribute, boolean restarting, - boolean shouldShowImeSwitcherWhenImeIsShown); + in EditorInfo attribute, boolean restarting, int navigationBarFlags); - void onShouldShowImeSwitcherWhenImeIsShownChanged(boolean shouldShowImeSwitcherWhenImeIsShown); + void onNavButtonFlagsChanged(int navButtonFlags); void createSession(in InputChannel channel, IInputSessionCallback callback); diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl index 0df3e870b80c..c5346b95440b 100644 --- a/core/java/com/android/internal/view/IInputMethodManager.aidl +++ b/core/java/com/android/internal/view/IInputMethodManager.aidl @@ -67,7 +67,7 @@ interface IInputMethodManager { void setAdditionalInputMethodSubtypes(String id, in InputMethodSubtype[] subtypes); // This is kept due to @UnsupportedAppUsage. // TODO(Bug 113914148): Consider removing this. - int getInputMethodWindowVisibleHeight(); + int getInputMethodWindowVisibleHeight(in IInputMethodClient client); oneway void reportPerceptibleAsync(in IBinder windowToken, boolean perceptible); /** Remove the IME surface. Requires INTERNAL_SYSTEM_WINDOW permission. */ diff --git a/core/jni/android_hardware_input_InputWindowHandle.cpp b/core/jni/android_hardware_input_InputWindowHandle.cpp index f453d1f06e22..db92310f2a26 100644 --- a/core/jni/android_hardware_input_InputWindowHandle.cpp +++ b/core/jni/android_hardware_input_InputWindowHandle.cpp @@ -23,6 +23,7 @@ #include <android_runtime/AndroidRuntime.h> #include <android_runtime/Log.h> #include <binder/IPCThreadState.h> +#include <ftl/cast.h> #include <gui/SurfaceControl.h> #include <gui/WindowInfo.h> #include <nativehelper/JNIHelp.h> @@ -63,16 +64,11 @@ static struct { jfieldID surfaceInset; jfieldID scaleFactor; jfieldID touchableRegion; - jfieldID visible; - jfieldID focusable; - jfieldID hasWallpaper; - jfieldID paused; - jfieldID trustedOverlay; jfieldID touchOcclusionMode; jfieldID ownerPid; jfieldID ownerUid; jfieldID packageName; - jfieldID inputFeatures; + jfieldID inputConfig; jfieldID displayId; jfieldID replaceTouchableRegionWithCrop; WeakRefHandleField touchableRegionSurfaceControl; @@ -162,64 +158,8 @@ bool NativeInputWindowHandle::updateInfo() { mInfo.layoutParamsFlags = flags; mInfo.layoutParamsType = type; - using InputConfig = gui::WindowInfo::InputConfig; - // Determine the value for each of the InputConfig flags. We rely on a switch statement and - // -Wswitch-enum to give us a build error if we forget to explicitly handle an InputConfig flag. - mInfo.inputConfig = InputConfig::NONE; - InputConfig enumerationStart = InputConfig::NONE; - switch (enumerationStart) { - case InputConfig::NONE: - FALLTHROUGH_INTENDED; - case InputConfig::NOT_VISIBLE: - if (env->GetBooleanField(obj, gInputWindowHandleClassInfo.visible) == JNI_FALSE) { - mInfo.inputConfig |= InputConfig::NOT_VISIBLE; - } - FALLTHROUGH_INTENDED; - case InputConfig::NOT_FOCUSABLE: - if (env->GetBooleanField(obj, gInputWindowHandleClassInfo.focusable) == JNI_FALSE) { - mInfo.inputConfig |= InputConfig::NOT_FOCUSABLE; - } - FALLTHROUGH_INTENDED; - case InputConfig::NOT_TOUCHABLE: - if (flags.test(WindowInfo::Flag::NOT_TOUCHABLE)) { - mInfo.inputConfig |= InputConfig::NOT_TOUCHABLE; - } - FALLTHROUGH_INTENDED; - case InputConfig::PREVENT_SPLITTING: - if (!flags.test(WindowInfo::Flag::SPLIT_TOUCH)) { - mInfo.inputConfig |= InputConfig::PREVENT_SPLITTING; - } - FALLTHROUGH_INTENDED; - case InputConfig::DUPLICATE_TOUCH_TO_WALLPAPER: - if (env->GetBooleanField(obj, gInputWindowHandleClassInfo.hasWallpaper) == JNI_TRUE) { - mInfo.inputConfig |= InputConfig::DUPLICATE_TOUCH_TO_WALLPAPER; - } - FALLTHROUGH_INTENDED; - case InputConfig::IS_WALLPAPER: - if (type == WindowInfo::Type::WALLPAPER) { - mInfo.inputConfig |= InputConfig::IS_WALLPAPER; - } - FALLTHROUGH_INTENDED; - case InputConfig::PAUSE_DISPATCHING: - if (env->GetBooleanField(obj, gInputWindowHandleClassInfo.paused) == JNI_TRUE) { - mInfo.inputConfig |= InputConfig::PAUSE_DISPATCHING; - } - FALLTHROUGH_INTENDED; - case InputConfig::TRUSTED_OVERLAY: - if (env->GetBooleanField(obj, gInputWindowHandleClassInfo.trustedOverlay) == JNI_TRUE) { - mInfo.inputConfig |= InputConfig::TRUSTED_OVERLAY; - } - FALLTHROUGH_INTENDED; - case InputConfig::WATCH_OUTSIDE_TOUCH: - if (flags.test(WindowInfo::Flag::WATCH_OUTSIDE_TOUCH)) { - mInfo.inputConfig |= InputConfig::WATCH_OUTSIDE_TOUCH; - } - FALLTHROUGH_INTENDED; - case InputConfig::SLIPPERY: - if (flags.test(WindowInfo::Flag::SLIPPERY)) { - mInfo.inputConfig |= InputConfig::SLIPPERY; - } - } + mInfo.inputConfig = static_cast<gui::WindowInfo::InputConfig>( + env->GetIntField(obj, gInputWindowHandleClassInfo.inputConfig)); mInfo.touchOcclusionMode = static_cast<TouchOcclusionMode>( env->GetIntField(obj, gInputWindowHandleClassInfo.touchOcclusionMode)); @@ -228,8 +168,6 @@ bool NativeInputWindowHandle::updateInfo() { mInfo.ownerUid = env->GetIntField(obj, gInputWindowHandleClassInfo.ownerUid); mInfo.packageName = getStringField(env, obj, gInputWindowHandleClassInfo.packageName, "<null>"); - mInfo.inputFeatures = static_cast<WindowInfo::Feature>( - env->GetIntField(obj, gInputWindowHandleClassInfo.inputFeatures)); mInfo.displayId = env->GetIntField(obj, gInputWindowHandleClassInfo.displayId); @@ -359,17 +297,6 @@ jobject android_view_InputWindowHandle_fromWindowInfo(JNIEnv* env, gui::WindowIn env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.touchableRegion, regionObj.get()); - using InputConfig = gui::WindowInfo::InputConfig; - env->SetBooleanField(inputWindowHandle, gInputWindowHandleClassInfo.visible, - !windowInfo.inputConfig.test(InputConfig::NOT_VISIBLE)); - env->SetBooleanField(inputWindowHandle, gInputWindowHandleClassInfo.focusable, - !windowInfo.inputConfig.test(gui::WindowInfo::InputConfig::NOT_FOCUSABLE)); - env->SetBooleanField(inputWindowHandle, gInputWindowHandleClassInfo.hasWallpaper, - windowInfo.inputConfig.test(InputConfig::DUPLICATE_TOUCH_TO_WALLPAPER)); - env->SetBooleanField(inputWindowHandle, gInputWindowHandleClassInfo.paused, - windowInfo.inputConfig.test(InputConfig::PAUSE_DISPATCHING)); - env->SetBooleanField(inputWindowHandle, gInputWindowHandleClassInfo.trustedOverlay, - windowInfo.inputConfig.test(InputConfig::TRUSTED_OVERLAY)); env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.touchOcclusionMode, static_cast<int32_t>(windowInfo.touchOcclusionMode)); env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.ownerPid, windowInfo.ownerPid); @@ -377,8 +304,11 @@ jobject android_view_InputWindowHandle_fromWindowInfo(JNIEnv* env, gui::WindowIn ScopedLocalRef<jstring> packageName(env, env->NewStringUTF(windowInfo.packageName.data())); env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.packageName, packageName.get()); - env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.inputFeatures, - static_cast<int32_t>(windowInfo.inputFeatures.get())); + + const auto inputConfig = windowInfo.inputConfig.get(); + static_assert(sizeof(inputConfig) == sizeof(int32_t)); + env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.inputConfig, + static_cast<int32_t>(inputConfig)); float transformVals[9]; for (int i = 0; i < 9; i++) { @@ -481,19 +411,6 @@ int register_android_view_InputWindowHandle(JNIEnv* env) { GET_FIELD_ID(gInputWindowHandleClassInfo.touchableRegion, clazz, "touchableRegion", "Landroid/graphics/Region;"); - GET_FIELD_ID(gInputWindowHandleClassInfo.visible, clazz, - "visible", "Z"); - - GET_FIELD_ID(gInputWindowHandleClassInfo.focusable, clazz, "focusable", "Z"); - - GET_FIELD_ID(gInputWindowHandleClassInfo.hasWallpaper, clazz, - "hasWallpaper", "Z"); - - GET_FIELD_ID(gInputWindowHandleClassInfo.paused, clazz, - "paused", "Z"); - - GET_FIELD_ID(gInputWindowHandleClassInfo.trustedOverlay, clazz, "trustedOverlay", "Z"); - GET_FIELD_ID(gInputWindowHandleClassInfo.touchOcclusionMode, clazz, "touchOcclusionMode", "I"); GET_FIELD_ID(gInputWindowHandleClassInfo.ownerPid, clazz, @@ -505,8 +422,7 @@ int register_android_view_InputWindowHandle(JNIEnv* env) { GET_FIELD_ID(gInputWindowHandleClassInfo.packageName, clazz, "packageName", "Ljava/lang/String;"); - GET_FIELD_ID(gInputWindowHandleClassInfo.inputFeatures, clazz, - "inputFeatures", "I"); + GET_FIELD_ID(gInputWindowHandleClassInfo.inputConfig, clazz, "inputConfig", "I"); GET_FIELD_ID(gInputWindowHandleClassInfo.displayId, clazz, "displayId", "I"); diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index 7c67cbcbd23c..a6fbf094a030 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -235,9 +235,7 @@ void android_os_Process_setThreadGroupAndCpuset(JNIEnv* env, jobject clazz, int void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jint grp) { ALOGV("%s pid=%d grp=%" PRId32, __func__, pid, grp); - DIR *d; char proc_path[255]; - struct dirent *de; if (!verifyGroup(env, grp)) { return; @@ -277,84 +275,8 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin } } - sprintf(proc_path, "/proc/%d/task", pid); - if (!(d = opendir(proc_path))) { - // If the process exited on us, don't generate an exception - if (errno != ENOENT) - signalExceptionForGroupError(env, errno, pid); - return; - } - - while ((de = readdir(d))) { - int t_pid; - int t_pri; - std::string taskprofile; - - if (de->d_name[0] == '.') - continue; - t_pid = atoi(de->d_name); - - if (!t_pid) { - ALOGE("Error getting pid for '%s'\n", de->d_name); - continue; - } - - t_pri = getpriority(PRIO_PROCESS, t_pid); - - if (t_pri <= ANDROID_PRIORITY_AUDIO) { - int scheduler = sched_getscheduler(t_pid) & ~SCHED_RESET_ON_FORK; - if ((scheduler == SCHED_FIFO) || (scheduler == SCHED_RR)) { - // This task wants to stay in its current audio group so it can keep its budget - // don't update its cpuset or cgroup - continue; - } - } - - errno = 0; - // grp == SP_BACKGROUND. Set background cpuset policy profile for all threads. - if (grp == SP_BACKGROUND) { - if (!SetTaskProfiles(t_pid, {"CPUSET_SP_BACKGROUND"}, true)) { - signalExceptionForGroupError(env, errno ? errno : EPERM, t_pid); - break; - } - continue; - } - - // grp != SP_BACKGROUND. Only change the cpuset cgroup for low priority thread, so it could - // preserve it sched policy profile setting. - if (t_pri >= ANDROID_PRIORITY_BACKGROUND) { - switch (grp) { - case SP_SYSTEM: - taskprofile = "ServiceCapacityLow"; - break; - case SP_RESTRICTED: - taskprofile = "ServiceCapacityRestricted"; - break; - case SP_FOREGROUND: - case SP_AUDIO_APP: - case SP_AUDIO_SYS: - taskprofile = "ProcessCapacityHigh"; - break; - case SP_TOP_APP: - taskprofile = "ProcessCapacityMax"; - break; - default: - taskprofile = "ProcessCapacityNormal"; - break; - } - if (!SetTaskProfiles(t_pid, {taskprofile}, true)) { - signalExceptionForGroupError(env, errno ? errno : EPERM, t_pid); - break; - } - // Change the cpuset policy profile for non-low priority thread according to the grp - } else { - if (!SetTaskProfiles(t_pid, {get_cpuset_policy_profile_name((SchedPolicy)grp)}, true)) { - signalExceptionForGroupError(env, errno ? errno : EPERM, t_pid); - break; - } - } - } - closedir(d); + if (!SetProcessProfilesCached(0, pid, {get_cpuset_policy_profile_name((SchedPolicy)grp)})) + signalExceptionForGroupError(env, errno ? errno : EPERM, pid); } void android_os_Process_setProcessFrozen( diff --git a/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp b/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp index 248db76da71d..0c05da551c8f 100644 --- a/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp +++ b/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp @@ -45,7 +45,7 @@ using android::zygote::ZygoteFailure; // WARNING: Knows a little about the wire protocol used to communicate with Zygote. // TODO: Fix error handling. -constexpr size_t MAX_COMMAND_BYTES = 12200; +constexpr size_t MAX_COMMAND_BYTES = 32768; constexpr size_t NICE_NAME_BYTES = 50; // A buffer optionally bundled with a file descriptor from which we can fill it. @@ -273,8 +273,6 @@ class NativeCommandBuffer { char mBuffer[MAX_COMMAND_BYTES]; }; -static_assert(sizeof(NativeCommandBuffer) < 3 * 4096); - static int buffersAllocd(0); // Get a new NativeCommandBuffer. Can only be called once between freeNativeBuffer calls, diff --git a/core/proto/android/os/incident.proto b/core/proto/android/os/incident.proto index 51e150e28437..15a6bc4369b3 100644 --- a/core/proto/android/os/incident.proto +++ b/core/proto/android/os/incident.proto @@ -48,7 +48,6 @@ import "frameworks/base/core/proto/android/service/batterystats.proto"; import "frameworks/base/core/proto/android/service/diskstats.proto"; import "frameworks/base/core/proto/android/service/dropbox.proto"; import "frameworks/base/core/proto/android/service/graphicsstats.proto"; -import "frameworks/base/core/proto/android/service/netstats.proto"; import "frameworks/base/core/proto/android/service/notification.proto"; import "frameworks/base/core/proto/android/service/package.proto"; import "frameworks/base/core/proto/android/service/print.proto"; @@ -62,6 +61,7 @@ import "frameworks/base/core/proto/android/util/textdump.proto"; import "frameworks/base/core/proto/android/privacy.proto"; import "frameworks/base/core/proto/android/section.proto"; import "frameworks/base/proto/src/ipconnectivity.proto"; +import "packages/modules/Connectivity/framework/proto/netstats.proto"; import "packages/modules/Permission/service/proto/com/android/role/roleservice.proto"; package android.os; diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index 3929027a4e94..0ade0934f2a6 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -53,6 +53,7 @@ message WindowManagerServiceDumpProto { optional int32 last_orientation = 8 [(.android.typedef) = "android.content.pm.ActivityInfo.ScreenOrientation", deprecated=true]; optional int32 focused_display_id = 9; optional bool hard_keyboard_available = 10; + optional bool window_frames_valid = 11; } /* represents RootWindowContainer object */ diff --git a/core/proto/android/service/netstats.proto b/core/proto/android/service/netstats.proto deleted file mode 100644 index ba2b6d6bd7e0..000000000000 --- a/core/proto/android/service/netstats.proto +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -syntax = "proto2"; -package android.service; - -option java_multiple_files = true; -option java_outer_classname = "NetworkStatsServiceProto"; - -// Represents dumpsys from NetworkStatsService (netstats). -message NetworkStatsServiceDumpProto { - repeated NetworkInterfaceProto active_interfaces = 1; - - repeated NetworkInterfaceProto active_uid_interfaces = 2; - - // Device level network stats, which may include non-IP layer traffic. - optional NetworkStatsRecorderProto dev_stats = 3; - - // IP-layer traffic stats. - optional NetworkStatsRecorderProto xt_stats = 4; - - // Per-UID network stats. - optional NetworkStatsRecorderProto uid_stats = 5; - - // Per-UID, per-tag network stats, excluding the default tag (i.e. tag=0). - optional NetworkStatsRecorderProto uid_tag_stats = 6; -} - -// Corresponds to NetworkStatsService.mActiveIfaces/mActiveUidIfaces. -message NetworkInterfaceProto { - // Name of the network interface (eg: wlan). - optional string interface = 1; - - optional NetworkIdentitySetProto identities = 2; -} - -// Corresponds to NetworkIdentitySet. -message NetworkIdentitySetProto { - repeated NetworkIdentityProto identities = 1; -} - -// Corresponds to NetworkIdentity. -message NetworkIdentityProto { - // Constants from ConnectivityManager.TYPE_*. - optional int32 type = 1; - - optional bool roaming = 4; - - optional bool metered = 5; - - optional bool default_network = 6; - - optional int32 oem_managed_network = 7; -} - -// Corresponds to NetworkStatsRecorder. -message NetworkStatsRecorderProto { - optional int64 pending_total_bytes = 1; - - optional NetworkStatsCollectionProto complete_history = 2; -} - -// Corresponds to NetworkStatsCollection. -message NetworkStatsCollectionProto { - repeated NetworkStatsCollectionStatsProto stats = 1; -} - -// Corresponds to NetworkStatsCollection.mStats. -message NetworkStatsCollectionStatsProto { - optional NetworkStatsCollectionKeyProto key = 1; - - optional NetworkStatsHistoryProto history = 2; -} - -// Corresponds to NetworkStatsCollection.Key. -message NetworkStatsCollectionKeyProto { - optional NetworkIdentitySetProto identity = 1; - - optional int32 uid = 2; - - optional int32 set = 3; - - optional int32 tag = 4; -} - -// Corresponds to NetworkStatsHistory. -message NetworkStatsHistoryProto { - // Duration for this bucket in milliseconds. - optional int64 bucket_duration_ms = 1; - - repeated NetworkStatsHistoryBucketProto buckets = 2; -} - -// Corresponds to each bucket in NetworkStatsHistory. -message NetworkStatsHistoryBucketProto { - // Bucket start time in milliseconds since epoch. - optional int64 bucket_start_ms = 1; - - optional int64 rx_bytes = 2; - - optional int64 rx_packets = 3; - - optional int64 tx_bytes = 4; - - optional int64 tx_packets = 5; - - optional int64 operations = 6; -} diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 434222ae8016..fa9eba34d30b 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2937,7 +2937,7 @@ <!-- @SystemApi @hide Allows an application to set the profile owners and the device owner. This permission is not available to third party applications.--> <permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" - android:protectionLevel="signature|role|setup" + android:protectionLevel="signature|role" android:label="@string/permlab_manageProfileAndDeviceOwners" android:description="@string/permdesc_manageProfileAndDeviceOwners" /> @@ -2946,6 +2946,10 @@ <permission android:name="android.permission.QUERY_ADMIN_POLICY" android:protectionLevel="signature|role" /> + <!-- @SystemApi @hide Allows an application to set a device owner on retail demo devices.--> + <permission android:name="android.permission.PROVISION_DEMO_DEVICE" + android:protectionLevel="signature|setup" /> + <!-- @TestApi @hide Allows an application to reset the record of previous system update freeze periods. --> <permission android:name="android.permission.CLEAR_FREEZE_PERIOD" @@ -3714,15 +3718,26 @@ android:protectionLevel="signature|privileged" /> <!-- ========================================= --> - <!-- Permissions for SupplementalApi --> + <!-- Permissions for AdServices --> <!-- ========================================= --> <eat-comment /> - <!-- TODO(b/213488783): Update with correct names. --> - <!-- Allows an application to access SupplementalApis. --> - <permission android:name="android.permission.ACCESS_SUPPLEMENTAL_APIS" - android:label="@string/permlab_accessSupplementalApi" - android:description="@string/permdesc_accessSupplementalApi" + <!-- Allows an application to access AdServices Topics API. --> + <permission android:name="android.permission.ACCESS_ADSERVICES_TOPICS" + android:label="@string/permlab_accessAdServicesTopics" + android:description="@string/permdesc_accessAdServicesTopics" + android:protectionLevel="normal" /> + + <!-- Allows an application to access AdServices Attribution APIs. --> + <permission android:name="android.permission.ACCESS_ADSERVICES_ATTRIBUTION" + android:label="@string/permlab_accessAdServicesAttribution" + android:description="@string/permdesc_accessAdServicesAttribution" + android:protectionLevel="normal" /> + + <!-- Allows an application to access AdServices Custom Audiences APIs. --> + <permission android:name="android.permission.ACCESS_ADSERVICES_CUSTOM_AUDIENCES" + android:label="@string/permlab_accessAdServicesCustomAudiences" + android:description="@string/permdesc_accessAdServicesCustomAudiences" android:protectionLevel="normal" /> <!-- ==================================== --> diff --git a/core/res/OWNERS b/core/res/OWNERS index 4bea4d55e5ef..ca8b3f8aa070 100644 --- a/core/res/OWNERS +++ b/core/res/OWNERS @@ -26,6 +26,10 @@ toddke@google.com tsuji@google.com yamasani@google.com +# Resources finalization +per-file res/xml/public-staging.xml = file:/tools/aapt2/OWNERS +per-file res/xml/public-final.xml = file:/tools/aapt2/OWNERS + # Multiuser per-file res/xml/config_user_types.xml = file:/MULTIUSER_OWNERS diff --git a/core/res/res/anim-ldrtl/activity_close_enter.xml b/core/res/res/anim-ldrtl/activity_close_enter.xml new file mode 100644 index 000000000000..6a699e7fcdfa --- /dev/null +++ b/core/res/res/anim-ldrtl/activity_close_enter.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2022, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:shareInterpolator="false"> + + <alpha + android:fromAlpha="1.0" + android:toAlpha="1.0" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/linear" + android:startOffset="0" + android:duration="450" /> + + <translate + android:fromXDelta="10%" + android:toXDelta="0" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:startOffset="0" + android:duration="450" /> + + <extend + android:fromExtendLeft="10%" + android:fromExtendTop="0" + android:fromExtendRight="0" + android:fromExtendBottom="0" + android:toExtendLeft="10%" + android:toExtendTop="0" + android:toExtendRight="0" + android:toExtendBottom="0" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:startOffset="0" + android:duration="450" /> +</set>
\ No newline at end of file diff --git a/core/res/res/anim-ldrtl/activity_close_exit.xml b/core/res/res/anim-ldrtl/activity_close_exit.xml new file mode 100644 index 000000000000..06a0d6916f61 --- /dev/null +++ b/core/res/res/anim-ldrtl/activity_close_exit.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2022, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:shareInterpolator="false"> + + <alpha + android:fromAlpha="1.0" + android:toAlpha="0.0" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/linear" + android:startOffset="35" + android:duration="83" /> + + <translate + android:fromXDelta="0" + android:toXDelta="-10%" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:startOffset="0" + android:duration="450" /> + + <extend + android:fromExtendLeft="0" + android:fromExtendTop="0" + android:fromExtendRight="10%" + android:fromExtendBottom="0" + android:toExtendLeft="0" + android:toExtendTop="0" + android:toExtendRight="10%" + android:toExtendBottom="0" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:startOffset="0" + android:duration="450" /> +</set> diff --git a/core/res/res/anim-ldrtl/activity_open_enter.xml b/core/res/res/anim-ldrtl/activity_open_enter.xml new file mode 100644 index 000000000000..7b1829466884 --- /dev/null +++ b/core/res/res/anim-ldrtl/activity_open_enter.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?><!-- +/* +** Copyright 2022, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:shareInterpolator="false"> + + <alpha + android:fromAlpha="0" + android:toAlpha="1.0" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/linear" + android:startOffset="50" + android:duration="83" /> + + <translate + android:fromXDelta="-10%" + android:toXDelta="0" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:duration="450" /> + + <extend + android:fromExtendLeft="0" + android:fromExtendTop="0" + android:fromExtendRight="10%" + android:fromExtendBottom="0" + android:toExtendLeft="0" + android:toExtendTop="0" + android:toExtendRight="10%" + android:toExtendBottom="0" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:startOffset="0" + android:duration="450" /> +</set> diff --git a/core/res/res/anim-ldrtl/activity_open_exit.xml b/core/res/res/anim-ldrtl/activity_open_exit.xml new file mode 100644 index 000000000000..c29509ef1b2a --- /dev/null +++ b/core/res/res/anim-ldrtl/activity_open_exit.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?><!-- +/* +** Copyright 2022, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:shareInterpolator="false"> + + <alpha + android:fromAlpha="1.0" + android:toAlpha="1.0" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/standard_accelerate" + android:startOffset="0" + android:duration="450" /> + + <translate + android:fromXDelta="0" + android:toXDelta="10%" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:startOffset="0" + android:duration="450" /> + + <extend + android:fromExtendLeft="10%" + android:fromExtendTop="0" + android:fromExtendRight="0" + android:fromExtendBottom="0" + android:toExtendLeft="10%" + android:toExtendTop="0" + android:toExtendRight="0" + android:toExtendBottom="0" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:startOffset="0" + android:duration="450" /> +</set>
\ No newline at end of file diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 7f16cdcfc595..879fc9e6ceb7 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2931,6 +2931,11 @@ <!-- Apps that are authorized to access shared accounts, overridden by product overlays --> <string name="config_appsAuthorizedForSharedAccounts" translatable="false">;com.android.settings;</string> + <!-- Settings intelligence package name --> + <string name="config_settingsIntelligencePackageName" translatable="false"> + com.android.settings.intelligence + </string> + <!-- Flag indicating that the media framework should not allow changes or mute on any stream or global volumes. --> <bool name="config_useFixedVolume">false</bool> @@ -4130,9 +4135,9 @@ This service must be trusted, as it can be activated without explicit consent of the user. If no service with the specified name exists on the device, cloudsearch will be disabled. Example: "com.android.intelligence/.CloudSearchService" - config_defaultCloudSearchService is for the single provider case. + config_defaultCloudSearchServices is for the multiple provider case. --> - <string name="config_defaultCloudSearchService" translatable="false"></string> + <string-array name="config_defaultCloudSearchServices"></string-array> <!-- The package name for the system's translation service. This service must be trusted, as it can be activated without explicit consent of the user. @@ -5262,9 +5267,9 @@ <bool name="config_cecPowerStateChangeOnActiveSourceLost_userConfigurable">true</bool> <bool name="config_cecPowerStateChangeOnActiveSourceLostNone_allowed">true</bool> - <bool name="config_cecPowerStateChangeOnActiveSourceLostNone_default">true</bool> + <bool name="config_cecPowerStateChangeOnActiveSourceLostNone_default">false</bool> <bool name="config_cecPowerStateChangeOnActiveSourceLostStandbyNow_allowed">true</bool> - <bool name="config_cecPowerStateChangeOnActiveSourceLostStandbyNow_default">false</bool> + <bool name="config_cecPowerStateChangeOnActiveSourceLostStandbyNow_default">true</bool> <bool name="config_cecSystemAudioControl_userConfigurable">true</bool> <bool name="config_cecSystemAudioControlEnabled_allowed">true</bool> diff --git a/core/res/res/values/ids.xml b/core/res/res/values/ids.xml index 29eb0c0365b3..082acbe3443a 100644 --- a/core/res/res/values/ids.xml +++ b/core/res/res/values/ids.xml @@ -270,20 +270,8 @@ <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_DRAG_CANCEL}. --> <item type="id" name="accessibilityActionDragCancel" /> - <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SWIPE_LEFT}. --> - <item type="id" name="accessibilityActionSwipeLeft" /> - - <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SWIPE_RIGHT}. --> - <item type="id" name="accessibilityActionSwipeRight" /> - - <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SWIPE_UP}. --> - <item type="id" name="accessibilityActionSwipeUp" /> - - <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SWIPE_DOWN}. --> - <item type="id" name="accessibilityActionSwipeDown" /> - - <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SHOW_SUGGESTIONS}. --> - <item type="id" name="accessibilityActionShowSuggestions" /> + <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SHOW_TEXT_SUGGESTIONS}. --> + <item type="id" name="accessibilityActionShowTextSuggestions" /> <!-- View tag for remote views to store the index of the next child when adding nested remote views dynamically. --> <item type="id" name="remote_views_next_child" /> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 3467e1b40470..80664eb296af 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3211,8 +3211,6 @@ </staging-public-group-final> <public type="attr" name="shouldUseDefaultUnfoldTransition" id="0x0101064c" /> - <public type="attr" name="lineBreakStyle" id="0x0101064d" /> - <public type="attr" name="lineBreakWordStyle" id="0x0101064e" /> <staging-public-group-final type="id" first-id="0x01fe0000"> <public name="accessibilityActionDragStart" /> @@ -3281,14 +3279,16 @@ <public name="intro" /> <public name="enableOnBackInvokedCallback" /> <public name="supportsInlineSuggestionsWithTouchExploration" /> + <public name="lineBreakStyle" /> + <public name="lineBreakWordStyle" /> </staging-public-group> <staging-public-group type="id" first-id="0x01de0000"> - <public name="accessibilityActionSwipeLeft" /> - <public name="accessibilityActionSwipeRight" /> - <public name="accessibilityActionSwipeUp" /> - <public name="accessibilityActionSwipeDown" /> - <public name="accessibilityActionShowSuggestions" /> + <public name="removed_accessibilityActionSwipeLeft" /> + <public name="removed_accessibilityActionSwipeRight" /> + <public name="removed_accessibilityActionSwipeUp" /> + <public name="removed_accessibilityActionSwipeDown" /> + <public name="accessibilityActionShowTextSuggestions" /> <public name="inputExtractAction" /> <public name="inputExtractAccessories" /> </staging-public-group> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 34bd2fbad576..05ebef9bf56f 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -234,9 +234,9 @@ <!-- Displayed to tell the user that they should switch their network preference. --> <string name="NetworkPreferenceSwitchSummary">Try changing preferred network. Tap to change.</string> <!-- Displayed to tell the user that emergency calls might not be available. --> - <string name="EmergencyCallWarningTitle">Emergency calling unavailable</string> + <string name="EmergencyCallWarningTitle">Emergency calls may be unavailable</string> <!-- Displayed to tell the user that emergency calls might not be available. --> - <string name="EmergencyCallWarningSummary">Can\u2019t make emergency calls over Wi\u2011Fi</string> + <string name="EmergencyCallWarningSummary"><xliff:g id="spn" example="Operator">%s</xliff:g> doesn\'t support emergency calls over Wi-Fi. Tap for details.</string> <!-- Telephony notification channel name for a channel containing network alert notifications. --> <string name="notification_channel_network_alert">Alerts</string> @@ -4095,10 +4095,20 @@ <!-- Description of an application permission that lets it query all other packages. [CHAR LIMIT=NONE] --> <string name="permdesc_queryAllPackages">Allows an app to see all installed packages.</string> - <!-- Title of an application permission that lets it access SupplementalApis. [CHAR LIMIT=NONE] --> - <string name="permlab_accessSupplementalApi">access SupplementalApis</string> - <!-- Description of an application permission that lets it access SupplementalApis. [CHAR LIMIT=NONE]--> - <string name="permdesc_accessSupplementalApi">Allows an application to access SupplementalApis.</string> + <!-- Title of an application permission that lets it access AdServices Topics API. [CHAR LIMIT=NONE] --> + <string name="permlab_accessAdServicesTopics">access AdServices Topics API</string> + <!-- Description of an application permission that lets it access AdServices Topics API. [CHAR LIMIT=NONE]--> + <string name="permdesc_accessAdServicesTopics">Allows an application to access AdServices Topics API.</string> + + <!-- Title of an application permission that lets it access AdServices Attribution APIs. [CHAR LIMIT=NONE] --> + <string name="permlab_accessAdServicesAttribution">access AdServices Attribution APIs</string> + <!-- Description of an application permission that lets it access AdServices Attribution APIs. [CHAR LIMIT=NONE]--> + <string name="permdesc_accessAdServicesAttribution">Allows an application to access AdServices Attribution APIs.</string> + + <!-- Title of an application permission that lets it access AdServices Custom Audiences API. [CHAR LIMIT=NONE] --> + <string name="permlab_accessAdServicesCustomAudiences">access AdServices Custom Audiences API</string> + <!-- Description of an application permission that lets it access AdServices Custom Audiences API. [CHAR LIMIT=NONE]--> + <string name="permdesc_accessAdServicesCustomAudiences">Allows an application to access AdServices Custom Audiences API.</string> <!-- Shown in the tutorial for tap twice for zoom control. --> <string name="tutorial_double_tap_to_zoom_message_short">Tap twice for zoom control</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index df3cbf34c8f0..2e1c6c2afc78 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3677,7 +3677,7 @@ <java-symbol type="string" name="notification_channel_network_status" /> <java-symbol type="string" name="notification_channel_network_alerts" /> <java-symbol type="string" name="notification_channel_network_available" /> - <java-symbol type="string" name="config_defaultCloudSearchService" /> + <java-symbol type="array" name="config_defaultCloudSearchServices" /> <java-symbol type="string" name="notification_channel_vpn" /> <java-symbol type="string" name="notification_channel_device_admin" /> <java-symbol type="string" name="notification_channel_alerts" /> diff --git a/core/tests/coretests/res/raw/obb_enc_file100_orig1.obb b/core/tests/coretests/res/raw/obb_enc_file100_orig1.obb Binary files differdeleted file mode 100644 index 373b8e4bd01f..000000000000 --- a/core/tests/coretests/res/raw/obb_enc_file100_orig1.obb +++ /dev/null diff --git a/core/tests/coretests/res/raw/obb_enc_file100_orig3.obb b/core/tests/coretests/res/raw/obb_enc_file100_orig3.obb Binary files differdeleted file mode 100644 index aa531d8b35bd..000000000000 --- a/core/tests/coretests/res/raw/obb_enc_file100_orig3.obb +++ /dev/null diff --git a/core/tests/coretests/src/android/os/IpcDataCacheTest.java b/core/tests/coretests/src/android/os/IpcDataCacheTest.java new file mode 100644 index 000000000000..fa7d7214d289 --- /dev/null +++ b/core/tests/coretests/src/android/os/IpcDataCacheTest.java @@ -0,0 +1,312 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.os; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; + +import androidx.test.filters.SmallTest; + +import org.junit.After; +import org.junit.Test; + +/** + * Test for verifying the behavior of {@link IpcDataCache}. This test does + * not use any actual binder calls - it is entirely self-contained. This test also relies + * on the test mode of {@link IpcDataCache} because Android SELinux rules do + * not grant test processes the permission to set system properties. + * <p> + * Build/Install/Run: + * atest FrameworksCoreTests:IpcDataCacheTest + */ +@SmallTest +public class IpcDataCacheTest { + + // Configuration for creating caches + private static final String MODULE = IpcDataCache.MODULE_TEST; + private static final String API = "testApi"; + + // This class is a proxy for binder calls. It contains a counter that increments + // every time the class is queried. + private static class ServerProxy { + // The number of times this class was queried. + private int mCount = 0; + + // A single query. The key behavior is that the query count is incremented. + boolean query(int x) { + mCount++; + return value(x); + } + + // Return the expected value of an input, without incrementing the query count. + boolean value(int x) { + return x % 3 == 0; + } + + // Verify the count. + void verify(int x) { + assertEquals(x, mCount); + } + } + + // The functions for querying the server. + private static class ServerQuery + extends IpcDataCache.QueryHandler<Integer, Boolean> { + private final ServerProxy mServer; + + ServerQuery(ServerProxy server) { + mServer = server; + } + + @Override + public Boolean apply(Integer x) { + return mServer.query(x); + } + @Override + public boolean shouldBypassCache(Integer x) { + return x % 13 == 0; + } + } + + // Clear the test mode after every test, in case this process is used for other + // tests. This also resets the test property map. + @After + public void tearDown() throws Exception { + IpcDataCache.setTestMode(false); + } + + // This test is disabled pending an sepolicy change that allows any app to set the + // test property. + @Test + public void testBasicCache() { + + // A stand-in for the binder. The test verifies that calls are passed through to + // this class properly. + ServerProxy tester = new ServerProxy(); + + // Create a cache that uses simple arithmetic to computer its values. + IpcDataCache<Integer, Boolean> testCache = + new IpcDataCache<>(4, MODULE, API, "testCache1", + new ServerQuery(tester)); + + IpcDataCache.setTestMode(true); + testCache.testPropertyName(); + + tester.verify(0); + assertEquals(tester.value(3), testCache.query(3)); + tester.verify(1); + assertEquals(tester.value(3), testCache.query(3)); + tester.verify(2); + testCache.invalidateCache(); + assertEquals(tester.value(3), testCache.query(3)); + tester.verify(3); + assertEquals(tester.value(5), testCache.query(5)); + tester.verify(4); + assertEquals(tester.value(5), testCache.query(5)); + tester.verify(4); + assertEquals(tester.value(3), testCache.query(3)); + tester.verify(4); + + // Invalidate the cache, and verify that the next read on 3 goes to the server. + testCache.invalidateCache(); + assertEquals(tester.value(3), testCache.query(3)); + tester.verify(5); + + // Test bypass. The query for 13 always bypasses the cache. + assertEquals(tester.value(12), testCache.query(12)); + assertEquals(tester.value(13), testCache.query(13)); + assertEquals(tester.value(14), testCache.query(14)); + tester.verify(8); + assertEquals(tester.value(12), testCache.query(12)); + assertEquals(tester.value(13), testCache.query(13)); + assertEquals(tester.value(14), testCache.query(14)); + tester.verify(9); + } + + @Test + public void testDisableCache() { + + // A stand-in for the binder. The test verifies that calls are passed through to + // this class properly. + ServerProxy tester = new ServerProxy(); + + // Three caches, all using the same system property but one uses a different name. + IpcDataCache<Integer, Boolean> cache1 = + new IpcDataCache<>(4, MODULE, API, "cacheA", + new ServerQuery(tester)); + IpcDataCache<Integer, Boolean> cache2 = + new IpcDataCache<>(4, MODULE, API, "cacheA", + new ServerQuery(tester)); + IpcDataCache<Integer, Boolean> cache3 = + new IpcDataCache<>(4, MODULE, API, "cacheB", + new ServerQuery(tester)); + + // Caches are enabled upon creation. + assertEquals(false, cache1.getDisabledState()); + assertEquals(false, cache2.getDisabledState()); + assertEquals(false, cache3.getDisabledState()); + + // Disable the cache1 instance. Only cache1 is disabled + cache1.disableInstance(); + assertEquals(true, cache1.getDisabledState()); + assertEquals(false, cache2.getDisabledState()); + assertEquals(false, cache3.getDisabledState()); + + // Disable cache1. This will disable cache1 and cache2 because they share the + // same name. cache3 has a different name and will not be disabled. + cache1.disableForCurrentProcess(); + assertEquals(true, cache1.getDisabledState()); + assertEquals(true, cache2.getDisabledState()); + assertEquals(false, cache3.getDisabledState()); + + // Create a new cache1. Verify that the new instance is disabled. + cache1 = new IpcDataCache<>(4, MODULE, API, "cacheA", + new ServerQuery(tester)); + assertEquals(true, cache1.getDisabledState()); + + // Remove the record of caches being locally disabled. This is a clean-up step. + cache1.forgetDisableLocal(); + assertEquals(true, cache1.getDisabledState()); + assertEquals(true, cache2.getDisabledState()); + assertEquals(false, cache3.getDisabledState()); + + // Create a new cache1. Verify that the new instance is not disabled. + cache1 = new IpcDataCache<>(4, MODULE, API, "cacheA", + new ServerQuery(tester)); + assertEquals(false, cache1.getDisabledState()); + } + + private static class TestQuery + extends IpcDataCache.QueryHandler<Integer, String> { + + private int mRecomputeCount = 0; + + @Override + public String apply(Integer qv) { + mRecomputeCount += 1; + return "foo" + qv.toString(); + } + + int getRecomputeCount() { + return mRecomputeCount; + } + } + + private static class TestCache extends IpcDataCache<Integer, String> { + private final TestQuery mQuery; + + TestCache() { + this(MODULE, API); + } + + TestCache(String module, String api) { + this(module, api, new TestQuery()); + } + + TestCache(String module, String api, TestQuery query) { + super(4, module, api, "testCache7", query); + mQuery = query; + setTestMode(true); + testPropertyName(); + } + + int getRecomputeCount() { + return mQuery.getRecomputeCount(); + } + } + + @Test + public void testCacheRecompute() { + TestCache cache = new TestCache(); + cache.invalidateCache(); + assertEquals(cache.isDisabled(), false); + assertEquals("foo5", cache.query(5)); + assertEquals(1, cache.getRecomputeCount()); + assertEquals("foo5", cache.query(5)); + assertEquals(1, cache.getRecomputeCount()); + assertEquals("foo6", cache.query(6)); + assertEquals(2, cache.getRecomputeCount()); + cache.invalidateCache(); + assertEquals("foo5", cache.query(5)); + assertEquals("foo5", cache.query(5)); + assertEquals(3, cache.getRecomputeCount()); + // Invalidate the cache with a direct call to the property. + IpcDataCache.invalidateCache(MODULE, API); + assertEquals("foo5", cache.query(5)); + assertEquals("foo5", cache.query(5)); + assertEquals(4, cache.getRecomputeCount()); + } + + @Test + public void testCacheInitialState() { + TestCache cache = new TestCache(); + assertEquals("foo5", cache.query(5)); + assertEquals("foo5", cache.query(5)); + assertEquals(2, cache.getRecomputeCount()); + cache.invalidateCache(); + assertEquals("foo5", cache.query(5)); + assertEquals("foo5", cache.query(5)); + assertEquals(3, cache.getRecomputeCount()); + } + + @Test + public void testCachePropertyUnset() { + final String UNSET_API = "otherApi"; + TestCache cache = new TestCache(MODULE, UNSET_API); + assertEquals("foo5", cache.query(5)); + assertEquals("foo5", cache.query(5)); + assertEquals(2, cache.getRecomputeCount()); + } + + @Test + public void testCacheDisableState() { + TestCache cache = new TestCache(); + assertEquals("foo5", cache.query(5)); + assertEquals("foo5", cache.query(5)); + assertEquals(2, cache.getRecomputeCount()); + cache.invalidateCache(); + assertEquals("foo5", cache.query(5)); + assertEquals("foo5", cache.query(5)); + assertEquals(3, cache.getRecomputeCount()); + cache.disableSystemWide(); + assertEquals("foo5", cache.query(5)); + assertEquals("foo5", cache.query(5)); + assertEquals(5, cache.getRecomputeCount()); + cache.invalidateCache(); // Should not reenable + assertEquals("foo5", cache.query(5)); + assertEquals("foo5", cache.query(5)); + assertEquals(7, cache.getRecomputeCount()); + } + + @Test + public void testLocalProcessDisable() { + TestCache cache = new TestCache(); + assertEquals(cache.isDisabled(), false); + cache.invalidateCache(); + assertEquals("foo5", cache.query(5)); + assertEquals(1, cache.getRecomputeCount()); + assertEquals("foo5", cache.query(5)); + assertEquals(1, cache.getRecomputeCount()); + assertEquals(cache.isDisabled(), false); + cache.disableForCurrentProcess(); + assertEquals(cache.isDisabled(), true); + assertEquals("foo5", cache.query(5)); + assertEquals("foo5", cache.query(5)); + assertEquals(3, cache.getRecomputeCount()); + } +} diff --git a/core/tests/coretests/src/android/os/storage/StorageManagerBaseTest.java b/core/tests/coretests/src/android/os/storage/StorageManagerBaseTest.java index e6660f32f817..d01d29bda3d6 100644 --- a/core/tests/coretests/src/android/os/storage/StorageManagerBaseTest.java +++ b/core/tests/coretests/src/android/os/storage/StorageManagerBaseTest.java @@ -55,11 +55,7 @@ public class StorageManagerBaseTest extends InstrumentationTestCase { protected static String OBB_FILE_1_CONTENTS_1 = "OneToOneThousandInts.bin"; protected static String OBB_FILE_2 = "obb_file2.obb"; protected static String OBB_FILE_3 = "obb_file3.obb"; - protected static String OBB_FILE_1_PASSWORD = "password1"; - protected static String OBB_FILE_1_ENCRYPTED = "obb_enc_file100_orig1.obb"; protected static String OBB_FILE_2_UNSIGNED = "obb_file2_nosign.obb"; - protected static String OBB_FILE_3_PASSWORD = "password3"; - protected static String OBB_FILE_3_ENCRYPTED = "obb_enc_file100_orig3.obb"; protected static String OBB_FILE_3_BAD_PACKAGENAME = "obb_file3_bad_packagename.obb"; protected static boolean FORCE = true; @@ -227,22 +223,21 @@ public class StorageManagerBaseTest extends InstrumentationTestCase { * Mounts an OBB file * * @param obbFilePath The full path to the OBB file to mount - * @param key (optional) The key to use to unencrypt the OBB; pass null for no encryption * @param expectedState The expected state resulting from trying to mount the OBB * @return A {@link String} representing the normalized path to OBB file that was mounted */ - protected String mountObb(String obbFilePath, String key, int expectedState) { - return doMountObb(obbFilePath, key, expectedState); + protected String mountObb(String obbFilePath, int expectedState) { + return doMountObb(obbFilePath, expectedState); } /** - * Mounts an OBB file with default options (no encryption, mounting succeeds) + * Mounts an OBB file with default options. * * @param obbFilePath The full path to the OBB file to mount * @return A {@link String} representing the normalized path to OBB file that was mounted */ protected String mountObb(String obbFilePath) { - return doMountObb(obbFilePath, null, OnObbStateChangeListener.MOUNTED); + return doMountObb(obbFilePath, OnObbStateChangeListener.MOUNTED); } /** @@ -279,13 +274,13 @@ public class StorageManagerBaseTest extends InstrumentationTestCase { * @return true if the listener was signaled of a state change by the system; else a fail() * is triggered if we timed out */ - protected String doMountObb_noThrow(String obbFilePath, String key, int expectedState) { - Log.i(LOG_TAG, "doMountObb() on " + obbFilePath + " using key: " + key); + protected String doMountObb_noThrow(String obbFilePath, int expectedState) { + Log.i(LOG_TAG, "doMountObb() on " + obbFilePath); assertTrue ("Null path was passed in for OBB file!", obbFilePath != null); assertTrue ("Null path was passed in for OBB file!", obbFilePath != null); ObbListener obbListener = new ObbListener(); - boolean success = mSm.mountObb(obbFilePath, key, obbListener); + boolean success = mSm.mountObb(obbFilePath, null, obbListener); success &= obbFilePath.equals(doWaitForObbStateChange(obbListener)); success &= (expectedState == obbListener.state()); @@ -307,17 +302,16 @@ public class StorageManagerBaseTest extends InstrumentationTestCase { * Mounts an OBB file without throwing and synchronously waits for it to finish mounting * * @param obbFilePath The full path to the OBB file to mount - * @param key (optional) The key to use to unencrypt the OBB; pass null for no encryption * @param expectedState The expected state resulting from trying to mount the OBB * @return A {@link String} representing the actual normalized path to OBB file that was * mounted, or null if the mounting failed */ - protected String doMountObb(String obbFilePath, String key, int expectedState) { - Log.i(LOG_TAG, "doMountObb() on " + obbFilePath + " using key: " + key); + protected String doMountObb(String obbFilePath, int expectedState) { + Log.i(LOG_TAG, "doMountObb() on " + obbFilePath); assertTrue ("Null path was passed in for OBB file!", obbFilePath != null); ObbListener obbListener = new ObbListener(); - assertTrue("mountObb call failed", mSm.mountObb(obbFilePath, key, obbListener)); + assertTrue("mountObb call failed", mSm.mountObb(obbFilePath, null, obbListener)); assertTrue("Failed to get OBB mount status change for file: " + obbFilePath, doWaitForObbStateChange(obbListener)); assertEquals("OBB mount state not what was expected!", expectedState, diff --git a/core/tests/coretests/src/android/os/storage/StorageManagerIntegrationTest.java b/core/tests/coretests/src/android/os/storage/StorageManagerIntegrationTest.java index 62f2ac28a601..ecd2f76a5160 100644 --- a/core/tests/coretests/src/android/os/storage/StorageManagerIntegrationTest.java +++ b/core/tests/coretests/src/android/os/storage/StorageManagerIntegrationTest.java @@ -83,58 +83,6 @@ public class StorageManagerIntegrationTest extends StorageManagerBaseTest { } /** - * Tests mounting a single encrypted OBB file and verifies its contents. - */ - @LargeTest - public void testMountSingleEncryptedObb() throws Exception { - final File file = createObbFile(OBB_FILE_3_ENCRYPTED, R.raw.obb_enc_file100_orig3); - String filePath = file.getAbsolutePath(); - mountObb(filePath, OBB_FILE_3_PASSWORD, OnObbStateChangeListener.MOUNTED); - verifyObb3Contents(filePath); - unmountObb(filePath, DONT_FORCE); - } - - /** - * Tests mounting a single encrypted OBB file using an invalid password. - */ - @LargeTest - public void testMountSingleEncryptedObbInvalidPassword() throws Exception { - final File file = createObbFile("bad password@$%#@^*(!&)", R.raw.obb_enc_file100_orig3); - String filePath = file.getAbsolutePath(); - mountObb(filePath, OBB_FILE_1_PASSWORD, OnObbStateChangeListener.ERROR_COULD_NOT_MOUNT); - } - - /** - * Tests simultaneously mounting 2 encrypted OBBs with different keys and verifies contents. - */ - @LargeTest - public void testMountTwoEncryptedObb() throws Exception { - File file3 = null; - File file1 = null; - try { - file3 = createObbFile(OBB_FILE_3_ENCRYPTED, R.raw.obb_enc_file100_orig3); - String filePath3 = file3.getAbsolutePath(); - mountObb(filePath3, OBB_FILE_3_PASSWORD, OnObbStateChangeListener.MOUNTED); - verifyObb3Contents(filePath3); - - file1 = createObbFile(OBB_FILE_1_ENCRYPTED, R.raw.obb_enc_file100_orig1); - String filePath1 = file1.getAbsolutePath(); - mountObb(filePath1, OBB_FILE_1_PASSWORD, OnObbStateChangeListener.MOUNTED); - verifyObb1Contents(filePath1); - - unmountObb(filePath3, DONT_FORCE); - unmountObb(filePath1, DONT_FORCE); - } finally { - if (file3 != null) { - file3.delete(); - } - if (file1 != null) { - file1.delete(); - } - } - } - - /** * Tests mounting a single OBB that isn't signed. */ @LargeTest @@ -142,7 +90,7 @@ public class StorageManagerIntegrationTest extends StorageManagerBaseTest { final File file = createObbFile(OBB_FILE_2_UNSIGNED, R.raw.obb_file2_nosign); String filePath = file.getAbsolutePath(); try { - mountObb(filePath, OBB_FILE_2_UNSIGNED, OnObbStateChangeListener.ERROR_INTERNAL); + mountObb(filePath, OnObbStateChangeListener.ERROR_INTERNAL); fail("mountObb should've failed with an exception"); } catch (IllegalArgumentException e) { // Expected @@ -156,8 +104,7 @@ public class StorageManagerIntegrationTest extends StorageManagerBaseTest { public void testMountBadPackageNameObb() throws Exception { final File file = createObbFile(OBB_FILE_3_BAD_PACKAGENAME, R.raw.obb_file3_bad_packagename); String filePath = file.getAbsolutePath(); - mountObb(filePath, OBB_FILE_3_BAD_PACKAGENAME, - OnObbStateChangeListener.ERROR_PERMISSION_DENIED); + mountObb(filePath, OnObbStateChangeListener.ERROR_PERMISSION_DENIED); } /** @@ -169,7 +116,7 @@ public class StorageManagerIntegrationTest extends StorageManagerBaseTest { String filePath = file.getAbsolutePath(); mountObb(filePath); verifyObb1Contents(filePath); - mountObb(filePath, null, OnObbStateChangeListener.ERROR_ALREADY_MOUNTED); + mountObb(filePath, OnObbStateChangeListener.ERROR_ALREADY_MOUNTED); verifyObb1Contents(filePath); unmountObb(filePath, DONT_FORCE); } diff --git a/core/tests/coretests/src/android/view/MotionEventTest.java b/core/tests/coretests/src/android/view/MotionEventTest.java index 78a8f7b3f32e..c4c983d24af9 100644 --- a/core/tests/coretests/src/android/view/MotionEventTest.java +++ b/core/tests/coretests/src/android/view/MotionEventTest.java @@ -16,6 +16,7 @@ package android.view; +import static android.view.InputDevice.SOURCE_CLASS_POINTER; import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_POINTER_DOWN; import static android.view.MotionEvent.TOOL_TYPE_FINGER; @@ -214,4 +215,27 @@ public class MotionEventTest { rotInvalid.transform(mat); assertEquals(-1, rotInvalid.getSurfaceRotation()); } + + @Test + public void testUsesPointerSourceByDefault() { + final MotionEvent event = MotionEvent.obtain(0 /* downTime */, 0 /* eventTime */, + ACTION_DOWN, 0 /* x */, 0 /* y */, 0 /* metaState */); + assertTrue(event.isFromSource(SOURCE_CLASS_POINTER)); + } + + @Test + public void testLocationOffsetOnlyAppliedToNonPointerSources() { + final MotionEvent event = MotionEvent.obtain(0 /* downTime */, 0 /* eventTime */, + ACTION_DOWN, 10 /* x */, 20 /* y */, 0 /* metaState */); + event.offsetLocation(40, 50); + + // The offset should be applied since a pointer source is used by default. + assertEquals(50, (int) event.getX()); + assertEquals(70, (int) event.getY()); + + // The offset should not be applied if the source is changed to a non-pointer source. + event.setSource(InputDevice.SOURCE_JOYSTICK); + assertEquals(10, (int) event.getX()); + assertEquals(20, (int) event.getY()); + } } diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java index 2817728fd9ea..e7a23f262753 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java @@ -39,6 +39,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import static org.testng.Assert.assertFalse; +import static org.testng.Assert.fail; import android.content.Intent; import android.content.pm.ResolveInfo; @@ -52,6 +53,7 @@ import android.widget.TextView; import androidx.test.InstrumentationRegistry; import androidx.test.espresso.Espresso; +import androidx.test.espresso.NoMatchingViewException; import androidx.test.rule.ActivityTestRule; import androidx.test.runner.AndroidJUnit4; @@ -750,6 +752,34 @@ public class ResolverActivityTest { } @Test + public void testMiniResolver_noCurrentProfileTarget() { + ResolverActivity.ENABLE_TABBED_VIEW = true; + markWorkProfileUserAvailable(); + List<ResolvedComponentInfo> personalResolvedComponentInfos = + createResolvedComponentsForTest(0); + List<ResolvedComponentInfo> workResolvedComponentInfos = + createResolvedComponentsForTest(1); + setupResolverControllers(personalResolvedComponentInfos, workResolvedComponentInfos); + Intent sendIntent = createSendImageIntent(); + sendIntent.setType("TestType"); + + mActivityRule.launchActivity(sendIntent); + waitForIdle(); + + // Need to ensure mini resolver doesn't trigger here. + assertNotMiniResolver(); + } + + private void assertNotMiniResolver() { + try { + onView(withId(R.id.open_cross_profile)).check(matches(isDisplayed())); + } catch (NoMatchingViewException e) { + return; + } + fail("Mini resolver present but shouldn't be"); + } + + @Test public void testWorkTab_noAppsAvailable_workOff_noAppsAvailableEmptyStateShown() { // enable the work tab feature flag ResolverActivity.ENABLE_TABBED_VIEW = true; diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 3c64cf55eb50..deffa3a6fea6 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -237,27 +237,6 @@ applications that come with the platform <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/> </privapp-permissions> - <privapp-permissions package="com.android.providers.media.module"> - <permission name="android.permission.INTERACT_ACROSS_USERS"/> - <permission name="android.permission.MANAGE_USERS"/> - <permission name="android.permission.USE_RESERVED_DISK"/> - <permission name="android.permission.WRITE_MEDIA_STORAGE"/> - <permission name="android.permission.MANAGE_EXTERNAL_STORAGE"/> - <permission name="android.permission.WATCH_APPOPS"/> - <permission name="android.permission.UPDATE_APP_OPS_STATS"/> - <permission name="android.permission.UPDATE_DEVICE_STATS"/> - <!-- Permissions required for reading and logging compat changes --> - <permission name="android.permission.LOG_COMPAT_CHANGE" /> - <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG" /> - <permission name="android.permission.REGISTER_STATS_PULL_ATOM" /> - <!-- Permissions required for reading DeviceConfig --> - <permission name="android.permission.READ_DEVICE_CONFIG" /> - <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/> - <permission name="android.permission.MODIFY_QUIET_MODE"/> - <!-- Permissions required to check if an app is in the foreground or not during IO --> - <permission name="android.permission.PACKAGE_USAGE_STATS"/> - </privapp-permissions> - <privapp-permissions package="com.android.providers.telephony"> <permission name="android.permission.INTERACT_ACROSS_USERS"/> <permission name="android.permission.MODIFY_PHONE_STATE"/> diff --git a/graphics/java/android/graphics/RuntimeShader.java b/graphics/java/android/graphics/RuntimeShader.java index 2ff888b06dd8..6abe34b1d675 100644 --- a/graphics/java/android/graphics/RuntimeShader.java +++ b/graphics/java/android/graphics/RuntimeShader.java @@ -19,12 +19,228 @@ package android.graphics; import android.annotation.ColorInt; import android.annotation.ColorLong; import android.annotation.NonNull; +import android.view.Window; import libcore.util.NativeAllocationRegistry; /** - * Shader that calculates per-pixel color via a user defined Android Graphics Shading Language - * (AGSL) function. + * <p>A {@link RuntimeShader} calculates a per-pixel color based on the output of a user defined + * Android Graphics Shading Language (AGSL) function.</p> + * + * <h3>Android Graphics Shading Language</h3> + * <p>The AGSL syntax is very similar to OpenGL ES Shading Language, but there are some important + * differences that are highlighted here. Most of these differences are summed up in one basic fact: + * <b>With GPU shading languages, you are programming a stage of the GPU pipeline. With AGSL, you + * are programming a stage of the {@link Canvas} or {@link RenderNode} drawing pipeline.</b></p> + * + * <p>In particular, a GLSL fragment shader controls the entire behavior of the GPU between the + * rasterizer and the blending hardware. That shader does all of the work to compute a color, and + * the color it generates is exactly what is fed to the blending stage of the pipeline.</p> + * + * <p>In contrast, AGSL functions exist as part of a larger pipeline. When you issue a + * {@link Canvas} drawing operation, Android (generally) assembles a single GPU fragment shader to + * do all of the required work. This shader typically includes several pieces. For example, it might + * include:</p> + * <ul> + * <li>Evaluating whether a pixel falls inside or outside of the shape being drawn (or on the + * border, where it might apply antialiasing).</li> + * <li>Evaluating whether a pixel falls inside or outside of the clipping region (again, with + * possible antialiasing logic for border pixels).</li> + * <li>Logic for the {@link Shader}, {@link ColorFilter}, and {@link BlendMode} on the + * {@link Paint}.</li> + * <li>Color space conversion code, as part of Android’s color management.</li> + * </ul> + * + * <p>A {@link RuntimeShader}, like other {@link Shader} types, effectively contributes a function + * to the GPU’s fragment shader.</p> + * + * <h3>AGSL Shader Execution</h3> + * <p>Just like a GLSL shader, an AGSL shader begins execution in a main function. Unlike GLSL, the + * function receives as an input parameter the position of the pixel within the {@link Canvas} or + * {@link RenderNode} coordinate space (similar to gl_fragCoord) and returns the color to be shaded + * as a vec4 (similar to out vec4 color or gl_FragColor in GLSL).</p> + * + * <pre class="prettyprint"> + * vec4 main(vec2 canvas_coordinates); + * </pre> + * + * <p>AGSL and GLSL use different coordinate spaces by default. In GLSL, the fragment coordinate + * (fragCoord) is relative to the lower left. AGSL matches the screen coordinate system of the + * Android {@link Canvas} which has its origin as the upper left corner. This means that the + * coordinates provided as a parameter in the main function are local to the canvas with the + * exception of any {@link Shader#getLocalMatrix(Matrix)} transformations applied to this shader. + * Additionally, if the shader is invoked by another using {@link #setInputShader(String, Shader)}, + * then that parent shader may modify the input coordinates arbitrarily.</p> + * + * <h3>AGSL and Color Spaces</h3> + * <p>Android Graphics and by extension {@link RuntimeShader} are color managed. The working + * {@link ColorSpace} for an AGSL shader is defined to be the color space of the destination, which + * in most cases is determined by {@link Window#setColorMode(int)}.</p> + * + * <p>When authoring an AGSL shader, you won’t know what the working color space is. For many + * effects, this is fine because by default color inputs are automatically converted into the + * working color space. For certain effects, it may be important to do some math in a fixed, known + * color space. A common example is lighting – to get physically accurate lighting, math should be + * done in a linear color space. To help with this, AGSL provides two intrinsic functions that + * convert colors between the working color space and the + * {@link ColorSpace.Named#LINEAR_EXTENDED_SRGB} color space: + * + * <pre class="prettyprint"> + * vec3 toLinearSrgb(vec3 color); + * vec3 fromLinearSrgb(vec3 color);</pre> + * + * <h3>AGSL and Premultiplied Alpha</h3> + * <p>When dealing with transparent colors, there are two (common) possible representations: + * straight (unassociated) alpha and premultiplied (associated) alpha. In ASGL the color returned + * by the main function is expected to be premultiplied. AGSL’s use of premultiplied alpha + * implies: + * </p> + * + * <ul> + * <li>If your AGSL shader will return transparent colors, be sure to multiply the RGB by A. The + * resulting color should be [R*A, G*A, B*A, A], not [R, G, B, A].</li> + * <li>For more complex shaders, you must understand which of your colors are premultiplied vs. + * straight. Many operations don’t make sense if you mix both kinds of color together.</li> + * </ul> + * + * <h3>Uniforms</h3> + * <p>AGSL, like GLSL, exposes the concept of uniforms. An AGSL uniform is defined as a read-only, + * global variable that is accessible by the AGSL code and is initialized by a number of setter + * methods on {@link RuntimeShader}. AGSL exposes two primitive uniform data types (float, int) and + * two specialized types (colors, shaders) that are outlined below.</p> + * + * <h4>Primitive Uniforms</h4> + * <p>There are two primitive uniform types supported by AGSL, float and int. For these types and + * uniforms representing a grouping of these types, like arrays and matrices, there are + * corresponding {@link RuntimeShader} methods to initialize them. + * <table border="2" width="85%" align="center" cellpadding="5"> + * <thead> + * <tr><th>Java Type</th> <th>AGSL Type</th> <th>Method</th> </tr> + * </thead> + * + * <tbody> + * <tr> + * <td rowspan="4">Floats</td> + * <td>float</td> + * <td>{@link RuntimeShader#setFloatUniform(String, float)}</td> + * </tr> + * <tr> + * <td>vec2</td> + * <td>{@link RuntimeShader#setFloatUniform(String, float, float)}</td> + * </tr> + * <tr> + * <td>vec3</td> + * <td>{@link RuntimeShader#setFloatUniform(String, float, float, float)}</td> + * </tr> + * <tr> + * <td>vec4</td> + * <td>{@link RuntimeShader#setFloatUniform(String, float, float, float, float)}</td> + * </tr> + * <tr> + * <td rowspan="4">Integers</td> + * <td>int</td> + * <td>{@link RuntimeShader#setIntUniform(String, int)}</td> + * </tr> + * <tr> + * <td>ivec2</td> + * <td>{@link RuntimeShader#setIntUniform(String, int, int)}</td> + * </tr> + * <tr> + * <td>ivec3</td> + * <td>{@link RuntimeShader#setIntUniform(String, int, int, int)}</td> + * </tr> + * <tr> + * <td>ivec4</td> + * <td>{@link RuntimeShader#setIntUniform(String, int, int, int, int)}</td> + * </tr> + * <tr> + * <td rowspan="2">Matrices and Arrays</td> + * <td>mat2, mat3, and mat4, and float[]</td> + * <td>{@link RuntimeShader#setFloatUniform(String, float[])}</td> + * </tr> + * <tr> + * <td>int[]</td> + * <td>{@link RuntimeShader#setIntUniform(String, int[])}</td> + * </tr> + * </tbody> + * </table> + * + * For example, a simple AGSL shader making use of a float uniform to modulate the transparency + * of the output color would look like:</p> + * + * <pre class="prettyprint"> + * uniform float alpha; + * vec4 main(vec2 canvas_coordinates) { + * vec3 red = vec3(1.0, 0.0, 0.0); + * return vec4(red * alpha, alpha); + * }</pre> + * + * <p>After creating a {@link RuntimeShader} with that program the uniform can then be initialized + * and updated per frame by calling {@link RuntimeShader#setFloatUniform(String, float)} with the + * value of alpha. The value of a primitive uniform defaults to 0 if it is declared in the AGSL + * shader but not initialized.</p> + * + * <h4>Color Uniforms</h4> + * <p>AGSL doesn't know if uniform variables contain colors, it won't automatically convert them to + * the working colorspace of the shader at runtime. However, you can label your vec4 uniform with + * the "layout(color)" qualifier which lets Android know that the uniform will be used as a color. + * Doing so allows AGSL to transform the uniform value to the working color space. In AGSL, declare + * the uniform like this: + * + * <pre class="prettyprint"> + * layout(color) uniform vec4 inputColorA; + * layout(color) uniform vec4 inputColorB; + * vec4 main(vec2 canvas_coordinates) { + * // blend the two colors together and return the resulting color + * return mix(inputColorA, inputColorB, 0.5); + * }</pre> + * + * <p>After creating a {@link RuntimeShader} with that program the uniforms can + * then be initialized and updated per frame by calling + * {@link RuntimeShader#setColorUniform(String, int)}, + * {@link RuntimeShader#setColorUniform(String, long)}, or + * {@link RuntimeShader#setColorUniform(String, Color)} with the desired colors. The value of a + * color uniform is undefined if it is declared in the AGSL shader but not initialized.</p> + * + * <h4>Shader Uniforms</h4> + * In GLSL, a fragment shader can sample a texture. For AGSL instead of sampling textures you can + * sample from any {@link Shader}, which includes but is not limited to {@link BitmapShader}. To + * make it clear that you are operating on an {@link Shader} object there is no "sample" + * method. Instead, the shader uniform has an "eval()" method. This distinction enables AGSL shaders + * to sample from existing bitmap and gradient shaders as well as other {@link RuntimeShader} + * objects. In AGSL, declare the uniform like this: + * + * <pre class="prettyprint"> + * uniform shader myShader; + * vec4 main(vec2 canvas_coordinates) { + * // swap the red and blue color channels when sampling from myShader + * return myShader.sample(canvas_coordinates).bgra; + * }</pre> + * + * <p>After creating a {@link RuntimeShader} with that program the shader uniform can + * then be initialized and updated per frame by calling + * {@link RuntimeShader#setInputShader(String, Shader)} with the desired shader. The value of a + * shader uniform is undefined if it is declared in the AGSL shader but not initialized.</p> + * + * <p>Although most {@link BitmapShader}s contain colors that should be color managed, some contain + * data that isn’t actually colors. This includes bitmaps storing normals, material properties + * (e.g. roughness), heightmaps, or any other purely mathematical data that happens to be stored in + * a bitmap. When using these kinds of shaders in AGSL, you probably want to initialize them with + * {@link #setInputBuffer(String, BitmapShader)}. Shaders initialized this way work much like + * a regular {@link BitmapShader} (including filtering and tiling), with a few major differences: + * <ul> + * <li>No color space transformation is applied (the color space of the bitmap is ignored).</li> + * <li>Bitmaps that return false for {@link Bitmap#isPremultiplied()} are not automatically + * premultiplied.</li> + * </ul> + * + * <p>In addition, when sampling from a {@link BitmapShader} be aware that the shader does not use + * normalized coordinates (like a texture in GLSL). It uses (0, 0) in the upper-left corner, and + * (width, height) in the bottom-right corner. Normally, this is exactly what you want. If you’re + * evaluating the shader with coordinates based on the ones passed to your AGSL program, the scale + * is correct. However, if you want to adjust those coordinates (to do some kind of re-mapping of + * the bitmap), remember that the coordinates are local to the canvas.</p> + * */ public class RuntimeShader extends Shader { diff --git a/identity/java/android/security/identity/CredentialDataRequest.java b/identity/java/android/security/identity/CredentialDataRequest.java index 2a47a02405e0..3482384a1fd9 100644 --- a/identity/java/android/security/identity/CredentialDataRequest.java +++ b/identity/java/android/security/identity/CredentialDataRequest.java @@ -153,7 +153,15 @@ public class CredentialDataRequest { /** * Sets whether to allow using an authentication key which use count has been exceeded. * - * By default this is set to true. + * <p>This is useful in situations where the application hasn't had a chance to renew + * authentication keys, for example if the device hasn't been connected to the Internet or + * if the issuing authority server has been down. + * + * <p>The reason this could be useful is that the privacy risk of reusing an authentication + * key for a credential presentation could be significantly smaller compared to the + * inconvenience of not being able to present the credential at all. + * + * <p>By default this is set to true. * * @param allowUsingExhaustedKeys whether to allow using an authentication key which use * count has been exceeded if no other key is available. @@ -167,7 +175,16 @@ public class CredentialDataRequest { /** * Sets whether to allow using an authentication key which is expired. * - * By default this is set to false. + * <p>This is useful in situations where the application hasn't had a chance to renew + * authentication keys, for example if the device hasn't been connected to the Internet or + * if the issuing authority server has been down. + * + * <p>The reason this could be useful is that many verifiers are likely to accept a + * credential presentation using an expired authentication key (the credential itself + * wouldn't be expired) and it's likely better for the holder to be able to do this than + * not present their credential at all. + * + * <p>By default this is set to false. * * @param allowUsingExpiredKeys whether to allow using an authentication key which is * expired if no other key is available. @@ -181,7 +198,12 @@ public class CredentialDataRequest { /** * Sets whether to increment the use-count for the authentication key used. * - * By default this is set to true. + * <p>Not incrementing the use-count for an authentication key is useful in situations + * where the authentication key is known with certainty to not be leaked. For example, + * consider an application doing a credential presentation for the sole purpose of + * displaying the credential data to the user (not for verification). + * + * <p>By default this is set to true. * * @param incrementUseCount whether to increment the use count of the authentication * key used. diff --git a/identity/java/android/security/identity/PresentationSession.java b/identity/java/android/security/identity/PresentationSession.java index afaafce32798..6cde611fcd63 100644 --- a/identity/java/android/security/identity/PresentationSession.java +++ b/identity/java/android/security/identity/PresentationSession.java @@ -26,6 +26,9 @@ import java.security.PublicKey; /** * Class for presenting multiple documents to a remote verifier. * + * <p>This should be used for all interactions with a remote verifier instead of the now deprecated + * {@link IdentityCredential#getEntries(byte[], Map, byte[], byte[])} method. + * * Use {@link IdentityCredentialStore#createPresentationSession(int)} to create a {@link * PresentationSession} instance. */ diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java b/keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java index 358104fffbf6..e5d127609b2e 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java @@ -83,16 +83,10 @@ public class AndroidKeyStoreProvider extends Provider { // java.security.KeyPairGenerator put("KeyPairGenerator.EC", PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$EC"); put("KeyPairGenerator.RSA", PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$RSA"); - put("KeyPairGenerator." + X25519_ALIAS, - PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$RSA"); - put("KeyPairGenerator." + ED25519_OID, - PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$RSA"); // java.security.KeyFactory putKeyFactoryImpl("EC"); putKeyFactoryImpl("RSA"); - putKeyFactoryImpl(X25519_ALIAS); - putKeyFactoryImpl(ED25519_OID); // javax.crypto.KeyGenerator put("KeyGenerator.AES", PACKAGE_NAME + ".AndroidKeyStoreKeyGeneratorSpi$AES"); diff --git a/libs/WindowManager/Jetpack/src/androidx/window/common/CommonDisplayFeature.java b/libs/WindowManager/Jetpack/src/androidx/window/common/CommonFoldingFeature.java index eb9429747b66..1c49881904e4 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/common/CommonDisplayFeature.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/common/CommonFoldingFeature.java @@ -18,17 +18,73 @@ package androidx.window.common; import static androidx.window.util.ExtensionHelper.isZero; +import android.annotation.IntDef; import android.annotation.Nullable; import android.graphics.Rect; +import android.util.Log; import androidx.annotation.NonNull; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; -/** Wrapper for both Extension and Sidecar versions of DisplayFeature. */ -final class CommonDisplayFeature implements DisplayFeature { +/** A representation of a folding feature for both Extension and Sidecar. + * For Sidecar this is the same as combining {@link androidx.window.sidecar.SidecarDeviceState} and + * {@link androidx.window.sidecar.SidecarDisplayFeature}. For Extensions this is the mirror of + * {@link androidx.window.extensions.layout.FoldingFeature}. + */ +public final class CommonFoldingFeature { + + private static final boolean DEBUG = false; + + public static final String TAG = CommonFoldingFeature.class.getSimpleName(); + + /** + * A common type to represent a hinge where the screen is continuous. + */ + public static final int COMMON_TYPE_FOLD = 1; + + /** + * A common type to represent a hinge where there is a physical gap separating multiple + * displays. + */ + public static final int COMMON_TYPE_HINGE = 2; + + @IntDef({COMMON_TYPE_FOLD, COMMON_TYPE_HINGE}) + @Retention(RetentionPolicy.SOURCE) + public @interface Type { + } + + /** + * A common state to represent when the state is not known. One example is if the device is + * closed. We do not emit this value for developers but is useful for implementation reasons. + */ + public static final int COMMON_STATE_UNKNOWN = -1; + + /** + * A common state to represent a FLAT hinge. This is needed because the definitions in Sidecar + * and Extensions do not match exactly. + */ + public static final int COMMON_STATE_FLAT = 3; + /** + * A common state to represent a HALF_OPENED hinge. This is needed because the definitions in + * Sidecar and Extensions do not match exactly. + */ + public static final int COMMON_STATE_HALF_OPENED = 2; + + /** + * The possible states for a folding hinge. + */ + @IntDef({COMMON_STATE_UNKNOWN, COMMON_STATE_FLAT, COMMON_STATE_HALF_OPENED}) + @Retention(RetentionPolicy.SOURCE) + public @interface State { + } + private static final Pattern FEATURE_PATTERN = Pattern.compile("([a-z]+)-\\[(\\d+),(\\d+),(\\d+),(\\d+)]-?(flat|half-opened)?"); @@ -38,17 +94,49 @@ final class CommonDisplayFeature implements DisplayFeature { private static final String PATTERN_STATE_FLAT = "flat"; private static final String PATTERN_STATE_HALF_OPENED = "half-opened"; - // TODO(b/183049815): Support feature strings that include the state of the feature. + /** + * Parse a {@link List} of {@link CommonFoldingFeature} from a {@link String}. + * @param value a {@link String} representation of multiple {@link CommonFoldingFeature} + * separated by a ":". + * @param hingeState a global fallback value for a {@link CommonFoldingFeature} if one is not + * specified in the input. + * @throws IllegalArgumentException if the provided string is improperly formatted or could not + * otherwise be parsed. + * @see #FEATURE_PATTERN + * @return {@link List} of {@link CommonFoldingFeature}. + */ + static List<CommonFoldingFeature> parseListFromString(@NonNull String value, + @State int hingeState) { + List<CommonFoldingFeature> features = new ArrayList<>(); + String[] featureStrings = value.split(";"); + for (String featureString : featureStrings) { + CommonFoldingFeature feature; + try { + feature = CommonFoldingFeature.parseFromString(featureString, hingeState); + } catch (IllegalArgumentException e) { + if (DEBUG) { + Log.w(TAG, "Failed to parse display feature: " + featureString, e); + } + continue; + } + features.add(feature); + } + return features; + } /** * Parses a display feature from a string. * + * @param string A {@link String} representation of a {@link CommonFoldingFeature}. + * @param hingeState A fallback value for the {@link State} if it is not specified in the input. * @throws IllegalArgumentException if the provided string is improperly formatted or could not * otherwise be parsed. + * @return {@link CommonFoldingFeature} represented by the {@link String} value. * @see #FEATURE_PATTERN */ @NonNull - static CommonDisplayFeature parseFromString(@NonNull String string) { + private static CommonFoldingFeature parseFromString(@NonNull String string, + @State int hingeState) { Matcher featureMatcher = FEATURE_PATTERN.matcher(string); if (!featureMatcher.matches()) { throw new IllegalArgumentException("Malformed feature description format: " + string); @@ -59,10 +147,10 @@ final class CommonDisplayFeature implements DisplayFeature { int type; switch (featureType) { case FEATURE_TYPE_FOLD: - type = 1 /* TYPE_FOLD */; + type = COMMON_TYPE_FOLD; break; case FEATURE_TYPE_HINGE: - type = 2 /* TYPE_HINGE */; + type = COMMON_TYPE_HINGE; break; default: { throw new IllegalArgumentException("Malformed feature type: " + featureType); @@ -79,7 +167,7 @@ final class CommonDisplayFeature implements DisplayFeature { } String stateString = featureMatcher.group(6); stateString = stateString == null ? "" : stateString; - Integer state; + final int state; switch (stateString) { case PATTERN_STATE_FLAT: state = COMMON_STATE_FLAT; @@ -88,10 +176,10 @@ final class CommonDisplayFeature implements DisplayFeature { state = COMMON_STATE_HALF_OPENED; break; default: - state = null; + state = hingeState; break; } - return new CommonDisplayFeature(type, state, featureRect); + return new CommonFoldingFeature(type, state, featureRect); } catch (NumberFormatException e) { throw new IllegalArgumentException("Malformed feature description: " + string, e); } @@ -99,11 +187,11 @@ final class CommonDisplayFeature implements DisplayFeature { private final int mType; @Nullable - private final Integer mState; + private final int mState; @NonNull private final Rect mRect; - CommonDisplayFeature(int type, @Nullable Integer state, @NonNull Rect rect) { + CommonFoldingFeature(int type, int state, @NonNull Rect rect) { assertValidState(state); this.mType = type; this.mState = state; @@ -114,16 +202,19 @@ final class CommonDisplayFeature implements DisplayFeature { this.mRect = rect; } + /** Returns the type of the feature. */ + @Type public int getType() { return mType; } - /** Returns the state of the feature, or {@code null} if the feature has no state. */ - @Nullable - public Integer getState() { + /** Returns the state of the feature.*/ + @State + public int getState() { return mState; } + /** Returns the bounds of the feature. */ @NonNull public Rect getRect() { return mRect; @@ -133,7 +224,7 @@ final class CommonDisplayFeature implements DisplayFeature { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - CommonDisplayFeature that = (CommonDisplayFeature) o; + CommonFoldingFeature that = (CommonFoldingFeature) o; return mType == that.mType && Objects.equals(mState, that.mState) && mRect.equals(that.mRect); diff --git a/libs/WindowManager/Jetpack/src/androidx/window/common/DeviceStateManagerPostureProducer.java b/libs/WindowManager/Jetpack/src/androidx/window/common/DeviceStateManagerFoldingFeatureProducer.java index fa9a5a8b7a1b..6987401525b4 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/common/DeviceStateManagerPostureProducer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/common/DeviceStateManagerFoldingFeatureProducer.java @@ -18,11 +18,15 @@ package androidx.window.common; import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE; +import static androidx.window.common.CommonFoldingFeature.COMMON_STATE_UNKNOWN; +import static androidx.window.common.CommonFoldingFeature.parseListFromString; + import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; import android.hardware.devicestate.DeviceStateManager; import android.hardware.devicestate.DeviceStateManager.DeviceStateCallback; +import android.text.TextUtils; import android.util.Log; import android.util.SparseIntArray; @@ -30,6 +34,7 @@ import androidx.window.util.BaseDataProducer; import com.android.internal.R; +import java.util.List; import java.util.Optional; /** @@ -37,10 +42,13 @@ import java.util.Optional; * by mapping the state returned from {@link DeviceStateManager} to values provided in the resources * config at {@link R.array#config_device_state_postures}. */ -public final class DeviceStateManagerPostureProducer extends BaseDataProducer<Integer> { - private static final String TAG = "ConfigDevicePostureProducer"; +public final class DeviceStateManagerFoldingFeatureProducer extends + BaseDataProducer<List<CommonFoldingFeature>> { + private static final String TAG = + DeviceStateManagerFoldingFeatureProducer.class.getSimpleName(); private static final boolean DEBUG = false; + private final Context mContext; private final SparseIntArray mDeviceStateToPostureMap = new SparseIntArray(); private int mCurrentDeviceState = INVALID_DEVICE_STATE; @@ -50,7 +58,8 @@ public final class DeviceStateManagerPostureProducer extends BaseDataProducer<In notifyDataChanged(); }; - public DeviceStateManagerPostureProducer(@NonNull Context context) { + public DeviceStateManagerFoldingFeatureProducer(@NonNull Context context) { + mContext = context; String[] deviceStatePosturePairs = context.getResources() .getStringArray(R.array.config_device_state_postures); for (String deviceStatePosturePair : deviceStatePosturePairs) { @@ -86,8 +95,17 @@ public final class DeviceStateManagerPostureProducer extends BaseDataProducer<In @Override @Nullable - public Optional<Integer> getData() { - final int posture = mDeviceStateToPostureMap.get(mCurrentDeviceState, -1); - return posture != -1 ? Optional.of(posture) : Optional.empty(); + public Optional<List<CommonFoldingFeature>> getData() { + final int globalHingeState = globalHingeState(); + String displayFeaturesString = mContext.getResources().getString( + R.string.config_display_features); + if (TextUtils.isEmpty(displayFeaturesString)) { + return Optional.empty(); + } + return Optional.of(parseListFromString(displayFeaturesString, globalHingeState)); + } + + private int globalHingeState() { + return mDeviceStateToPostureMap.get(mCurrentDeviceState, COMMON_STATE_UNKNOWN); } } diff --git a/libs/WindowManager/Jetpack/src/androidx/window/common/DisplayFeature.java b/libs/WindowManager/Jetpack/src/androidx/window/common/DisplayFeature.java deleted file mode 100644 index 573641857b99..000000000000 --- a/libs/WindowManager/Jetpack/src/androidx/window/common/DisplayFeature.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.window.common; - -import android.annotation.IntDef; -import android.annotation.Nullable; -import android.graphics.Rect; - -import androidx.annotation.NonNull; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -/** Wrapper for both Extension and Sidecar versions of DisplayFeature. */ -public interface DisplayFeature { - /** Returns the type of the feature. */ - int getType(); - - /** Returns the state of the feature, or {@code null} if the feature has no state. */ - @Nullable - @State - Integer getState(); - - /** Returns the bounds of the feature. */ - @NonNull - Rect getRect(); - - /** - * A common state to represent a FLAT hinge. This is needed because the definitions in Sidecar - * and Extensions do not match exactly. - */ - int COMMON_STATE_FLAT = 3; - /** - * A common state to represent a HALF_OPENED hinge. This is needed because the definitions in - * Sidecar and Extensions do not match exactly. - */ - int COMMON_STATE_HALF_OPENED = 2; - - /** - * The possible states for a folding hinge. - */ - @IntDef({COMMON_STATE_FLAT, COMMON_STATE_HALF_OPENED}) - @Retention(RetentionPolicy.SOURCE) - @interface State {} - -} diff --git a/libs/WindowManager/Jetpack/src/androidx/window/common/EmptyLifecycleCallbacksAdapter.java b/libs/WindowManager/Jetpack/src/androidx/window/common/EmptyLifecycleCallbacksAdapter.java new file mode 100644 index 000000000000..d923a46c3b5d --- /dev/null +++ b/libs/WindowManager/Jetpack/src/androidx/window/common/EmptyLifecycleCallbacksAdapter.java @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package androidx.window.common; + +import android.app.Activity; +import android.app.Application; +import android.os.Bundle; + +/** + * An empty implementation of {@link Application.ActivityLifecycleCallbacks} derived classes can + * implement the methods necessary. + */ +public class EmptyLifecycleCallbacksAdapter implements Application.ActivityLifecycleCallbacks { + @Override + public void onActivityCreated(Activity activity, Bundle savedInstanceState) { + } + + @Override + public void onActivityStarted(Activity activity) { + } + + @Override + public void onActivityResumed(Activity activity) { + } + + @Override + public void onActivityPaused(Activity activity) { + } + + @Override + public void onActivityStopped(Activity activity) { + } + + @Override + public void onActivitySaveInstanceState(Activity activity, Bundle outState) { + } + + @Override + public void onActivityDestroyed(Activity activity) { + } +} diff --git a/libs/WindowManager/Jetpack/src/androidx/window/common/ResourceConfigDisplayFeatureProducer.java b/libs/WindowManager/Jetpack/src/androidx/window/common/ResourceConfigDisplayFeatureProducer.java deleted file mode 100644 index cd2cadc082e1..000000000000 --- a/libs/WindowManager/Jetpack/src/androidx/window/common/ResourceConfigDisplayFeatureProducer.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.window.common; - -import android.annotation.NonNull; -import android.annotation.Nullable; -import android.content.Context; -import android.text.TextUtils; -import android.util.Log; - -import androidx.window.util.BaseDataProducer; - -import com.android.internal.R; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -/** - * Implementation of {@link androidx.window.util.DataProducer} that produces - * {@link CommonDisplayFeature} parsed from a string stored in the resources config at - * {@link R.string#config_display_features}. - */ -public final class ResourceConfigDisplayFeatureProducer extends - BaseDataProducer<List<DisplayFeature>> { - private static final boolean DEBUG = false; - private static final String TAG = "ResourceConfigDisplayFeatureProducer"; - - private final Context mContext; - - public ResourceConfigDisplayFeatureProducer(@NonNull Context context) { - mContext = context; - } - - @Override - @Nullable - public Optional<List<DisplayFeature>> getData() { - String displayFeaturesString = mContext.getResources().getString( - R.string.config_display_features); - if (TextUtils.isEmpty(displayFeaturesString)) { - return Optional.empty(); - } - - List<DisplayFeature> features = new ArrayList<>(); - String[] featureStrings = displayFeaturesString.split(";"); - for (String featureString : featureStrings) { - CommonDisplayFeature feature; - try { - feature = CommonDisplayFeature.parseFromString(featureString); - } catch (IllegalArgumentException e) { - if (DEBUG) { - Log.w(TAG, "Failed to parse display feature: " + featureString, e); - } - continue; - } - features.add(feature); - } - return Optional.of(features); - } -} diff --git a/libs/WindowManager/Jetpack/src/androidx/window/common/SettingsDevicePostureProducer.java b/libs/WindowManager/Jetpack/src/androidx/window/common/SettingsDevicePostureProducer.java deleted file mode 100644 index 2026df3fa979..000000000000 --- a/libs/WindowManager/Jetpack/src/androidx/window/common/SettingsDevicePostureProducer.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.window.common; - -import android.annotation.NonNull; -import android.annotation.Nullable; -import android.content.ContentResolver; -import android.content.Context; -import android.database.ContentObserver; -import android.net.Uri; -import android.os.Handler; -import android.os.Looper; -import android.provider.Settings; - -import androidx.window.util.BaseDataProducer; - -import java.util.Optional; - -/** - * Implementation of {@link androidx.window.util.DataProducer} that provides the device posture - * as an {@link Integer} from a value stored in {@link Settings}. - */ -public final class SettingsDevicePostureProducer extends BaseDataProducer<Integer> { - private static final String DEVICE_POSTURE = "device_posture"; - - private final Uri mDevicePostureUri = - Settings.Global.getUriFor(DEVICE_POSTURE); - - private final ContentResolver mResolver; - private final ContentObserver mObserver; - private boolean mRegisteredObservers; - - public SettingsDevicePostureProducer(@NonNull Context context) { - mResolver = context.getContentResolver(); - mObserver = new SettingsObserver(); - } - - @Override - @Nullable - public Optional<Integer> getData() { - int posture = Settings.Global.getInt(mResolver, DEVICE_POSTURE, -1); - return posture == -1 ? Optional.empty() : Optional.of(posture); - } - - /** - * Registers settings observers, if needed. When settings observers are registered for this - * producer callbacks for changes in data will be triggered. - */ - public void registerObserversIfNeeded() { - if (mRegisteredObservers) { - return; - } - mRegisteredObservers = true; - mResolver.registerContentObserver(mDevicePostureUri, false /* notifyForDescendants */, - mObserver /* ContentObserver */); - } - - /** - * Unregisters settings observers, if needed. When settings observers are unregistered for this - * producer callbacks for changes in data will not be triggered. - */ - public void unregisterObserversIfNeeded() { - if (!mRegisteredObservers) { - return; - } - mRegisteredObservers = false; - mResolver.unregisterContentObserver(mObserver); - } - - private final class SettingsObserver extends ContentObserver { - SettingsObserver() { - super(new Handler(Looper.getMainLooper())); - } - - @Override - public void onChange(boolean selfChange, Uri uri) { - if (mDevicePostureUri.equals(uri)) { - notifyDataChanged(); - } - } - } -} diff --git a/libs/WindowManager/Jetpack/src/androidx/window/common/SettingsDisplayFeatureProducer.java b/libs/WindowManager/Jetpack/src/androidx/window/common/SettingsDisplayFeatureProducer.java index 040662657a74..e9d213e06fa9 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/common/SettingsDisplayFeatureProducer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/common/SettingsDisplayFeatureProducer.java @@ -16,8 +16,10 @@ package androidx.window.common; +import static androidx.window.common.CommonFoldingFeature.COMMON_STATE_UNKNOWN; +import static androidx.window.common.CommonFoldingFeature.parseListFromString; + import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.ContentResolver; import android.content.Context; import android.database.ContentObserver; @@ -26,22 +28,19 @@ import android.os.Handler; import android.os.Looper; import android.provider.Settings; import android.text.TextUtils; -import android.util.Log; import androidx.window.util.BaseDataProducer; -import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Optional; /** * Implementation of {@link androidx.window.util.DataProducer} that produces - * {@link CommonDisplayFeature} parsed from a string stored in {@link Settings}. + * {@link CommonFoldingFeature} parsed from a string stored in {@link Settings}. */ public final class SettingsDisplayFeatureProducer - extends BaseDataProducer<List<DisplayFeature>> { - private static final boolean DEBUG = false; - private static final String TAG = "SettingsDisplayFeatureProducer"; + extends BaseDataProducer<List<CommonFoldingFeature>> { private static final String DISPLAY_FEATURES = "display_features"; private final Uri mDisplayFeaturesUri = @@ -57,32 +56,17 @@ public final class SettingsDisplayFeatureProducer } @Override - @Nullable - public Optional<List<DisplayFeature>> getData() { + @NonNull + public Optional<List<CommonFoldingFeature>> getData() { String displayFeaturesString = Settings.Global.getString(mResolver, DISPLAY_FEATURES); if (displayFeaturesString == null) { return Optional.empty(); } - List<DisplayFeature> features = new ArrayList<>(); if (TextUtils.isEmpty(displayFeaturesString)) { - return Optional.of(features); - } - String[] featureStrings = displayFeaturesString.split(";"); - - for (String featureString : featureStrings) { - CommonDisplayFeature feature; - try { - feature = CommonDisplayFeature.parseFromString(featureString); - } catch (IllegalArgumentException e) { - if (DEBUG) { - Log.w(TAG, "Failed to parse display feature: " + featureString, e); - } - continue; - } - features.add(feature); + return Optional.of(Collections.emptyList()); } - return Optional.of(features); + return Optional.of(parseListFromString(displayFeaturesString, COMMON_STATE_UNKNOWN)); } /** diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java index 6d8383372461..1d2b9384f47d 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java @@ -28,7 +28,6 @@ import android.app.Activity; import android.app.ActivityClient; import android.app.ActivityOptions; import android.app.ActivityThread; -import android.app.Application.ActivityLifecycleCallbacks; import android.app.Instrumentation; import android.content.Context; import android.content.Intent; @@ -41,6 +40,8 @@ import android.os.Looper; import android.window.TaskFragmentInfo; import android.window.WindowContainerTransaction; +import androidx.window.common.EmptyLifecycleCallbacksAdapter; + import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -763,11 +764,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen return shouldRetainAssociatedContainer(finishingContainer, associatedContainer); } - private final class LifecycleCallbacks implements ActivityLifecycleCallbacks { - - @Override - public void onActivityCreated(Activity activity, Bundle savedInstanceState) { - } + private final class LifecycleCallbacks extends EmptyLifecycleCallbacksAdapter { @Override public void onActivityPostCreated(Activity activity, Bundle savedInstanceState) { @@ -779,30 +776,6 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } @Override - public void onActivityStarted(Activity activity) { - } - - @Override - public void onActivityResumed(Activity activity) { - } - - @Override - public void onActivityPaused(Activity activity) { - } - - @Override - public void onActivityStopped(Activity activity) { - } - - @Override - public void onActivitySaveInstanceState(Activity activity, Bundle outState) { - } - - @Override - public void onActivityDestroyed(Activity activity) { - } - - @Override public void onActivityConfigurationChanged(Activity activity) { SplitController.this.onActivityConfigurationChanged(activity); } diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java index fe9ce971d4d9..a4fbdbc493f5 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java @@ -18,28 +18,30 @@ package androidx.window.extensions.layout; import static android.view.Display.DEFAULT_DISPLAY; -import static androidx.window.common.DisplayFeature.COMMON_STATE_FLAT; -import static androidx.window.common.DisplayFeature.COMMON_STATE_HALF_OPENED; +import static androidx.window.common.CommonFoldingFeature.COMMON_STATE_FLAT; +import static androidx.window.common.CommonFoldingFeature.COMMON_STATE_HALF_OPENED; import static androidx.window.util.ExtensionHelper.rotateRectToDisplayRotation; import static androidx.window.util.ExtensionHelper.transformToWindowSpaceRect; import android.annotation.Nullable; import android.app.Activity; +import android.app.Application; import android.content.Context; import android.graphics.Rect; +import android.os.Bundle; +import android.os.IBinder; +import android.util.ArrayMap; import android.util.Log; import androidx.annotation.NonNull; -import androidx.window.common.DeviceStateManagerPostureProducer; -import androidx.window.common.DisplayFeature; -import androidx.window.common.ResourceConfigDisplayFeatureProducer; -import androidx.window.common.SettingsDevicePostureProducer; +import androidx.window.common.CommonFoldingFeature; +import androidx.window.common.DeviceStateManagerFoldingFeatureProducer; +import androidx.window.common.EmptyLifecycleCallbacksAdapter; import androidx.window.common.SettingsDisplayFeatureProducer; import androidx.window.util.DataProducer; import androidx.window.util.PriorityDataProducer; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; @@ -56,36 +58,27 @@ import java.util.function.Consumer; */ public class WindowLayoutComponentImpl implements WindowLayoutComponent { private static final String TAG = "SampleExtension"; - private static WindowLayoutComponent sInstance; private final Map<Activity, Consumer<WindowLayoutInfo>> mWindowLayoutChangeListeners = - new HashMap<>(); - - private final SettingsDevicePostureProducer mSettingsDevicePostureProducer; - private final DataProducer<Integer> mDevicePostureProducer; + new ArrayMap<>(); private final SettingsDisplayFeatureProducer mSettingsDisplayFeatureProducer; - private final DataProducer<List<DisplayFeature>> mDisplayFeatureProducer; + private final DataProducer<List<CommonFoldingFeature>> mFoldingFeatureProducer; public WindowLayoutComponentImpl(Context context) { - mSettingsDevicePostureProducer = new SettingsDevicePostureProducer(context); - mDevicePostureProducer = new PriorityDataProducer<>(List.of( - mSettingsDevicePostureProducer, - new DeviceStateManagerPostureProducer(context) - )); - + ((Application) context.getApplicationContext()) + .registerActivityLifecycleCallbacks(new NotifyOnConfigurationChanged()); mSettingsDisplayFeatureProducer = new SettingsDisplayFeatureProducer(context); - mDisplayFeatureProducer = new PriorityDataProducer<>(List.of( + mFoldingFeatureProducer = new PriorityDataProducer<>(List.of( mSettingsDisplayFeatureProducer, - new ResourceConfigDisplayFeatureProducer(context) + new DeviceStateManagerFoldingFeatureProducer(context) )); - - mDevicePostureProducer.addDataChangedCallback(this::onDisplayFeaturesChanged); - mDisplayFeatureProducer.addDataChangedCallback(this::onDisplayFeaturesChanged); + mFoldingFeatureProducer.addDataChangedCallback(this::onDisplayFeaturesChanged); } /** * Adds a listener interested in receiving updates to {@link WindowLayoutInfo} + * * @param activity hosting a {@link android.view.Window} * @param consumer interested in receiving updates to {@link WindowLayoutInfo} */ @@ -97,6 +90,7 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { /** * Removes a listener no longer interested in receiving updates. + * * @param consumer no longer interested in receiving updates to {@link WindowLayoutInfo} */ public void removeWindowLayoutInfoListener( @@ -118,43 +112,34 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { return mWindowLayoutChangeListeners.keySet(); } - protected boolean hasListeners() { - return !mWindowLayoutChangeListeners.isEmpty(); + @NonNull + private boolean isListeningForLayoutChanges(IBinder token) { + for (Activity activity: getActivitiesListeningForLayoutChanges()) { + if (token.equals(activity.getWindow().getAttributes().token)) { + return true; + } + } + return false; } - /** - * Calculate the {@link DisplayFeature.State} from the feature or the device posture producer. - * If the given {@link DisplayFeature.State} is not valid then {@code null} will be returned. - * The {@link FoldingFeature} should be ignored in the case of an invalid - * {@link DisplayFeature.State}. - * - * @param feature a {@link DisplayFeature} to provide the feature state if present. - * @return {@link DisplayFeature.State} of the hinge if present or the state from the posture - * produce if present. - */ - @Nullable - private Integer getFeatureState(DisplayFeature feature) { - Integer featureState = feature.getState(); - Optional<Integer> posture = mDevicePostureProducer.getData(); - Integer state = featureState == null ? posture.orElse(null) : featureState; - return convertToExtensionState(state); + protected boolean hasListeners() { + return !mWindowLayoutChangeListeners.isEmpty(); } /** * A convenience method to translate from the common feature state to the extensions feature - * state. More specifically, translates from {@link DisplayFeature.State} to + * state. More specifically, translates from {@link CommonFoldingFeature.State} to * {@link FoldingFeature.STATE_FLAT} or {@link FoldingFeature.STATE_HALF_OPENED}. If it is not * possible to translate, then we will return a {@code null} value. * - * @param state if it matches a value in {@link DisplayFeature.State}, {@code null} otherwise. - * @return a {@link FoldingFeature.STATE_FLAT} or {@link FoldingFeature.STATE_HALF_OPENED} if - * the given state matches a value in {@link DisplayFeature.State} and {@code null} otherwise. + * @param state if it matches a value in {@link CommonFoldingFeature.State}, {@code null} + * otherwise. @return a {@link FoldingFeature.STATE_FLAT} or + * {@link FoldingFeature.STATE_HALF_OPENED} if the given state matches a value in + * {@link CommonFoldingFeature.State} and {@code null} otherwise. */ @Nullable - private Integer convertToExtensionState(@Nullable Integer state) { - if (state == null) { // The null check avoids a NullPointerException. - return null; - } else if (state == COMMON_STATE_FLAT) { + private Integer convertToExtensionState(int state) { + if (state == COMMON_STATE_FLAT) { return FoldingFeature.STATE_FLAT; } else if (state == COMMON_STATE_HALF_OPENED) { return FoldingFeature.STATE_HALF_OPENED; @@ -172,33 +157,30 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { @NonNull private WindowLayoutInfo getWindowLayoutInfo(@NonNull Activity activity) { - List<androidx.window.extensions.layout.DisplayFeature> displayFeatures = - getDisplayFeatures(activity); + List<DisplayFeature> displayFeatures = getDisplayFeatures(activity); return new WindowLayoutInfo(displayFeatures); } /** - * Translate from the {@link DisplayFeature} to - * {@link androidx.window.extensions.layout.DisplayFeature} for a given {@link Activity}. If a - * {@link DisplayFeature} is not valid then it will be omitted. + * Translate from the {@link CommonFoldingFeature} to + * {@link DisplayFeature} for a given {@link Activity}. If a + * {@link CommonFoldingFeature} is not valid then it will be omitted. * * For a {@link FoldingFeature} the bounds are localized into the {@link Activity} window - * coordinate space and the state is calculated either from {@link DisplayFeature#getState()} or - * {@link #mDisplayFeatureProducer}. The state from {@link #mDisplayFeatureProducer} may not be - * valid since {@link #mDisplayFeatureProducer} is a general state controller. If the state is - * not valid, the {@link FoldingFeature} is omitted from the {@link List} of - * {@link androidx.window.extensions.layout.DisplayFeature}. If the bounds are not valid, - * constructing a {@link FoldingFeature} will throw an {@link IllegalArgumentException} since - * this can cause negative UI effects down stream. + * coordinate space and the state is calculated from {@link CommonFoldingFeature#getState()}. + * The state from {@link #mFoldingFeatureProducer} may not be valid since + * {@link #mFoldingFeatureProducer} is a general state controller. If the state is not valid, + * the {@link FoldingFeature} is omitted from the {@link List} of {@link DisplayFeature}. If the + * bounds are not valid, constructing a {@link FoldingFeature} will throw an + * {@link IllegalArgumentException} since this can cause negative UI effects down stream. * * @param activity a proxy for the {@link android.view.Window} that contains the - * {@link androidx.window.extensions.layout.DisplayFeature}. - * @return a {@link List} of valid {@link androidx.window.extensions.layout.DisplayFeature} that + * {@link DisplayFeature}. + * @return a {@link List} of valid {@link DisplayFeature} that * are within the {@link android.view.Window} of the {@link Activity} */ - private List<androidx.window.extensions.layout.DisplayFeature> getDisplayFeatures( - @NonNull Activity activity) { - List<androidx.window.extensions.layout.DisplayFeature> features = new ArrayList<>(); + private List<DisplayFeature> getDisplayFeatures(@NonNull Activity activity) { + List<DisplayFeature> features = new ArrayList<>(); int displayId = activity.getDisplay().getDisplayId(); if (displayId != DEFAULT_DISPLAY) { Log.w(TAG, "This sample doesn't support display features on secondary displays"); @@ -211,11 +193,10 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { return features; } - Optional<List<DisplayFeature>> storedFeatures = mDisplayFeatureProducer.getData(); + Optional<List<CommonFoldingFeature>> storedFeatures = mFoldingFeatureProducer.getData(); if (storedFeatures.isPresent()) { - - for (DisplayFeature baseFeature : storedFeatures.get()) { - Integer state = getFeatureState(baseFeature); + for (CommonFoldingFeature baseFeature : storedFeatures.get()) { + Integer state = convertToExtensionState(baseFeature.getState()); if (state == null) { continue; } @@ -223,8 +204,7 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { rotateRectToDisplayRotation(displayId, featureRect); transformToWindowSpaceRect(activity, featureRect); - features.add(new FoldingFeature(featureRect, baseFeature.getType(), - getFeatureState(baseFeature))); + features.add(new FoldingFeature(featureRect, baseFeature.getType(), state)); } } return features; @@ -232,13 +212,31 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { private void updateRegistrations() { if (hasListeners()) { - mSettingsDevicePostureProducer.registerObserversIfNeeded(); mSettingsDisplayFeatureProducer.registerObserversIfNeeded(); } else { - mSettingsDevicePostureProducer.unregisterObserversIfNeeded(); mSettingsDisplayFeatureProducer.unregisterObserversIfNeeded(); } - onDisplayFeaturesChanged(); } + + private final class NotifyOnConfigurationChanged extends EmptyLifecycleCallbacksAdapter { + @Override + public void onActivityCreated(Activity activity, Bundle savedInstanceState) { + super.onActivityCreated(activity, savedInstanceState); + onDisplayFeaturesChangedIfListening(activity); + } + + @Override + public void onActivityConfigurationChanged(Activity activity) { + super.onActivityConfigurationChanged(activity); + onDisplayFeaturesChangedIfListening(activity); + } + + private void onDisplayFeaturesChangedIfListening(Activity activity) { + IBinder token = activity.getWindow().getAttributes().token; + if (token == null || isListeningForLayoutChanges(token)) { + onDisplayFeaturesChanged(); + } + } + } } diff --git a/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java index aa949f126154..c7b709347060 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java @@ -23,16 +23,17 @@ import static androidx.window.util.ExtensionHelper.transformToWindowSpaceRect; import android.app.Activity; import android.app.ActivityThread; +import android.app.Application; import android.content.Context; import android.graphics.Rect; +import android.os.Bundle; import android.os.IBinder; import android.util.Log; import androidx.annotation.NonNull; -import androidx.window.common.DeviceStateManagerPostureProducer; -import androidx.window.common.DisplayFeature; -import androidx.window.common.ResourceConfigDisplayFeatureProducer; -import androidx.window.common.SettingsDevicePostureProducer; +import androidx.window.common.CommonFoldingFeature; +import androidx.window.common.DeviceStateManagerFoldingFeatureProducer; +import androidx.window.common.EmptyLifecycleCallbacksAdapter; import androidx.window.common.SettingsDisplayFeatureProducer; import androidx.window.util.DataProducer; import androidx.window.util.PriorityDataProducer; @@ -48,36 +49,25 @@ import java.util.Optional; */ class SampleSidecarImpl extends StubSidecar { private static final String TAG = "SampleSidecar"; - private static final boolean DEBUG = false; - private final SettingsDevicePostureProducer mSettingsDevicePostureProducer; - private final DataProducer<Integer> mDevicePostureProducer; + private final DataProducer<List<CommonFoldingFeature>> mFoldingFeatureProducer; - private final SettingsDisplayFeatureProducer mSettingsDisplayFeatureProducer; - private final DataProducer<List<DisplayFeature>> mDisplayFeatureProducer; + private final SettingsDisplayFeatureProducer mSettingsFoldingFeatureProducer; SampleSidecarImpl(Context context) { - mSettingsDevicePostureProducer = new SettingsDevicePostureProducer(context); - mDevicePostureProducer = new PriorityDataProducer<>(List.of( - mSettingsDevicePostureProducer, - new DeviceStateManagerPostureProducer(context) + ((Application) context.getApplicationContext()) + .registerActivityLifecycleCallbacks(new NotifyOnConfigurationChanged()); + mSettingsFoldingFeatureProducer = new SettingsDisplayFeatureProducer(context); + mFoldingFeatureProducer = new PriorityDataProducer<>(List.of( + mSettingsFoldingFeatureProducer, + new DeviceStateManagerFoldingFeatureProducer(context) )); - mSettingsDisplayFeatureProducer = new SettingsDisplayFeatureProducer(context); - mDisplayFeatureProducer = new PriorityDataProducer<>(List.of( - mSettingsDisplayFeatureProducer, - new ResourceConfigDisplayFeatureProducer(context) - )); - - mDevicePostureProducer.addDataChangedCallback(this::onDevicePostureChanged); - mDisplayFeatureProducer.addDataChangedCallback(this::onDisplayFeaturesChanged); - } - - private void onDevicePostureChanged() { - updateDeviceState(getDeviceState()); + mFoldingFeatureProducer.addDataChangedCallback(this::onDisplayFeaturesChanged); } private void onDisplayFeaturesChanged() { + updateDeviceState(getDeviceState()); for (IBinder windowToken : getWindowsListeningForLayoutChanges()) { SidecarWindowLayoutInfo newLayout = getWindowLayoutInfo(windowToken); updateWindowLayout(windowToken, newLayout); @@ -87,27 +77,21 @@ class SampleSidecarImpl extends StubSidecar { @NonNull @Override public SidecarDeviceState getDeviceState() { - Optional<Integer> posture = mDevicePostureProducer.getData(); - SidecarDeviceState deviceState = new SidecarDeviceState(); - deviceState.posture = posture.orElse(deviceStateFromFeature()); + deviceState.posture = deviceStateFromFeature(); return deviceState; } private int deviceStateFromFeature() { - List<DisplayFeature> storedFeatures = mDisplayFeatureProducer.getData() + List<CommonFoldingFeature> storedFeatures = mFoldingFeatureProducer.getData() .orElse(Collections.emptyList()); for (int i = 0; i < storedFeatures.size(); i++) { - DisplayFeature feature = storedFeatures.get(i); - final int state = feature.getState() == null ? -1 : feature.getState(); - if (DEBUG && feature.getState() == null) { - Log.d(TAG, "feature#getState was null for DisplayFeature: " + feature); - } - + CommonFoldingFeature feature = storedFeatures.get(i); + final int state = feature.getState(); switch (state) { - case DisplayFeature.COMMON_STATE_FLAT: + case CommonFoldingFeature.COMMON_STATE_FLAT: return SidecarDeviceState.POSTURE_OPENED; - case DisplayFeature.COMMON_STATE_HALF_OPENED: + case CommonFoldingFeature.COMMON_STATE_HALF_OPENED: return SidecarDeviceState.POSTURE_HALF_OPENED; } } @@ -127,22 +111,22 @@ class SampleSidecarImpl extends StubSidecar { } private List<SidecarDisplayFeature> getDisplayFeatures(@NonNull Activity activity) { - List<SidecarDisplayFeature> features = new ArrayList<SidecarDisplayFeature>(); int displayId = activity.getDisplay().getDisplayId(); if (displayId != DEFAULT_DISPLAY) { Log.w(TAG, "This sample doesn't support display features on secondary displays"); - return features; + return Collections.emptyList(); } if (activity.isInMultiWindowMode()) { // It is recommended not to report any display features in multi-window mode, since it // won't be possible to synchronize the display feature positions with window movement. - return features; + return Collections.emptyList(); } - Optional<List<DisplayFeature>> storedFeatures = mDisplayFeatureProducer.getData(); + Optional<List<CommonFoldingFeature>> storedFeatures = mFoldingFeatureProducer.getData(); + List<SidecarDisplayFeature> features = new ArrayList<>(); if (storedFeatures.isPresent()) { - for (DisplayFeature baseFeature : storedFeatures.get()) { + for (CommonFoldingFeature baseFeature : storedFeatures.get()) { SidecarDisplayFeature feature = new SidecarDisplayFeature(); Rect featureRect = baseFeature.getRect(); rotateRectToDisplayRotation(displayId, featureRect); @@ -152,17 +136,37 @@ class SampleSidecarImpl extends StubSidecar { features.add(feature); } } - return features; + return Collections.unmodifiableList(features); } @Override protected void onListenersChanged() { if (hasListeners()) { - mSettingsDevicePostureProducer.registerObserversIfNeeded(); - mSettingsDisplayFeatureProducer.registerObserversIfNeeded(); + mSettingsFoldingFeatureProducer.registerObserversIfNeeded(); + onDisplayFeaturesChanged(); } else { - mSettingsDevicePostureProducer.unregisterObserversIfNeeded(); - mSettingsDisplayFeatureProducer.unregisterObserversIfNeeded(); + mSettingsFoldingFeatureProducer.unregisterObserversIfNeeded(); + } + } + + private final class NotifyOnConfigurationChanged extends EmptyLifecycleCallbacksAdapter { + @Override + public void onActivityCreated(Activity activity, Bundle savedInstanceState) { + super.onActivityCreated(activity, savedInstanceState); + onDisplayFeaturesChangedForActivity(activity); + } + + @Override + public void onActivityConfigurationChanged(Activity activity) { + super.onActivityConfigurationChanged(activity); + onDisplayFeaturesChangedForActivity(activity); + } + + private void onDisplayFeaturesChangedForActivity(@NonNull Activity activity) { + IBinder token = activity.getWindow().getAttributes().token; + if (token == null || mWindowLayoutChangeListenerTokens.contains(token)) { + onDisplayFeaturesChanged(); + } } } } diff --git a/libs/WindowManager/Jetpack/src/androidx/window/sidecar/StubSidecar.java b/libs/WindowManager/Jetpack/src/androidx/window/sidecar/StubSidecar.java index 199c37315c07..b9c808a6569b 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/sidecar/StubSidecar.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/sidecar/StubSidecar.java @@ -30,7 +30,7 @@ import java.util.Set; abstract class StubSidecar implements SidecarInterface { private SidecarCallback mSidecarCallback; - private final Set<IBinder> mWindowLayoutChangeListenerTokens = new HashSet<>(); + final Set<IBinder> mWindowLayoutChangeListenerTokens = new HashSet<>(); private boolean mDeviceStateChangeListenerRegistered; StubSidecar() { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java index 91ea436f81b6..3f8343a7abd3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java @@ -98,16 +98,22 @@ public class ShellTaskOrganizer extends TaskOrganizer implements default void onTaskInfoChanged(RunningTaskInfo taskInfo) {} default void onTaskVanished(RunningTaskInfo taskInfo) {} default void onBackPressedOnTaskRoot(RunningTaskInfo taskInfo) {} - /** Whether this task listener supports compat UI. */ + /** Whether this task listener supports compat UI. */ default boolean supportCompatUI() { // All TaskListeners should support compat UI except PIP. return true; } - /** Attaches the a child window surface to the task surface. */ + /** Attaches a child window surface to the task surface. */ default void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { throw new IllegalStateException( "This task listener doesn't support child surface attachment."); } + /** Reparents a child window surface to the task surface. */ + default void reparentChildSurfaceToTask(int taskId, SurfaceControl sc, + SurfaceControl.Transaction t) { + throw new IllegalStateException( + "This task listener doesn't support child surface reparent."); + } default void dump(@NonNull PrintWriter pw, String prefix) {}; } @@ -620,6 +626,23 @@ public class ShellTaskOrganizer extends TaskOrganizer implements updateCameraCompatControlState(info.getTaskInfo().token, state); } + /** Reparents a child window surface to the task surface. */ + public void reparentChildSurfaceToTask(int taskId, SurfaceControl sc, + SurfaceControl.Transaction t) { + final TaskListener taskListener; + synchronized (mLock) { + taskListener = mTasks.contains(taskId) + ? getTaskListener(mTasks.get(taskId).getTaskInfo()) + : null; + } + if (taskListener == null) { + ProtoLog.w(WM_SHELL_TASK_ORG, "Failed to find Task to reparent surface taskId=%d", + taskId); + return; + } + taskListener.reparentChildSurfaceToTask(taskId, sc, t); + } + private void logSizeCompatRestartButtonEventReported(@NonNull TaskAppearedInfo info, int event) { ActivityInfo topActivityInfo = info.getTaskInfo().topActivityInfo; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java index 54e743f72cc6..ca4ef07eb1db 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java @@ -367,10 +367,20 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback, @Override public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { - if (mTaskInfo.taskId != taskId) { + b.setParent(findTaskSurface(taskId)); + } + + @Override + public void reparentChildSurfaceToTask(int taskId, SurfaceControl sc, + SurfaceControl.Transaction t) { + t.reparent(sc, findTaskSurface(taskId)); + } + + private SurfaceControl findTaskSurface(int taskId) { + if (mTaskInfo == null || mTaskLeash == null || mTaskInfo.taskId != taskId) { throw new IllegalArgumentException("There is no surface for taskId=" + taskId); } - b.setParent(mTaskLeash); + return mTaskLeash; } @Override diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java b/libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java index e344c3bea42b..33eec335bca3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java @@ -275,12 +275,22 @@ class AppPair implements ShellTaskOrganizer.TaskListener, SplitLayout.SplitLayou @Override public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { + b.setParent(findTaskSurface(taskId)); + } + + @Override + public void reparentChildSurfaceToTask(int taskId, SurfaceControl sc, + SurfaceControl.Transaction t) { + t.reparent(sc, findTaskSurface(taskId)); + } + + private SurfaceControl findTaskSurface(int taskId) { if (getRootTaskId() == taskId) { - b.setParent(mRootTaskLeash); + return mRootTaskLeash; } else if (getTaskId1() == taskId) { - b.setParent(mTaskLeash1); + return mTaskLeash1; } else if (getTaskId2() == taskId) { - b.setParent(mTaskLeash2); + return mTaskLeash2; } else { throw new IllegalArgumentException("There is no surface for taskId=" + taskId); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BadgedImageView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BadgedImageView.java index 79e624212f4b..3876533a922e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BadgedImageView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BadgedImageView.java @@ -173,8 +173,8 @@ public class BadgedImageView extends ConstraintLayout { } @Override - public void onDraw(Canvas canvas) { - super.onDraw(canvas); + public void dispatchDraw(Canvas canvas) { + super.dispatchDraw(canvas); if (!shouldDrawDot()) { return; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUI.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUI.java index 99dbfe01964c..b87cf47dd93f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUI.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUI.java @@ -24,9 +24,12 @@ import com.android.wm.shell.common.annotations.ExternalThread; @ExternalThread public interface CompatUI { /** - * Called when the keyguard occluded state changes. Removes all compat UIs if the - * keyguard is now occluded. - * @param occluded indicates if the keyguard is now occluded. + * Called when the keyguard showing state changes. Removes all compat UIs if the + * keyguard is now showing. + * + * <p>Note that if the keyguard is occluded it will also be considered showing. + * + * @param showing indicates if the keyguard is now showing. */ - void onKeyguardOccludedChanged(boolean occluded); + void onKeyguardShowingChanged(boolean showing); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java index ee4d5ed018bf..b2bbafeb7bf5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java @@ -109,9 +109,9 @@ public class CompatUIController implements OnDisplaysChangedListener, // Only show each hint once automatically in the process life. private final CompatUIHintsState mCompatUIHintsState; - // Indicates if the keyguard is currently occluded, in which case compat UIs shouldn't + // Indicates if the keyguard is currently showing, in which case compat UIs shouldn't // be shown. - private boolean mKeyguardOccluded; + private boolean mKeyguardShowing; public CompatUIController(Context context, DisplayController displayController, @@ -218,14 +218,14 @@ public class CompatUIController implements OnDisplaysChangedListener, } @VisibleForTesting - void onKeyguardOccludedChanged(boolean occluded) { - mKeyguardOccluded = occluded; - // Hide the compat UIs when keyguard is occluded. + void onKeyguardShowingChanged(boolean showing) { + mKeyguardShowing = showing; + // Hide the compat UIs when keyguard is showing. forAllLayouts(layout -> layout.updateVisibility(showOnDisplay(layout.getDisplayId()))); } private boolean showOnDisplay(int displayId) { - return !mKeyguardOccluded && !isImeShowingOnDisplay(displayId); + return !mKeyguardShowing && !isImeShowingOnDisplay(displayId); } private boolean isImeShowingOnDisplay(int displayId) { @@ -372,9 +372,9 @@ public class CompatUIController implements OnDisplaysChangedListener, @ExternalThread private class CompatUIImpl implements CompatUI { @Override - public void onKeyguardOccludedChanged(boolean occluded) { + public void onKeyguardShowingChanged(boolean showing) { mMainExecutor.execute(() -> { - CompatUIController.this.onKeyguardOccludedChanged(occluded); + CompatUIController.this.onKeyguardShowingChanged(showing); }); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduDialogLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduDialogLayout.java index 2da6a6bc70c0..8aa4d0ee99ab 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduDialogLayout.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduDialogLayout.java @@ -21,6 +21,7 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.View; +import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; @@ -38,6 +39,7 @@ class LetterboxEduDialogLayout extends ConstraintLayout { // 204 is simply 255 * 0.8. static final int BACKGROUND_DIM_ALPHA = 204; private View mDialogContainer; + private TextView mDialogTitle; private Drawable mBackgroundDim; public LetterboxEduDialogLayout(Context context) { @@ -61,6 +63,10 @@ class LetterboxEduDialogLayout extends ConstraintLayout { return mDialogContainer; } + TextView getDialogTitle() { + return mDialogTitle; + } + Drawable getBackgroundDim() { return mBackgroundDim; } @@ -84,6 +90,7 @@ class LetterboxEduDialogLayout extends ConstraintLayout { protected void onFinishInflate() { super.onFinishInflate(); mDialogContainer = findViewById(R.id.letterbox_education_dialog_container); + mDialogTitle = findViewById(R.id.letterbox_education_dialog_title); mBackgroundDim = getBackground().mutate(); // Set the alpha of the background dim to 0 for enter animation. mBackgroundDim.setAlpha(0); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduWindowManager.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduWindowManager.java index 30b9f0838e10..dda72ffb432f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduWindowManager.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduWindowManager.java @@ -28,6 +28,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup.MarginLayoutParams; import android.view.WindowManager; +import android.view.accessibility.AccessibilityEvent; import com.android.internal.annotations.VisibleForTesting; import com.android.wm.shell.R; @@ -132,7 +133,7 @@ public class LetterboxEduWindowManager extends CompatUIWindowManagerAbstract { updateDialogMargins(); mAnimationController.startEnterAnimation(mLayout, /* endCallback= */ - this::setDismissOnClickListener); + this::onDialogEnterAnimationEnded); return mLayout; } @@ -157,11 +158,13 @@ public class LetterboxEduWindowManager extends CompatUIWindowManagerAbstract { R.layout.letterbox_education_dialog_layout, null); } - private void setDismissOnClickListener() { + private void onDialogEnterAnimationEnded() { if (mLayout == null) { return; } mLayout.setDismissOnClickListener(this::onDismiss); + // Focus on the dialog title for accessibility. + mLayout.getDialogTitle().sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED); } private void onDismiss() { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvPipModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvPipModule.java index 491dff08187f..1e934c5c6e22 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvPipModule.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvPipModule.java @@ -27,7 +27,6 @@ import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.SystemWindows; import com.android.wm.shell.common.TaskStackListenerImpl; import com.android.wm.shell.common.annotations.ShellMainThread; -import com.android.wm.shell.legacysplitscreen.LegacySplitScreenController; import com.android.wm.shell.pip.Pip; import com.android.wm.shell.pip.PipAnimationController; import com.android.wm.shell.pip.PipMediaController; @@ -163,15 +162,14 @@ public abstract class TvPipModule { PipAnimationController pipAnimationController, PipTransitionController pipTransitionController, PipSurfaceTransactionHelper pipSurfaceTransactionHelper, - Optional<LegacySplitScreenController> splitScreenOptional, - Optional<SplitScreenController> newSplitScreenOptional, + Optional<SplitScreenController> splitScreenControllerOptional, DisplayController displayController, PipUiEventLogger pipUiEventLogger, ShellTaskOrganizer shellTaskOrganizer, @ShellMainThread ShellExecutor mainExecutor) { return new PipTaskOrganizer(context, syncTransactionQueue, pipTransitionState, tvPipBoundsState, tvPipBoundsAlgorithm, tvPipMenuController, pipAnimationController, pipSurfaceTransactionHelper, - pipTransitionController, splitScreenOptional, newSplitScreenOptional, + pipTransitionController, splitScreenControllerOptional, displayController, pipUiEventLogger, shellTaskOrganizer, mainExecutor); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java index 7879e7a5bb00..73f393140cbc 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java @@ -285,15 +285,14 @@ public class WMShellModule { PipAnimationController pipAnimationController, PipSurfaceTransactionHelper pipSurfaceTransactionHelper, PipTransitionController pipTransitionController, - Optional<LegacySplitScreenController> splitScreenOptional, - Optional<SplitScreenController> newSplitScreenOptional, + Optional<SplitScreenController> splitScreenControllerOptional, DisplayController displayController, PipUiEventLogger pipUiEventLogger, ShellTaskOrganizer shellTaskOrganizer, @ShellMainThread ShellExecutor mainExecutor) { return new PipTaskOrganizer(context, syncTransactionQueue, pipTransitionState, pipBoundsState, pipBoundsAlgorithm, menuPhoneController, pipAnimationController, pipSurfaceTransactionHelper, - pipTransitionController, splitScreenOptional, newSplitScreenOptional, + pipTransitionController, splitScreenControllerOptional, displayController, pipUiEventLogger, shellTaskOrganizer, mainExecutor); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java index 52ff21bc3172..fef9be36a35f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java @@ -110,6 +110,24 @@ public class FreeformTaskListener implements ShellTaskOrganizer.TaskListener { } @Override + public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { + b.setParent(findTaskSurface(taskId)); + } + + @Override + public void reparentChildSurfaceToTask(int taskId, SurfaceControl sc, + SurfaceControl.Transaction t) { + t.reparent(sc, findTaskSurface(taskId)); + } + + private SurfaceControl findTaskSurface(int taskId) { + if (!mTasks.contains(taskId)) { + throw new IllegalArgumentException("There is no surface for taskId=" + taskId); + } + return mTasks.get(taskId).mLeash; + } + + @Override public void dump(PrintWriter pw, String prefix) { final String innerPrefix = prefix + " "; pw.println(prefix + this); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java index 6e38e421d4b6..73e6cba43ec0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java @@ -133,10 +133,20 @@ public class FullscreenTaskListener implements ShellTaskOrganizer.TaskListener { @Override public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { + b.setParent(findTaskSurface(taskId)); + } + + @Override + public void reparentChildSurfaceToTask(int taskId, SurfaceControl sc, + SurfaceControl.Transaction t) { + t.reparent(sc, findTaskSurface(taskId)); + } + + private SurfaceControl findTaskSurface(int taskId) { if (!mDataByTaskId.contains(taskId)) { throw new IllegalArgumentException("There is no surface for taskId=" + taskId); } - b.setParent(mDataByTaskId.get(taskId).surface); + return mDataByTaskId.get(taskId).surface; } @Override diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java index 86bf3ff1cea9..d2f42c39acd5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java @@ -343,10 +343,20 @@ class LegacySplitScreenTaskListener implements ShellTaskOrganizer.TaskListener { @Override public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { + b.setParent(findTaskSurface(taskId)); + } + + @Override + public void reparentChildSurfaceToTask(int taskId, SurfaceControl sc, + SurfaceControl.Transaction t) { + t.reparent(sc, findTaskSurface(taskId)); + } + + private SurfaceControl findTaskSurface(int taskId) { if (!mLeashByTaskId.contains(taskId)) { throw new IllegalArgumentException("There is no surface for taskId=" + taskId); } - b.setParent(mLeashByTaskId.get(taskId)); + return mLeashByTaskId.get(taskId); } @Override diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/IPip.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/IPip.aidl index ddc85f758916..e03421dd58ac 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/IPip.aidl +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/IPip.aidl @@ -47,12 +47,13 @@ interface IPip { /** * Notifies the swiping Activity to PiP onto home transition is finished * + * @param taskId the Task id that the Activity and overlay are currently in. * @param componentName ComponentName represents the Activity * @param destinationBounds the destination bounds the PiP window lands into * @param overlay an optional overlay to fade out after entering PiP */ - oneway void stopSwipePipToHome(in ComponentName componentName, in Rect destinationBounds, - in SurfaceControl overlay) = 2; + oneway void stopSwipePipToHome(int taskId, in ComponentName componentName, + in Rect destinationBounds, in SurfaceControl overlay) = 2; /** * Sets listener to get pinned stack animation callbacks. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsState.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsState.java index 210ea54baf58..ddcd4bd3a8e3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsState.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsState.java @@ -29,14 +29,15 @@ import android.graphics.Point; import android.graphics.Rect; import android.os.RemoteException; import android.util.ArraySet; -import android.util.Log; import android.util.Size; import android.view.Display; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.protolog.common.ProtoLog; import com.android.internal.util.function.TriConsumer; import com.android.wm.shell.R; import com.android.wm.shell.common.DisplayLayout; +import com.android.wm.shell.protolog.ShellProtoLogGroup; import java.io.PrintWriter; import java.lang.annotation.Retention; @@ -223,7 +224,8 @@ public class PipBoundsState { new PictureInPictureUiState(stashedState != STASH_TYPE_NONE /* isStashed */) ); } catch (RemoteException e) { - Log.e(TAG, "Unable to set alert PiP state change."); + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Unable to set alert PiP state change.", TAG); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index 1eb9501ac076..b266189ec262 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -63,7 +63,6 @@ import android.content.res.Configuration; import android.graphics.Rect; import android.os.RemoteException; import android.os.SystemClock; -import android.util.Log; import android.util.Rational; import android.view.Display; import android.view.Surface; @@ -73,6 +72,7 @@ import android.window.WindowContainerToken; import android.window.WindowContainerTransaction; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.R; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.animation.Interpolators; @@ -81,8 +81,8 @@ import com.android.wm.shell.common.ScreenshotUtils; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.annotations.ShellMainThread; -import com.android.wm.shell.legacysplitscreen.LegacySplitScreenController; import com.android.wm.shell.pip.phone.PipMotionHelper; +import com.android.wm.shell.protolog.ShellProtoLogGroup; import com.android.wm.shell.splitscreen.SplitScreenController; import com.android.wm.shell.transition.Transitions; @@ -133,7 +133,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, private final int mExitAnimationDuration; private final int mCrossFadeAnimationDuration; private final PipSurfaceTransactionHelper mSurfaceTransactionHelper; - private final Optional<LegacySplitScreenController> mLegacySplitScreenOptional; private final Optional<SplitScreenController> mSplitScreenOptional; protected final ShellTaskOrganizer mTaskOrganizer; protected final ShellExecutor mMainExecutor; @@ -249,7 +248,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, * An optional overlay used to mask content changing between an app in/out of PiP, only set if * {@link PipTransitionState#getInSwipePipToHomeTransition()} is true. */ - private SurfaceControl mSwipePipToHomeOverlay; + @Nullable + SurfaceControl mSwipePipToHomeOverlay; public PipTaskOrganizer(Context context, @NonNull SyncTransactionQueue syncTransactionQueue, @@ -260,7 +260,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, @NonNull PipAnimationController pipAnimationController, @NonNull PipSurfaceTransactionHelper surfaceTransactionHelper, @NonNull PipTransitionController pipTransitionController, - Optional<LegacySplitScreenController> legacySplitScreenOptional, Optional<SplitScreenController> splitScreenOptional, @NonNull DisplayController displayController, @NonNull PipUiEventLogger pipUiEventLogger, @@ -283,7 +282,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, mPipAnimationController = pipAnimationController; mPipUiEventLoggerLogger = pipUiEventLogger; mSurfaceControlTransactionFactory = SurfaceControl.Transaction::new; - mLegacySplitScreenOptional = legacySplitScreenOptional; mSplitScreenOptional = splitScreenOptional; mTaskOrganizer = shellTaskOrganizer; mMainExecutor = mainExecutor; @@ -356,12 +354,24 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, * Callback when launcher finishes swipe-pip-to-home operation. * Expect {@link #onTaskAppeared(ActivityManager.RunningTaskInfo, SurfaceControl)} afterwards. */ - public void stopSwipePipToHome(ComponentName componentName, Rect destinationBounds, + public void stopSwipePipToHome(int taskId, ComponentName componentName, Rect destinationBounds, SurfaceControl overlay) { // do nothing if there is no startSwipePipToHome being called before - if (mPipTransitionState.getInSwipePipToHomeTransition()) { - mPipBoundsState.setBounds(destinationBounds); - mSwipePipToHomeOverlay = overlay; + if (!mPipTransitionState.getInSwipePipToHomeTransition()) { + return; + } + mPipBoundsState.setBounds(destinationBounds); + mSwipePipToHomeOverlay = overlay; + if (ENABLE_SHELL_TRANSITIONS) { + // With Shell transition, the overlay was attached to the remote transition leash, which + // will be removed when the current transition is finished, so we need to reparent it + // to the actual Task surface now. + // PipTransition is responsible to fade it out and cleanup when finishing the enter PIP + // transition. + final SurfaceControl.Transaction t = new SurfaceControl.Transaction(); + mTaskOrganizer.reparentChildSurfaceToTask(taskId, overlay, t); + t.setLayer(overlay, Integer.MAX_VALUE); + t.apply(); } } @@ -395,8 +405,10 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, if (!mPipTransitionState.isInPip() || mPipTransitionState.getTransitionState() == PipTransitionState.EXITING_PIP || mToken == null) { - Log.wtf(TAG, "Not allowed to exitPip in current state" - + " mState=" + mPipTransitionState.getTransitionState() + " mToken=" + mToken); + ProtoLog.wtf(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Not allowed to exitPip in current state" + + " mState=%d mToken=%s", TAG, mPipTransitionState.getTransitionState(), + mToken); return; } @@ -489,20 +501,17 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, wct.setWindowingMode(mToken, getOutPipWindowingMode()); // Simply reset the activity mode set prior to the animation running. wct.setActivityWindowingMode(mToken, WINDOWING_MODE_UNDEFINED); - mLegacySplitScreenOptional.ifPresent(splitScreen -> { - if (direction == TRANSITION_DIRECTION_LEAVE_PIP_TO_SPLIT_SCREEN) { - wct.reparent(mToken, splitScreen.getSecondaryRoot(), true /* onTop */); - } - }); } /** * Removes PiP immediately. */ public void removePip() { - if (!mPipTransitionState.isInPip() || mToken == null) { - Log.wtf(TAG, "Not allowed to removePip in current state" - + " mState=" + mPipTransitionState.getTransitionState() + " mToken=" + mToken); + if (!mPipTransitionState.isInPip() || mToken == null) { + ProtoLog.wtf(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Not allowed to removePip in current state" + + " mState=%d mToken=%s", TAG, mPipTransitionState.getTransitionState(), + mToken); return; } @@ -539,7 +548,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, ActivityTaskManager.getService().removeRootTasksInWindowingModes( new int[]{ WINDOWING_MODE_PINNED }); } catch (RemoteException e) { - Log.e(TAG, "Failed to remove PiP", e); + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Failed to remove PiP, %s", + TAG, e); } } @@ -568,7 +579,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, if (!mWaitForFixedRotation) { onEndOfSwipePipToHomeTransition(); } else { - Log.d(TAG, "Defer onTaskAppeared-SwipePipToHome until end of fixed rotation."); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Defer onTaskAppeared-SwipePipToHome until end of fixed rotation.", + TAG); } return; } @@ -576,7 +589,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, if (mOneShotAnimationType == ANIM_TYPE_ALPHA && SystemClock.uptimeMillis() - mLastOneShotAlphaAnimationTime > ONE_SHOT_ALPHA_ANIMATION_TIMEOUT_MS) { - Log.d(TAG, "Alpha animation is expired. Use bounds animation."); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Alpha animation is expired. Use bounds animation.", TAG); mOneShotAnimationType = ANIM_TYPE_BOUNDS; } @@ -613,8 +627,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, private void onTaskAppearedWithFixedRotation() { if (mOneShotAnimationType == ANIM_TYPE_ALPHA) { - Log.d(TAG, "Defer entering PiP alpha animation, fixed rotation is ongoing"); - // If deferred, hide the surface till fixed rotation is completed. + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Defer entering PiP alpha animation, fixed rotation is ongoing", TAG); + // If deferred, hside the surface till fixed rotation is completed. final SurfaceControl.Transaction tx = mSurfaceControlTransactionFactory.getTransaction(); tx.setAlpha(mLeash, 0f); @@ -671,7 +686,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, private void onEndOfSwipePipToHomeTransition() { if (Transitions.ENABLE_SHELL_TRANSITIONS) { - mSwipePipToHomeOverlay = null; return; } @@ -763,7 +777,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, final WindowContainerToken token = info.token; Objects.requireNonNull(token, "Requires valid WindowContainerToken"); if (token.asBinder() != mToken.asBinder()) { - Log.wtf(TAG, "Unrecognized token: " + token); + ProtoLog.wtf(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Unrecognized token: %s", TAG, token); return; } onExitPipFinished(info); @@ -788,8 +803,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, Objects.requireNonNull(mToken, "onTaskInfoChanged requires valid existing mToken"); if (mPipTransitionState.getTransitionState() != PipTransitionState.ENTERED_PIP && mPipTransitionState.getTransitionState() != PipTransitionState.EXITING_PIP) { - Log.d(TAG, "Defer onTaskInfoChange in current state: " - + mPipTransitionState.getTransitionState()); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Defer onTaskInfoChange in current state: %d", TAG, + mPipTransitionState.getTransitionState()); // Defer applying PiP parameters if the task is entering PiP to avoid disturbing // the animation. mDeferredTaskInfo = info; @@ -800,7 +816,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, mPipBoundsAlgorithm.getMinimalSize(info.topActivityInfo)); final PictureInPictureParams newParams = info.pictureInPictureParams; if (newParams == null || !applyPictureInPictureParams(newParams)) { - Log.d(TAG, "Ignored onTaskInfoChanged with PiP param: " + newParams); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Ignored onTaskInfoChanged with PiP param: %s", TAG, newParams); return; } // Aspect ratio changed, re-calculate bounds if valid. @@ -823,6 +840,24 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, } @Override + public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { + b.setParent(findTaskSurface(taskId)); + } + + @Override + public void reparentChildSurfaceToTask(int taskId, SurfaceControl sc, + SurfaceControl.Transaction t) { + t.reparent(sc, findTaskSurface(taskId)); + } + + private SurfaceControl findTaskSurface(int taskId) { + if (mTaskInfo == null || mLeash == null || mTaskInfo.taskId != taskId) { + throw new IllegalArgumentException("There is no surface for taskId=" + taskId); + } + return mLeash; + } + + @Override public void onFixedRotationStarted(int displayId, int newRotation) { mNextRotation = newRotation; mWaitForFixedRotation = true; @@ -877,9 +912,13 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, clearWaitForFixedRotation(); } - /** Called when exiting PIP tranisiton is finished to do the state cleanup. */ + /** Called when exiting PIP transition is finished to do the state cleanup. */ void onExitPipFinished(TaskInfo info) { clearWaitForFixedRotation(); + if (mSwipePipToHomeOverlay != null) { + removeContentOverlay(mSwipePipToHomeOverlay, null /* callback */); + mSwipePipToHomeOverlay = null; + } mPipTransitionState.setInSwipePipToHomeTransition(false); mPictureInPictureParams = null; mPipTransitionState.setTransitionState(PipTransitionState.UNDEFINED); @@ -895,7 +934,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, private void fadeExistingPip(boolean show) { if (mLeash == null || !mLeash.isValid()) { - Log.w(TAG, "Invalid leash on fadeExistingPip: " + mLeash); + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Invalid leash on fadeExistingPip: %s", TAG, mLeash); return; } final float alphaStart = show ? 0 : 1; @@ -942,11 +982,13 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, if ((mPipTransitionState.getInSwipePipToHomeTransition() || waitForFixedRotationOnEnteringPip) && fromRotation) { if (DEBUG) { - Log.d(TAG, "Skip onMovementBoundsChanged on rotation change" - + " InSwipePipToHomeTransition=" - + mPipTransitionState.getInSwipePipToHomeTransition() - + " mWaitForFixedRotation=" + mWaitForFixedRotation - + " getTransitionState=" + mPipTransitionState.getTransitionState()); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Skip onMovementBoundsChanged on rotation change" + + " InSwipePipToHomeTransition=%b" + + " mWaitForFixedRotation=%b" + + " getTransitionState=%d", TAG, + mPipTransitionState.getInSwipePipToHomeTransition(), mWaitForFixedRotation, + mPipTransitionState.getTransitionState()); } return; } @@ -1061,7 +1103,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, @PipAnimationController.TransitionDirection int direction, Consumer<Rect> updateBoundsCallback) { if (mWaitForFixedRotation) { - Log.d(TAG, "skip scheduleAnimateResizePip, entering pip deferred"); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: skip scheduleAnimateResizePip, entering pip deferred", TAG); return; } scheduleAnimateResizePip(mPipBoundsState.getBounds(), toBounds, 0 /* startingAngle */, @@ -1075,7 +1118,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, public void scheduleAnimateResizePip(Rect fromBounds, Rect toBounds, int duration, float startingAngle, Consumer<Rect> updateBoundsCallback) { if (mWaitForFixedRotation) { - Log.d(TAG, "skip scheduleAnimateResizePip, entering pip deferred"); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: skip scheduleAnimateResizePip, entering pip deferred", TAG); return; } scheduleAnimateResizePip(fromBounds, toBounds, startingAngle, null /* sourceHintRect */, @@ -1113,7 +1157,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, public void scheduleResizePip(Rect toBounds, Consumer<Rect> updateBoundsCallback) { // Could happen when exitPip if (mToken == null || mLeash == null) { - Log.w(TAG, "Abort animation, invalid leash"); + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Abort animation, invalid leash", TAG); return; } mPipBoundsState.setBounds(toBounds); @@ -1148,12 +1193,14 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, Consumer<Rect> updateBoundsCallback) { // Could happen when exitPip if (mToken == null || mLeash == null) { - Log.w(TAG, "Abort animation, invalid leash"); + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Abort animation, invalid leash", TAG); return; } if (startBounds.isEmpty() || toBounds.isEmpty()) { - Log.w(TAG, "Attempted to user resize PIP to or from empty bounds, aborting."); + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Attempted to user resize PIP to or from empty bounds, aborting.", TAG); return; } @@ -1228,7 +1275,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, return; } if (mWaitForFixedRotation) { - Log.d(TAG, "skip scheduleOffsetPip, entering pip deferred"); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: skip scheduleOffsetPip, entering pip deferred", TAG); return; } offsetPip(originalBounds, 0 /* xOffset */, offset, duration); @@ -1241,7 +1289,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, private void offsetPip(Rect originalBounds, int xOffset, int yOffset, int durationMs) { if (mTaskInfo == null) { - Log.w(TAG, "mTaskInfo is not set"); + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, "%s: mTaskInfo is not set", + TAG); return; } final Rect destinationBounds = new Rect(originalBounds); @@ -1386,7 +1435,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, float startingAngle) { // Could happen when exitPip if (mToken == null || mLeash == null) { - Log.w(TAG, "Abort animation, invalid leash"); + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Abort animation, invalid leash", TAG); return null; } final int rotationDelta = mWaitForFixedRotation @@ -1453,36 +1503,21 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, } /** - * Sync with {@link LegacySplitScreenController} or {@link SplitScreenController} on destination - * bounds if PiP is going to split screen. + * Sync with {@link SplitScreenController} on destination bounds if PiP is going to + * split screen. * * @param destinationBoundsOut contain the updated destination bounds if applicable * @return {@code true} if destinationBounds is altered for split screen */ private boolean syncWithSplitScreenBounds(Rect destinationBoundsOut, boolean enterSplit) { - if (enterSplit && mSplitScreenOptional.isPresent()) { - final Rect topLeft = new Rect(); - final Rect bottomRight = new Rect(); - mSplitScreenOptional.get().getStageBounds(topLeft, bottomRight); - final boolean isPipTopLeft = isPipTopLeft(); - destinationBoundsOut.set(isPipTopLeft ? topLeft : bottomRight); - return true; - } - - if (!mLegacySplitScreenOptional.isPresent()) { + if (!enterSplit || !mSplitScreenOptional.isPresent()) { return false; } - - LegacySplitScreenController legacySplitScreen = mLegacySplitScreenOptional.get(); - if (!legacySplitScreen.isDividerVisible()) { - // fail early if system is not in split screen mode - return false; - } - - // PiP window will go to split-secondary mode instead of fullscreen, populates the - // split screen bounds here. - destinationBoundsOut.set(legacySplitScreen.getDividerView() - .getNonMinimizedSplitScreenSecondaryBounds()); + final Rect topLeft = new Rect(); + final Rect bottomRight = new Rect(); + mSplitScreenOptional.get().getStageBounds(topLeft, bottomRight); + final boolean isPipTopLeft = isPipTopLeft(); + destinationBoundsOut.set(isPipTopLeft ? topLeft : bottomRight); return true; } @@ -1501,7 +1536,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, if (mPipTransitionState.getTransitionState() == PipTransitionState.UNDEFINED) { // Could happen if onTaskVanished happens during the animation since we may have // set a start delay on this animation. - Log.d(TAG, "Task vanished, skip fadeOutAndRemoveOverlay"); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Task vanished, skip fadeOutAndRemoveOverlay", TAG); animation.removeAllListeners(); animation.removeAllUpdateListeners(); animation.cancel(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java index f01457bc4c95..401dc9ae02e1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java @@ -50,7 +50,6 @@ import android.graphics.Matrix; import android.graphics.Point; import android.graphics.Rect; import android.os.IBinder; -import android.util.Log; import android.view.Surface; import android.view.SurfaceControl; import android.window.TransitionInfo; @@ -61,8 +60,10 @@ import android.window.WindowContainerTransaction; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.R; import com.android.wm.shell.ShellTaskOrganizer; +import com.android.wm.shell.protolog.ShellProtoLogGroup; import com.android.wm.shell.splitscreen.SplitScreenController; import com.android.wm.shell.transition.CounterRotatorHelper; import com.android.wm.shell.transition.Transitions; @@ -603,11 +604,18 @@ public class PipTransition extends PipTransitionController { && taskInfo.pictureInPictureParams.isAutoEnterEnabled() && mPipTransitionState.getInSwipePipToHomeTransition()) { mOneShotAnimationType = ANIM_TYPE_BOUNDS; - SurfaceControl.Transaction tx = new SurfaceControl.Transaction(); - tx.setMatrix(leash, Matrix.IDENTITY_MATRIX, new float[9]) + final SurfaceControl swipePipToHomeOverlay = mPipOrganizer.mSwipePipToHomeOverlay; + startTransaction.setMatrix(leash, Matrix.IDENTITY_MATRIX, new float[9]) .setPosition(leash, destinationBounds.left, destinationBounds.top) .setWindowCrop(leash, destinationBounds.width(), destinationBounds.height()); - startTransaction.merge(tx); + if (swipePipToHomeOverlay != null) { + // Launcher fade in the overlay on top of the fullscreen Task. It is possible we + // reparent the PIP activity to a new PIP task (in case there are other activities + // in the original Task), so we should also reparent the overlay to the PIP task. + startTransaction.reparent(swipePipToHomeOverlay, leash) + .setLayer(swipePipToHomeOverlay, Integer.MAX_VALUE); + mPipOrganizer.mSwipePipToHomeOverlay = null; + } startTransaction.apply(); if (rotationDelta != Surface.ROTATION_0 && mInFixedRotation) { // For fixed rotation, set the destination bounds to the new rotation coordinates @@ -617,6 +625,10 @@ public class PipTransition extends PipTransitionController { mPipBoundsState.setBounds(destinationBounds); onFinishResize(taskInfo, destinationBounds, TRANSITION_DIRECTION_TO_PIP, null /* tx */); sendOnPipTransitionFinished(TRANSITION_DIRECTION_TO_PIP); + if (swipePipToHomeOverlay != null) { + mPipOrganizer.fadeOutAndRemoveOverlay(swipePipToHomeOverlay, + null /* callback */, false /* withStartDelay */); + } mPipTransitionState.setInSwipePipToHomeTransition(false); return true; } @@ -757,7 +769,8 @@ public class PipTransition extends PipTransitionController { final SurfaceControl leash = mPipOrganizer.getSurfaceControl(); final TaskInfo taskInfo = mPipOrganizer.getTaskInfo(); if (leash == null || !leash.isValid() || taskInfo == null) { - Log.w(TAG, "Invalid leash on fadeExistingPip: " + leash); + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Invalid leash on fadeExistingPip: %s", TAG, leash); return; } final float alphaStart = show ? 0 : 1; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipUtils.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipUtils.java index da6d9804b29d..d7b69adf1241 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipUtils.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipUtils.java @@ -24,9 +24,11 @@ import android.app.ActivityTaskManager.RootTaskInfo; import android.content.ComponentName; import android.content.Context; import android.os.RemoteException; -import android.util.Log; import android.util.Pair; +import com.android.internal.protolog.common.ProtoLog; +import com.android.wm.shell.protolog.ShellProtoLogGroup; + /** A class that includes convenience methods. */ public class PipUtils { private static final String TAG = "PipUtils"; @@ -51,7 +53,8 @@ public class PipUtils { } } } catch (RemoteException e) { - Log.w(TAG, "Unable to get pinned stack."); + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Unable to get pinned stack.", TAG); } return new Pair<>(null, 0); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java index 71cff025a7a8..c4dadf1f739a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java @@ -29,7 +29,6 @@ import android.graphics.RectF; import android.os.Debug; import android.os.Handler; import android.os.RemoteException; -import android.util.Log; import android.util.Size; import android.view.MotionEvent; import android.view.SurfaceControl; @@ -37,6 +36,7 @@ import android.view.SyncRtSurfaceTransactionApplier; import android.view.SyncRtSurfaceTransactionApplier.SurfaceParams; import android.view.WindowManagerGlobal; +import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SystemWindows; import com.android.wm.shell.pip.PipBoundsState; @@ -44,6 +44,7 @@ import com.android.wm.shell.pip.PipMediaController; import com.android.wm.shell.pip.PipMediaController.ActionListener; import com.android.wm.shell.pip.PipMenuController; import com.android.wm.shell.pip.PipUiEventLogger; +import com.android.wm.shell.protolog.ShellProtoLogGroup; import com.android.wm.shell.splitscreen.SplitScreenController; import java.io.PrintWriter; @@ -285,13 +286,15 @@ public class PhonePipMenuController implements PipMenuController { private void showMenuInternal(int menuState, Rect stackBounds, boolean allowMenuTimeout, boolean willResizeMenu, boolean withDelay, boolean showResizeHandle) { if (DEBUG) { - Log.d(TAG, "showMenu() state=" + menuState - + " isMenuVisible=" + isMenuVisible() - + " allowMenuTimeout=" + allowMenuTimeout - + " willResizeMenu=" + willResizeMenu - + " withDelay=" + withDelay - + " showResizeHandle=" + showResizeHandle - + " callers=\n" + Debug.getCallers(5, " ")); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: showMenu() state=%s" + + " isMenuVisible=%s" + + " allowMenuTimeout=%s" + + " willResizeMenu=%s" + + " withDelay=%s" + + " showResizeHandle=%s" + + " callers=\n%s", TAG, menuState, isMenuVisible(), allowMenuTimeout, + willResizeMenu, withDelay, showResizeHandle, Debug.getCallers(5, " ")); } if (!maybeCreateSyncApplier()) { @@ -383,7 +386,8 @@ public class PhonePipMenuController implements PipMenuController { private boolean maybeCreateSyncApplier() { if (mPipMenuView == null || mPipMenuView.getViewRootImpl() == null) { - Log.v(TAG, "Not going to move PiP, either menu or its parent is not created."); + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Not going to move PiP, either menu or its parent is not created.", TAG); return false; } @@ -400,7 +404,8 @@ public class PhonePipMenuController implements PipMenuController { public void pokeMenu() { final boolean isMenuVisible = isMenuVisible(); if (DEBUG) { - Log.d(TAG, "pokeMenu() isMenuVisible=" + isMenuVisible); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: pokeMenu() isMenuVisible=%b", TAG, isMenuVisible); } if (isMenuVisible) { mPipMenuView.pokeMenu(); @@ -410,7 +415,8 @@ public class PhonePipMenuController implements PipMenuController { private void fadeOutMenu() { final boolean isMenuVisible = isMenuVisible(); if (DEBUG) { - Log.d(TAG, "fadeOutMenu() isMenuVisible=" + isMenuVisible); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: fadeOutMenu() isMenuVisible=%b", TAG, isMenuVisible); } if (isMenuVisible) { mPipMenuView.fadeOutMenu(); @@ -436,11 +442,14 @@ public class PhonePipMenuController implements PipMenuController { public void hideMenu(@PipMenuView.AnimationType int animationType, boolean resize) { final boolean isMenuVisible = isMenuVisible(); if (DEBUG) { - Log.d(TAG, "hideMenu() state=" + mMenuState - + " isMenuVisible=" + isMenuVisible - + " animationType=" + animationType - + " resize=" + resize - + " callers=\n" + Debug.getCallers(5, " ")); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: hideMenu() state=%s" + + " isMenuVisible=%s" + + " animationType=%s" + + " resize=%s" + + " callers=\n%s", TAG, mMenuState, isMenuVisible, + animationType, resize, + Debug.getCallers(5, " ")); } if (isMenuVisible) { mPipMenuView.hideMenu(resize, animationType); @@ -516,9 +525,11 @@ public class PhonePipMenuController implements PipMenuController { */ void onMenuStateChangeStart(int menuState, boolean resize, Runnable callback) { if (DEBUG) { - Log.d(TAG, "onMenuStateChangeStart() mMenuState=" + mMenuState - + " menuState=" + menuState + " resize=" + resize - + " callers=\n" + Debug.getCallers(5, " ")); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: onMenuStateChangeStart() mMenuState=%s" + + " menuState=%s resize=%s" + + " callers=\n%s", TAG, mMenuState, menuState, resize, + Debug.getCallers(5, " ")); } if (menuState != mMenuState) { @@ -538,7 +549,8 @@ public class PhonePipMenuController implements PipMenuController { mSystemWindows.getFocusGrantToken(mPipMenuView), menuState != MENU_STATE_NONE /* grantFocus */); } catch (RemoteException e) { - Log.e(TAG, "Unable to update focus as menu appears/disappears", e); + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Unable to update focus as menu appears/disappears, %s", TAG, e); } } } @@ -584,9 +596,11 @@ public class PhonePipMenuController implements PipMenuController { public void updateMenuLayout(Rect bounds) { final boolean isMenuVisible = isMenuVisible(); if (DEBUG) { - Log.d(TAG, "updateMenuLayout() state=" + mMenuState - + " isMenuVisible=" + isMenuVisible - + " callers=\n" + Debug.getCallers(5, " ")); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: updateMenuLayout() state=%s" + + " isMenuVisible=%s" + + " callers=\n%s", TAG, mMenuState, isMenuVisible, + Debug.getCallers(5, " ")); } if (isMenuVisible) { mPipMenuView.updateMenuLayout(bounds); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java index d3dc91515921..e7a1c4cca07e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java @@ -46,10 +46,8 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import android.util.Log; import android.util.Pair; import android.util.Size; -import android.util.Slog; import android.view.DisplayInfo; import android.view.SurfaceControl; import android.view.WindowManagerGlobal; @@ -61,6 +59,7 @@ import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.jank.InteractionJankMonitor; +import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.R; import com.android.wm.shell.WindowManagerShellWrapper; import com.android.wm.shell.common.DisplayChangeController; @@ -85,6 +84,7 @@ import com.android.wm.shell.pip.PipSnapAlgorithm; import com.android.wm.shell.pip.PipTaskOrganizer; import com.android.wm.shell.pip.PipTransitionController; import com.android.wm.shell.pip.PipUtils; +import com.android.wm.shell.protolog.ShellProtoLogGroup; import com.android.wm.shell.transition.Transitions; import java.io.PrintWriter; @@ -282,7 +282,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb Optional<OneHandedController> oneHandedController, ShellExecutor mainExecutor) { if (!context.getPackageManager().hasSystemFeature(FEATURE_PICTURE_IN_PICTURE)) { - Slog.w(TAG, "Device doesn't support Pip feature"); + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Device doesn't support Pip feature", TAG); return null; } @@ -375,7 +376,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb try { mWindowManagerShellWrapper.addPinnedStackListener(mPinnedTaskListener); } catch (RemoteException e) { - Slog.e(TAG, "Failed to register pinned stack listener", e); + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Failed to register pinned stack listener, %s", TAG, e); } try { @@ -387,7 +389,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb mPipInputConsumer.registerInputConsumer(); } } catch (RemoteException | UnsupportedOperationException e) { - Log.e(TAG, "Failed to register pinned stack listener", e); + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Failed to register pinned stack listener, %s", TAG, e); e.printStackTrace(); } @@ -592,9 +595,9 @@ public class PipController implements PipTransitionController.PipTransitionCallb return entryBounds; } - private void stopSwipePipToHome(ComponentName componentName, Rect destinationBounds, + private void stopSwipePipToHome(int taskId, ComponentName componentName, Rect destinationBounds, SurfaceControl overlay) { - mPipTaskOrganizer.stopSwipePipToHome(componentName, destinationBounds, overlay); + mPipTaskOrganizer.stopSwipePipToHome(taskId, componentName, destinationBounds, overlay); } private String getTransitionTag(int direction) { @@ -724,7 +727,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb .getRootTaskInfo(WINDOWING_MODE_PINNED, ACTIVITY_TYPE_UNDEFINED); if (pinnedTaskInfo == null) return false; } catch (RemoteException e) { - Log.e(TAG, "Failed to get RootTaskInfo for pinned task", e); + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Failed to get RootTaskInfo for pinned task, %s", TAG, e); return false; } final PipSnapAlgorithm pipSnapAlgorithm = mPipBoundsAlgorithm.getSnapAlgorithm(); @@ -870,7 +874,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb PipController.this.dump(pw); }); } catch (InterruptedException e) { - Slog.e(TAG, "Failed to dump PipController in 2s"); + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Failed to dump PipController in 2s", TAG); } } } @@ -923,11 +928,12 @@ public class PipController implements PipTransitionController.PipTransitionCallb } @Override - public void stopSwipePipToHome(ComponentName componentName, Rect destinationBounds, - SurfaceControl overlay) { + public void stopSwipePipToHome(int taskId, ComponentName componentName, + Rect destinationBounds, SurfaceControl overlay) { executeRemoteCallWithTaskPermission(mController, "stopSwipePipToHome", (controller) -> { - controller.stopSwipePipToHome(componentName, destinationBounds, overlay); + controller.stopSwipePipToHome(taskId, componentName, destinationBounds, + overlay); }); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipInputConsumer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipInputConsumer.java index 6e3a20d5f2b2..e57abc28bd0a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipInputConsumer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipInputConsumer.java @@ -22,14 +22,15 @@ import android.os.Binder; import android.os.IBinder; import android.os.Looper; import android.os.RemoteException; -import android.util.Log; import android.view.BatchedInputEventReceiver; import android.view.Choreographer; import android.view.IWindowManager; import android.view.InputChannel; import android.view.InputEvent; +import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.common.ShellExecutor; +import com.android.wm.shell.protolog.ShellProtoLogGroup; import java.io.PrintWriter; @@ -141,7 +142,8 @@ public class PipInputConsumer { mWindowManager.destroyInputConsumer(mName, DEFAULT_DISPLAY); mWindowManager.createInputConsumer(mToken, mName, DEFAULT_DISPLAY, inputChannel); } catch (RemoteException e) { - Log.e(TAG, "Failed to create input consumer", e); + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Failed to create input consumer, %s", TAG, e); } mMainExecutor.execute(() -> { // Choreographer.getSfInstance() must be called on the thread that the input event @@ -165,7 +167,8 @@ public class PipInputConsumer { // TODO(b/113087003): Support Picture-in-picture in multi-display. mWindowManager.destroyInputConsumer(mName, DEFAULT_DISPLAY); } catch (RemoteException e) { - Log.e(TAG, "Failed to destroy input consumer", e); + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Failed to destroy input consumer, %s", TAG, e); } mInputEventReceiver.dispose(); mInputEventReceiver = null; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java index 225305bd5178..c0fa8c0a8898 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java @@ -47,7 +47,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; -import android.util.Log; import android.util.Pair; import android.util.Size; import android.view.KeyEvent; @@ -60,11 +59,13 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.FrameLayout; import android.widget.LinearLayout; +import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.R; import com.android.wm.shell.animation.Interpolators; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.pip.PipUiEventLogger; import com.android.wm.shell.pip.PipUtils; +import com.android.wm.shell.protolog.ShellProtoLogGroup; import com.android.wm.shell.splitscreen.SplitScreenController; import java.lang.annotation.Retention; @@ -423,7 +424,7 @@ public class PipMenuView extends FrameLayout { /** * @return Estimated minimum {@link Size} to hold the actions. - * See also {@link #updateActionViews(Rect)} + * See also {@link #updateActionViews(Rect)} */ Size getEstimatedMinMenuSize() { final int pipActionSize = getResources().getDimensionPixelSize(R.dimen.pip_action_size); @@ -505,7 +506,8 @@ public class PipMenuView extends FrameLayout { try { action.getActionIntent().send(); } catch (CanceledException e) { - Log.w(TAG, "Failed to send action", e); + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Failed to send action, %s", TAG, e); } }); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMotionHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMotionHelper.java index 96fd59f0c911..f3789fd5a3d6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMotionHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMotionHelper.java @@ -34,12 +34,12 @@ import android.graphics.PointF; import android.graphics.Rect; import android.os.Debug; import android.os.Looper; -import android.util.Log; import android.view.Choreographer; import androidx.dynamicanimation.animation.AnimationHandler; import androidx.dynamicanimation.animation.AnimationHandler.FrameCallbackScheduler; +import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.R; import com.android.wm.shell.animation.FloatProperties; import com.android.wm.shell.animation.PhysicsAnimator; @@ -49,6 +49,7 @@ import com.android.wm.shell.pip.PipBoundsState; import com.android.wm.shell.pip.PipSnapAlgorithm; import com.android.wm.shell.pip.PipTaskOrganizer; import com.android.wm.shell.pip.PipTransitionController; +import com.android.wm.shell.protolog.ShellProtoLogGroup; import java.util.function.Consumer; @@ -354,8 +355,9 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, */ private void expandLeavePip(boolean skipAnimation, boolean enterSplit) { if (DEBUG) { - Log.d(TAG, "exitPip: skipAnimation=" + skipAnimation - + " callers=\n" + Debug.getCallers(5, " ")); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: exitPip: skipAnimation=%s" + + " callers=\n%s", TAG, skipAnimation, Debug.getCallers(5, " ")); } cancelPhysicsAnimation(); mMenuController.hideMenu(ANIM_TYPE_NONE, false /* resize */); @@ -368,7 +370,8 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, @Override public void dismissPip() { if (DEBUG) { - Log.d(TAG, "removePip: callers=\n" + Debug.getCallers(5, " ")); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: removePip: callers=\n%s", TAG, Debug.getCallers(5, " ")); } cancelPhysicsAnimation(); mMenuController.hideMenu(ANIM_TYPE_DISMISS, false /* resize */); @@ -552,8 +555,10 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, */ void animateToOffset(Rect originalBounds, int offset) { if (DEBUG) { - Log.d(TAG, "animateToOffset: originalBounds=" + originalBounds + " offset=" + offset - + " callers=\n" + Debug.getCallers(5, " ")); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: animateToOffset: originalBounds=%s offset=%s" + + " callers=\n%s", TAG, originalBounds, offset, + Debug.getCallers(5, " ")); } cancelPhysicsAnimation(); mPipTaskOrganizer.scheduleOffsetPip(originalBounds, offset, SHIFT_DURATION, @@ -671,8 +676,9 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, */ private void resizePipUnchecked(Rect toBounds) { if (DEBUG) { - Log.d(TAG, "resizePipUnchecked: toBounds=" + toBounds - + " callers=\n" + Debug.getCallers(5, " ")); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: resizePipUnchecked: toBounds=%s" + + " callers=\n%s", TAG, toBounds, Debug.getCallers(5, " ")); } if (!toBounds.equals(getBounds())) { mPipTaskOrganizer.scheduleResizePip(toBounds, mUpdateBoundsCallback); @@ -684,8 +690,10 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, */ private void resizeAndAnimatePipUnchecked(Rect toBounds, int duration) { if (DEBUG) { - Log.d(TAG, "resizeAndAnimatePipUnchecked: toBounds=" + toBounds - + " duration=" + duration + " callers=\n" + Debug.getCallers(5, " ")); + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: resizeAndAnimatePipUnchecked: toBounds=%s" + + " duration=%s callers=\n%s", TAG, toBounds, duration, + Debug.getCallers(5, " ")); } // Intentionally resize here even if the current bounds match the destination bounds. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java index 350f2856e2bc..147a272f4645 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java @@ -35,7 +35,6 @@ import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; import android.provider.DeviceConfig; -import android.util.Log; import android.util.Size; import android.view.InputEvent; import android.view.MotionEvent; @@ -46,6 +45,7 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityWindowInfo; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.R; import com.android.wm.shell.common.FloatingContentCoordinator; import com.android.wm.shell.common.ShellExecutor; @@ -54,6 +54,7 @@ import com.android.wm.shell.pip.PipBoundsAlgorithm; import com.android.wm.shell.pip.PipBoundsState; import com.android.wm.shell.pip.PipTaskOrganizer; import com.android.wm.shell.pip.PipUiEventLogger; +import com.android.wm.shell.protolog.ShellProtoLogGroup; import java.io.PrintWriter; @@ -1010,7 +1011,8 @@ public class PipTouchHandler { } final Size estimatedMinMenuSize = mMenuController.getEstimatedMinMenuSize(); if (estimatedMinMenuSize == null) { - Log.wtf(TAG, "Failed to get estimated menu size"); + ProtoLog.wtf(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Failed to get estimated menu size", TAG); return false; } final Rect currentBounds = mPipBoundsState.getBounds(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchState.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchState.java index 53303ff2b679..d7d69f27f9f8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchState.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchState.java @@ -17,15 +17,15 @@ package com.android.wm.shell.pip.phone; import android.graphics.PointF; -import android.os.Handler; -import android.util.Log; import android.view.Display; import android.view.MotionEvent; import android.view.VelocityTracker; import android.view.ViewConfiguration; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.common.ShellExecutor; +import com.android.wm.shell.protolog.ShellProtoLogGroup; import java.io.PrintWriter; @@ -104,7 +104,8 @@ public class PipTouchState { mActivePointerId = ev.getPointerId(0); if (DEBUG) { - Log.e(TAG, "Setting active pointer id on DOWN: " + mActivePointerId); + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Setting active pointer id on DOWN: %d", TAG, mActivePointerId); } mLastTouch.set(ev.getRawX(), ev.getRawY()); mDownTouch.set(mLastTouch); @@ -131,7 +132,8 @@ public class PipTouchState { addMovementToVelocityTracker(ev); int pointerIndex = ev.findPointerIndex(mActivePointerId); if (pointerIndex == -1) { - Log.e(TAG, "Invalid active pointer id on MOVE: " + mActivePointerId); + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Invalid active pointer id on MOVE: %d", TAG, mActivePointerId); break; } @@ -168,8 +170,9 @@ public class PipTouchState { final int newPointerIndex = (pointerIndex == 0) ? 1 : 0; mActivePointerId = ev.getPointerId(newPointerIndex); if (DEBUG) { - Log.e(TAG, - "Relinquish active pointer id on POINTER_UP: " + mActivePointerId); + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Relinquish active pointer id on POINTER_UP: %d", + TAG, mActivePointerId); } mLastTouch.set(ev.getRawX(newPointerIndex), ev.getRawY(newPointerIndex)); } @@ -189,7 +192,8 @@ public class PipTouchState { int pointerIndex = ev.findPointerIndex(mActivePointerId); if (pointerIndex == -1) { - Log.e(TAG, "Invalid active pointer id on UP: " + mActivePointerId); + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Invalid active pointer id on UP: %d", TAG, mActivePointerId); break; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java b/libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java index 1ddc0e7abeaf..64017e176fc3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java @@ -38,6 +38,8 @@ public enum ShellProtoLogGroup implements IProtoLogGroup { "ShellBackPreview"), WM_SHELL_RECENT_TASKS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false, Consts.TAG_WM_SHELL), + WM_SHELL_PICTURE_IN_PICTURE(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, + false, Consts.TAG_WM_SHELL), TEST_GROUP(true, true, false, "WindowManagerShellProtoLogTest"); private final boolean mEnabled; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java index c5aab45f56fa..109f96e166d7 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java @@ -280,10 +280,20 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { @Override public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { + b.setParent(findTaskSurface(taskId)); + } + + @Override + public void reparentChildSurfaceToTask(int taskId, SurfaceControl sc, + SurfaceControl.Transaction t) { + t.reparent(sc, findTaskSurface(taskId)); + } + + private SurfaceControl findTaskSurface(int taskId) { if (mRootTaskInfo.taskId == taskId) { - b.setParent(mRootLeash); + return mRootLeash; } else if (mChildrenLeashes.contains(taskId)) { - b.setParent(mChildrenLeashes.get(taskId)); + return mChildrenLeashes.get(taskId); } else { throw new IllegalArgumentException("There is no surface for taskId=" + taskId); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/stagesplit/StageTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/stagesplit/StageTaskListener.java index 8b36c9406b15..7b679580fa87 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/stagesplit/StageTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/stagesplit/StageTaskListener.java @@ -227,10 +227,20 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { @Override public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { + b.setParent(findTaskSurface(taskId)); + } + + @Override + public void reparentChildSurfaceToTask(int taskId, SurfaceControl sc, + SurfaceControl.Transaction t) { + t.reparent(sc, findTaskSurface(taskId)); + } + + private SurfaceControl findTaskSurface(int taskId) { if (mRootTaskInfo.taskId == taskId) { - b.setParent(mRootLeash); + return mRootLeash; } else if (mChildrenLeashes.contains(taskId)) { - b.setParent(mChildrenLeashes.get(taskId)); + return mChildrenLeashes.get(taskId); } else { throw new IllegalArgumentException("There is no surface for taskId=" + taskId); } 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 56d51687603a..a225f4ec8349 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 @@ -408,7 +408,8 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { || type == TRANSIT_CLOSE || type == TRANSIT_TO_FRONT || type == TRANSIT_TO_BACK; - if (isOpenOrCloseTransition) { + final boolean isTranslucent = (change.getFlags() & FLAG_TRANSLUCENT) != 0; + if (isOpenOrCloseTransition && !isTranslucent) { // Use the overview background as the background for the animation final Context uiContext = ActivityThread.currentActivityThread() .getSystemUiContext(); @@ -729,14 +730,17 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { ? R.styleable.WindowAnimation_wallpaperCloseEnterAnimation : R.styleable.WindowAnimation_wallpaperCloseExitAnimation; } else if (type == TRANSIT_OPEN) { - if (isTask) { + // We will translucent open animation for translucent activities and tasks. Choose + // WindowAnimation_activityOpenEnterAnimation and set translucent here, then + // TransitionAnimation loads appropriate animation later. + if ((changeFlags & FLAG_TRANSLUCENT) != 0 && enter) { + translucent = true; + } + if (isTask && !translucent) { animAttr = enter ? R.styleable.WindowAnimation_taskOpenEnterAnimation : R.styleable.WindowAnimation_taskOpenExitAnimation; } else { - if ((changeFlags & FLAG_TRANSLUCENT) != 0 && enter) { - translucent = true; - } animAttr = enter ? R.styleable.WindowAnimation_activityOpenEnterAnimation : R.styleable.WindowAnimation_activityOpenExitAnimation; @@ -770,7 +774,7 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { .loadAnimationAttr(options.getPackageName(), options.getAnimations(), animAttr, translucent); } else { - a = mTransitionAnimation.loadDefaultAnimationAttr(animAttr); + a = mTransitionAnimation.loadDefaultAnimationAttr(animAttr, translucent); } } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java index efb52a5b4644..610d2cc39445 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java @@ -363,7 +363,9 @@ public class Transitions implements RemoteCallable<Transitions> { return; } - // apply transfer starting window directly if there is no other task change. + // apply transfer starting window directly if there is no other task change. Since this + // is an activity->activity situation, we can detect it by selecting transitions with only + // 2 changes where neither are tasks and one is a starting-window recipient. final int changeSize = info.getChanges().size(); if (changeSize == 2) { boolean nonTaskChange = true; @@ -380,7 +382,9 @@ public class Transitions implements RemoteCallable<Transitions> { } if (nonTaskChange && transferStartingWindow) { t.apply(); - onFinish(transitionToken, null /* wct */, null /* wctCB */); + // Treat this as an abort since we are bypassing any merge logic and effectively + // finishing immediately. + onAbort(transitionToken); return; } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIControllerTest.java index 29e40be457d1..a31b28737552 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIControllerTest.java @@ -325,17 +325,17 @@ public class CompatUIControllerTest extends ShellTestCase { } @Test - public void testChangeLayoutsVisibilityOnKeyguardOccludedChanged() { + public void testChangeLayoutsVisibilityOnKeyguardShowingChanged() { mController.onCompatInfoChanged(createTaskInfo(DISPLAY_ID, TASK_ID, /* hasSizeCompat= */ true, CAMERA_COMPAT_CONTROL_HIDDEN), mMockTaskListener); - // Verify that the restart button is hidden after keyguard becomes occluded. - mController.onKeyguardOccludedChanged(true); + // Verify that the restart button is hidden after keyguard becomes showing. + mController.onKeyguardShowingChanged(true); verify(mMockCompatLayout).updateVisibility(false); verify(mMockLetterboxEduLayout).updateVisibility(false); - // Verify button remains hidden while keyguard is occluded. + // Verify button remains hidden while keyguard is showing. TaskInfo taskInfo = createTaskInfo(DISPLAY_ID, TASK_ID, /* hasSizeCompat= */ true, CAMERA_COMPAT_CONTROL_HIDDEN); mController.onCompatInfoChanged(taskInfo, mMockTaskListener); @@ -345,20 +345,20 @@ public class CompatUIControllerTest extends ShellTestCase { verify(mMockLetterboxEduLayout).updateCompatInfo(taskInfo, mMockTaskListener, /* canShow= */ false); - // Verify button is shown after keyguard becomes not occluded. - mController.onKeyguardOccludedChanged(false); + // Verify button is shown after keyguard becomes not showing. + mController.onKeyguardShowingChanged(false); verify(mMockCompatLayout).updateVisibility(true); verify(mMockLetterboxEduLayout).updateVisibility(true); } @Test - public void testLayoutsRemainHiddenOnKeyguardOccludedFalseWhenImeIsShowing() { + public void testLayoutsRemainHiddenOnKeyguardShowingFalseWhenImeIsShowing() { mController.onCompatInfoChanged(createTaskInfo(DISPLAY_ID, TASK_ID, /* hasSizeCompat= */ true, CAMERA_COMPAT_CONTROL_HIDDEN), mMockTaskListener); mController.onImeVisibilityChanged(DISPLAY_ID, /* isShowing= */ true); - mController.onKeyguardOccludedChanged(true); + mController.onKeyguardShowingChanged(true); verify(mMockCompatLayout, times(2)).updateVisibility(false); verify(mMockLetterboxEduLayout, times(2)).updateVisibility(false); @@ -366,8 +366,8 @@ public class CompatUIControllerTest extends ShellTestCase { clearInvocations(mMockCompatLayout); clearInvocations(mMockLetterboxEduLayout); - // Verify button remains hidden after keyguard becomes not occluded since IME is showing. - mController.onKeyguardOccludedChanged(false); + // Verify button remains hidden after keyguard becomes not showing since IME is showing. + mController.onKeyguardShowingChanged(false); verify(mMockCompatLayout).updateVisibility(false); verify(mMockLetterboxEduLayout).updateVisibility(false); @@ -380,12 +380,12 @@ public class CompatUIControllerTest extends ShellTestCase { } @Test - public void testLayoutsRemainHiddenOnImeHideWhenKeyguardIsOccluded() { + public void testLayoutsRemainHiddenOnImeHideWhenKeyguardIsShowing() { mController.onCompatInfoChanged(createTaskInfo(DISPLAY_ID, TASK_ID, /* hasSizeCompat= */ true, CAMERA_COMPAT_CONTROL_HIDDEN), mMockTaskListener); mController.onImeVisibilityChanged(DISPLAY_ID, /* isShowing= */ true); - mController.onKeyguardOccludedChanged(true); + mController.onKeyguardShowingChanged(true); verify(mMockCompatLayout, times(2)).updateVisibility(false); verify(mMockLetterboxEduLayout, times(2)).updateVisibility(false); @@ -393,14 +393,14 @@ public class CompatUIControllerTest extends ShellTestCase { clearInvocations(mMockCompatLayout); clearInvocations(mMockLetterboxEduLayout); - // Verify button remains hidden after IME is hidden since keyguard is occluded. + // Verify button remains hidden after IME is hidden since keyguard is showing. mController.onImeVisibilityChanged(DISPLAY_ID, /* isShowing= */ false); verify(mMockCompatLayout).updateVisibility(false); verify(mMockLetterboxEduLayout).updateVisibility(false); - // Verify button is shown after keyguard becomes not occluded. - mController.onKeyguardOccludedChanged(false); + // Verify button is shown after keyguard becomes not showing. + mController.onKeyguardShowingChanged(false); verify(mMockCompatLayout).updateVisibility(true); verify(mMockLetterboxEduLayout).updateVisibility(true); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduDialogLayoutTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduDialogLayoutTest.java index 00e4938d866c..1dee88c43806 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduDialogLayoutTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduDialogLayoutTest.java @@ -70,6 +70,8 @@ public class LetterboxEduDialogLayoutTest extends ShellTestCase { public void testOnFinishInflate() { assertEquals(mLayout.getDialogContainer(), mLayout.findViewById(R.id.letterbox_education_dialog_container)); + assertEquals(mLayout.getDialogTitle(), + mLayout.findViewById(R.id.letterbox_education_dialog_title)); assertEquals(mLayout.getBackgroundDim(), mLayout.getBackground()); assertEquals(mLayout.getBackground().getAlpha(), 0); } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduWindowManagerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduWindowManagerTest.java index 0509dd38abe0..337b7385faec 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduWindowManagerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduWindowManagerTest.java @@ -41,9 +41,11 @@ import android.testing.AndroidTestingRunner; import android.view.DisplayCutout; import android.view.DisplayInfo; import android.view.SurfaceControlViewHost; +import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.MarginLayoutParams; import android.view.WindowManager; +import android.view.accessibility.AccessibilityEvent; import androidx.test.filters.SmallTest; @@ -173,13 +175,19 @@ public class LetterboxEduWindowManagerTest extends ShellTestCase { verifyLayout(layout, mWindowAttrsCaptor.getValue(), /* expectedWidth= */ TASK_WIDTH, /* expectedHeight= */ TASK_HEIGHT, /* expectedExtraTopMargin= */ DISPLAY_CUTOUT_TOP, /* expectedExtraBottomMargin= */ DISPLAY_CUTOUT_BOTTOM); + View dialogTitle = layout.getDialogTitle(); + assertNotNull(dialogTitle); + spyOn(dialogTitle); // Clicking the layout does nothing until enter animation is done. layout.performClick(); verify(mAnimationController, never()).startExitAnimation(any(), any()); + // The dialog title shouldn't be focused for Accessibility until enter animation is done. + verify(dialogTitle, never()).sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED); verifyAndFinishEnterAnimation(layout); + verify(dialogTitle).sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED); // Exit animation should start following a click on the layout. layout.performClick(); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipTaskOrganizerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipTaskOrganizerTest.java index 0172cf324eea..14d9fb9babc4 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipTaskOrganizerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipTaskOrganizerTest.java @@ -48,7 +48,6 @@ import com.android.wm.shell.TestShellExecutor; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.SyncTransactionQueue; -import com.android.wm.shell.legacysplitscreen.LegacySplitScreenController; import com.android.wm.shell.pip.phone.PhonePipMenuController; import com.android.wm.shell.splitscreen.SplitScreenController; @@ -76,7 +75,6 @@ public class PipTaskOrganizerTest extends ShellTestCase { @Mock private PipTransitionController mMockPipTransitionController; @Mock private PipSurfaceTransactionHelper mMockPipSurfaceTransactionHelper; @Mock private PipUiEventLogger mMockPipUiEventLogger; - @Mock private Optional<LegacySplitScreenController> mMockOptionalLegacySplitScreen; @Mock private Optional<SplitScreenController> mMockOptionalSplitScreen; @Mock private ShellTaskOrganizer mMockShellTaskOrganizer; private TestShellExecutor mMainExecutor; @@ -101,8 +99,8 @@ public class PipTaskOrganizerTest extends ShellTestCase { mMockSyncTransactionQueue, mPipTransitionState, mPipBoundsState, mPipBoundsAlgorithm, mMockPhonePipMenuController, mMockPipAnimationController, mMockPipSurfaceTransactionHelper, - mMockPipTransitionController, mMockOptionalLegacySplitScreen, - mMockOptionalSplitScreen, mMockDisplayController, mMockPipUiEventLogger, + mMockPipTransitionController, mMockOptionalSplitScreen, + mMockDisplayController, mMockPipUiEventLogger, mMockShellTaskOrganizer, mMainExecutor)); mMainExecutor.flushAll(); preparePipTaskOrg(); diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index f6ad4c2f3aa5..ece150a4bd45 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -535,7 +535,10 @@ cc_defaults { target: { android: { - header_libs: ["libandroid_headers_private"], + header_libs: [ + "libandroid_headers_private", + "libtonemap_headers", + ], srcs: [ "hwui/AnimatedImageThread.cpp", diff --git a/libs/storage/IMountService.cpp b/libs/storage/IMountService.cpp index fd6e6e932ebc..055dbb2b5c5e 100644 --- a/libs/storage/IMountService.cpp +++ b/libs/storage/IMountService.cpp @@ -442,14 +442,13 @@ public: reply.readExceptionCode(); } - void mountObb(const String16& rawPath, const String16& canonicalPath, const String16& key, + void mountObb(const String16& rawPath, const String16& canonicalPath, const sp<IObbActionListener>& token, int32_t nonce, const sp<ObbInfo>& obbInfo) { Parcel data, reply; data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(rawPath); data.writeString16(canonicalPath); - data.writeString16(key); data.writeStrongBinder(IInterface::asBinder(token)); data.writeInt32(nonce); obbInfo->writeToParcel(&data); diff --git a/libs/storage/include/storage/IMountService.h b/libs/storage/include/storage/IMountService.h index 2463e023efc1..5b07318f4432 100644 --- a/libs/storage/include/storage/IMountService.h +++ b/libs/storage/include/storage/IMountService.h @@ -64,8 +64,8 @@ public: virtual void shutdown(const sp<IMountShutdownObserver>& observer) = 0; virtual void finishMediaUpdate() = 0; virtual void mountObb(const String16& rawPath, const String16& canonicalPath, - const String16& key, const sp<IObbActionListener>& token, - const int32_t nonce, const sp<ObbInfo>& obbInfo) = 0; + const sp<IObbActionListener>& token, const int32_t nonce, + const sp<ObbInfo>& obbInfo) = 0; virtual void unmountObb(const String16& filename, const bool force, const sp<IObbActionListener>& token, const int32_t nonce) = 0; virtual bool isObbMounted(const String16& filename) = 0; diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 3a2f0d9194f5..432196c9e4ef 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -8450,6 +8450,22 @@ public class AudioManager { } } + /** + * Returns the audio HAL version in the form MAJOR.MINOR. If there is no audio HAL found, null + * will be returned. + * + * @hide + */ + @TestApi + public static @Nullable String getHalVersion() { + try { + return getService().getHalVersion(); + } catch (RemoteException e) { + Log.e(TAG, "Error querying getHalVersion", e); + throw e.rethrowFromSystemServer(); + } + } + private final Object mMuteAwaitConnectionListenerLock = new Object(); @GuardedBy("mMuteAwaitConnectionListenerLock") diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl index fa3057a4ead1..bdbb740a849b 100755 --- a/media/java/android/media/IAudioService.aidl +++ b/media/java/android/media/IAudioService.aidl @@ -480,7 +480,6 @@ interface IAudioService { boolean sendFocusLoss(in AudioFocusInfo focusLoser, in IAudioPolicyCallback apcb); - @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)") void addAssistantServicesUids(in int[] assistantUID); @@ -501,4 +500,6 @@ interface IAudioService { in IAudioDeviceVolumeDispatcher cb, in String packageName, in AudioDeviceAttributes device, in List<VolumeInfo> volumes); + + String getHalVersion(); } diff --git a/media/java/android/media/MediaRouter2.java b/media/java/android/media/MediaRouter2.java index 311476cbd489..47e402f73f40 100644 --- a/media/java/android/media/MediaRouter2.java +++ b/media/java/android/media/MediaRouter2.java @@ -76,6 +76,7 @@ public final class MediaRouter2 { @GuardedBy("sSystemRouterLock") private static Map<String, MediaRouter2> sSystemMediaRouter2Map = new ArrayMap<>(); + private static MediaRouter2Manager sManager; @GuardedBy("sRouterLock") @@ -119,14 +120,12 @@ public final class MediaRouter2 { private final AtomicInteger mNextRequestId = new AtomicInteger(1); final Handler mHandler; - @GuardedBy("mLock") - private boolean mShouldUpdateRoutes = true; + + private volatile ArrayMap<String, MediaRoute2Info> mPreviousRoutes = new ArrayMap<>(); private volatile List<MediaRoute2Info> mFilteredRoutes = Collections.emptyList(); private volatile OnGetControllerHintsListener mOnGetControllerHintsListener; - /** - * Gets an instance of the media router associated with the context. - */ + /** Gets an instance of the media router associated with the context. */ @NonNull public static MediaRouter2 getInstance(@NonNull Context context) { Objects.requireNonNull(context, "context must not be null"); @@ -139,29 +138,31 @@ public final class MediaRouter2 { } /** - * Gets an instance of the system media router which controls the app's media routing. - * Returns {@code null} if the given package name is invalid. - * There are several things to note when using the media routers created with this method. - * <p> - * First of all, the discovery preference passed to {@link #registerRouteCallback} - * will have no effect. The callback will be called accordingly with the client app's - * discovery preference. Therefore, it is recommended to pass - * {@link RouteDiscoveryPreference#EMPTY} there. - * <p> - * Also, do not keep/compare the instances of the {@link RoutingController}, since they are + * Gets an instance of the system media router which controls the app's media routing. Returns + * {@code null} if the given package name is invalid. There are several things to note when + * using the media routers created with this method. + * + * <p>First of all, the discovery preference passed to {@link #registerRouteCallback} will have + * no effect. The callback will be called accordingly with the client app's discovery + * preference. Therefore, it is recommended to pass {@link RouteDiscoveryPreference#EMPTY} + * there. + * + * <p>Also, do not keep/compare the instances of the {@link RoutingController}, since they are * always newly created with the latest session information whenever below methods are called: + * * <ul> - * <li> {@link #getControllers()} </li> - * <li> {@link #getController(String)}} </li> - * <li> {@link TransferCallback#onTransfer(RoutingController, RoutingController)} </li> - * <li> {@link TransferCallback#onStop(RoutingController)} </li> - * <li> {@link ControllerCallback#onControllerUpdated(RoutingController)} </li> + * <li>{@link #getControllers()} + * <li>{@link #getController(String)}} + * <li>{@link TransferCallback#onTransfer(RoutingController, RoutingController)} + * <li>{@link TransferCallback#onStop(RoutingController)} + * <li>{@link ControllerCallback#onControllerUpdated(RoutingController)} * </ul> + * * Therefore, in order to track the current routing status, keep the controller's ID instead, - * and use {@link #getController(String)} and {@link #getSystemController()} for - * getting controllers. - * <p> - * Finally, it will have no effect to call {@link #setOnGetControllerHintsListener}. + * and use {@link #getController(String)} and {@link #getSystemController()} for getting + * controllers. + * + * <p>Finally, it will have no effect to call {@link #setOnGetControllerHintsListener}. * * @param clientPackageName the package name of the app to control * @throws SecurityException if the caller doesn't have MODIFY_AUDIO_ROUTING permission. @@ -170,15 +171,16 @@ public final class MediaRouter2 { @SystemApi @RequiresPermission(Manifest.permission.MEDIA_CONTENT_CONTROL) @Nullable - public static MediaRouter2 getInstance(@NonNull Context context, - @NonNull String clientPackageName) { + public static MediaRouter2 getInstance( + @NonNull Context context, @NonNull String clientPackageName) { Objects.requireNonNull(context, "context must not be null"); Objects.requireNonNull(clientPackageName, "clientPackageName must not be null"); // Note: Even though this check could be somehow bypassed, the other permission checks // in system server will not allow MediaRouter2Manager to be registered. - IMediaRouterService serviceBinder = IMediaRouterService.Stub.asInterface( - ServiceManager.getService(Context.MEDIA_ROUTER_SERVICE)); + IMediaRouterService serviceBinder = + IMediaRouterService.Stub.asInterface( + ServiceManager.getService(Context.MEDIA_ROUTER_SERVICE)); try { // SecurityException will be thrown if there's no permission. serviceBinder.enforceMediaContentControlPermission(); @@ -212,17 +214,17 @@ public final class MediaRouter2 { /** * Starts scanning remote routes. - * <p> - * Route discovery can happen even when the {@link #startScan()} is not called. - * This is because the scanning could be started before by other apps. - * Therefore, calling this method after calling {@link #stopScan()} does not necessarily mean - * that the routes found before are removed and added again. - * <p> - * Use {@link RouteCallback} to get the route related events. - * <p> - * Note that calling start/stopScan is applied to all system routers in the same process. - * <p> - * This will be no-op for non-system media routers. + * + * <p>Route discovery can happen even when the {@link #startScan()} is not called. This is + * because the scanning could be started before by other apps. Therefore, calling this method + * after calling {@link #stopScan()} does not necessarily mean that the routes found before are + * removed and added again. + * + * <p>Use {@link RouteCallback} to get the route related events. + * + * <p>Note that calling start/stopScan is applied to all system routers in the same process. + * + * <p>This will be no-op for non-system media routers. * * @see #stopScan() * @see #getInstance(Context, String) @@ -238,18 +240,17 @@ public final class MediaRouter2 { /** * Stops scanning remote routes to reduce resource consumption. - * <p> - * Route discovery can be continued even after this method is called. - * This is because the scanning is only turned off when all the apps stop scanning. - * Therefore, calling this method does not necessarily mean the routes are removed. - * Also, for the same reason it does not mean that {@link RouteCallback#onRoutesAdded(List)} - * is not called afterwards. - * <p> - * Use {@link RouteCallback} to get the route related events. - * <p> - * Note that calling start/stopScan is applied to all system routers in the same process. - * <p> - * This will be no-op for non-system media routers. + * + * <p>Route discovery can be continued even after this method is called. This is because the + * scanning is only turned off when all the apps stop scanning. Therefore, calling this method + * does not necessarily mean the routes are removed. Also, for the same reason it does not mean + * that {@link RouteCallback#onRoutesAdded(List)} is not called afterwards. + * + * <p>Use {@link RouteCallback} to get the route related events. + * + * <p>Note that calling start/stopScan is applied to all system routers in the same process. + * + * <p>This will be no-op for non-system media routers. * * @see #startScan() * @see #getInstance(Context, String) @@ -265,8 +266,9 @@ public final class MediaRouter2 { private MediaRouter2(Context appContext) { mContext = appContext; - mMediaRouterService = IMediaRouterService.Stub.asInterface( - ServiceManager.getService(Context.MEDIA_ROUTER_SERVICE)); + mMediaRouterService = + IMediaRouterService.Stub.asInterface( + ServiceManager.getService(Context.MEDIA_ROUTER_SERVICE)); mPackageName = mContext.getPackageName(); mHandler = new Handler(Looper.getMainLooper()); @@ -302,9 +304,10 @@ public final class MediaRouter2 { mClientPackageName = clientPackageName; mManagerCallback = new ManagerCallback(); mHandler = new Handler(Looper.getMainLooper()); - mSystemController = new SystemRoutingController( - ensureClientPackageNameForSystemSession( - sManager.getSystemRoutingSession(clientPackageName))); + mSystemController = + new SystemRoutingController( + ensureClientPackageNameForSystemSession( + sManager.getSystemRoutingSession(clientPackageName))); mDiscoveryPreference = sManager.getDiscoveryPreference(clientPackageName); updateAllRoutesFromManager(); @@ -318,8 +321,8 @@ public final class MediaRouter2 { * * @hide */ - static boolean checkRouteListContainsRouteId(@NonNull List<MediaRoute2Info> routeList, - @NonNull String routeId) { + static boolean checkRouteListContainsRouteId( + @NonNull List<MediaRoute2Info> routeList, @NonNull String routeId) { for (MediaRoute2Info info : routeList) { if (TextUtils.equals(routeId, info.getId())) { return true; @@ -330,8 +333,8 @@ public final class MediaRouter2 { /** * Gets the client package name of the app which this media router controls. - * <p> - * This will return null for non-system media routers. + * + * <p>This will return null for non-system media routers. * * @see #getInstance(Context, String) * @hide @@ -344,12 +347,12 @@ public final class MediaRouter2 { /** * Registers a callback to discover routes and to receive events when they change. - * <p> - * If the specified callback is already registered, its registration will be updated for the + * + * <p>If the specified callback is already registered, its registration will be updated for the * given {@link Executor executor} and {@link RouteDiscoveryPreference discovery preference}. - * </p> */ - public void registerRouteCallback(@NonNull @CallbackExecutor Executor executor, + public void registerRouteCallback( + @NonNull @CallbackExecutor Executor executor, @NonNull RouteCallback routeCallback, @NonNull RouteDiscoveryPreference preference) { Objects.requireNonNull(executor, "executor must not be null"); @@ -391,8 +394,8 @@ public final class MediaRouter2 { } /** - * Unregisters the given callback. The callback will no longer receive events. - * If the callback has not been added or been removed already, it is ignored. + * Unregisters the given callback. The callback will no longer receive events. If the callback + * has not been added or been removed already, it is ignored. * * @param routeCallback the callback to unregister * @see #registerRouteCallback @@ -400,8 +403,7 @@ public final class MediaRouter2 { public void unregisterRouteCallback(@NonNull RouteCallback routeCallback) { Objects.requireNonNull(routeCallback, "callback must not be null"); - if (!mRouteCallbackRecords.remove( - new RouteCallbackRecord(null, routeCallback, null))) { + if (!mRouteCallbackRecords.remove(new RouteCallbackRecord(null, routeCallback, null))) { Log.w(TAG, "unregisterRouteCallback: Ignoring unknown callback"); return; } @@ -416,8 +418,7 @@ public final class MediaRouter2 { } if (updateDiscoveryPreferenceIfNeededLocked()) { try { - mMediaRouterService.setDiscoveryRequestWithRouter2( - mStub, mDiscoveryPreference); + mMediaRouterService.setDiscoveryRequestWithRouter2(mStub, mDiscoveryPreference); } catch (RemoteException ex) { Log.e(TAG, "unregisterRouteCallback: Unable to set discovery request.", ex); } @@ -430,27 +431,28 @@ public final class MediaRouter2 { } mStub = null; } - mShouldUpdateRoutes = true; } } + @GuardedBy("mLock") private boolean updateDiscoveryPreferenceIfNeededLocked() { RouteDiscoveryPreference newDiscoveryPreference = new RouteDiscoveryPreference.Builder( mRouteCallbackRecords.stream().map(record -> record.mPreference).collect( Collectors.toList())).build(); + if (Objects.equals(mDiscoveryPreference, newDiscoveryPreference)) { return false; } mDiscoveryPreference = newDiscoveryPreference; - mShouldUpdateRoutes = true; + updateFilteredRoutesLocked(); return true; } /** - * Gets the list of all discovered routes. - * This list includes the routes that are not related to the client app. - * <p> - * This will return an empty list for non-system media routers. + * Gets the list of all discovered routes. This list includes the routes that are not related to + * the client app. + * + * <p>This will return an empty list for non-system media routers. * * @hide */ @@ -464,25 +466,19 @@ public final class MediaRouter2 { } /** - * Gets the unmodifiable list of {@link MediaRoute2Info routes} currently - * known to the media router. - * <p> - * Please note that the list can be changed before callbacks are invoked. - * </p> + * Gets the unmodifiable list of {@link MediaRoute2Info routes} currently known to the media + * router. + * + * <p>Please note that the list can be changed before callbacks are invoked. + * * @return the list of routes that contains at least one of the route features in discovery - * preferences registered by the application + * preferences registered by the application */ @NonNull public List<MediaRoute2Info> getRoutes() { synchronized (mLock) { - if (mShouldUpdateRoutes) { - mShouldUpdateRoutes = false; - - mFilteredRoutes = Collections.unmodifiableList( - filterRoutes(List.copyOf(mRoutes.values()), mDiscoveryPreference)); - } + return mFilteredRoutes; } - return mFilteredRoutes; } /** @@ -493,8 +489,8 @@ public final class MediaRouter2 { * @param callback the callback to register * @see #unregisterTransferCallback */ - public void registerTransferCallback(@NonNull @CallbackExecutor Executor executor, - @NonNull TransferCallback callback) { + public void registerTransferCallback( + @NonNull @CallbackExecutor Executor executor, @NonNull TransferCallback callback) { Objects.requireNonNull(executor, "executor must not be null"); Objects.requireNonNull(callback, "callback must not be null"); @@ -522,12 +518,13 @@ public final class MediaRouter2 { } /** - * Registers a {@link ControllerCallback}. - * If you register the same callback twice or more, it will be ignored. + * Registers a {@link ControllerCallback}. If you register the same callback twice or more, it + * will be ignored. + * * @see #unregisterControllerCallback(ControllerCallback) */ - public void registerControllerCallback(@NonNull @CallbackExecutor Executor executor, - @NonNull ControllerCallback callback) { + public void registerControllerCallback( + @NonNull @CallbackExecutor Executor executor, @NonNull ControllerCallback callback) { Objects.requireNonNull(executor, "executor must not be null"); Objects.requireNonNull(callback, "callback must not be null"); @@ -539,12 +536,12 @@ public final class MediaRouter2 { } /** - * Unregisters a {@link ControllerCallback}. The callback will no longer receive - * events. If the callback has not been added or been removed already, it is ignored. + * Unregisters a {@link ControllerCallback}. The callback will no longer receive events. + * If the callback has not been added or been removed already, it is ignored. + * * @see #registerControllerCallback(Executor, ControllerCallback) */ - public void unregisterControllerCallback( - @NonNull ControllerCallback callback) { + public void unregisterControllerCallback(@NonNull ControllerCallback callback) { Objects.requireNonNull(callback, "callback must not be null"); if (!mControllerCallbackRecords.remove(new ControllerCallbackRecord(null, callback))) { @@ -559,7 +556,7 @@ public final class MediaRouter2 { * {@link #transferTo(MediaRoute2Info)}. * * @param listener A listener to send optional app-specific hints when creating a controller. - * {@code null} for unset. + * {@code null} for unset. */ public void setOnGetControllerHintsListener(@Nullable OnGetControllerHintsListener listener) { if (isSystemRouter()) { @@ -569,13 +566,11 @@ public final class MediaRouter2 { } /** - * Transfers the current media to the given route. - * If it's necessary a new {@link RoutingController} is created or it is handled within - * the current routing controller. + * Transfers the current media to the given route. If it's necessary a new + * {@link RoutingController} is created or it is handled within the current routing controller. * * @param route the route you want to transfer the current media to. Pass {@code null} to * stop routing of the current media. - * * @see TransferCallback#onTransfer * @see TransferCallback#onTransferFailure */ @@ -622,8 +617,8 @@ public final class MediaRouter2 { /** * Transfers the media of a routing controller to the given route. - * <p> - * This will be no-op for non-system media routers. + * + * <p>This will be no-op for non-system media routers. * * @param controller a routing controller controlling media routing. * @param route the route you want to transfer the media to. @@ -638,13 +633,15 @@ public final class MediaRouter2 { } } - void requestCreateController(@NonNull RoutingController controller, - @NonNull MediaRoute2Info route, long managerRequestId) { + void requestCreateController( + @NonNull RoutingController controller, + @NonNull MediaRoute2Info route, + long managerRequestId) { final int requestId = mNextRequestId.getAndIncrement(); - ControllerCreationRequest request = new ControllerCreationRequest(requestId, - managerRequestId, route, controller); + ControllerCreationRequest request = + new ControllerCreationRequest(requestId, managerRequestId, route, controller); mControllerCreationRequests.add(request); OnGetControllerHintsListener listener = mOnGetControllerHintsListener; @@ -663,11 +660,15 @@ public final class MediaRouter2 { if (stub != null) { try { mMediaRouterService.requestCreateSessionWithRouter2( - stub, requestId, managerRequestId, - controller.getRoutingSessionInfo(), route, controllerHints); + stub, + requestId, + managerRequestId, + controller.getRoutingSessionInfo(), + route, + controllerHints); } catch (RemoteException ex) { Log.e(TAG, "createControllerForTransfer: " - + "Failed to request for creating a controller.", ex); + + "Failed to request for creating a controller.", ex); mControllerCreationRequests.remove(request); if (managerRequestId == MANAGER_REQUEST_ID_NONE) { notifyTransferFailure(route); @@ -685,11 +686,11 @@ public final class MediaRouter2 { /** * Gets a {@link RoutingController} which can control the routes provided by system. * e.g. Phone speaker, wired headset, Bluetooth, etc. - * <p> - * Note: The system controller can't be released. Calling {@link RoutingController#release()} + * + * <p>Note: The system controller can't be released. Calling {@link RoutingController#release()} * will be ignored. - * <p> - * This method always returns the same instance. + * + * <p>This method always returns the same instance. */ @NonNull public RoutingController getSystemController() { @@ -714,8 +715,8 @@ public final class MediaRouter2 { /** * Gets the list of currently active {@link RoutingController routing controllers} on which * media can be played. - * <p> - * Note: The list returned here will never be empty. The first element in the list is + * + * <p>Note: The list returned here will never be empty. The first element in the list is * always the {@link #getSystemController() system controller}. */ @NonNull @@ -750,8 +751,8 @@ public final class MediaRouter2 { /** * Requests a volume change for the route asynchronously. * It may have no effect if the route is currently not selected. - * <p> - * This will be no-op for non-system media routers. + * + * <p>This will be no-op for non-system media routers. * * @param volume The new volume value between 0 and {@link MediaRoute2Info#getVolumeMax}. * @see #getInstance(Context, String) @@ -769,55 +770,61 @@ public final class MediaRouter2 { // If this API needs to be public, use IMediaRouterService#setRouteVolumeWithRouter2() } - void syncRoutesOnHandler(List<MediaRoute2Info> currentRoutes, - RoutingSessionInfo currentSystemSessionInfo) { + void syncRoutesOnHandler( + List<MediaRoute2Info> currentRoutes, RoutingSessionInfo currentSystemSessionInfo) { if (currentRoutes == null || currentRoutes.isEmpty() || currentSystemSessionInfo == null) { Log.e(TAG, "syncRoutesOnHandler: Received wrong data. currentRoutes=" + currentRoutes + ", currentSystemSessionInfo=" + currentSystemSessionInfo); return; } + synchronized (mLock) { + mRoutes.clear(); + for (MediaRoute2Info route : currentRoutes) { + mRoutes.put(route.getId(), route); + } + updateFilteredRoutesLocked(); + } + + RoutingSessionInfo oldInfo = mSystemController.getRoutingSessionInfo(); + mSystemController.setRoutingSessionInfo(currentSystemSessionInfo); + if (!oldInfo.equals(currentSystemSessionInfo)) { + notifyControllerUpdated(mSystemController); + } + } + + void dispatchFilteredRoutesChangedLocked(List<MediaRoute2Info> newRoutes) { List<MediaRoute2Info> addedRoutes = new ArrayList<>(); List<MediaRoute2Info> removedRoutes = new ArrayList<>(); List<MediaRoute2Info> changedRoutes = new ArrayList<>(); - synchronized (mLock) { - List<String> currentRoutesIds = currentRoutes.stream().map(MediaRoute2Info::getId) - .collect(Collectors.toList()); - - for (String routeId : mRoutes.keySet()) { - if (!currentRoutesIds.contains(routeId)) { - // This route is removed while the callback is unregistered. - MediaRoute2Info route = mRoutes.get(routeId); - if (route.hasAnyFeatures(mDiscoveryPreference.getPreferredFeatures())) { - removedRoutes.add(mRoutes.get(routeId)); - } - } - } + Set<String> newRouteIds = + newRoutes.stream().map(MediaRoute2Info::getId).collect(Collectors.toSet()); - for (MediaRoute2Info route : currentRoutes) { - if (mRoutes.containsKey(route.getId())) { - if (!route.equals(mRoutes.get(route.getId()))) { - // This route is changed while the callback is unregistered. - if (route.hasAnyFeatures( - mDiscoveryPreference.getPreferredFeatures())) { - changedRoutes.add(route); - } - } - } else { - // This route is added while the callback is unregistered. - if (route.hasAnyFeatures(mDiscoveryPreference.getPreferredFeatures())) { - addedRoutes.add(route); - } - } + for (MediaRoute2Info route : newRoutes) { + MediaRoute2Info prevRoute = mPreviousRoutes.get(route.getId()); + if (prevRoute == null) { + addedRoutes.add(route); + } else if (!prevRoute.equals(route)) { + changedRoutes.add(route); } + } - mRoutes.clear(); - for (MediaRoute2Info route : currentRoutes) { - mRoutes.put(route.getId(), route); + for (int i = 0; i < mPreviousRoutes.size(); i++) { + if (!newRouteIds.contains(mPreviousRoutes.keyAt(i))) { + removedRoutes.add(mPreviousRoutes.valueAt(i)); } + } - mShouldUpdateRoutes = true; + // update previous routes + for (MediaRoute2Info route : removedRoutes) { + mPreviousRoutes.remove(route.getId()); + } + for (MediaRoute2Info route : addedRoutes) { + mPreviousRoutes.put(route.getId(), route); + } + for (MediaRoute2Info route : changedRoutes) { + mPreviousRoutes.put(route.getId(), route); } if (!addedRoutes.isEmpty()) { @@ -829,43 +836,23 @@ public final class MediaRouter2 { if (!changedRoutes.isEmpty()) { notifyRoutesChanged(changedRoutes); } - - RoutingSessionInfo oldInfo = mSystemController.getRoutingSessionInfo(); - mSystemController.setRoutingSessionInfo(currentSystemSessionInfo); - if (!oldInfo.equals(currentSystemSessionInfo)) { - notifyControllerUpdated(mSystemController); - } } void addRoutesOnHandler(List<MediaRoute2Info> routes) { - List<MediaRoute2Info> addedRoutes = new ArrayList<>(); synchronized (mLock) { for (MediaRoute2Info route : routes) { mRoutes.put(route.getId(), route); - if (route.hasAnyFeatures(mDiscoveryPreference.getPreferredFeatures())) { - addedRoutes.add(route); - } } - mShouldUpdateRoutes = true; - } - if (!addedRoutes.isEmpty()) { - notifyRoutesAdded(addedRoutes); + updateFilteredRoutesLocked(); } } void removeRoutesOnHandler(List<MediaRoute2Info> routes) { - List<MediaRoute2Info> removedRoutes = new ArrayList<>(); synchronized (mLock) { for (MediaRoute2Info route : routes) { mRoutes.remove(route.getId()); - if (route.hasAnyFeatures(mDiscoveryPreference.getPreferredFeatures())) { - removedRoutes.add(route); - } } - mShouldUpdateRoutes = true; - } - if (!removedRoutes.isEmpty()) { - notifyRoutesRemoved(removedRoutes); + updateFilteredRoutesLocked(); } } @@ -874,23 +861,27 @@ public final class MediaRouter2 { synchronized (mLock) { for (MediaRoute2Info route : routes) { mRoutes.put(route.getId(), route); - if (route.hasAnyFeatures(mDiscoveryPreference.getPreferredFeatures())) { - changedRoutes.add(route); - } } - mShouldUpdateRoutes = true; - } - if (!changedRoutes.isEmpty()) { - notifyRoutesChanged(changedRoutes); + updateFilteredRoutesLocked(); } } + /** Updates filtered routes and dispatch callbacks */ + @GuardedBy("mLock") + void updateFilteredRoutesLocked() { + mFilteredRoutes = + Collections.unmodifiableList( + filterRoutesWithCompositePreferenceLocked(List.copyOf(mRoutes.values()))); + mHandler.sendMessage( + obtainMessage(MediaRouter2::dispatchFilteredRoutesChangedLocked, + this, mFilteredRoutes)); + } + /** - * Creates a controller and calls the {@link TransferCallback#onTransfer}. - * If the controller creation has failed, then it calls - * {@link TransferCallback#onTransferFailure}. - * <p> - * Pass {@code null} to sessionInfo for the failure case. + * Creates a controller and calls the {@link TransferCallback#onTransfer}. If the controller + * creation has failed, then it calls {@link TransferCallback#onTransferFailure}. + * + * <p>Pass {@code null} to sessionInfo for the failure case. */ void createControllerOnHandler(int requestId, @Nullable RoutingSessionInfo sessionInfo) { ControllerCreationRequest matchingRequest = null; @@ -913,12 +904,15 @@ public final class MediaRouter2 { if (sessionInfo == null) { notifyTransferFailure(requestedRoute); return; - } else if (!TextUtils.equals(requestedRoute.getProviderId(), - sessionInfo.getProviderId())) { - Log.w(TAG, "The session's provider ID does not match the requested route's. " - + "(requested route's providerId=" + requestedRoute.getProviderId() - + ", actual providerId=" + sessionInfo.getProviderId() - + ")"); + } else if (!TextUtils.equals(requestedRoute.getProviderId(), sessionInfo.getProviderId())) { + Log.w( + TAG, + "The session's provider ID does not match the requested route's. " + + "(requested route's providerId=" + + requestedRoute.getProviderId() + + ", actual providerId=" + + sessionInfo.getProviderId() + + ")"); notifyTransferFailure(requestedRoute); return; } @@ -927,9 +921,12 @@ public final class MediaRouter2 { // When the old controller is released before transferred, treat it as a failure. // This could also happen when transfer is requested twice or more. if (!oldController.scheduleRelease()) { - Log.w(TAG, "createControllerOnHandler: " - + "Ignoring controller creation for released old controller. " - + "oldController=" + oldController); + Log.w( + TAG, + "createControllerOnHandler: " + + "Ignoring controller creation for released old controller. " + + "oldController=" + + oldController); if (!sessionInfo.isSystemSession()) { new RoutingController(sessionInfo).release(); } @@ -971,15 +968,21 @@ public final class MediaRouter2 { } if (matchingController == null) { - Log.w(TAG, "updateControllerOnHandler: Matching controller not found. uniqueSessionId=" - + sessionInfo.getId()); + Log.w( + TAG, + "updateControllerOnHandler: Matching controller not found. uniqueSessionId=" + + sessionInfo.getId()); return; } RoutingSessionInfo oldInfo = matchingController.getRoutingSessionInfo(); if (!TextUtils.equals(oldInfo.getProviderId(), sessionInfo.getProviderId())) { - Log.w(TAG, "updateControllerOnHandler: Provider IDs are not matched. old=" - + oldInfo.getProviderId() + ", new=" + sessionInfo.getProviderId()); + Log.w( + TAG, + "updateControllerOnHandler: Provider IDs are not matched. old=" + + oldInfo.getProviderId() + + ", new=" + + sessionInfo.getProviderId()); return; } @@ -1000,24 +1003,31 @@ public final class MediaRouter2 { if (matchingController == null) { if (DEBUG) { - Log.d(TAG, "releaseControllerOnHandler: Matching controller not found. " - + "uniqueSessionId=" + sessionInfo.getId()); + Log.d( + TAG, + "releaseControllerOnHandler: Matching controller not found. " + + "uniqueSessionId=" + + sessionInfo.getId()); } return; } RoutingSessionInfo oldInfo = matchingController.getRoutingSessionInfo(); if (!TextUtils.equals(oldInfo.getProviderId(), sessionInfo.getProviderId())) { - Log.w(TAG, "releaseControllerOnHandler: Provider IDs are not matched. old=" - + oldInfo.getProviderId() + ", new=" + sessionInfo.getProviderId()); + Log.w( + TAG, + "releaseControllerOnHandler: Provider IDs are not matched. old=" + + oldInfo.getProviderId() + + ", new=" + + sessionInfo.getProviderId()); return; } matchingController.releaseInternal(/* shouldReleaseSession= */ false); } - void onRequestCreateControllerByManagerOnHandler(RoutingSessionInfo oldSession, - MediaRoute2Info route, long managerRequestId) { + void onRequestCreateControllerByManagerOnHandler( + RoutingSessionInfo oldSession, MediaRoute2Info route, long managerRequestId) { RoutingController controller; if (oldSession.isSystemSession()) { controller = getSystemController(); @@ -1033,17 +1043,17 @@ public final class MediaRouter2 { } /** - * Returns whether this router is created with {@link #getInstance(Context, String)}. - * This kind of router can control the target app's media routing. + * Returns whether this router is created with {@link #getInstance(Context, String)}. This kind + * of router can control the target app's media routing. */ private boolean isSystemRouter() { return mClientPackageName != null; } /** - * Returns a {@link RoutingSessionInfo} which has the client package name. - * The client package name is set only when the given sessionInfo doesn't have it. - * Should only used for system media routers. + * Returns a {@link RoutingSessionInfo} which has the client package name. The client package + * name is set only when the given sessionInfo doesn't have it. Should only used for system + * media routers. */ private RoutingSessionInfo ensureClientPackageNameForSystemSession( @NonNull RoutingSessionInfo sessionInfo) { @@ -1057,41 +1067,44 @@ public final class MediaRouter2 { .build(); } - private List<MediaRoute2Info> getSortedRoutes(List<MediaRoute2Info> routes, - RouteDiscoveryPreference preference) { - if (!preference.shouldRemoveDuplicates()) { + private List<MediaRoute2Info> getSortedRoutes( + List<MediaRoute2Info> routes, List<String> packageOrder) { + if (packageOrder.isEmpty()) { return routes; } Map<String, Integer> packagePriority = new ArrayMap<>(); - int count = preference.getDeduplicationPackageOrder().size(); + int count = packageOrder.size(); for (int i = 0; i < count; i++) { // the last package will have 1 as the priority - packagePriority.put(preference.getDeduplicationPackageOrder().get(i), count - i); + packagePriority.put(packageOrder.get(i), count - i); } ArrayList<MediaRoute2Info> sortedRoutes = new ArrayList<>(routes); // take the negative for descending order - sortedRoutes.sort(Comparator.comparingInt( - r -> -packagePriority.getOrDefault(r.getPackageName(), 0))); + sortedRoutes.sort( + Comparator.comparingInt(r -> -packagePriority.getOrDefault(r.getPackageName(), 0))); return sortedRoutes; } - private List<MediaRoute2Info> filterRoutes(List<MediaRoute2Info> routes, - RouteDiscoveryPreference discoveryPreference) { + @GuardedBy("mLock") + private List<MediaRoute2Info> filterRoutesWithCompositePreferenceLocked( + List<MediaRoute2Info> routes) { Set<String> deduplicationIdSet = new ArraySet<>(); List<MediaRoute2Info> filteredRoutes = new ArrayList<>(); - for (MediaRoute2Info route : getSortedRoutes(routes, discoveryPreference)) { - if (!route.hasAnyFeatures(discoveryPreference.getPreferredFeatures())) { + for (MediaRoute2Info route : + getSortedRoutes(routes, mDiscoveryPreference.getDeduplicationPackageOrder())) { + if (!route.hasAnyFeatures(mDiscoveryPreference.getPreferredFeatures())) { continue; } - if (!discoveryPreference.getAllowedPackages().isEmpty() + if (!mDiscoveryPreference.getAllowedPackages().isEmpty() && (route.getPackageName() == null - || !discoveryPreference.getAllowedPackages() - .contains(route.getPackageName()))) { + || !mDiscoveryPreference + .getAllowedPackages() + .contains(route.getPackageName()))) { continue; } - if (discoveryPreference.shouldRemoveDuplicates()) { + if (mDiscoveryPreference.shouldRemoveDuplicates()) { if (!Collections.disjoint(deduplicationIdSet, route.getDeduplicationIds())) { continue; } @@ -1102,6 +1115,25 @@ public final class MediaRouter2 { return filteredRoutes; } + private List<MediaRoute2Info> filterRoutesWithIndividualPreference( + List<MediaRoute2Info> routes, RouteDiscoveryPreference discoveryPreference) { + List<MediaRoute2Info> filteredRoutes = new ArrayList<>(); + for (MediaRoute2Info route : routes) { + if (!route.hasAnyFeatures(discoveryPreference.getPreferredFeatures())) { + continue; + } + if (!discoveryPreference.getAllowedPackages().isEmpty() + && (route.getPackageName() == null + || !discoveryPreference + .getAllowedPackages() + .contains(route.getPackageName()))) { + continue; + } + filteredRoutes.add(route); + } + return filteredRoutes; + } + private void updateAllRoutesFromManager() { if (!isSystemRouter()) { return; @@ -1111,23 +1143,24 @@ public final class MediaRouter2 { for (MediaRoute2Info route : sManager.getAllRoutes()) { mRoutes.put(route.getId(), route); } - mShouldUpdateRoutes = true; + updateFilteredRoutesLocked(); } } private void notifyRoutesAdded(List<MediaRoute2Info> routes) { - for (RouteCallbackRecord record: mRouteCallbackRecords) { - List<MediaRoute2Info> filteredRoutes = filterRoutes(routes, record.mPreference); + for (RouteCallbackRecord record : mRouteCallbackRecords) { + List<MediaRoute2Info> filteredRoutes = + filterRoutesWithIndividualPreference(routes, record.mPreference); if (!filteredRoutes.isEmpty()) { - record.mExecutor.execute( - () -> record.mRouteCallback.onRoutesAdded(filteredRoutes)); + record.mExecutor.execute(() -> record.mRouteCallback.onRoutesAdded(filteredRoutes)); } } } private void notifyRoutesRemoved(List<MediaRoute2Info> routes) { - for (RouteCallbackRecord record: mRouteCallbackRecords) { - List<MediaRoute2Info> filteredRoutes = filterRoutes(routes, record.mPreference); + for (RouteCallbackRecord record : mRouteCallbackRecords) { + List<MediaRoute2Info> filteredRoutes = + filterRoutesWithIndividualPreference(routes, record.mPreference); if (!filteredRoutes.isEmpty()) { record.mExecutor.execute( () -> record.mRouteCallback.onRoutesRemoved(filteredRoutes)); @@ -1136,8 +1169,9 @@ public final class MediaRouter2 { } private void notifyRoutesChanged(List<MediaRoute2Info> routes) { - for (RouteCallbackRecord record: mRouteCallbackRecords) { - List<MediaRoute2Info> filteredRoutes = filterRoutes(routes, record.mPreference); + for (RouteCallbackRecord record : mRouteCallbackRecords) { + List<MediaRoute2Info> filteredRoutes = + filterRoutesWithIndividualPreference(routes, record.mPreference); if (!filteredRoutes.isEmpty()) { record.mExecutor.execute( () -> record.mRouteCallback.onRoutesChanged(filteredRoutes)); @@ -1146,46 +1180,42 @@ public final class MediaRouter2 { } private void notifyPreferredFeaturesChanged(List<String> features) { - for (RouteCallbackRecord record: mRouteCallbackRecords) { + for (RouteCallbackRecord record : mRouteCallbackRecords) { record.mExecutor.execute( () -> record.mRouteCallback.onPreferredFeaturesChanged(features)); } } private void notifyTransfer(RoutingController oldController, RoutingController newController) { - for (TransferCallbackRecord record: mTransferCallbackRecords) { + for (TransferCallbackRecord record : mTransferCallbackRecords) { record.mExecutor.execute( () -> record.mTransferCallback.onTransfer(oldController, newController)); } } private void notifyTransferFailure(MediaRoute2Info route) { - for (TransferCallbackRecord record: mTransferCallbackRecords) { - record.mExecutor.execute( - () -> record.mTransferCallback.onTransferFailure(route)); + for (TransferCallbackRecord record : mTransferCallbackRecords) { + record.mExecutor.execute(() -> record.mTransferCallback.onTransferFailure(route)); } } private void notifyStop(RoutingController controller) { - for (TransferCallbackRecord record: mTransferCallbackRecords) { - record.mExecutor.execute( - () -> record.mTransferCallback.onStop(controller)); + for (TransferCallbackRecord record : mTransferCallbackRecords) { + record.mExecutor.execute(() -> record.mTransferCallback.onStop(controller)); } } private void notifyControllerUpdated(RoutingController controller) { - for (ControllerCallbackRecord record: mControllerCallbackRecords) { + for (ControllerCallbackRecord record : mControllerCallbackRecords) { record.mExecutor.execute(() -> record.mCallback.onControllerUpdated(controller)); } } - /** - * Callback for receiving events about media route discovery. - */ + /** Callback for receiving events about media route discovery. */ public abstract static class RouteCallback { /** - * Called when routes are added. Whenever you registers a callback, this will - * be invoked with known routes. + * Called when routes are added. Whenever you registers a callback, this will be invoked + * with known routes. * * @param routes the list of routes that have been added. It's never empty. */ @@ -1199,17 +1229,17 @@ public final class MediaRouter2 { public void onRoutesRemoved(@NonNull List<MediaRoute2Info> routes) {} /** - * Called when routes are changed. For example, it is called when the route's name - * or volume have been changed. + * Called when routes are changed. For example, it is called when the route's name or volume + * have been changed. * * @param routes the list of routes that have been changed. It's never empty. */ public void onRoutesChanged(@NonNull List<MediaRoute2Info> routes) {} /** - * Called when the client app's preferred features are changed. - * When this is called, it is recommended to {@link #getRoutes()} to get the routes - * that are currently available to the app. + * Called when the client app's preferred features are changed. When this is called, it is + * recommended to {@link #getRoutes()} to get the routes that are currently available to the + * app. * * @param preferredFeatures the new preferred features set by the application * @hide @@ -1218,26 +1248,25 @@ public final class MediaRouter2 { public void onPreferredFeaturesChanged(@NonNull List<String> preferredFeatures) {} } - /** - * Callback for receiving events on media transfer. - */ + /** Callback for receiving events on media transfer. */ public abstract static class TransferCallback { /** - * Called when a media is transferred between two different routing controllers. - * This can happen by calling {@link #transferTo(MediaRoute2Info)}. - * <p> Override this to start playback with {@code newController}. You may want to get - * the status of the media that is being played with {@code oldController} and resume it - * continuously with {@code newController}. - * After this is called, any callbacks with {@code oldController} will not be invoked - * unless {@code oldController} is the {@link #getSystemController() system controller}. - * You need to {@link RoutingController#release() release} {@code oldController} before - * playing the media with {@code newController}. + * Called when a media is transferred between two different routing controllers. This can + * happen by calling {@link #transferTo(MediaRoute2Info)}. + * + * <p>Override this to start playback with {@code newController}. You may want to get the + * status of the media that is being played with {@code oldController} and resume it + * continuously with {@code newController}. After this is called, any callbacks with {@code + * oldController} will not be invoked unless {@code oldController} is the {@link + * #getSystemController() system controller}. You need to {@link RoutingController#release() + * release} {@code oldController} before playing the media with {@code newController}. * * @param oldController the previous controller that controlled routing * @param newController the new controller to control routing * @see #transferTo(MediaRoute2Info) */ - public void onTransfer(@NonNull RoutingController oldController, + public void onTransfer( + @NonNull RoutingController oldController, @NonNull RoutingController newController) {} /** @@ -1248,61 +1277,58 @@ public final class MediaRouter2 { public void onTransferFailure(@NonNull MediaRoute2Info requestedRoute) {} /** - * Called when a media routing stops. It can be stopped by a user or a provider. - * App should not continue playing media locally when this method is called. - * The {@code controller} is released before this method is called. + * Called when a media routing stops. It can be stopped by a user or a provider. App should + * not continue playing media locally when this method is called. The {@code controller} is + * released before this method is called. * * @param controller the controller that controlled the stopped media routing */ - public void onStop(@NonNull RoutingController controller) { } + public void onStop(@NonNull RoutingController controller) {} } /** - * A listener interface to send optional app-specific hints when creating a - * {@link RoutingController}. + * A listener interface to send optional app-specific hints when creating a {@link + * RoutingController}. */ public interface OnGetControllerHintsListener { /** - * Called when the {@link MediaRouter2} or the system is about to request - * a media route provider service to create a controller with the given route. - * The {@link Bundle} returned here will be sent to media route provider service as a hint. - * <p> - * Since controller creation can be requested by the {@link MediaRouter2} and the system, - * set the listener as soon as possible after acquiring {@link MediaRouter2} instance. - * The method will be called on the same thread that calls - * {@link #transferTo(MediaRoute2Info)} or the main thread if it is requested by the system. + * Called when the {@link MediaRouter2} or the system is about to request a media route + * provider service to create a controller with the given route. The {@link Bundle} returned + * here will be sent to media route provider service as a hint. + * + * <p>Since controller creation can be requested by the {@link MediaRouter2} and the system, + * set the listener as soon as possible after acquiring {@link MediaRouter2} instance. The + * method will be called on the same thread that calls {@link #transferTo(MediaRoute2Info)} + * or the main thread if it is requested by the system. * * @param route the route to create a controller with - * @return An optional bundle of app-specific arguments to send to the provider, - * or {@code null} if none. The contents of this bundle may affect the result of - * controller creation. + * @return An optional bundle of app-specific arguments to send to the provider, or {@code + * null} if none. The contents of this bundle may affect the result of controller + * creation. * @see MediaRoute2ProviderService#onCreateSession(long, String, String, Bundle) */ @Nullable Bundle onGetControllerHints(@NonNull MediaRoute2Info route); } - /** - * Callback for receiving {@link RoutingController} updates. - */ + /** Callback for receiving {@link RoutingController} updates. */ public abstract static class ControllerCallback { /** - * Called when a controller is updated. (e.g., when the selected routes of the - * controller is changed or when the volume of the controller is changed.) + * Called when a controller is updated. (e.g., when the selected routes of the controller is + * changed or when the volume of the controller is changed.) * - * @param controller the updated controller. It may be the - * {@link #getSystemController() system controller}. + * @param controller the updated controller. It may be the {@link #getSystemController() + * system controller}. * @see #getSystemController() */ - public void onControllerUpdated(@NonNull RoutingController controller) { } + public void onControllerUpdated(@NonNull RoutingController controller) {} } /** - * A class to control media routing session in media route provider. - * For example, selecting/deselecting/transferring to routes of a session can be done through - * this. Instances are created when - * {@link TransferCallback#onTransfer(RoutingController, RoutingController)} is called, - * which is invoked after {@link #transferTo(MediaRoute2Info)} is called. + * A class to control media routing session in media route provider. For example, + * selecting/deselecting/transferring to routes of a session can be done through this. Instances + * are created when {@link TransferCallback#onTransfer(RoutingController, RoutingController)} is + * called, which is invoked after {@link #transferTo(MediaRoute2Info)} is called. */ public class RoutingController { private final Object mControllerLock = new Object(); @@ -1339,8 +1365,8 @@ public final class MediaRouter2 { } /** - * Gets the original session ID set by - * {@link RoutingSessionInfo.Builder#Builder(String, String)}. + * Gets the original session ID set by {@link RoutingSessionInfo.Builder#Builder(String, + * String)}. * * @hide */ @@ -1353,8 +1379,8 @@ public final class MediaRouter2 { } /** - * Gets the control hints used to control routing session if available. - * It is set by the media route provider. + * Gets the control hints used to control routing session if available. It is set by the + * media route provider. */ @Nullable public Bundle getControlHints() { @@ -1401,11 +1427,12 @@ public final class MediaRouter2 { /** * Gets the information about how volume is handled on the session. - * <p>Please note that you may not control the volume of the session even when - * you can control the volume of each selected route in the session. * - * @return {@link MediaRoute2Info#PLAYBACK_VOLUME_FIXED} or - * {@link MediaRoute2Info#PLAYBACK_VOLUME_VARIABLE} + * <p>Please note that you may not control the volume of the session even when you can + * control the volume of each selected route in the session. + * + * @return {@link MediaRoute2Info#PLAYBACK_VOLUME_FIXED} or {@link + * MediaRoute2Info#PLAYBACK_VOLUME_VARIABLE} */ @MediaRoute2Info.PlaybackVolume public int getVolumeHandling() { @@ -1414,9 +1441,7 @@ public final class MediaRouter2 { } } - /** - * Gets the maximum volume of the session. - */ + /** Gets the maximum volume of the session. */ public int getVolumeMax() { synchronized (mControllerLock) { return mSessionInfo.getVolumeMax(); @@ -1425,11 +1450,10 @@ public final class MediaRouter2 { /** * Gets the current volume of the session. - * <p> - * When it's available, it represents the volume of routing session, which is a group - * of selected routes. Use {@link MediaRoute2Info#getVolume()} - * to get the volume of a route, - * </p> + * + * <p>When it's available, it represents the volume of routing session, which is a group of + * selected routes. Use {@link MediaRoute2Info#getVolume()} to get the volume of a route, + * * @see MediaRoute2Info#getVolume() */ public int getVolume() { @@ -1439,9 +1463,9 @@ public final class MediaRouter2 { } /** - * Returns true if this controller is released, false otherwise. - * If it is released, then all other getters from this instance may return invalid values. - * Also, any operations to this instance will be ignored once released. + * Returns true if this controller is released, false otherwise. If it is released, then all + * other getters from this instance may return invalid values. Also, any operations to this + * instance will be ignored once released. * * @see #release */ @@ -1454,14 +1478,16 @@ public final class MediaRouter2 { /** * Selects a route for the remote session. After a route is selected, the media is expected * to be played to the all the selected routes. This is different from {@link - * MediaRouter2#transferTo(MediaRoute2Info)} transferring to a route}, - * where the media is expected to 'move' from one route to another. - * <p> - * The given route must satisfy all of the following conditions: + * MediaRouter2#transferTo(MediaRoute2Info)} transferring to a route}, where the media is + * expected to 'move' from one route to another. + * + * <p>The given route must satisfy all of the following conditions: + * * <ul> - * <li>It should not be included in {@link #getSelectedRoutes()}</li> - * <li>It should be included in {@link #getSelectableRoutes()}</li> + * <li>It should not be included in {@link #getSelectedRoutes()} + * <li>It should be included in {@link #getSelectableRoutes()} * </ul> + * * If the route doesn't meet any of above conditions, it will be ignored. * * @see #deselectRoute(MediaRoute2Info) @@ -1509,12 +1535,14 @@ public final class MediaRouter2 { /** * Deselects a route from the remote session. After a route is deselected, the media is * expected to be stopped on the deselected route. - * <p> - * The given route must satisfy all of the following conditions: + * + * <p>The given route must satisfy all of the following conditions: + * * <ul> - * <li>It should be included in {@link #getSelectedRoutes()}</li> - * <li>It should be included in {@link #getDeselectableRoutes()}</li> + * <li>It should be included in {@link #getSelectedRoutes()} + * <li>It should be included in {@link #getDeselectableRoutes()} * </ul> + * * If the route doesn't meet any of above conditions, it will be ignored. * * @see #getSelectedRoutes() @@ -1559,8 +1587,8 @@ public final class MediaRouter2 { } /** - * Transfers to a given route for the remote session. The given route must be included - * in {@link RoutingSessionInfo#getTransferableRoutes()}. + * Transfers to a given route for the remote session. The given route must be included in + * {@link RoutingSessionInfo#getTransferableRoutes()}. * * @see RoutingSessionInfo#getSelectedRoutes() * @see RoutingSessionInfo#getTransferableRoutes() @@ -1597,7 +1625,7 @@ public final class MediaRouter2 { * Requests a volume change for the remote session asynchronously. * * @param volume The new volume value between 0 and {@link RoutingController#getVolumeMax} - * (inclusive). + * (inclusive). * @see #getVolume() */ public void setVolume(int volume) { @@ -1634,9 +1662,9 @@ public final class MediaRouter2 { } /** - * Releases this controller and the corresponding session. - * Any operations on this controller after calling this method will be ignored. - * The devices that are playing media will stop playing it. + * Releases this controller and the corresponding session. Any operations on this controller + * after calling this method will be ignored. The devices that are playing media will stop + * playing it. */ public void release() { releaseInternal(/* shouldReleaseSession= */ true); @@ -1644,8 +1672,9 @@ public final class MediaRouter2 { /** * Schedules release of the controller. + * * @return {@code true} if it's successfully scheduled, {@code false} if it's already - * scheduled to be released or released. + * scheduled to be released or released. */ boolean scheduleRelease() { synchronized (mControllerLock) { @@ -1701,11 +1730,15 @@ public final class MediaRouter2 { } if (shouldNotifyStop) { - mHandler.sendMessage(obtainMessage(MediaRouter2::notifyStop, MediaRouter2.this, - RoutingController.this)); + mHandler.sendMessage( + obtainMessage( + MediaRouter2::notifyStop, + MediaRouter2.this, + RoutingController.this)); } - if (mRouteCallbackRecords.isEmpty() && mNonSystemRoutingControllers.isEmpty() + if (mRouteCallbackRecords.isEmpty() + && mNonSystemRoutingControllers.isEmpty() && mStub != null) { try { mMediaRouterService.unregisterRouter2(mStub); @@ -1720,26 +1753,34 @@ public final class MediaRouter2 { @Override public String toString() { // To prevent logging spam, we only print the ID of each route. - List<String> selectedRoutes = getSelectedRoutes().stream() - .map(MediaRoute2Info::getId).collect(Collectors.toList()); - List<String> selectableRoutes = getSelectableRoutes().stream() - .map(MediaRoute2Info::getId).collect(Collectors.toList()); - List<String> deselectableRoutes = getDeselectableRoutes().stream() - .map(MediaRoute2Info::getId).collect(Collectors.toList()); - - StringBuilder result = new StringBuilder() - .append("RoutingController{ ") - .append("id=").append(getId()) - .append(", selectedRoutes={") - .append(selectedRoutes) - .append("}") - .append(", selectableRoutes={") - .append(selectableRoutes) - .append("}") - .append(", deselectableRoutes={") - .append(deselectableRoutes) - .append("}") - .append(" }"); + List<String> selectedRoutes = + getSelectedRoutes().stream() + .map(MediaRoute2Info::getId) + .collect(Collectors.toList()); + List<String> selectableRoutes = + getSelectableRoutes().stream() + .map(MediaRoute2Info::getId) + .collect(Collectors.toList()); + List<String> deselectableRoutes = + getDeselectableRoutes().stream() + .map(MediaRoute2Info::getId) + .collect(Collectors.toList()); + + StringBuilder result = + new StringBuilder() + .append("RoutingController{ ") + .append("id=") + .append(getId()) + .append(", selectedRoutes={") + .append(selectedRoutes) + .append("}") + .append(", selectableRoutes={") + .append(selectableRoutes) + .append("}") + .append(", deselectableRoutes={") + .append(deselectableRoutes) + .append("}") + .append(" }"); return result.toString(); } @@ -1764,7 +1805,8 @@ public final class MediaRouter2 { } synchronized (mLock) { - return routeIds.stream().map(mRoutes::get) + return routeIds.stream() + .map(mRoutes::get) .filter(Objects::nonNull) .collect(Collectors.toList()); } @@ -1799,7 +1841,9 @@ public final class MediaRouter2 { public final RouteCallback mRouteCallback; public final RouteDiscoveryPreference mPreference; - RouteCallbackRecord(@Nullable Executor executor, @NonNull RouteCallback routeCallback, + RouteCallbackRecord( + @Nullable Executor executor, + @NonNull RouteCallback routeCallback, @Nullable RouteDiscoveryPreference preference) { mRouteCallback = routeCallback; mExecutor = executor; @@ -1827,8 +1871,8 @@ public final class MediaRouter2 { public final Executor mExecutor; public final TransferCallback mTransferCallback; - TransferCallbackRecord(@NonNull Executor executor, - @NonNull TransferCallback transferCallback) { + TransferCallbackRecord( + @NonNull Executor executor, @NonNull TransferCallback transferCallback) { mTransferCallback = transferCallback; mExecutor = executor; } @@ -1854,8 +1898,8 @@ public final class MediaRouter2 { public final Executor mExecutor; public final ControllerCallback mCallback; - ControllerCallbackRecord(@Nullable Executor executor, - @NonNull ControllerCallback callback) { + ControllerCallbackRecord( + @Nullable Executor executor, @NonNull ControllerCallback callback) { mCallback = callback; mExecutor = executor; } @@ -1883,66 +1927,87 @@ public final class MediaRouter2 { public final MediaRoute2Info mRoute; public final RoutingController mOldController; - ControllerCreationRequest(int requestId, long managerRequestId, - @NonNull MediaRoute2Info route, @NonNull RoutingController oldController) { + ControllerCreationRequest( + int requestId, + long managerRequestId, + @NonNull MediaRoute2Info route, + @NonNull RoutingController oldController) { mRequestId = requestId; mManagerRequestId = managerRequestId; mRoute = Objects.requireNonNull(route, "route must not be null"); - mOldController = Objects.requireNonNull(oldController, - "oldController must not be null"); + mOldController = + Objects.requireNonNull(oldController, "oldController must not be null"); } } class MediaRouter2Stub extends IMediaRouter2.Stub { @Override - public void notifyRouterRegistered(List<MediaRoute2Info> currentRoutes, - RoutingSessionInfo currentSystemSessionInfo) { - mHandler.sendMessage(obtainMessage(MediaRouter2::syncRoutesOnHandler, - MediaRouter2.this, currentRoutes, currentSystemSessionInfo)); + public void notifyRouterRegistered( + List<MediaRoute2Info> currentRoutes, RoutingSessionInfo currentSystemSessionInfo) { + mHandler.sendMessage( + obtainMessage( + MediaRouter2::syncRoutesOnHandler, + MediaRouter2.this, + currentRoutes, + currentSystemSessionInfo)); } @Override public void notifyRoutesAdded(List<MediaRoute2Info> routes) { - mHandler.sendMessage(obtainMessage(MediaRouter2::addRoutesOnHandler, - MediaRouter2.this, routes)); + mHandler.sendMessage( + obtainMessage(MediaRouter2::addRoutesOnHandler, MediaRouter2.this, routes)); } @Override public void notifyRoutesRemoved(List<MediaRoute2Info> routes) { - mHandler.sendMessage(obtainMessage(MediaRouter2::removeRoutesOnHandler, - MediaRouter2.this, routes)); + mHandler.sendMessage( + obtainMessage(MediaRouter2::removeRoutesOnHandler, MediaRouter2.this, routes)); } @Override public void notifyRoutesChanged(List<MediaRoute2Info> routes) { - mHandler.sendMessage(obtainMessage(MediaRouter2::changeRoutesOnHandler, - MediaRouter2.this, routes)); + mHandler.sendMessage( + obtainMessage(MediaRouter2::changeRoutesOnHandler, MediaRouter2.this, routes)); } @Override public void notifySessionCreated(int requestId, @Nullable RoutingSessionInfo sessionInfo) { - mHandler.sendMessage(obtainMessage(MediaRouter2::createControllerOnHandler, - MediaRouter2.this, requestId, sessionInfo)); + mHandler.sendMessage( + obtainMessage( + MediaRouter2::createControllerOnHandler, + MediaRouter2.this, + requestId, + sessionInfo)); } @Override public void notifySessionInfoChanged(@Nullable RoutingSessionInfo sessionInfo) { - mHandler.sendMessage(obtainMessage(MediaRouter2::updateControllerOnHandler, - MediaRouter2.this, sessionInfo)); + mHandler.sendMessage( + obtainMessage( + MediaRouter2::updateControllerOnHandler, + MediaRouter2.this, + sessionInfo)); } @Override public void notifySessionReleased(RoutingSessionInfo sessionInfo) { - mHandler.sendMessage(obtainMessage(MediaRouter2::releaseControllerOnHandler, - MediaRouter2.this, sessionInfo)); + mHandler.sendMessage( + obtainMessage( + MediaRouter2::releaseControllerOnHandler, + MediaRouter2.this, + sessionInfo)); } @Override - public void requestCreateSessionByManager(long managerRequestId, - RoutingSessionInfo oldSession, MediaRoute2Info route) { - mHandler.sendMessage(obtainMessage( - MediaRouter2::onRequestCreateControllerByManagerOnHandler, - MediaRouter2.this, oldSession, route, managerRequestId)); + public void requestCreateSessionByManager( + long managerRequestId, RoutingSessionInfo oldSession, MediaRoute2Info route) { + mHandler.sendMessage( + obtainMessage( + MediaRouter2::onRequestCreateControllerByManagerOnHandler, + MediaRouter2.this, + oldSession, + route, + managerRequestId)); } } @@ -1952,57 +2017,21 @@ public final class MediaRouter2 { @Override public void onRoutesAdded(@NonNull List<MediaRoute2Info> routes) { updateAllRoutesFromManager(); - - List<MediaRoute2Info> filteredRoutes; - synchronized (mLock) { - filteredRoutes = filterRoutes(routes, mDiscoveryPreference); - } - if (filteredRoutes.isEmpty()) { - return; - } - for (RouteCallbackRecord record: mRouteCallbackRecords) { - record.mExecutor.execute( - () -> record.mRouteCallback.onRoutesAdded(filteredRoutes)); - } } @Override public void onRoutesRemoved(@NonNull List<MediaRoute2Info> routes) { updateAllRoutesFromManager(); - - List<MediaRoute2Info> filteredRoutes; - synchronized (mLock) { - filteredRoutes = filterRoutes(routes, mDiscoveryPreference); - } - if (filteredRoutes.isEmpty()) { - return; - } - for (RouteCallbackRecord record: mRouteCallbackRecords) { - record.mExecutor.execute( - () -> record.mRouteCallback.onRoutesRemoved(filteredRoutes)); - } } @Override public void onRoutesChanged(@NonNull List<MediaRoute2Info> routes) { updateAllRoutesFromManager(); - - List<MediaRoute2Info> filteredRoutes; - synchronized (mLock) { - filteredRoutes = filterRoutes(routes, mDiscoveryPreference); - } - if (filteredRoutes.isEmpty()) { - return; - } - for (RouteCallbackRecord record: mRouteCallbackRecords) { - record.mExecutor.execute( - () -> record.mRouteCallback.onRoutesChanged(filteredRoutes)); - } } @Override - public void onTransferred(@NonNull RoutingSessionInfo oldSession, - @NonNull RoutingSessionInfo newSession) { + public void onTransferred( + @NonNull RoutingSessionInfo oldSession, @NonNull RoutingSessionInfo newSession) { if (!oldSession.isSystemSession() && !TextUtils.equals(mClientPackageName, oldSession.getClientPackageName())) { return; @@ -2018,7 +2047,6 @@ public final class MediaRouter2 { return; } - RoutingController oldController; if (oldSession.isSystemSession()) { mSystemController.setRoutingSessionInfo( @@ -2041,8 +2069,8 @@ public final class MediaRouter2 { } @Override - public void onTransferFailed(@NonNull RoutingSessionInfo session, - @NonNull MediaRoute2Info route) { + public void onTransferFailed( + @NonNull RoutingSessionInfo session, @NonNull MediaRoute2Info route) { if (!session.isSystemSession() && !TextUtils.equals(mClientPackageName, session.getClientPackageName())) { return; @@ -2083,8 +2111,8 @@ public final class MediaRouter2 { } @Override - public void onDiscoveryPreferenceChanged(@NonNull String packageName, - @NonNull RouteDiscoveryPreference preference) { + public void onDiscoveryPreferenceChanged( + @NonNull String packageName, @NonNull RouteDiscoveryPreference preference) { if (!TextUtils.equals(mClientPackageName, packageName)) { return; } diff --git a/media/java/android/media/NearbyDevice.java b/media/java/android/media/NearbyDevice.java index c203e7b2b88b..dbcc6b716c8f 100644 --- a/media/java/android/media/NearbyDevice.java +++ b/media/java/android/media/NearbyDevice.java @@ -22,9 +22,10 @@ import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Arrays; +import java.util.List; /** * A parcelable representing a nearby device that can be used for media transfer. @@ -35,6 +36,7 @@ import java.lang.annotation.RetentionPolicy; * <li>a range zone specifying how far away this device is from the device with the media route. * </li> * </ul> + * * @hide */ @SystemApi @@ -69,7 +71,7 @@ public final class NearbyDevice implements Parcelable { * * @hide */ - @IntDef(prefix = { "RANGE_" }, value = { + @IntDef(prefix = {"RANGE_"}, value = { RANGE_UNKNOWN, RANGE_FAR, RANGE_LONG, @@ -77,7 +79,8 @@ public final class NearbyDevice implements Parcelable { RANGE_WITHIN_REACH }) @Retention(RetentionPolicy.SOURCE) - public @interface RangeZone {} + public @interface RangeZone { + } /** * Gets a human-readable string of the range zone. @@ -102,8 +105,17 @@ public final class NearbyDevice implements Parcelable { } } - @NonNull private final String mMediaRoute2Id; - @RangeZone private final int mRangeZone; + /** + * A list stores all the range and list from far to close, used for range comparison. + */ + private static final List<Integer> RANGE_WEIGHT_LIST = + Arrays.asList(RANGE_UNKNOWN, + RANGE_FAR, RANGE_LONG, RANGE_CLOSE, RANGE_WITHIN_REACH); + + @NonNull + private final String mMediaRoute2Id; + @RangeZone + private final int mRangeZone; /** Creates a device object with the given ID and range zone. */ public NearbyDevice(@NonNull String mediaRoute2Id, @RangeZone int rangeZone) { @@ -129,6 +141,22 @@ public final class NearbyDevice implements Parcelable { } }; + /** + * Compares two ranges and return result. + * + * @return 0 means two ranges are the same, -1 means first range is closer, 1 means farther + * + * @hide + */ + public static int compareRangeZones(@RangeZone int rangeZone, @RangeZone int anotherRangeZone) { + if (rangeZone == anotherRangeZone) { + return 0; + } else { + return RANGE_WEIGHT_LIST.indexOf(rangeZone) > RANGE_WEIGHT_LIST.indexOf( + anotherRangeZone) ? -1 : 1; + } + } + @Override public int describeContents() { return 0; diff --git a/media/java/android/media/tv/interactive/TvInteractiveAppService.java b/media/java/android/media/tv/interactive/TvInteractiveAppService.java index 57730aca125f..52b00b7b43e5 100755 --- a/media/java/android/media/tv/interactive/TvInteractiveAppService.java +++ b/media/java/android/media/tv/interactive/TvInteractiveAppService.java @@ -986,7 +986,7 @@ public abstract class TvInteractiveAppService extends Service { if (DEBUG) { Log.d(TAG, "notifyContentAllowed"); } - notifyContentAllowed(); + onContentAllowed(); } void notifyContentBlocked(TvContentRating rating) { diff --git a/native/android/storage_manager.cpp b/native/android/storage_manager.cpp index 22725254fef6..9e0a6eb476d3 100644 --- a/native/android/storage_manager.cpp +++ b/native/android/storage_manager.cpp @@ -140,8 +140,7 @@ public: } } - void mountObb(const char* rawPath, const char* key, AStorageManager_obbCallbackFunc func, - void* data) { + void mountObb(const char* rawPath, AStorageManager_obbCallbackFunc func, void* data) { // Resolve path before sending to MountService char canonicalPath[PATH_MAX]; if (realpath(rawPath, canonicalPath) == NULL) { @@ -158,9 +157,7 @@ public: ObbCallback* cb = registerObbCallback(func, data); String16 rawPath16(rawPath); String16 canonicalPath16(canonicalPath); - String16 key16(key); - mMountService->mountObb(rawPath16, canonicalPath16, key16, mObbActionListener, - cb->nonce, obbInfo); + mMountService->mountObb(rawPath16, canonicalPath16, mObbActionListener, cb->nonce, obbInfo); } void unmountObb(const char* filename, const bool force, AStorageManager_obbCallbackFunc func, void* data) { @@ -207,7 +204,11 @@ void AStorageManager_delete(AStorageManager* mgr) { void AStorageManager_mountObb(AStorageManager* mgr, const char* filename, const char* key, AStorageManager_obbCallbackFunc cb, void* data) { - mgr->mountObb(filename, key, cb, data); + if (key != nullptr && key[0] != '\0') { + ALOGE("mounting encrypted OBBs is no longer supported"); + return; + } + mgr->mountObb(filename, cb, data); } void AStorageManager_unmountObb(AStorageManager* mgr, const char* filename, const int force, diff --git a/packages/CompanionDeviceManager/res/drawable/ic_apps.xml b/packages/CompanionDeviceManager/res/drawable/ic_apps.xml new file mode 100644 index 000000000000..f839b80d2e0c --- /dev/null +++ b/packages/CompanionDeviceManager/res/drawable/ic_apps.xml @@ -0,0 +1,34 @@ +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="108" + android:viewportHeight="108"> + <group android:scaleX="5.142857" + android:scaleY="5.142857" + android:translateY="2.5714285"> + <path + android:pathData="M13.1235,1.01L5.1235,1C4.0235,1 3.1235,1.9 3.1235,3V17C3.1235,18.1 4.0235,19 5.1235,19H13.1235C14.2235,19 15.1235,18.1 15.1235,17V12.9765H13.1235V14H5.1235V6H13.1235V6.0034H15.1235V3C15.1235,1.9 14.2235,1.01 13.1235,1.01ZM13.1235,17H5.1235V16H13.1235V17ZM5.1235,4V3H13.1235V4H5.1235Z" + android:fillColor="#202124" + android:fillType="evenOdd"/> + <path + android:pathData="M10.6984,6.4016V13.3136L12.3596,12.3628H17.8731V6.4016H10.6984ZM16.3731,7.9016H12.1984V10.8628H16.3731V7.9016Z" + android:fillColor="#202124" + android:fillType="evenOdd"/> + </group> +</vector>
\ No newline at end of file diff --git a/packages/CompanionDeviceManager/res/drawable/ic_notifications.xml b/packages/CompanionDeviceManager/res/drawable/ic_notifications.xml new file mode 100644 index 000000000000..4ac4d04b184e --- /dev/null +++ b/packages/CompanionDeviceManager/res/drawable/ic_notifications.xml @@ -0,0 +1,25 @@ +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + <path android:fillColor="@android:color/white" + android:pathData="M4,19V17H6V10Q6,7.925 7.25,6.312Q8.5,4.7 10.5,4.2V3.5Q10.5,2.875 10.938,2.438Q11.375,2 12,2Q12.625,2 13.062,2.438Q13.5,2.875 13.5,3.5V4.2Q15.5,4.7 16.75,6.312Q18,7.925 18,10V17H20V19ZM12,11.5Q12,11.5 12,11.5Q12,11.5 12,11.5Q12,11.5 12,11.5Q12,11.5 12,11.5ZM12,22Q11.175,22 10.588,21.413Q10,20.825 10,20H14Q14,20.825 13.413,21.413Q12.825,22 12,22ZM8,17H16V10Q16,8.35 14.825,7.175Q13.65,6 12,6Q10.35,6 9.175,7.175Q8,8.35 8,10Z"/> +</vector>
\ No newline at end of file diff --git a/packages/CompanionDeviceManager/res/drawable/ic_storage.xml b/packages/CompanionDeviceManager/res/drawable/ic_storage.xml new file mode 100644 index 000000000000..d8b7f59185c8 --- /dev/null +++ b/packages/CompanionDeviceManager/res/drawable/ic_storage.xml @@ -0,0 +1,25 @@ +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + <path android:fillColor="@android:color/white" + android:pathData="M6,17H18L14.25,12L11.25,16L9,13ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM5,19H19Q19,19 19,19Q19,19 19,19V5Q19,5 19,5Q19,5 19,5H5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19ZM5,5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19Q5,19 5,19Q5,19 5,19V5Q5,5 5,5Q5,5 5,5Z"/> +</vector>
\ No newline at end of file diff --git a/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml b/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml index f30dadffa788..82fe72bee4e4 100644 --- a/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml +++ b/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml @@ -51,6 +51,11 @@ android:scrollbars="vertical" android:layout_height="200dp" /> + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/permission_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </RelativeLayout> <LinearLayout diff --git a/packages/CompanionDeviceManager/res/layout/list_item_permission.xml b/packages/CompanionDeviceManager/res/layout/list_item_permission.xml new file mode 100644 index 000000000000..b8a0f7938f0b --- /dev/null +++ b/packages/CompanionDeviceManager/res/layout/list_item_permission.xml @@ -0,0 +1,55 @@ +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/list_item_permission" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="5dp"> + + <ImageView + android:id="@+id/permission_icon" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginTop="7dp" + android:layout_marginEnd="12dp" + android:contentDescription="Permission Icon"/> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="center_vertical" + android:padding="6dp"> + + <TextView + android:id="@+id/permission_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="16sp" + android:textAppearance="?android:attr/textAppearanceListItemSmall"/> + + <TextView + android:id="@+id/permission_summary" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="14sp" + android:textColor="?android:attr/textColorSecondary"/> + + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/packages/CompanionDeviceManager/res/values/strings.xml b/packages/CompanionDeviceManager/res/values/strings.xml index 9626751679e1..c4ad432b092e 100644 --- a/packages/CompanionDeviceManager/res/values/strings.xml +++ b/packages/CompanionDeviceManager/res/values/strings.xml @@ -38,6 +38,12 @@ <!-- ================= DEVICE_PROFILE_APP_STREAMING ================= --> + <!-- Apps permission will be granted of APP_STREAMING profile [CHAR LIMIT=30] --> + <string name="permission_apps">Apps</string> + + <!-- Description of apps permission of APP_STREAMING profile [CHAR LIMIT=NONE] --> + <string name="permission_apps_summary">Stream your phone\u2019s apps</string> + <!-- Confirmation for associating an application with a companion device of APP_STREAMING profile (type) [CHAR LIMIT=NONE] --> <string name="title_app_streaming">Allow <strong><xliff:g id="app_name" example="Exo">%1$s</xliff:g></strong> to access this information for your phone</string> @@ -72,6 +78,18 @@ <!-- Description of the privileges the application will get if associated with the companion device of COMPUTER profile (type) [CHAR LIMIT=NONE] --> <string name="summary_computer"></string> + <!-- Notification permission will be granted of COMPUTER profile [CHAR LIMIT=30] --> + <string name="permission_notification">Notifications</string> + + <!-- Description of notification permission of COMPUTER profile [CHAR LIMIT=NONE] --> + <string name="permission_notification_summary">Can read all notifications, including information like contracts, messages, and photos</string> + + <!-- Storage permission will be granted of COMPUTER profile [CHAR LIMIT=30] --> + <string name="permission_storage">Photos and media</string> + + <!-- Description of storage permission of COMPUTER profile [CHAR LIMIT=NONE] --> + <string name="permission_storage_summary"></string> + <!-- Title of the helper dialog for COMPUTER profile [CHAR LIMIT=30]. --> <string name="helper_title_computer">Google Play services</string> diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java index 0fba250b200a..1b626911fdde 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java @@ -24,6 +24,9 @@ import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTE import static com.android.companiondevicemanager.CompanionDeviceDiscoveryService.DiscoveryState; import static com.android.companiondevicemanager.CompanionDeviceDiscoveryService.DiscoveryState.FINISHED_TIMEOUT; +import static com.android.companiondevicemanager.PermissionListAdapter.TYPE_APPS; +import static com.android.companiondevicemanager.PermissionListAdapter.TYPE_NOTIFICATION; +import static com.android.companiondevicemanager.PermissionListAdapter.TYPE_STORAGE; import static com.android.companiondevicemanager.Utils.getApplicationLabel; import static com.android.companiondevicemanager.Utils.getHtmlFromResources; import static com.android.companiondevicemanager.Utils.getVendorHeaderIcon; @@ -61,6 +64,7 @@ import androidx.fragment.app.FragmentManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import java.util.ArrayList; import java.util.List; /** @@ -122,8 +126,12 @@ public class CompanionDeviceActivity extends FragmentActivity implements // The recycler view is only shown for multiple-device regular association request, after // at least one matching device is found. - private @Nullable RecyclerView mRecyclerView; - private @Nullable DeviceListAdapter mAdapter; + private @Nullable RecyclerView mDeviceListRecyclerView; + private @Nullable DeviceListAdapter mDeviceAdapter; + + // The recycler view is only shown for selfManaged association request. + private @Nullable RecyclerView mPermissionListRecyclerView; + private @Nullable PermissionListAdapter mPermissionListAdapter; // The flag used to prevent double taps, that may lead to sending several requests for creating // an association to CDM. @@ -133,6 +141,8 @@ public class CompanionDeviceActivity extends FragmentActivity implements // onActivityResult() after the association is created. private @Nullable DeviceFilterPair<?> mSelectedDevice; + private @Nullable List<Integer> mPermissionTypes; + @Override public void onCreate(Bundle savedInstanceState) { if (DEBUG) Log.d(TAG, "onCreate()"); @@ -242,8 +252,11 @@ public class CompanionDeviceActivity extends FragmentActivity implements mVendorHeaderName = findViewById(R.id.vendor_header_name); mVendorHeaderButton = findViewById(R.id.vendor_header_button); - mRecyclerView = findViewById(R.id.device_list); - mAdapter = new DeviceListAdapter(this, this::onListItemClick); + mDeviceListRecyclerView = findViewById(R.id.device_list); + mDeviceAdapter = new DeviceListAdapter(this, this::onListItemClick); + + mPermissionListRecyclerView = findViewById(R.id.permission_list); + mPermissionListAdapter = new PermissionListAdapter(this); mButtonAllow = findViewById(R.id.btn_positive); mButtonNotAllow = findViewById(R.id.btn_negative); @@ -359,7 +372,8 @@ public class CompanionDeviceActivity extends FragmentActivity implements final Drawable vendorIcon; final CharSequence vendorName; final Spanned title; - final Spanned summary; + + mPermissionTypes = new ArrayList<>(); try { vendorIcon = getVendorHeaderIcon(this, packageName, userId); @@ -372,33 +386,36 @@ public class CompanionDeviceActivity extends FragmentActivity implements switch (deviceProfile) { case DEVICE_PROFILE_APP_STREAMING: - title = getHtmlFromResources(this, R.string.title_app_streaming, appLabel); - summary = getHtmlFromResources( - this, R.string.summary_app_streaming, appLabel, deviceName); + title = getHtmlFromResources(this, R.string.title_app_streaming, deviceName); + mPermissionTypes.add(TYPE_APPS); break; case DEVICE_PROFILE_AUTOMOTIVE_PROJECTION: - title = getHtmlFromResources(this, R.string.title_automotive_projection, appLabel); - summary = getHtmlFromResources( - this, R.string.summary_automotive_projection, appLabel, deviceName); + title = getHtmlFromResources( + this, R.string.title_automotive_projection, deviceName); break; case DEVICE_PROFILE_COMPUTER: - title = getHtmlFromResources(this, R.string.title_computer, appLabel); - summary = getHtmlFromResources( - this, R.string.summary_computer, appLabel, deviceName); + title = getHtmlFromResources(this, R.string.title_computer, deviceName); + mPermissionTypes.add(TYPE_NOTIFICATION); + mPermissionTypes.add(TYPE_STORAGE); break; default: throw new RuntimeException("Unsupported profile " + deviceProfile); } + mSummary.setVisibility(View.GONE); + + mPermissionListAdapter.setPermissionType(mPermissionTypes); + mPermissionListRecyclerView.setAdapter(mPermissionListAdapter); + mPermissionListRecyclerView.setLayoutManager(new LinearLayoutManager(this)); + mTitle.setText(title); - mSummary.setText(summary); mVendorHeaderImage.setImageDrawable(vendorIcon); mVendorHeaderName.setText(vendorName); - mRecyclerView.setVisibility(View.GONE); + mDeviceListRecyclerView.setVisibility(View.GONE); mVendorHeader.setVisibility(View.VISIBLE); } @@ -411,7 +428,8 @@ public class CompanionDeviceActivity extends FragmentActivity implements deviceFilterPairs -> updateSingleDeviceUi( deviceFilterPairs, deviceProfile, appLabel)); - mRecyclerView.setVisibility(View.GONE); + mPermissionListRecyclerView.setVisibility(View.GONE); + mDeviceListRecyclerView.setVisibility(View.GONE); } private void updateSingleDeviceUi(List<DeviceFilterPair<?>> deviceFilterPairs, @@ -460,15 +478,15 @@ public class CompanionDeviceActivity extends FragmentActivity implements mTitle.setText(title); mSummary.setText(summary); - mAdapter = new DeviceListAdapter(this, this::onListItemClick); + mDeviceAdapter = new DeviceListAdapter(this, this::onListItemClick); // TODO: hide the list and show a spinner until a first device matching device is found. - mRecyclerView.setAdapter(mAdapter); - mRecyclerView.setLayoutManager(new LinearLayoutManager(this)); + mDeviceListRecyclerView.setAdapter(mDeviceAdapter); + mDeviceListRecyclerView.setLayoutManager(new LinearLayoutManager(this)); CompanionDeviceDiscoveryService.getScanResult().observe( /* lifecycleOwner */ this, - /* observer */ mAdapter); + /* observer */ mDeviceAdapter); // "Remove" consent button: users would need to click on the list item. mButtonAllow.setVisibility(View.GONE); @@ -477,14 +495,14 @@ public class CompanionDeviceActivity extends FragmentActivity implements private void onListItemClick(int position) { if (DEBUG) Log.d(TAG, "onListItemClick() " + position); - final DeviceFilterPair<?> selectedDevice = mAdapter.getItem(position); + final DeviceFilterPair<?> selectedDevice = mDeviceAdapter.getItem(position); if (mSelectedDevice != null) { if (DEBUG) Log.w(TAG, "Already selected."); return; } // Notify the adapter to highlight the selected item. - mAdapter.setSelectedPosition(position); + mDeviceAdapter.setSelectedPosition(position); mSelectedDevice = requireNonNull(selectedDevice); diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceListAdapter.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceListAdapter.java index e5513b074865..8babd3ade1eb 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceListAdapter.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceListAdapter.java @@ -15,9 +15,10 @@ */ package com.android.companiondevicemanager; + +import static com.android.companiondevicemanager.Utils.getIcon; + import android.content.Context; -import android.graphics.Color; -import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -60,11 +61,11 @@ class DeviceListAdapter extends RecyclerView.Adapter<DeviceListAdapter.ViewHolde R.layout.list_item_device, parent, false); ViewHolder viewHolder = new ViewHolder(view); if (viewType == TYPE_WIFI) { - viewHolder.mImageView.setImageDrawable(getIcon( - com.android.internal.R.drawable.ic_wifi_signal_3)); + viewHolder.mImageView.setImageDrawable( + getIcon(mContext, com.android.internal.R.drawable.ic_wifi_signal_3)); } else { - viewHolder.mImageView.setImageDrawable(getIcon( - android.R.drawable.stat_sys_data_bluetooth)); + viewHolder.mImageView.setImageDrawable( + getIcon(mContext, android.R.drawable.stat_sys_data_bluetooth)); } return viewHolder; } @@ -115,12 +116,6 @@ class DeviceListAdapter extends RecyclerView.Adapter<DeviceListAdapter.ViewHolde return mDevices.get(position).getDevice() instanceof android.net.wifi.ScanResult; } - private Drawable getIcon(int resId) { - Drawable icon = mContext.getResources().getDrawable(resId, null); - icon.setTint(Color.DKGRAY); - return icon; - } - public interface OnItemClickListener { void onItemClick(int position); } diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/PermissionListAdapter.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/PermissionListAdapter.java new file mode 100644 index 000000000000..895b729ea8c7 --- /dev/null +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/PermissionListAdapter.java @@ -0,0 +1,128 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.companiondevicemanager; + +import static com.android.companiondevicemanager.Utils.getHtmlFromResources; +import static com.android.companiondevicemanager.Utils.getIcon; + +import static java.util.Collections.unmodifiableMap; + +import android.content.Context; +import android.text.Spanned; +import android.util.ArrayMap; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView; + +import java.util.List; +import java.util.Map; + +class PermissionListAdapter extends RecyclerView.Adapter<PermissionListAdapter.ViewHolder> { + private final Context mContext; + + private List<Integer> mPermissions; + + static final int TYPE_NOTIFICATION = 0; + static final int TYPE_STORAGE = 1; + static final int TYPE_APPS = 2; + + private static final Map<Integer, Integer> sTitleMap; + static { + final Map<Integer, Integer> map = new ArrayMap<>(); + map.put(TYPE_NOTIFICATION, R.string.permission_notification); + map.put(TYPE_STORAGE, R.string.permission_storage); + map.put(TYPE_APPS, R.string.permission_apps); + sTitleMap = unmodifiableMap(map); + } + + private static final Map<Integer, Integer> sSummaryMap; + static { + final Map<Integer, Integer> map = new ArrayMap<>(); + map.put(TYPE_NOTIFICATION, R.string.permission_notification_summary); + map.put(TYPE_STORAGE, R.string.permission_storage_summary); + map.put(TYPE_APPS, R.string.permission_apps_summary); + sSummaryMap = unmodifiableMap(map); + } + + private static final Map<Integer, Integer> sIconMap; + static { + final Map<Integer, Integer> map = new ArrayMap<>(); + map.put(TYPE_NOTIFICATION, R.drawable.ic_notifications); + map.put(TYPE_STORAGE, R.drawable.ic_storage); + map.put(TYPE_APPS, R.drawable.ic_apps); + sIconMap = unmodifiableMap(map); + } + + PermissionListAdapter(Context context) { + mContext = context; + } + + @Override + public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()).inflate( + R.layout.list_item_permission, parent, false); + ViewHolder viewHolder = new ViewHolder(view); + viewHolder.mPermissionIcon.setImageDrawable(getIcon(mContext, sIconMap.get(viewType))); + + return viewHolder; + } + + @Override + public void onBindViewHolder(ViewHolder holder, int position) { + int type = getItemViewType(position); + final Spanned title = getHtmlFromResources(mContext, sTitleMap.get(type)); + final Spanned summary = getHtmlFromResources(mContext, sSummaryMap.get(type)); + + holder.mPermissionName.setText(title); + holder.mPermissionSummary.setText(summary); + } + + @Override + public int getItemViewType(int position) { + return mPermissions.get(position); + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getItemCount() { + return mPermissions != null ? mPermissions.size() : 0; + } + + static class ViewHolder extends RecyclerView.ViewHolder { + private final TextView mPermissionName; + private final TextView mPermissionSummary; + private final ImageView mPermissionIcon; + ViewHolder(View itemView) { + super(itemView); + mPermissionName = itemView.findViewById(R.id.permission_name); + mPermissionSummary = itemView.findViewById(R.id.permission_summary); + mPermissionIcon = itemView.findViewById(R.id.permission_icon); + } + } + + void setPermissionType(List<Integer> permissions) { + mPermissions = permissions; + } +} diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/Utils.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/Utils.java index 76bbcfb79155..d5b2f0a748f1 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/Utils.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/Utils.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.ApplicationInfoFlags; +import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; @@ -121,6 +122,12 @@ class Utils { return appInfo; } + static @NonNull Drawable getIcon(@NonNull Context context, int resId) { + Drawable icon = context.getResources().getDrawable(resId, null); + icon.setTint(Color.DKGRAY); + return icon; + } + static void runOnMainThread(Runnable runnable) { if (Thread.currentThread() == Looper.getMainLooper().getThread()) { runnable.run(); diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java index a48f94b66def..da5f88dc3b7e 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java @@ -189,14 +189,14 @@ public class NetworkIdentity { public void dumpDebug(ProtoOutputStream proto, long tag) { final long start = proto.start(tag); - proto.write(NetworkIdentityProto.TYPE_FIELD_NUMBER, mType); + proto.write(NetworkIdentityProto.TYPE, mType); // TODO: dump mRatType as well. - proto.write(NetworkIdentityProto.ROAMING_FIELD_NUMBER, mRoaming); - proto.write(NetworkIdentityProto.METERED_FIELD_NUMBER, mMetered); - proto.write(NetworkIdentityProto.DEFAULT_NETWORK_FIELD_NUMBER, mDefaultNetwork); - proto.write(NetworkIdentityProto.OEM_MANAGED_NETWORK_FIELD_NUMBER, mOemManaged); + proto.write(NetworkIdentityProto.ROAMING, mRoaming); + proto.write(NetworkIdentityProto.METERED, mMetered); + proto.write(NetworkIdentityProto.DEFAULT_NETWORK, mDefaultNetwork); + proto.write(NetworkIdentityProto.OEM_MANAGED_NETWORK, mOemManaged); proto.end(start); } diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentitySet.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentitySet.java index 56461babfe49..ad3a958a680e 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentitySet.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentitySet.java @@ -222,7 +222,7 @@ public class NetworkIdentitySet extends HashSet<NetworkIdentity> { final long start = proto.start(tag); for (NetworkIdentity ident : this) { - ident.dumpDebug(proto, NetworkIdentitySetProto.IDENTITIES_FIELD_NUMBER); + ident.dumpDebug(proto, NetworkIdentitySetProto.IDENTITIES); } proto.end(start); diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java index 67d48f0000d5..735c44d5c87e 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java @@ -732,19 +732,19 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W final long start = proto.start(tag); for (Key key : getSortedKeys()) { - final long startStats = proto.start(NetworkStatsCollectionProto.STATS_FIELD_NUMBER); + final long startStats = proto.start(NetworkStatsCollectionProto.STATS); // Key - final long startKey = proto.start(NetworkStatsCollectionStatsProto.KEY_FIELD_NUMBER); - key.ident.dumpDebug(proto, NetworkStatsCollectionKeyProto.IDENTITY_FIELD_NUMBER); - proto.write(NetworkStatsCollectionKeyProto.UID_FIELD_NUMBER, key.uid); - proto.write(NetworkStatsCollectionKeyProto.SET_FIELD_NUMBER, key.set); - proto.write(NetworkStatsCollectionKeyProto.TAG_FIELD_NUMBER, key.tag); + final long startKey = proto.start(NetworkStatsCollectionStatsProto.KEY); + key.ident.dumpDebug(proto, NetworkStatsCollectionKeyProto.IDENTITY); + proto.write(NetworkStatsCollectionKeyProto.UID, key.uid); + proto.write(NetworkStatsCollectionKeyProto.SET, key.set); + proto.write(NetworkStatsCollectionKeyProto.TAG, key.tag); proto.end(startKey); // Value final NetworkStatsHistory history = mStats.get(key); - history.dumpDebug(proto, NetworkStatsCollectionStatsProto.HISTORY_FIELD_NUMBER); + history.dumpDebug(proto, NetworkStatsCollectionStatsProto.HISTORY); proto.end(startStats); } diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.java index 822a16e0bb41..301fef944169 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.java @@ -915,18 +915,18 @@ public final class NetworkStatsHistory implements Parcelable { public void dumpDebug(ProtoOutputStream proto, long tag) { final long start = proto.start(tag); - proto.write(NetworkStatsHistoryProto.BUCKET_DURATION_MS_FIELD_NUMBER, bucketDuration); + proto.write(NetworkStatsHistoryProto.BUCKET_DURATION_MS, bucketDuration); for (int i = 0; i < bucketCount; i++) { - final long startBucket = proto.start(NetworkStatsHistoryProto.BUCKETS_FIELD_NUMBER); + final long startBucket = proto.start(NetworkStatsHistoryProto.BUCKETS); - proto.write(NetworkStatsHistoryBucketProto.BUCKET_START_MS_FIELD_NUMBER, + proto.write(NetworkStatsHistoryBucketProto.BUCKET_START_MS, bucketStart[i]); - dumpDebug(proto, NetworkStatsHistoryBucketProto.RX_BYTES_FIELD_NUMBER, rxBytes, i); - dumpDebug(proto, NetworkStatsHistoryBucketProto.RX_PACKETS_FIELD_NUMBER, rxPackets, i); - dumpDebug(proto, NetworkStatsHistoryBucketProto.TX_BYTES_FIELD_NUMBER, txBytes, i); - dumpDebug(proto, NetworkStatsHistoryBucketProto.TX_PACKETS_FIELD_NUMBER, txPackets, i); - dumpDebug(proto, NetworkStatsHistoryBucketProto.OPERATIONS_FIELD_NUMBER, operations, i); + dumpDebug(proto, NetworkStatsHistoryBucketProto.RX_BYTES, rxBytes, i); + dumpDebug(proto, NetworkStatsHistoryBucketProto.RX_PACKETS, rxPackets, i); + dumpDebug(proto, NetworkStatsHistoryBucketProto.TX_BYTES, txBytes, i); + dumpDebug(proto, NetworkStatsHistoryBucketProto.TX_PACKETS, txPackets, i); + dumpDebug(proto, NetworkStatsHistoryBucketProto.OPERATIONS, operations, i); proto.end(startBucket); } diff --git a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsRecorder.java b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsRecorder.java index a006cd597568..f62765d07427 100644 --- a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsRecorder.java +++ b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsRecorder.java @@ -471,11 +471,11 @@ public class NetworkStatsRecorder { public void dumpDebugLocked(ProtoOutputStream proto, long tag) { final long start = proto.start(tag); if (mPending != null) { - proto.write(NetworkStatsRecorderProto.PENDING_TOTAL_BYTES_FIELD_NUMBER, + proto.write(NetworkStatsRecorderProto.PENDING_TOTAL_BYTES, mPending.getTotalBytes()); } getOrLoadCompleteLocked().dumpDebug(proto, - NetworkStatsRecorderProto.COMPLETE_HISTORY_FIELD_NUMBER); + NetworkStatsRecorderProto.COMPLETE_HISTORY); proto.end(start); } diff --git a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java index ef6f39a5c040..b5e05395f2e8 100644 --- a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java +++ b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java @@ -2132,15 +2132,15 @@ public class NetworkStatsService extends INetworkStatsService.Stub { // TODO Right now it writes all history. Should it limit to the "since-boot" log? - dumpInterfaces(proto, NetworkStatsServiceDumpProto.ACTIVE_INTERFACES_FIELD_NUMBER, + dumpInterfaces(proto, NetworkStatsServiceDumpProto.ACTIVE_INTERFACES, mActiveIfaces); - dumpInterfaces(proto, NetworkStatsServiceDumpProto.ACTIVE_UID_INTERFACES_FIELD_NUMBER, + dumpInterfaces(proto, NetworkStatsServiceDumpProto.ACTIVE_UID_INTERFACES, mActiveUidIfaces); - mDevRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.DEV_STATS_FIELD_NUMBER); - mXtRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.XT_STATS_FIELD_NUMBER); - mUidRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.UID_STATS_FIELD_NUMBER); + mDevRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.DEV_STATS); + mXtRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.XT_STATS); + mUidRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.UID_STATS); mUidTagRecorder.dumpDebugLocked(proto, - NetworkStatsServiceDumpProto.UID_TAG_STATS_FIELD_NUMBER); + NetworkStatsServiceDumpProto.UID_TAG_STATS); proto.flush(); } @@ -2150,8 +2150,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub { for (int i = 0; i < ifaces.size(); i++) { final long start = proto.start(tag); - proto.write(NetworkInterfaceProto.INTERFACE_FIELD_NUMBER, ifaces.keyAt(i)); - ifaces.valueAt(i).dumpDebug(proto, NetworkInterfaceProto.IDENTITIES_FIELD_NUMBER); + proto.write(NetworkInterfaceProto.INTERFACE, ifaces.keyAt(i)); + ifaces.valueAt(i).dumpDebug(proto, NetworkInterfaceProto.IDENTITIES); proto.end(start); } diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java index 5e2f31010900..7573177565a4 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java @@ -24,9 +24,9 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothHeadset; import android.bluetooth.BluetoothHeadsetClient; import android.bluetooth.BluetoothHearingAid; -import android.bluetooth.BluetoothLeAudio; import android.bluetooth.BluetoothHidDevice; import android.bluetooth.BluetoothHidHost; +import android.bluetooth.BluetoothLeAudio; import android.bluetooth.BluetoothMap; import android.bluetooth.BluetoothMapClient; import android.bluetooth.BluetoothPan; @@ -159,10 +159,8 @@ public class LocalBluetoothProfileManager { if (mHfpClientProfile == null && supportedList.contains(BluetoothProfile.HEADSET_CLIENT)) { if (DEBUG) Log.d(TAG, "Adding local HfpClient profile"); mHfpClientProfile = new HfpClientProfile(mContext, mDeviceManager, this); - addHeadsetProfile(mHfpClientProfile, HfpClientProfile.NAME, - BluetoothHeadsetClient.ACTION_CONNECTION_STATE_CHANGED, - BluetoothHeadsetClient.ACTION_AUDIO_STATE_CHANGED, - BluetoothHeadsetClient.STATE_AUDIO_DISCONNECTED); + addProfile(mHfpClientProfile, HfpClientProfile.NAME, + BluetoothHeadsetClient.ACTION_CONNECTION_STATE_CHANGED); } if (mMapClientProfile == null && supportedList.contains(BluetoothProfile.MAP_CLIENT)) { if (DEBUG) Log.d(TAG, "Adding local MAP CLIENT profile"); diff --git a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java index c7599623c465..3984ee9aa007 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java @@ -35,6 +35,7 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.media.MediaRoute2Info; import android.media.MediaRouter2Manager; +import android.media.NearbyDevice; import android.text.TextUtils; import android.util.Log; @@ -77,6 +78,8 @@ public abstract class MediaDevice implements Comparable<MediaDevice> { private int mConnectedRecord; private int mState; + @NearbyDevice.RangeZone + private int mRangeZone = NearbyDevice.RANGE_UNKNOWN; protected final Context mContext; protected final MediaRoute2Info mRouteInfo; @@ -136,6 +139,14 @@ public abstract class MediaDevice implements Comparable<MediaDevice> { getId()); } + public @NearbyDevice.RangeZone int getRangeZone() { + return mRangeZone; + } + + public void setRangeZone(@NearbyDevice.RangeZone int rangeZone) { + mRangeZone = rangeZone; + } + /** * Get name from MediaDevice. * @@ -319,6 +330,11 @@ public abstract class MediaDevice implements Comparable<MediaDevice> { } } + // Both devices have same connection status, compare the range zone + if (NearbyDevice.compareRangeZones(getRangeZone(), another.getRangeZone()) != 0) { + return NearbyDevice.compareRangeZones(getRangeZone(), another.getRangeZone()); + } + if (mType == another.mType) { // Check device is muting expected device if (isMutingExpectedDevice()) { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java index c122a37d0f79..179a498b7397 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java @@ -31,6 +31,7 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import android.media.MediaRoute2Info; import android.media.MediaRouter2Manager; +import android.media.NearbyDevice; import android.os.Parcel; import com.android.settingslib.bluetooth.A2dpProfile; @@ -200,6 +201,18 @@ public class MediaDeviceTest { } @Test + public void compareTo_differentRange_sortWithRange() { + mBluetoothMediaDevice1.setRangeZone(NearbyDevice.RANGE_FAR); + mBluetoothMediaDevice2.setRangeZone(NearbyDevice.RANGE_CLOSE); + mMediaDevices.add(mBluetoothMediaDevice1); + mMediaDevices.add(mBluetoothMediaDevice2); + + assertThat(mMediaDevices.get(0)).isEqualTo(mBluetoothMediaDevice1); + Collections.sort(mMediaDevices, COMPARATOR); + assertThat(mMediaDevices.get(0)).isEqualTo(mBluetoothMediaDevice2); + } + + @Test public void compareTo_carKit_info_carKitFirst() { when(mDevice1.getBluetoothClass()).thenReturn(mCarkitClass); mMediaDevices.add(mInfoMediaDevice1); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 3f4372bd78ff..057a9b05de58 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -271,6 +271,7 @@ public class SettingsBackupTest { Settings.Global.DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD, Settings.Global.SMART_REPLIES_IN_NOTIFICATIONS_FLAGS, Settings.Global.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS, + Settings.Global.STYLUS_HANDWRITING_ENABLED, Settings.Global.ENABLE_ADB_INCREMENTAL_INSTALL_DEFAULT, Settings.Global.ENABLE_MULTI_SLOT_TIMEOUT_MILLIS, Settings.Global.ENHANCED_4G_MODE_ENABLED, diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index c0e2b2ef361f..dae63a8b0e3c 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -210,6 +210,7 @@ <uses-permission android:name="android.permission.MANAGE_CREDENTIAL_MANAGEMENT_APP" /> <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" /> <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" /> + <uses-permission android:name="android.permission.PROVISION_DEMO_DEVICE" /> <uses-permission android:name="android.permission.QUERY_ADMIN_POLICY" /> <uses-permission android:name="android.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES" /> <uses-permission android:name="android.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS" /> diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/GhostedViewLaunchAnimatorController.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/GhostedViewLaunchAnimatorController.kt index 183584227087..3f7e0f0fb527 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/GhostedViewLaunchAnimatorController.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/GhostedViewLaunchAnimatorController.kt @@ -33,6 +33,7 @@ import android.view.ViewGroup import android.view.ViewGroupOverlay import android.widget.FrameLayout import com.android.internal.jank.InteractionJankMonitor +import java.util.LinkedList import kotlin.math.min private const val TAG = "GhostedViewLaunchAnimatorController" @@ -81,21 +82,51 @@ open class GhostedViewLaunchAnimatorController( * [backgroundView]. */ private var backgroundDrawable: WrappedDrawable? = null - private val backgroundInsets by lazy { getBackground()?.opticalInsets ?: Insets.NONE } + private val backgroundInsets by lazy { background?.opticalInsets ?: Insets.NONE } private var startBackgroundAlpha: Int = 0xFF private val ghostedViewLocation = IntArray(2) private val ghostedViewState = LaunchAnimator.State() /** - * Return the background of the [ghostedView]. This background will be used to draw the - * background of the background view that is expanding up to the final animation position. This - * is called at the start of the animation. + * The background of the [ghostedView]. This background will be used to draw the background of + * the background view that is expanding up to the final animation position. * * Note that during the animation, the alpha value value of this background will be set to 0, * then set back to its initial value at the end of the animation. */ - protected open fun getBackground(): Drawable? = ghostedView.background + private val background: Drawable? + + init { + /** Find the first view with a background in [view] and its children. */ + fun findBackground(view: View): Drawable? { + if (view.background != null) { + return view.background + } + + // Perform a BFS to find the largest View with background. + val views = LinkedList<View>().apply { + add(view) + } + + while (views.isNotEmpty()) { + val v = views.removeFirst() + if (v.background != null) { + return v.background + } + + if (v is ViewGroup) { + for (i in 0 until v.childCount) { + views.add(v.getChildAt(i)) + } + } + } + + return null + } + + background = findBackground(ghostedView) + } /** * Set the corner radius of [background]. The background is the one that was returned by @@ -113,7 +144,7 @@ open class GhostedViewLaunchAnimatorController( /** Return the current top corner radius of the background. */ protected open fun getCurrentTopCornerRadius(): Float { - val drawable = getBackground() ?: return 0f + val drawable = background ?: return 0f val gradient = findGradientDrawable(drawable) ?: return 0f // TODO(b/184121838): Support more than symmetric top & bottom radius. @@ -122,7 +153,7 @@ open class GhostedViewLaunchAnimatorController( /** Return the current bottom corner radius of the background. */ protected open fun getCurrentBottomCornerRadius(): Float { - val drawable = getBackground() ?: return 0f + val drawable = background ?: return 0f val gradient = findGradientDrawable(drawable) ?: return 0f // TODO(b/184121838): Support more than symmetric top & bottom radius. @@ -162,9 +193,8 @@ open class GhostedViewLaunchAnimatorController( // We wrap the ghosted view background and use it to draw the expandable background. Its // alpha will be set to 0 as soon as we start drawing the expanding background. - val drawable = getBackground() - startBackgroundAlpha = drawable?.alpha ?: 0xFF - backgroundDrawable = WrappedDrawable(drawable) + startBackgroundAlpha = background?.alpha ?: 0xFF + backgroundDrawable = WrappedDrawable(background) backgroundView?.background = backgroundDrawable // Create a ghost of the view that will be moving and fading out. This allows to fade out diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags index c97ebe8d5559..e74b6c78ec80 100644 --- a/packages/SystemUI/proguard.flags +++ b/packages/SystemUI/proguard.flags @@ -41,6 +41,14 @@ -keep,allowoptimization,allowaccessmodification class com.android.systemui.dagger.Dagger** { !synthetic *; } -keep,allowoptimization,allowaccessmodification class com.android.systemui.tv.Dagger** { !synthetic *; } +# Prevent optimization or access modification of any referenced code that may +# conflict with code in the bootclasspath. +# TODO(b/222468116): Resolve such collisions in the build system. +-keepnames class android.**.nano.** { *; } +-keepnames class com.android.**.nano.** { *; } +-keepnames class com.android.internal.protolog.** { *; } +-keepnames class android.hardware.common.** { *; } + # Allows proguard to make private and protected methods and fields public as # part of optimization. This lets proguard inline trivial getter/setter methods. -allowaccessmodification diff --git a/packages/SystemUI/res/layout/communal_host_view.xml b/packages/SystemUI/res/layout/communal_host_view.xml deleted file mode 100644 index cd9c26065dc1..000000000000 --- a/packages/SystemUI/res/layout/communal_host_view.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2021 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<!-- This is a view that shows general status information in Keyguard. --> -<com.android.systemui.communal.CommunalHostView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/communal_host" - android:layout_width="match_parent" - android:layout_height="match_parent"/>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/dream_overlay_status_bar_view.xml b/packages/SystemUI/res/layout/dream_overlay_status_bar_view.xml index 1cbc3c284874..d0f4903a3421 100644 --- a/packages/SystemUI/res/layout/dream_overlay_status_bar_view.xml +++ b/packages/SystemUI/res/layout/dream_overlay_status_bar_view.xml @@ -42,17 +42,6 @@ app:layout_constraintEnd_toEndOf="parent"> <com.android.systemui.statusbar.AlphaOptimizedImageView - android:id="@+id/dream_overlay_assistant_guest_mode_enabled" - android:layout_width="@dimen/dream_overlay_status_bar_icon_size" - android:layout_height="match_parent" - android:layout_marginEnd="@dimen/dream_overlay_status_icon_margin" - android:src="@drawable/ic_account_circle" - android:tint="@android:color/white" - android:visibility="gone" - android:contentDescription= - "@string/dream_overlay_status_bar_assistant_guest_mode_enabled" /> - - <com.android.systemui.statusbar.AlphaOptimizedImageView android:id="@+id/dream_overlay_alarm_set" android:layout_width="@dimen/dream_overlay_status_bar_icon_size" android:layout_height="match_parent" diff --git a/packages/SystemUI/res/layout/media_output_dialog.xml b/packages/SystemUI/res/layout/media_output_dialog.xml index 51211a0c0d2a..05343e75b448 100644 --- a/packages/SystemUI/res/layout/media_output_dialog.xml +++ b/packages/SystemUI/res/layout/media_output_dialog.xml @@ -129,7 +129,7 @@ style="@style/Widget.Dialog.Button.BorderButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/keyboard_key_media_stop" + android:text="@string/media_output_dialog_button_stop_casting" android:visibility="gone"/> <Space diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index e4706e263a0f..ef030baa967b 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -26,9 +26,6 @@ android:layout_height="match_parent" android:background="@android:color/transparent"> - <include layout="@layout/communal_host_view" - android:visibility="gone"/> - <ViewStub android:id="@+id/keyguard_qs_user_switch_stub" android:layout="@layout/keyguard_qs_user_switch" diff --git a/packages/SystemUI/res/layout/status_bar_notification_section_header.xml b/packages/SystemUI/res/layout/status_bar_notification_section_header.xml index e33f186dcbb7..c4d8d55f74e2 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_section_header.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_section_header.xml @@ -21,8 +21,6 @@ android:layout_height="@dimen/notification_section_header_height" android:paddingStart="4dp" android:paddingEnd="4dp" - android:focusable="true" - android:clickable="true" > <LinearLayout @@ -46,6 +44,7 @@ android:id="@+id/header_label" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:focusable="true" android:forceHasOverlappingRendering="false" android:text="@string/notification_section_header_gentle" /> @@ -57,6 +56,7 @@ android:layout_height="48dp" android:src="@drawable/status_bar_notification_section_header_clear_btn" android:contentDescription="@string/accessibility_notification_section_header_gentle_clear_all" + android:focusable="true" android:scaleType="center" android:tintMode="src_in" android:visibility="gone" diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 42955caf5ae9..c0fdf689cfc2 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Stelsel-UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Battery kan binnekort afloop"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> oor"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Kan nie deur USB laai nie"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Gebruik die laaier wat jy saam met jou toestel gekry het"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Gesig is gestaaf"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Bevestig"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Tik op Bevestig om te voltooi"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Gestaaf"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Gebruik PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Gebruik patroon"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Maak toe"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"volkome stilte"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"net wekkers"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Moenie Steur Nie."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth aan."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Wekker gestel vir <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Nageregkas"</string> <string name="start_dreams" msgid="9131802557946276718">"Sluimerskerm"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Moenie Steur Nie"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Geen saamgebinde toestelle beskikbaar nie"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> batterykrag"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Kennisgewings"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Gesprekke"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Vee alle stil kennisgewings uit"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Kennisgewings onderbreek deur Moenie Steur Nie"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Begin nou"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Geen kennisgewings nie"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Hierdie toestel word deur jou ouer bestuur"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Laer gegradeer"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Word aan die bokant van gesprekskennisgewings en as \'n profielfoto op sluitskerm gewys"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Word aan die bokant van gesprekskennisgewings en as \'n profielfoto op sluitskerm gewys, verskyn as \'n borrel"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Word aan die bokant van gesprekskennisgewings en as \'n profielfoto op sluitskerm gewys, onderbreek Moenie Steur Nie"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Word aan die bokant van gesprekskennisgewings en as \'n profielfoto op sluitskerm gewys, verskyn as \'n borrel, onderbreek Moenie Steur Nie"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioriteit"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> steun nie gesprekskenmerke nie"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Hierdie kennisgewings kan nie gewysig word nie."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Musiek"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalender"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Moenie Steur Nie"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Volumeknoppieskortpad"</string> <string name="battery" msgid="769686279459897127">"Battery"</string> <string name="headset" msgid="4485892374984466437">"Kopstuk"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi is af"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth is af"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Moenie Steur Nie is af"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"\'n Outomatiese reël (<xliff:g id="ID_1">%s</xliff:g>) het Moenie Steur Nie aangeskakel."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"\'n Program (<xliff:g id="ID_1">%s</xliff:g>) het Moenie Steur Nie aangeskakel."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"\'n Outomatiese reël of program het Moenie Steur Nie aangeskakel."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Programme wat op die agtergrond loop"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Tik vir besonderhede oor battery- en datagebruik"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Skakel mobiele data af?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(werk)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Oproep"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(deur <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"ligging"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofoon"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(ontkoppel)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Kan nie wissel nie. Tik om weer te probeer."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Bind nuwe toestel saam"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Maak die program oop om hierdie sessie uit te saai."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Onbekende program"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Bounommer"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Bounommer is na knipbord gekopieer."</string> <string name="basic_status" msgid="2315371112182658176">"Maak gesprek oop"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Sien onlangse boodskappe, gemiste oproepe en statusopdaterings"</string> <string name="people_tile_title" msgid="6589377493334871272">"Gesprek"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Onderbreek deur Moenie Steur nie"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> het \'n boodskap gestuur: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> het \'n prent gestuur"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> het \'n statusopdatering: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktiewe programme</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aktiewe program</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nuwe inligting"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktiewe programme"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Gestop"</string> @@ -889,8 +910,14 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"Wysig gekopieerde teks"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Wysig gekopieerde prent"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Stuur na toestel in die omtrek"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="add" msgid="81036585205287996">"Voeg by"</string> + <string name="manage_users" msgid="1823875311934643849">"Bestuur gebruikers"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Sleep na verdeelde skerm word nie vir hierdie kennisgewing gesteun nie."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑fi onbeskikbaar"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Prioriteitmodus"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Wekker gestel"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistent-gasmodus is geaktiveer"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera en mikrofoon is af"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 03ae0e41ff41..43ad0057d2ba 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"የስርዓት UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"ባትሪ በቅርቡ ሊያልቅ ይችላል"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> ይቀራል"</string> <string name="invalid_charger_title" msgid="938685362320735167">"በዩኤስቢ በኩል ኃይል መሙላት አይቻልም"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"ከእርስዎ መሣሪያ ጋር የመጣውን ኃይል መሙያ ይጠቀሙ"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"መልክ ተረጋግጧል"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"ተረጋግጧል"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"ለማጠናቀቅ አረጋግጥን መታ ያድርጉ"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"የተረጋገጠ"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ፒን ይጠቀሙ"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ሥርዓተ ጥለትን ተጠቀም"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"ዝጋ"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"ሙሉ ለሙሉ ጸጥታ"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"ማንቂያዎች ብቻ"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"አትረብሽ።"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"ብሉቱዝ።"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"ብሉቱዝ በርቷል።"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"ማንቂያ ለ<xliff:g id="TIME">%s</xliff:g> ተዋቅሯል።"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"የማወራረጃ ምግቦች መያዣ"</string> <string name="start_dreams" msgid="9131802557946276718">"የማያ ገጽ ማቆያ"</string> <string name="ethernet_label" msgid="2203544727007463351">"ኤተርኔት"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"አትረብሽ"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ብሉቱዝ"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"ምንም የተጣመሩ መሣሪያዎች አይገኝም"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> ባትሪ"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"ማሳወቂያዎች"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"ውይይቶች"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"ሁሉንም ጸጥ ያሉ ማሳወቂያዎችን ያጽዱ"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"ማሳወቂያዎች በአትረብሽ ባሉበት ቆመዋል"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"አሁን ጀምር"</string> <string name="empty_shade_text" msgid="8935967157319717412">"ምንም ማሳወቂያ የለም"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"ይህ መሣሪያ በእርስዎ ወላጅ የሚተዳደር ነው።"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>ሁኔታ:</b> ዝቅተኛ ደረጃ ተሰጥቶታል"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"በውይይት ማሳወቂያዎች አናት ላይ እና በማያ ገጽ መቆለፊያ ላይ እንደ መገለጫ ምስል ይታያል"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"በውይይት ማሳወቂያዎች አናት ላይ እና በማያ ገጽ መቆለፊያ ላይ እንደ መገለጫ ምስል ይታያል፣ እንደ አረፋ ሆኖ ይታያል"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"በውይይት ማሳወቂያዎች አናት ላይ እና በማያ ገጽ መቆለፊያ ላይ እንደ መገለጫ ምስል ይታያል፣ አትረብሽን ያቋርጣል"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"በውይይት ማሳወቂያዎች አናት ላይ እና በማያ ገጽ መቆለፊያ ላይ እንደ መገለጫ ምስል ይታያል፣ እንደ አረፋ ሆኖ ይታያል፣ አትረብሽን ያቋርጣል"</string> <string name="notification_priority_title" msgid="2079708866333537093">"ቅድሚያ"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> የውይይት ባህሪያትን አይደግፍም"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"እነዚህ ማሳወቂያዎች ሊሻሻሉ አይችሉም።"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"ኤስኤምኤስ"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"ሙዚቃ"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"የቀን መቁጠሪያ"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"አትረብሽ"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"የድምፅ አዝራሮች አቋራጭ"</string> <string name="battery" msgid="769686279459897127">"ባትሪ"</string> <string name="headset" msgid="4485892374984466437">"ጆሮ ማዳመጫ"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>፣ <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi ጠፍቷል"</string> <string name="bt_is_off" msgid="7436344904889461591">"ብሉቱዝ ጠፍቷል"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"አትረብሽ ጠፍቷል"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"አትረብሽ በአንድ ራስ-ሰር ደንብ (<xliff:g id="ID_1">%s</xliff:g>) በርቷል።"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"አትረብሽ በአንድ መተግበሪያ (<xliff:g id="ID_1">%s</xliff:g>) በርቷል።"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"አትረብሽ በአንድ ራስ-ሰር ደንብ ወይም መተግበሪያ በርቷል።"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"በጀርባ ውስጥ የሚያሄዱ መተግበሪያዎች"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"በባትሪ እና ውሂብ አጠቃቀም ላይ ዝርዝሮችን ለማግኘት መታ ያድርጉ"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"የተንቀሳቃሽ ስልክ ውሂብ ይጥፋ?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ስራ)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"የስልክ ጥሪ"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(በ<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> በኩል)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"ካሜራ"</string> <string name="privacy_type_location" msgid="7991481648444066703">"አካባቢ"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"ማይክሮፎን"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(ተቋርጧል)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"መቀየር አይቻልም። እንደገና ለመሞከር መታ ያድርጉ።"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"አዲስ መሣሪያ ያጣምሩ"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"ይህን ክፍለ ጊዜ cast ለማድረግ፣ እባክዎ መተግበሪያውን ይክፈቱ።"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"የማይታወቅ መተግበሪያ"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"የግንብ ቁጥር"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"የገንባ ቁጥር ወደ ቅንጥብ ሰሌዳ ተቀድቷል።"</string> <string name="basic_status" msgid="2315371112182658176">"ውይይት ይክፈቱ"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"የቅርብ ጊዜ መልዕክቶችን፣ ያመለጡ ጥሪዎች እና፣ የሁኔታ ዝመናዎችን ይመልከቱ"</string> <string name="people_tile_title" msgid="6589377493334871272">"ውይይት"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"በአትረብሽ ባለበት ቆሟል"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> መልዕክት ልከዋል፦ <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ምስል ልኳል"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> የሁኔታ ዝማኔ አለው፦ <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> ገቢር መተግበሪያዎች</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ገቢር መተግበሪያዎች</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"አዲስ መረጃ"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ገቢር መተግበሪያዎች"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"መቆሚያ"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ቆሟል"</string> @@ -889,8 +910,14 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"የተቀዳ ጽሁፍ አርትዕ ያድርጉ"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"የተቀዳ ምስል አርትዕ ያድርጉ"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"በአቅራቢያ ወዳለ መሳሪያ ይላኩ"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="add" msgid="81036585205287996">"አክል"</string> + <string name="manage_users" msgid="1823875311934643849">"ተጠቃሚዎችን ያስተዳድሩ"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"ይህ ማሳወቂያ ወደ Splitscreen መጎተትን አይደግፍም።"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi አይገኝም"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"የቅድሚያ ሁነታ"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"ማንቂያ ተቀናብሯል"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"የረዳት እንግዳ ሁነታ ነቅቷል"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"ካሜራ እና ማይክሮፎን ጠፍተዋል"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 38dcb89cd56d..5ec5e9b537f0 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"واجهة مستخدم النظام"</string> - <string name="battery_low_title" msgid="6891106956328275225">"قد ينفد شحن البطارية قريبًا"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"متبقي <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"يتعذّر الشحن باستخدام USB."</string> <string name="invalid_charger_text" msgid="2339310107232691577">"استخدم الشاحن المرفق بجهازك."</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"تمّت مصادقة الوجه."</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"تمّ التأكيد."</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"يمكنك النقر على \"تأكيد\" لإكمال المهمة."</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"مصادقة"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"استخدام رقم تعريف شخصي"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"استخدام نقش"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"إغلاق"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"كتم الصوت تمامًا"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"المنبِّهات فقط"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"عدم الإزعاج"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"البلوتوث."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"تفعيل البلوتوث."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"تم ضبط المنبّه على <xliff:g id="TIME">%s</xliff:g>."</string> @@ -209,6 +217,7 @@ <string name="dessert_case" msgid="9104973640704357717">"حالة الحلويات"</string> <string name="start_dreams" msgid="9131802557946276718">"شاشة الاستراحة"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"عدم الإزعاج"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"بلوتوث"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"لا يتوفر أي أجهزة مقترنة"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"مستوى طاقة البطارية <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -360,6 +369,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"الإشعارات"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"المحادثات"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"محو جميع الإشعارات الصامتة"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"تم إيقاف الإشعارات مؤقتًا وفقًا لإعداد \"عدم الإزعاج\""</string> <string name="media_projection_action_text" msgid="3634906766918186440">"البدء الآن"</string> <string name="empty_shade_text" msgid="8935967157319717412">"ليس هناك أي اشعارات"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"يتولّى أحد الوالدين إدارة هذا الجهاز."</string> @@ -503,6 +513,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>الحالة:</b> تم خفض الترتيب"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"تظهر في أعلى إشعارات المحادثات وكصورة ملف شخصي على شاشة القفل."</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"تظهر في أعلى إشعارات المحادثات وكصورة ملف شخصي على شاشة القفل وتظهر على شكل فقاعة."</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"تظهر في أعلى إشعارات المحادثات وكصورة ملف شخصي على شاشة القفل، وتقاطع ميزة \"عدم الإزعاج\"."</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"تظهر في أعلى إشعارات المحادثات وكصورة ملف شخصي على شاشة القفل وتظهر على شكل فقاعة لمقاطعة ميزة \"عدم الإزعاج\"."</string> <string name="notification_priority_title" msgid="2079708866333537093">"الأولوية"</string> <string name="no_shortcut" msgid="8257177117568230126">"لا يدعم تطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> ميزات المحادثات."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"يتعذّر تعديل هذه الإشعارات."</string> @@ -586,6 +598,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"الرسائل القصيرة SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"الموسيقى"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"التقويم"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"عدم الإزعاج"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"اختصار أزرار مستوى الصوت"</string> <string name="battery" msgid="769686279459897127">"البطارية"</string> <string name="headset" msgid="4485892374984466437">"سماعة الرأس"</string> @@ -704,6 +717,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>، <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"تم إيقاف شبكة Wi-Fi"</string> <string name="bt_is_off" msgid="7436344904889461591">"تم إيقاف البلوتوث."</string> + <string name="dnd_is_off" msgid="3185706903793094463">"تم إيقاف وضع \"عدم الإزعاج\""</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"تم تفعيل وضع \"عدم الإزعاج\" بواسطة قاعدة تلقائية (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"تم تفعيل وضع \"عدم الإزعاج\" بواسطة تطبيق (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"تم تفعيل وضع \"عدم الإزعاج\" بواسطة قاعدة تلقائية أو تطبيق."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"التطبيقات التي تعمل في الخلفية"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"انقر للحصول على تفاصيل حول البطارية واستخدام البيانات"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"هل تريد إيقاف بيانات الجوّال؟"</string> @@ -728,6 +745,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(العمل)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"المكالمات الهاتفية"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(من خلال <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"الكاميرا"</string> <string name="privacy_type_location" msgid="7991481648444066703">"الموقع"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"الميكروفون"</string> @@ -830,6 +849,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(غير متّصل)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"لا يمكن التبديل. انقر لإعادة المحاولة."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"إقران جهاز جديد"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"لبث هذه الجلسة، يُرجى فتح التطبيق"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"تطبيق غير معروف"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"رقم الإصدار"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"تم نسخ رقم الإصدار إلى الحافظة."</string> <string name="basic_status" msgid="2315371112182658176">"محادثة مفتوحة"</string> @@ -863,6 +884,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"+<xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"عرض أحدث الرسائل والمكالمات الفائتة والتغييرات في الحالة"</string> <string name="people_tile_title" msgid="6589377493334871272">"محادثة"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"تم إيقاف الإشعار مؤقتًا من خلال ميزة \"عدم الإزعاج\""</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"تم إرسال رسالة من <xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"تم إرسال صورة من <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="new_status_content_description" msgid="6046637888641308327">"تم تعديل حالة <xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -905,8 +927,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> تطبيق نشط</item> <item quantity="one">تطبيق واحد (<xliff:g id="COUNT_0">%s</xliff:g>) نشط</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"معلومات جديدة"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"# تطبيق نشط"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"إيقاف"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"متوقّف"</string> @@ -914,14 +935,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"تم النسخ."</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"من <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"إغلاق واجهة مستخدم النسخ"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"تعديل النص المنسوخ"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"تعديل الصورة المنسوخة"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"الإرسال إلى جهاز مجاور"</string> + <string name="add" msgid="81036585205287996">"إضافة"</string> + <string name="manage_users" msgid="1823875311934643849">"إدارة المستخدمين"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"لا يتيح هذا الإشعار السحب لتقسيم الشاشة."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"شبكة Wi‑Fi غير متاحة"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"وضع الأولوية"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"تم ضبط المنبه."</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"تم تفعيل وضع الضيف لاستخدام \"مساعد Google\"."</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"الكاميرا والميكروفون غير مفعّلين."</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index 8d8a0fb32d96..00f7790e384d 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"ছিষ্টেম ইউআই"</string> - <string name="battery_low_title" msgid="6891106956328275225">"বেটাৰী অতি সোনকালে শেষ হ\'ব পাৰে"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> বাকী আছে"</string> <string name="invalid_charger_title" msgid="938685362320735167">"ইউএছবি জৰিয়তে চ্চাৰ্জ কৰিব নোৱাৰি"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"আপোনাৰ ডিভাইচৰ লগত পোৱা চ্চাৰ্জাৰটো ব্যৱহাৰ কৰক।"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"মুখমণ্ডলৰ বিশ্বাসযোগ্যতা প্ৰমাণীকৰণ কৰা হ’ল"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"নিশ্চিত কৰিলে"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"সম্পূৰ্ণ কৰিবলৈ নিশ্চিত কৰক-ত টিপক"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"বিশ্বাসযোগ্যতা প্ৰমাণীকৰণ কৰা হ’ল"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"পিন ব্যৱহাৰ কৰক"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"আৰ্হি ব্যৱহাৰ কৰক"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"বন্ধ কৰক"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"সম্পূৰ্ণ নিৰৱতা"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"কেৱল এলাৰ্মবোৰৰ বাবে"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"অসুবিধা নিদিব"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"ব্লুটুথ।"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"ব্লুটুথ অন হৈ আছে।"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"<xliff:g id="TIME">%s</xliff:g>ৰ বাবে এলাৰ্ম ছেট কৰা হৈছে।"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"মিষ্টান্ন ভাণ্ডাৰ"</string> <string name="start_dreams" msgid="9131802557946276718">"স্ক্ৰীন ছেভাৰ"</string> <string name="ethernet_label" msgid="2203544727007463351">"ইথাৰনেট"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"অসুবিধা নিদিব"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ব্লুটুথ"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"কোনো যোৰা লগোৱা ডিভাইচ উপলব্ধ নহয়।"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"বেটাৰী <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"জাননীসমূহ"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"বাৰ্তালাপ"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"আটাইবোৰ নীৰৱ জাননী মচক"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"অসুবিধা নিদিব-ই জাননী পজ কৰিছে"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"এতিয়াই আৰম্ভ কৰক"</string> <string name="empty_shade_text" msgid="8935967157319717412">"কোনো জাননী নাই"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"এই ডিভাইচটো আপোনাৰ অভিভাৱকে পৰিচালনা কৰে"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>স্থিতি:</b> স্থান তললৈ কৰা হৈছে"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"বাৰ্তালাপৰ জাননীৰ শীৰ্ষত আৰু প্ৰ’ফাইল চিত্ৰ হিচাপে লক স্ক্ৰীনত দেখুৱায়"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"বাৰ্তালাপৰ জাননীৰ শীৰ্ষত আৰু প্ৰ’ফাইল চিত্ৰ হিচাপে লক স্ক্ৰীনত দেখুৱায়, এটা বাবল হিচাপে দেখা পোৱা যায়"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"বাৰ্তালাপৰ জাননীৰ শীৰ্ষত আৰু প্ৰ’ফাইল চিত্ৰ হিচাপে লক স্ক্ৰীনত দেখুৱায়, অসুবিধা নিদিব ম’ডত ব্যাঘাত জন্মায়"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"বাৰ্তালাপৰ জাননীৰ শীৰ্ষত আৰু প্ৰ’ফাইল চিত্ৰ হিচাপে লক স্ক্ৰীনত দেখুৱায়, এটা বাবল হিচাপে দেখা পোৱা যায়, অসুবিধা নিদিব ম’ডত ব্যাঘাত জন্মায়"</string> <string name="notification_priority_title" msgid="2079708866333537093">"অগ্ৰাধিকাৰ"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g>এ বাৰ্তালাপৰ সুবিধাসমূহ সমৰ্থন নকৰে"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"এই জাননীসমূহ সংশোধন কৰিব নোৱাৰি।"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"এছএমএছ"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"সংগীত"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"অসুবিধা নিদিব"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"ভলিউম বুটামসমূহৰ শ্বৰ্টকাট"</string> <string name="battery" msgid="769686279459897127">"বেটাৰী"</string> <string name="headset" msgid="4485892374984466437">"হেডছেট"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"ৱাই-ফাই অফ অৱস্থাত আছে"</string> <string name="bt_is_off" msgid="7436344904889461591">"ব্লুটুথ অফ অৱস্থাত আছে"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"অসুবিধা নিদিব অফ অৱস্থাত আছে"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"অসুবিধা নিদিব-ক এটা স্বয়ংক্ৰিয় নিয়ম (<xliff:g id="ID_1">%s</xliff:g>)এ অন কৰিলে।"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"অসুবিধা নিদিব-ক কোনো এপ্ (<xliff:g id="ID_1">%s</xliff:g>)এ অন কৰিলে।"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"অসুবিধা নিদিব-ক এটা স্বয়ংক্ৰিয় নিয়ম বা এপে অন কৰিলে।"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"নেপথ্যত চলি থকা এপসমূহ"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"বেটাৰী আৰু ডেটাৰ ব্যৱহাৰৰ বিষয়ে সবিশেষ জানিবলৈ টিপক"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"ম’বাইল ডেটা অফ কৰিবনে?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(কৰ্মস্থান)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"ফ’ন কল"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>ৰ জৰিয়তে)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"Camera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"অৱস্থান"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"মাইক্ৰ\'ফ\'ন"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(সংযোগ বিচ্ছিন্ন কৰা হৈছে)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"সলনি কৰিব নোৱাৰি। আকৌ চেষ্টা কৰিবলৈ টিপক।"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"নতুন ডিভাইচ পেয়াৰ কৰক"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"এই ছেশ্বনটো কাষ্ট কৰিবলৈ, অনুগ্ৰহ কৰি এপ্টো খোলক"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"অজ্ঞাত এপ্"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"বিল্ডৰ নম্বৰ"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ক্লিপব’ৰ্ডলৈ বিল্ডৰ নম্বৰ প্ৰতিলিপি কৰা হ’ল।"</string> <string name="basic_status" msgid="2315371112182658176">"বাৰ্তালাপ খোলক"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"শেহতীয়া বাৰ্তা, মিছড্ কল আৰু স্থিতিৰ আপডে’ট চাওক"</string> <string name="people_tile_title" msgid="6589377493334871272">"বাৰ্তালাপ"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"অসুবিধা নিদিব সুবিধাটোৱে পজ কৰিছে"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g>এ এটা বাৰ্তা পঠিয়াইছে: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>এ এখন প্ৰতিচ্ছবি পঠিয়াইছে"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g>ৰ এটা স্থিতিৰ আপডে’ট আছে: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> টা সক্ৰিয় এপ্</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> টা সক্ৰিয় এপ্</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"নতুন তথ্য"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"সক্ৰিয় এপ্"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"বন্ধ কৰক"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"বন্ধ হ’ল"</string> @@ -889,8 +910,14 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"প্ৰতিলিপি কৰা পাঠ সম্পাদনা কৰক"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"প্ৰতিলিপি কৰা প্ৰতিচ্ছবি সম্পাদনা কৰক"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"নিকটৱৰ্তী ডিভাইচলৈ পঠাওক"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="add" msgid="81036585205287996">"যোগ দিয়ক"</string> + <string name="manage_users" msgid="1823875311934643849">"ব্যৱহাৰকাৰী পৰিচালনা কৰক"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"এই জাননীটোৱে টানি আনি এৰাৰ পৰা বিভাজিত স্ক্ৰীন সমৰ্থন নকৰে।"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"ৱাই-ফাই উপলব্ধ নহয়"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"অগ্ৰাধিকাৰ ম’ড"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"এলাৰ্ম ছেট কৰা হ’ল"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistantৰ অতিথি ম’ড সক্ষম কৰা হৈছে"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"কেমেৰা আৰু মাইক অফ হৈ আছে"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index 1fc28a88d390..a1956b30c54c 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Sistemin İstifadə İnterfeysi"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Batareya tezliklə bitə bilər"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> qalır"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB vasitəsilə enerji yığa bilməz"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Cihazla verilən adapterdən istifadə edin"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Üz doğrulandı"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Təsdiqləndi"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Tamamlamaq üçün \"Təsdiq edin\" seçiminə toxunun"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Doğrulandı"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN istifadə edin"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Model istifadə edin"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Qapadın"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"tam sakitlik"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"bildirişlər"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Narahat Etməyin."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth aktiv."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarm <xliff:g id="TIME">%s</xliff:g> üçün qurulub."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Desert Qabı"</string> <string name="start_dreams" msgid="9131802557946276718">"Ekran qoruyucu"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Narahat etməyin"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Heç bir cütlənmiş cihaz əlçatan deyil"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> batareya"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Bildirişlər"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Söhbətlər"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Səssiz bildirişlərin hamısını silin"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Bildirişlər \"Narahat Etməyin\" rejimi tərəfindən dayandırıldı"</string> <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="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Bu cihaz valideyniniz tərəfindən idarə olunur"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Aşağı sıraya keçirilib"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Söhbət bildirişlərinin yuxarısında və kilid ekranında profil şəkli kimi göstərilir"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Söhbət bildirişlərinin yuxarısında və kilid ekranında profil şəkli kimi göstərilir, baloncuq kimi görünür"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Söhbət bildirişlərinin yuxarısında və kilid ekranında profil şəkli kimi göstərilir, Narahat Etməyin rejimini kəsir"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Söhbət bildirişlərinin yuxarısında və kilid ekranında profil şəkli kimi göstərilir, baloncuq kimi görünür, Narahat Etməyin rejimini kəsir"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritet"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> söhbət funksiyalarını dəstəkləmir"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Bu bildirişlər dəyişdirilə bilməz."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Musiqi"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Təqvim"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Narahat Etməyin"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Səs düymələri qısayolu"</string> <string name="battery" msgid="769686279459897127">"Batareya"</string> <string name="headset" msgid="4485892374984466437">"Qulaqlıq"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi deaktivdir"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth deaktivdir"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"\"Narahat Etməyin\" deaktivdir"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"\"Narahat etməyin\" rejimi (<xliff:g id="ID_1">%s</xliff:g>) avtomatik qaydası tərəfindən aktiv edildi."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"\"Narahat etməyin\" rejimi (<xliff:g id="ID_1">%s</xliff:g>) tətbiqi tərəfindən aktiv edildi."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"\"Narahat etməyin\" rejimi avtomatik qayda və ya tətbiq tərəfindən aktiv edildi."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Arxa fonda işləyən tətbiqlər"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Batareya və data istifadəsi haqqında ətraflı məlumat üçün klikləyin"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Mobil data söndürülsün?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(iş)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefon zəngi"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> vasitəsilə)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"məkan"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(bağlantı kəsildi)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Dəyişmək olmur. Yenidən cəhd etmək üçün toxunun."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Cihaz əlavə edin"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Bu sessiyanı yayımlamaq üçün tətbiqi açın."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Naməlum tətbiq"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Montaj nömrəsi"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Versiya nömrəsi mübadilə buferinə kopyalandı."</string> <string name="basic_status" msgid="2315371112182658176">"Açıq söhbət"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Son mesajlar, buraxılmış zənglər və status güncəlləmələrinə baxın"</string> <string name="people_tile_title" msgid="6589377493334871272">"Söhbət"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"\"Narahat Etməyin\" rejimini tərəfindən durdurulub"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> mesaj göndərdi: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> şəkil göndərdi"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> status güncəlləməsi edib: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktiv tətbiq</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aktiv tətbiq</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Yeni məlumat"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktiv tətbiqlər"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Dayandırın"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Dayandırılıb"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Kopyalandı"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Mənbə: <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"UI kopyalanmasını qapadın"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Kopyalanmış mətni redaktə edin"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Kopyalanmış şəkli redaktə edin"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Yaxınlıqdakı cihaza göndərin"</string> + <string name="add" msgid="81036585205287996">"Əlavə edin"</string> + <string name="manage_users" msgid="1823875311934643849">"İstifadəçiləri idarə edin"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Bu bildiriş Ayrılmış ekrana sürüşdürməyi dəstəkləmir."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi əlçatan deyil"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Prioritet rejimi"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Siqnal ayarlanıb"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistent qonaq rejimi aktivdir"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera və mikrofon deaktivdir"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index 555b477770a4..2019e9dbcb8a 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI sistema"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Baterija će se možda uskoro isprazniti"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Još <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Punjenje preko USB-a nije uspelo"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Koristite punjač koji ste dobili uz uređaj"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Lice je potvrđeno"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Potvrđeno"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Dodirnite Potvrdi da biste završili"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Identitet je potvrđen"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Koristite PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Koristite šablon"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Zatvori"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"potpuna tišina"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"samo alarmi"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Ne uznemiravaj."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth je uključen."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarm je podešen za <xliff:g id="TIME">%s</xliff:g>."</string> @@ -206,6 +214,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Vitrina sa poslasticama"</string> <string name="start_dreams" msgid="9131802557946276718">"Čuvar ekrana"</string> <string name="ethernet_label" msgid="2203544727007463351">"Eternet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Ne uznemiravaj"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Nije dostupan nijedan upareni uređaj"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Nivo baterije je <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -351,6 +360,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Obaveštenja"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Konverzacije"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Obrišite sva nečujna obaveštenja"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Obaveštenja su pauzirana režimom Ne uznemiravaj"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Započni"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Nema obaveštenja"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Ovim uređajem upravlja roditelj"</string> @@ -494,6 +504,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Rangirano niže"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Prikazuje se u vrhu obaveštenja o konverzacijama i kao slika profila na zaključanom ekranu"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Prikazuje se u vrhu obaveštenja o konverzacijama i kao slika profila na zaključanom ekranu, pojavljuje se kao oblačić"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Prikazuje se u vrhu obaveštenja o konverzacijama i kao slika profila na zaključanom ekranu, prekida režim Ne uznemiravaj"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Prikazuje se u vrhu obaveštenja o konverzacijama i kao slika profila na zaključanom ekranu, pojavljuje se kao oblačić, prekida režim Ne uznemiravaj"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritet"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ne podržava funkcije konverzacije"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ova obaveštenja ne mogu da se menjaju."</string> @@ -571,6 +583,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Muzika"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Ne uznemiravaj"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Prečica za dugmad za jačinu zvuka"</string> <string name="battery" msgid="769686279459897127">"Baterija"</string> <string name="headset" msgid="4485892374984466437">"Naglavne slušalice"</string> @@ -689,6 +702,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"WiFi je isključen"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth je isključen"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Režim Ne uznemiravaj je isključen"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Automatsko pravilo (<xliff:g id="ID_1">%s</xliff:g>) je uključilo režim Ne uznemiravaj."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Aplikacija (<xliff:g id="ID_1">%s</xliff:g>) je uključila režim Ne uznemiravaj."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Automatsko pravilo ili aplikacija su uključili režim Ne uznemiravaj."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Aplikacije pokrenute u pozadini"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Dodirnite za detalje o bateriji i potrošnji podataka"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Želite da isključite mobilne podatke?"</string> @@ -713,6 +730,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(posao)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonski poziv"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(preko: <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kameru"</string> <string name="privacy_type_location" msgid="7991481648444066703">"lokaciju"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -812,6 +831,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(veza je prekinuta)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Prebacivanje nije uspelo. Probajte ponovo."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Upari novi uređaj"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Da biste prebacivali ovu sesiju, otvorite aplikaciju."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Nepoznata aplikacija"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Broj verzije"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Broj verzije je kopiran u privremenu memoriju."</string> <string name="basic_status" msgid="2315371112182658176">"Otvorite konverzaciju"</string> @@ -845,6 +866,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Pogledajte nedavne poruke, propuštene pozive i ažuriranja statusa"</string> <string name="people_tile_title" msgid="6589377493334871272">"Konverzacija"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Pauzirano režimom Ne uznemiravaj"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> je poslao/la poruku: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> šalje sliku"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ima ažuriranje statusa: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -884,8 +906,7 @@ <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> aktivne aplikacije</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktivnih aplikacija</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nove informacije"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktivne aplikacije"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Zaustavi"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Zaustavljeno"</string> @@ -893,14 +914,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Kopirano je"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Iz: <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Odbaci kopiranje korisničkog interfejsa"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Izmenite kopirani tekst"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Izmenite kopiranu sliku"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Pošalji na uređaj u blizini"</string> + <string name="add" msgid="81036585205287996">"Dodaj"</string> + <string name="manage_users" msgid="1823875311934643849">"Upravljajte korisnicima"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Ovo obaveštenje ne podržava prevlačenje na podeljeni ekran."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"WiFi nije dostupan"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Prioritetni režim"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarm je podešen"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Omogućen je režim gosta u Pomoćniku"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera i mikrofon su isključeni"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 744600740be6..c10a36d66373 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Інтэрфейс сістэмы"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Акумулятар хутка разрадзіцца"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Засталося <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Не ўдалося выканаць зарадку праз USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Выкарыстоўвайце зараднае прыстасаванне з камплекта прылады"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Твар распазнаны"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Пацверджана"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Націсніце \"Пацвердзіць\", каб завяршыць"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Распазнана"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Увесці PIN-код"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Выкарыстаць узор разблакіроўкі"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Закрыць"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"поўная цішыня"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"толькі будзільнікі"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Не турбаваць."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth уключаны."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Наладжаны будзiльнiк: <xliff:g id="TIME">%s</xliff:g>."</string> @@ -207,6 +215,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Вітрына з дэсертамі"</string> <string name="start_dreams" msgid="9131802557946276718">"Экранная застаўка"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Не турбаваць"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Няма даступных спалучаных прылад"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Узровень зараду: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -354,6 +363,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Апавяшчэнні"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Размовы"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Выдаліць усе апавяшчэнні без гуку"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Паказ апавяшчэнняў прыпынены ў рэжыме \"Не турбаваць\""</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Пачаць зараз"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Апавяшчэнняў няма"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Гэта прылада знаходзіцца пад кантролем бацькоў"</string> @@ -497,6 +507,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Стан:</b> Ацэнена як няважнае"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"З\'яўляецца ўверсе раздзела размоў і паказвае на экране блакіроўкі відарыс профілю"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"З\'яўляецца ўверсе раздзела размоў як усплывальнае апавяшчэнне, якое паказвае на экране блакіроўкі відарыс профілю"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"З\'яўляецца ўверсе раздзела размоў, перарывае рэжым \"Не турбаваць\" і паказвае на экране блакіроўкі відарыс профілю"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"З\'яўляецца ўверсе раздзела размоў як усплывальнае апавяшчэнне, якое перарывае рэжым \"Не турбаваць\" і паказвае на экране блакіроўкі відарыс профілю"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Прыярытэт"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> не падтрымлівае функцыі размовы"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Гэтыя апавяшчэнні нельга змяніць."</string> @@ -576,6 +588,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS-паведамленні"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Музыка"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Каляндар"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Не турбаваць"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Доступ праз кнопкі рэгулявання гучнасці"</string> <string name="battery" msgid="769686279459897127">"Акумулятар"</string> <string name="headset" msgid="4485892374984466437">"Гарнітура"</string> @@ -694,6 +707,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi выключаны"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth выключаны"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Рэжым \"Не турбаваць\" выключаны"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Рэжым \"Не турбаваць\" быў уключаны аўтаматычным правілам (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Рэжым \"Не турбаваць\" быў уключаны праграмай (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Рэжым \"Не турбаваць\" быў уключаны аўтаматычным правілам ці праграмай."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Праграмы, якія працуюць у фонавым рэжыме"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Дакраніцеся, каб даведацца пра выкарыстанне трафіка і акумулятара"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Выключыць мабільную перадачу даных?"</string> @@ -718,6 +735,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(працоўная)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Тэлефонны выклік"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(праз праграму \"<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>\")"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"камера"</string> <string name="privacy_type_location" msgid="7991481648444066703">"геалакацыя"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"мікрафон"</string> @@ -818,6 +837,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(адключана)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Не ўдалося пераключыцца. Дакраніцеся, каб паўтарыць спробу."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Спалучыць з новай прыладай"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Для трансляцыі гэтага сеанса адкрыйце праграму."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Невядомая праграма"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Нумар зборкі"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Нумар зборкі скапіраваны ў буфер абмену."</string> <string name="basic_status" msgid="2315371112182658176">"Адкрытая размова"</string> @@ -851,6 +872,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Глядзець нядаўнія паведамленні, прапушчаныя выклікі і абнаўленні стану"</string> <string name="people_tile_title" msgid="6589377493334871272">"Размова"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Прыпынена функцыяй \"Не турбаваць\""</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"Карыстальнік <xliff:g id="NAME">%1$s</xliff:g> прыслаў паведамленне: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"Карыстальнік <xliff:g id="NAME">%1$s</xliff:g> адправіў відарыс"</string> <string name="new_status_content_description" msgid="6046637888641308327">"Карыстальнік <xliff:g id="NAME">%1$s</xliff:g> абнавіў стан: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -891,8 +913,7 @@ <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> актыўных праграм</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> актыўнай праграмы</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Новая інфармацыя"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Актыўныя праграмы"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Спыніць"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Спынена"</string> @@ -900,14 +921,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Скапіравана"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"З праграмы \"<xliff:g id="APPNAME">%1$s</xliff:g>\""</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Закрыць інтэрфейс капіравання"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Змяніць скапіраваны тэкст"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Змяніць скапіраваны відарыс"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Адправіць на прыладу паблізу"</string> + <string name="add" msgid="81036585205287996">"Дадаць"</string> + <string name="manage_users" msgid="1823875311934643849">"Кіраванне карыстальнікамі"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Гэта апавяшчэнне нельга перацягнуць на падзелены экран."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Сетка Wi‑Fi недаступная"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Прыярытэтны рэжым"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Будзільнік зададзены"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Гасцявы рэжым для Памочніка ўключаны"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Камера і мікрафон выключаны"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index f7a1ad65b0f0..a10750401a05 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Системен ПИ"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Батерията може скоро да се изтощи"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Остава/т <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Зареждането през USB не е възможно"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Използвайте оригиналното зарядно устройство"</string> @@ -111,7 +116,7 @@ <string name="accessibility_phone_button" msgid="4256353121703100427">"Телефон"</string> <string name="accessibility_voice_assist_button" msgid="6497706615649754510">"Гласова помощ"</string> <string name="accessibility_wallet_button" msgid="1458258783460555507">"Портфейл"</string> - <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"Инструмент за сканиране на QR кодове"</string> + <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"Скенер за QR кодове"</string> <string name="accessibility_unlock_button" msgid="122785427241471085">"Отключване"</string> <string name="accessibility_lock_icon" msgid="661492842417875775">"Устройството е заключено"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Извършва се сканиране на лице"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Лицето е удостоверено"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Потвърдено"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Докоснете „Потвърждаване“ за завършване"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Удостоверено"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Използване на ПИН"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Използване на фигура"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Затваряне"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"пълна тишина"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"само будилници"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Не безпокойте."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Функцията за Bluetooth е включена."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Будилникът е навит за <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Витрина с десерти"</string> <string name="start_dreams" msgid="9131802557946276718">"Скрийнсейвър"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Не безпокойте"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Няма налични сдвоени устройства"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Батерия: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Известия"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Разговори"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Изчистване на всички беззвучни известия"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Известията са поставени на пауза от режима „Не безпокойте“"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Стартиране сега"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Няма известия"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Това устройство се управлява от родителя ви"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Състояние:</b> Класирано по-ниско"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Показва се в горната част на известията за разговори и като снимка на потребителския профил на заключения екран"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Показва се в горната част на известията за разговори и като снимка на потребителския профил на заключения екран, изглежда като балонче"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Показва се в горната част на известията за разговори и като снимка на потребителския профил на заключения екран, прекъсва режима „Не безпокойте“"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Показва се в горната част на известията за разговори и като снимка на потребителския профил на заключения екран, изглежда като балонче, прекъсва режима „Не безпокойте“"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Приоритет"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> не поддържа функциите за разговор"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Тези известия не могат да бъдат променяни."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Музика"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Календар"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Не безпокойте"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Пряк път към бутоните за силата на звука"</string> <string name="battery" msgid="769686279459897127">"Батерия"</string> <string name="headset" msgid="4485892374984466437">"Слушалки"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Функцията за Wi‑Fi е изключена"</string> <string name="bt_is_off" msgid="7436344904889461591">"Функцията за Bluetooth е изключена"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Режимът „Не безпокойте“ е изключен"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Режимът „Не безпокойте“ бе включен от автоматично правило (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Режимът „Не безпокойте“ бе включен от приложение (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Режимът „Не безпокойте“ бе включен от автоматично правило или от приложение."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Приложения, работещи на заден план"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Докоснете за информация относно използването на батерията и преноса на данни"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Да се изключат ли мобилните данни?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(служебно)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Телефонно обаждане"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(чрез <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"камерата"</string> <string name="privacy_type_location" msgid="7991481648444066703">"местополож."</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"микрофона"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(връзката е прекратена)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Не може да се превключи. Докоснете за нов опит."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Сдвояване на ново устройство"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"За да предавате тази сесия, моля, отворете приложението."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Неизвестно приложение"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Номер на компилацията"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Номерът на компилацията е копиран в буферната памет."</string> <string name="basic_status" msgid="2315371112182658176">"Отворен разговор"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"Над <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Преглеждайте скорошни съобщения, пропуснати обаждания и информация за състоянието"</string> <string name="people_tile_title" msgid="6589377493334871272">"Разговор"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Поставено на пауза от режима „Не безпокойте“"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> изпрати съобщение: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> изпрати изображение"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> има актуализация на състоянието: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> активни приложения</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> активно приложение</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Нова информация"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Активни приложения"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Спиране"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Спряно"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Копирано"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"От <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Отхвърляне на ПИ за копиране"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Редактиране на копирания текст"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Редактиране на копираното изображение"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Изпращане до устройство в близост"</string> + <string name="add" msgid="81036585205287996">"Добавяне"</string> + <string name="manage_users" msgid="1823875311934643849">"Управление на потребителите"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Това известие не поддържа плъзгане за разделяне на екрана."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi не е налице"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Приоритетен режим"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Будилникът е зададен"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Режимът на гост за Асистент е активиран"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Камерата и микрофонът са изключени"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index 36a5bc48b2b4..b5040e959a34 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"সিস্টেম UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"চার্জ শীঘ্রই শেষ হয়ে যেতে পারে"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> অবশিষ্ট আছে"</string> <string name="invalid_charger_title" msgid="938685362320735167">"ইউএসবি দিয়ে চার্জ করা যাবে না"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"ডিভাইসের সাথে যে চার্জারটি পেয়েছেন, সেটি ব্যবহার করুন"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"ফেস যাচাই করা হয়েছে"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"কনফার্ম করা হয়েছে"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"সম্পূর্ণ করতে \'কনফার্ম করুন\' বোতামে ট্যাপ করুন"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"প্রমাণীকৃত"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"পিন ব্যবহার করুন"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"প্যাটার্ন ব্যবহার করুন"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"বন্ধ করুন"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"সম্পূর্ণ নীরব"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"শুধুমাত্র অ্যালার্ম"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"বিরক্ত করবে না।"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"ব্লুটুথ"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"ব্লুটুথ চালু আছে।"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"<xliff:g id="TIME">%s</xliff:g> এ অ্যালার্ম সেট করা হয়েছে৷"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"ডেজার্ট কেস"</string> <string name="start_dreams" msgid="9131802557946276718">"স্ক্রিন সেভার"</string> <string name="ethernet_label" msgid="2203544727007463351">"ইথারনেট"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"বিরক্ত করবে না"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ব্লুটুথ"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"চেনা কোনও ডিভাইস নেই"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"চার্জ <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"বিজ্ঞপ্তি"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"কথোপকথন"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"সব নীরব বিজ্ঞপ্তি মুছুন"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"\'বিরক্ত করবে না\' দিয়ে বিজ্ঞপ্তি পজ করা হয়েছে"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"এখন শুরু করুন"</string> <string name="empty_shade_text" msgid="8935967157319717412">"কোনো বিজ্ঞপ্তি নেই"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"আপনার অভিভাবক এই ডিভাইস ম্যানেজ করেন"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>স্ট্যাটাস:</b> র্যাঙ্ক কমে গেছে"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"কথোপকথনের বিজ্ঞপ্তির উপরের দিকে এবং প্রোফাইল ছবি হিসেবে লক স্ক্রিনে দেখানো হয়"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"কথোপকথনের বিজ্ঞপ্তির উপরের দিকে এবং প্রোফাইল ছবি হিসেবে লক স্ক্রিনে দেখানো হয়, বাবল হিসেবেও এটি দেখা যায়"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"কথোপকথনের বিজ্ঞপ্তির উপরের দিকে এবং প্রোফাইল ছবি হিসেবে লক স্ক্রিনে দেখানো হয় এবং এর ফলে \'বিরক্ত করবে না\' মোডে কাজ করতে অসুবিধা হয়"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"কথোপকথনের বিজ্ঞপ্তির উপরের দিকে এবং প্রোফাইল ছবি হিসেবে লক স্ক্রিনে দেখানো হয়, বাবল হিসেবেও এটি দেখা যায় এবং এর ফলে \'বিরক্ত করবে না\' মোডে কাজ করতে অসুবিধা হয়"</string> <string name="notification_priority_title" msgid="2079708866333537093">"অগ্রাধিকার"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এ কথোপকথন ফিচার কাজ করে না"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"এই বিজ্ঞপ্তিগুলি পরিবর্তন করা যাবে না।"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"সংগীত"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"বিরক্ত করবে না"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"ভলিউম বোতামের শর্টকাট"</string> <string name="battery" msgid="769686279459897127">"ব্যাটারি"</string> <string name="headset" msgid="4485892374984466437">"হেডসেট"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"ওয়াই ফাই বন্ধ আছে"</string> <string name="bt_is_off" msgid="7436344904889461591">"ব্লুটুথ বন্ধ আছে"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"বিরক্ত করবে না বিকল্পটি বন্ধ আছে"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"বিরক্ত করবে না বিকল্পটি একটি স্বয়ংক্রিয় নিয়ম <xliff:g id="ID_1">%s</xliff:g> এর দ্বারা চালু করা হয়েছে।"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"বিরক্ত করবে না বিকল্পটি একটি অ্যাপ <xliff:g id="ID_1">%s</xliff:g> এর দ্বারা চালু করা হয়েছে।"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"বিরক্ত করবে না বিকল্পটি একটি স্বয়ংক্রিয় নিয়ম বা অ্যাপের দ্বারা চালু করা হয়েছে।"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"পটভূমিতে অ্যাপ চালু আছে"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"ব্যাটারি এবং ডেটার ব্যবহারের বিশদ বিবরণের জন্য ট্যাপ করুন"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"মোবাইল ডেটা বন্ধ করবেন?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(অফিস)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"ফোন কল"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>-এর সাহায্যে)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"ক্যামেরা"</string> <string name="privacy_type_location" msgid="7991481648444066703">"লোকেশন"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"মাইক্রোফোন"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(ডিসকানেক্ট হয়ে গেছে)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"পাল্টানো যাচ্ছে না। আবার চেষ্টা করতে ট্যাপ করুন।"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"নতুন ডিভাইস পেয়ার করুন"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"এই সেশন কাস্ট করার জন্য, অ্যাপ খুলুন।"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"অজানা অ্যাপ"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"বিল্ড নম্বর"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"বিল্ড নম্বর ক্লিপবোর্ডে কপি করা হয়েছে।"</string> <string name="basic_status" msgid="2315371112182658176">"খোলা কথোপকথন"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"সাম্প্রতিক মেসেজ, মিসড কল এবং স্ট্যাটাস সংক্রান্ত আপডেট দেখুন"</string> <string name="people_tile_title" msgid="6589377493334871272">"কথোপকথন"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"\'বিরক্ত করবে না\' মোডের মাধ্যমে পজ করা আছে"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> একটি মেসেজ পাঠিয়েছেন: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> একটি ছবি পাঠিয়েছেন"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> একটি স্ট্যাটাস আপডেট করেছেন: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g>টি অ্যাক্টিভ অ্যাপ</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g>টি অ্যাক্টিভ অ্যাপ</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"নতুন তথ্য"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"অ্যাক্টিভ অ্যাপ"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"বন্ধ করুন"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"থামানো হয়েছে"</string> @@ -889,8 +910,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"কপি করা টেক্সট এডিট করুন"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"কপি করা ছবি এডিট করুন"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"আশেপাশের ডিভাইসে পাঠান"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"যোগ করুন"</string> + <string name="manage_users" msgid="1823875311934643849">"ব্যবহারকারীদের ম্যানেজ করুন"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"স্প্লিটস্ক্রিন মোডে এই বিজ্ঞপ্তি টেনে আনা যাবে না।"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"ওয়াই-ফাই উপলভ্য নেই"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"প্রায়োরিটি মোড"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"অ্যালার্ম সেট করা হয়েছে"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistant-এর \'অতিথি মোড\' চালু করা হয়েছে"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"ক্যামেরা ও মাইক্রোফোন বন্ধ আছে"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{#টি বিজ্ঞপ্তি}one{#টি বিজ্ঞপ্তি}other{#টি বিজ্ঞপ্তি}}"</string> </resources> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 1545c43aafbd..b0691fe6b5b0 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Sistemski UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Baterija će se uskoro isprazniti"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Preostalo <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Punjenje putem USB-a nije moguće"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Koristite punjač koji ste dobili uz uređaj"</string> @@ -111,7 +116,7 @@ <string name="accessibility_phone_button" msgid="4256353121703100427">"Telefon"</string> <string name="accessibility_voice_assist_button" msgid="6497706615649754510">"Glasovna pomoć"</string> <string name="accessibility_wallet_button" msgid="1458258783460555507">"Novčanik"</string> - <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"Skener QR kôda"</string> + <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"Skener QR koda"</string> <string name="accessibility_unlock_button" msgid="122785427241471085">"Otključaj"</string> <string name="accessibility_lock_icon" msgid="661492842417875775">"Uređaj je zaključan"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skeniranje lica"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Lice je provjereno"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Potvrđeno"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Dodirnite Potvrdi da završite"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentificirano"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Koristi PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Koristi uzorak"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Zatvori"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"potpuna tišina"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"samo alarmi"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Ne ometaj."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth uključen."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarm je podešen na <xliff:g id="TIME">%s</xliff:g>."</string> @@ -206,6 +214,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Slika sa desertima"</string> <string name="start_dreams" msgid="9131802557946276718">"Čuvar ekrana"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Ne ometaj"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Nema dostupnih uparenih uređaja"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> baterije"</string> @@ -351,6 +360,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Obavještenja"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Razgovori"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Obriši sva nečujna obavještenja"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Obavještenja su pauzirana načinom rada Ne ometaj"</string> <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="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Ovim uređajem upravlja tvoj roditelj"</string> @@ -494,6 +504,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> je rangiran niže"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Prikazuje se na vrhu obavještenja u razgovorima i kao slika profila na zaključanom ekranu"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Prikazuje se na vrhu obavještenja u razgovorima i kao slika profila na zaključanom ekranu, izgleda kao oblačić"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Prikazuje se na vrhu obavještenja u razgovorima i kao slika profila na zaključanom ekranu, prekida funkciju Ne ometaj"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Prikazuje se na vrhu obavještenja u razgovorima i kao slika profila na zaključanom ekranu, izgleda kao oblačić, prekida funkciju Ne ometaj"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritetno"</string> <string name="no_shortcut" msgid="8257177117568230126">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> ne podržava funkcije razgovora"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ta obavještenja se ne mogu izmijeniti."</string> @@ -571,6 +583,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Muzika"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Ne ometaj"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Prečica za dugmad za Jačinu zvuka"</string> <string name="battery" msgid="769686279459897127">"Baterija"</string> <string name="headset" msgid="4485892374984466437">"Slušalice s mikrofonom"</string> @@ -689,10 +702,14 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"WiFi veza je isključena"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth je isključen"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Način rada Ne ometaj je isključen"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Opciju Ne ometaju uključilo je automatsko pravilo (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <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="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 mreže."</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> <string name="touch_filtered_warning" msgid="8119511393338714836">"Postavke ne mogu potvrditi vaš odgovor jer aplikacija zaklanja zahtjev za odobrenje."</string> <string name="slice_permission_title" msgid="3262615140094151017">"Dozvoliti aplikaciji <xliff:g id="APP_0">%1$s</xliff:g> da prikazuje isječke aplikacije <xliff:g id="APP_2">%2$s</xliff:g>?"</string> @@ -713,6 +730,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(posao)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonski poziv"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(putem aplikacije <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kameru"</string> <string name="privacy_type_location" msgid="7991481648444066703">"lokaciju"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -812,6 +831,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(veza je prekinuta)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Nije moguće prebaciti. Dodirnite da pokušate ponovo."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Uparite novi uređaj"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Da emitirate ovu sesiju, otvorite aplikaciju."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Nepoznata aplikacija"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Broj verzije"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Broj verzije je kopiran u međumemoriju."</string> <string name="basic_status" msgid="2315371112182658176">"Otvoreni razgovor"</string> @@ -845,6 +866,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Pregledajte nedavne poruke, propuštene pozive i ažuriranja statusa"</string> <string name="people_tile_title" msgid="6589377493334871272">"Razgovor"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Pauzirala je funkcija Ne ometaj"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> je poslao/la poruku: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> je poslao/la sliku"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> je ažurirao/la status: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -884,8 +906,7 @@ <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> aktivne aplikacije</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktivnih aplikacija</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nove informacije"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktivne aplikacije"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Zaustavi"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Zaustavljeno"</string> @@ -896,8 +917,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"Uredi kopirani tekst"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Uredi kopiranu sliku"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Pošalji na uređaj u blizini"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"Dodaj"</string> + <string name="manage_users" msgid="1823875311934643849">"Upravljajte korisnicima"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Ovo obavještenje ne podržava prevlačenje na podijeljeni ekran."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"WiFi je nedostupan"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Način rada Prioriteti"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarm je postavljen"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Način rada za gosta Asistenta je omogućen"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera i mikrofon su isključeni"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# obavijest}one{# obavijest}few{# obavijesti}other{# obavijesti}}"</string> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 621f5f9a5383..da4cba76a427 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"IU del sistema"</string> - <string name="battery_low_title" msgid="6891106956328275225">"És possible que la bateria s\'esgoti aviat"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g>."</string> <string name="invalid_charger_title" msgid="938685362320735167">"No es pot carregar per USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Fes servir el carregador original del dispositiu"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Cara autenticada"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmat"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Toca Confirma per completar"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticat"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Utilitza el PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Utilitza el patró"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Tanca"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"silenci total"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"només alarmes"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"No molestis."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth activat."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"S\'ha configurat l\'alarma (<xliff:g id="TIME">%s</xliff:g>)."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Capsa de postres"</string> <string name="start_dreams" msgid="9131802557946276718">"Estalvi de pantalla"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"No molestis"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"No hi ha dispositius vinculats disponibles"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> de bateria"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificacions"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Converses"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Esborra totes les notificacions silencioses"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notificacions pausades pel mode No molestis"</string> <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="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Els teus pares gestionen aquest dispositiu"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Estat</b>: s\'ha classificat amb un nivell inferior"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Es mostra a la part superior de les notificacions de les converses i com a foto de perfil a la pantalla de bloqueig"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Es mostra a la part superior de les notificacions de les converses i com a foto de perfil a la pantalla de bloqueig, apareix com una bombolla"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Es mostra a la part superior de les notificacions de les converses i com a foto de perfil a la pantalla de bloqueig, interromp el mode No molestis"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Es mostra a la part superior de les notificacions de les converses i com a foto de perfil a la pantalla de bloqueig, apareix com una bombolla, interromp el mode No molestis"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritat"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> no admet les funcions de converses"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Aquestes notificacions no es poden modificar."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Música"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"No molestis"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Drecera per als botons de volum"</string> <string name="battery" msgid="769686279459897127">"Bateria"</string> <string name="headset" msgid="4485892374984466437">"Auriculars"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"La Wi-Fi està desactivada"</string> <string name="bt_is_off" msgid="7436344904889461591">"El Bluetooth està desactivat"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"El mode No molestis està desactivat"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Una regla automàtica (<xliff:g id="ID_1">%s</xliff:g>) ha activat el mode No molestis."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Una aplicació (<xliff:g id="ID_1">%s</xliff:g>) ha activat el mode No molestis."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Una regla automàtica o una aplicació han activat el mode No molestis."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Aplicacions que s\'estan executant en segon pla"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Toca per obtenir informació sobre l\'ús de dades i de bateria"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Vols desactivar les dades mòbils?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(feina)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Trucada"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(a través de: <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"càmera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"ubicació"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"micròfon"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(desconnectat)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"No es pot canviar. Torna-ho a provar."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Vincula un dispositiu nou"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Per emetre aquesta sessió, obre l\'aplicació."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Aplicació desconeguda"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número de compilació"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"El número de compilació s\'ha copiat al porta-retalls."</string> <string name="basic_status" msgid="2315371112182658176">"Conversa oberta"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Consulta els missatges recents, les trucades perdudes i les actualitzacions d\'estat"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversa"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Posat en pausa pel mode No molestis"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> ha enviat un missatge: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ha enviat una imatge"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> té una actualització d\'estat: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplicacions actives</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplicació activa</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Informació nova"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aplicacions actives"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Atura"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Aturada"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"S\'ha copiat"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"De: <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Ignora la IU de còpia"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Edita el text que has copiat"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Edita la imatge que has copiat"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Envia a un dispositiu proper"</string> + <string name="add" msgid="81036585205287996">"Afegeix"</string> + <string name="manage_users" msgid="1823875311934643849">"Gestiona els usuaris"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Aquesta notificació no es pot arrossegar a la pantalla dividida."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi no disponible"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Mode Prioritat"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarma definida"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Mode de convidat de l\'Assistent activat"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Càmera i micròfon desactivats"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index ba976883136f..e93fc2937913 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI systému"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Baterie se brzy vybije"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Zbývá <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Nabíjení přes USB nefunguje"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Používejte originální nabíječku, která byla dodána spolu se zařízením."</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Obličej byl ověřen"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Potvrzeno"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Ověření dokončíte klepnutím na Potvrdit"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Ověřeno"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Použít kód PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Použít gesto"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Zavřít"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"úplné ticho"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"pouze budíky"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Nerušit."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Rozhraní Bluetooth je zapnuto."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Budík je nastaven na <xliff:g id="TIME">%s</xliff:g>."</string> @@ -207,6 +215,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Pult se sladkostmi"</string> <string name="start_dreams" msgid="9131802557946276718">"Spořič obrazovky"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Nerušit"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Nejsou dostupná žádná spárovaná zařízení"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Baterie: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -354,6 +363,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Oznámení"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Konverzace"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Vymazat všechna tichá oznámení"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Oznámení jsou pozastavena režimem Nerušit"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Spustit"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Žádná oznámení"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Toto zařízení spravuje rodič"</string> @@ -497,6 +507,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Stav:</b> zařazeno níže"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Zobrazuje se v horní části sekce konverzací a na obrazovce uzamčení se objevuje jako profilová fotka"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Zobrazuje se v horní části sekce konverzací a na obrazovce uzamčení se objevuje jako profilová fotka, má podobu bubliny"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Zobrazuje se v horní části sekce konverzací a na obrazovce uzamčení se objevuje jako profilová fotka, deaktivuje režim Nerušit"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Zobrazuje se v horní části sekce konverzací a na obrazovce uzamčení se objevuje jako profilová fotka, má podobu bubliny a deaktivuje režim Nerušit"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Priorita"</string> <string name="no_shortcut" msgid="8257177117568230126">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> funkce konverzace nepodporuje"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Tato oznámení nelze upravit."</string> @@ -576,6 +588,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Hudba"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalendář"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Nerušit"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Zkratka tlačítek hlasitosti"</string> <string name="battery" msgid="769686279459897127">"Baterie"</string> <string name="headset" msgid="4485892374984466437">"Sluchátka"</string> @@ -694,6 +707,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi je vypnuta"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth je vypnuto"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Režim Nerušit je vypnut"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Režim Nerušit byl zapnut automatickým pravidlem (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Režim Nerušit byl zapnut aplikací (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Režim Nerušit byl zapnut automatickým pravidlem nebo aplikací."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Aplikace běžící na pozadí"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Klepnutím zobrazíte podrobnosti o využití baterie a dat"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Vypnout mobilní data?"</string> @@ -718,6 +735,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(práce)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonní hovor"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(prostřednictvím aplikace <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"fotoaparát"</string> <string name="privacy_type_location" msgid="7991481648444066703">"poloha"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -818,6 +837,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(odpojeno)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Nelze přepnout. Klepnutím opakujte akci."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Spárovat nové zařízení"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Pokud chcete odesílat relaci, otevřete aplikaci."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Neznámá aplikace"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Číslo sestavení"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Číslo sestavení bylo zkopírováno do schránky."</string> <string name="basic_status" msgid="2315371112182658176">"Otevřít konverzaci"</string> @@ -851,6 +872,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Zobrazit poslední zprávy, zmeškané hovory a aktualizace stavu"</string> <string name="people_tile_title" msgid="6589377493334871272">"Konverzace"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Pozastaveno funkcí Nerušit"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> posílá zprávu: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> posílá obrázek"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> má aktualizaci stavu: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -891,8 +913,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktivních aplikací</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aktivních aplikací</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nové informace"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktivní aplikace"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Konec"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Zastaveno"</string> @@ -900,14 +921,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Zkopírováno"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Z aplikace <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Zavřít uživatelské rozhraní kopírování"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Upravit zkopírovaný text"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Upravit zkopírovaný obrázek"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Odeslat do zařízení v okolí"</string> + <string name="add" msgid="81036585205287996">"Přidat"</string> + <string name="manage_users" msgid="1823875311934643849">"Správa uživatelů"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Toto oznámení nepodporuje přetažení na rozdělenou obrazovku."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Síť Wi‑Fi není k dispozici"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Prioritní režim"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Je nastaven budík"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"U Asistenta je aktivován režim hosta"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Fotoaparát a mikrofon jsou vypnuté"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# oznámení}few{# oznámení}many{# oznámení}other{# oznámení}}"</string> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index bbcb9bc0b530..bf460fe05c6b 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"System-UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Enheden løber muligvis snart tør for batteri"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> tilbage"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Enheden kan ikke oplades via USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Brug den oplader, der fulgte med din enhed"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Ansigtet er godkendt"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Bekræftet"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Tryk på Bekræft for at udføre"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Godkendt"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Brug pinkode"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Brug mønster"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Luk"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"total stilhed"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"kun alarmer"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Forstyr ikke."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth er slået til."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarmen er indstillet til <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessertcase"</string> <string name="start_dreams" msgid="9131802557946276718">"Pauseskærm"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Forstyr ikke"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Der er ingen tilgængelige parrede enheder"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> batteri"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifikationer"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Samtaler"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Ryd alle lydløse notifikationer"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notifikationer er sat på pause af Forstyr ikke"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Start nu"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Ingen notifikationer"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Denne enhed administreres af din forælder"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Placeret lavere"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Vises øverst i samtalenotifikationer og som et profilbillede på låseskærmen"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Vises øverst i samtalenotifikationer og som et profilbillede på låseskærmen. Vises som en boble"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Vises øverst i samtalenotifikationer og som et profilbillede på låseskærmen. Afbryder Forstyr ikke"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Vises øverst i samtalenotifikationer og som et profilbillede på låseskærmen. Vises som en boble, der afbryder Forstyr ikke"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritet"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> understøtter ikke samtalefunktioner"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Disse notifikationer kan ikke redigeres."</string> @@ -566,6 +578,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="volume_and_do_not_disturb" msgid="502044092739382832">"Forstyr ikke"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Genvej til lydstyrkeknapper"</string> <string name="battery" msgid="769686279459897127">"Batteri"</string> <string name="headset" msgid="4485892374984466437">"Headset"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi er slået fra"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth er slået fra"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Forstyr ikke er slået fra"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Tilstanden Forstyr ikke blev aktiveret af en automatisk regel (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Tilstanden Forstyr ikke blev aktiveret af en app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Tilstanden Forstyr ikke blev aktiveret af en automatisk regel eller en app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apps, der kører i baggrunden"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Tryk for at se info om batteri- og dataforbrug"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Vil du deaktivere mobildata?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(arbejde)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonopkald"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(via <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kameraet"</string> <string name="privacy_type_location" msgid="7991481648444066703">"lokation"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofonen"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(afbrudt)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Det var ikke muligt at skifte. Tryk for at prøve igen."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Par ny enhed"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Åbn appen for at caste denne session."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Ukendt app"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Buildnummer"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Buildnummeret blev kopieret til udklipsholderen."</string> <string name="basic_status" msgid="2315371112182658176">"Åben samtale"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Se dine seneste beskeder, mistede opkald og statusopdateringer"</string> <string name="people_tile_title" msgid="6589377493334871272">"Samtale"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Sat på pause af Forstyr ikke"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> har sendt en besked: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> har sendt et billede"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> har opdateret sin status: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> aktiv app</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktive apps</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nye oplysninger"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktive apps"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stoppet"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Kopieret"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Fra <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Luk brugerfladen for kopi"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Rediger kopieret tekst"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Rediger kopieret billede"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Send til enhed i nærheden"</string> + <string name="add" msgid="81036585205287996">"Tilføj"</string> + <string name="manage_users" msgid="1823875311934643849">"Administrer brugere"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Denne notifikation kan ikke trækkes til en opdelt skærm."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Ingen tilgængelig Wi-Fi-forbindelse"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Tilstanden Prioritet"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarmen er indstillet"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Gæstetilstand i Assistent er aktiveret"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera og mikrofon er slået fra"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 2b9f725e24e4..6197b3fbae0c 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"System-UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Der Akku ist fast leer"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> verbleibend"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Aufladen über USB nicht möglich"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Verwende das mit dem Gerät gelieferte Ladegerät"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Gesicht authentifiziert"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Bestätigt"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Zum Abschließen auf \"Bestätigen\" tippen"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authentifiziert"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN verwenden"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Muster verwenden"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Schließen"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"lautlos"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"nur Weckrufe"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Bitte nicht stören."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth aktiviert"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Wecker gestellt für <xliff:g id="TIME">%s</xliff:g>"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessertbehälter"</string> <string name="start_dreams" msgid="9131802557946276718">"Bildschirmschoner"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Bitte nicht stören"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Keine gekoppelten Geräte verfügbar"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Akkustand: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Benachrichtigungen"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Unterhaltungen"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Alle lautlosen Benachrichtigungen löschen"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Benachrichtigungen durch „Bitte nicht stören“ pausiert"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Jetzt starten"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Keine Benachrichtigungen"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Dieses Gerät wird von deinen Eltern verwaltet"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status</b>: niedriger eingestuft"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Wird oben im Bereich „Unterhaltungen“ sowie als Profilbild auf dem Sperrbildschirm angezeigt"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Wird oben im Bereich „Unterhaltungen“ sowie als Profilbild auf dem Sperrbildschirm angezeigt, erscheint als Bubble"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Wird oben im Bereich „Unterhaltungen“ sowie als Profilbild auf dem Sperrbildschirm angezeigt, unterbricht „Bitte nicht stören“"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Wird oben im Bereich „Unterhaltungen“ sowie als Profilbild auf dem Sperrbildschirm angezeigt, erscheint als Bubble, unterbricht „Bitte nicht stören“"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Priorität"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> unterstützt keine Funktionen für Unterhaltungen"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Diese Benachrichtigungen können nicht geändert werden."</string> @@ -566,6 +578,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="volume_and_do_not_disturb" msgid="502044092739382832">"Bitte nicht stören"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Tastenkombination für Lautstärketasten"</string> <string name="battery" msgid="769686279459897127">"Akku"</string> <string name="headset" msgid="4485892374984466437">"Headset"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"WLAN ist deaktiviert"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth ist deaktiviert"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"„Bitte nicht stören“ ist deaktiviert"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"„Bitte nicht stören“ wurde von einer automatischen Regel aktiviert (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"„Bitte nicht stören“ wurde von einer App aktiviert (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"„Bitte nicht stören“ wurde von einer automatischen Regel oder einer App aktiviert."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apps, die im Hintergrund ausgeführt werden"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Für Details zur Akku- und Datennutzung tippen"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Mobile Daten deaktivieren?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(geschäftlich)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonanruf"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(über <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"Kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"Standort"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"Mikrofon"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(nicht verbunden)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Wechseln nicht möglich. Tippe, um es noch einmal zu versuchen."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Neues Gerät koppeln"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Öffne zum Streamen dieser Sitzung die App."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Unbekannte App"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Build-Nummer"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Build-Nummer in Zwischenablage kopiert."</string> <string name="basic_status" msgid="2315371112182658176">"Offene Unterhaltung"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Letzte Nachrichten, verpasste Anrufe und Statusaktualisierungen ansehen"</string> <string name="people_tile_title" msgid="6589377493334871272">"Unterhaltung"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Durch „Bitte nicht stören“ pausiert"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> hat eine Nachricht gesendet: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> hat ein Bild gesendet"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> hat den Status aktualisiert: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktive Apps</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aktive App</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Neue Informationen"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktive Apps"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Beenden"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Beendet"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Kopiert"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Von <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Kopieren-Benutzeroberfläche schließen"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Kopierten Text bearbeiten"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Kopiertes Bild bearbeiten"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"An Gerät in der Nähe senden"</string> + <string name="add" msgid="81036585205287996">"Hinzufügen"</string> + <string name="manage_users" msgid="1823875311934643849">"Nutzer verwalten"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Diese Benachrichtigung lässt sich nicht auf einen geteilten Bildschirm ziehen."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"WLAN nicht verfügbar"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Prioritätsmodus"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Wecker gestellt"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistant-Gastmodus aktiviert"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera und Mikrofon ausgeschaltet"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 609674929af5..dc0d98bc7caf 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI συστήματ."</string> - <string name="battery_low_title" msgid="6891106956328275225">"Η μπαταρία μπορεί να εξαντληθεί σύντομα"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Απομένουν <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Δεν είναι δυνατή η φόρτιση μέσω USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Χρησιμοποιήστε τον φορτιστή που συνοδεύει τη συσκευή σας"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Έγινε έλεγχος ταυτότητας προσώπου"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Επιβεβαιώθηκε"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Πατήστε Επιβεβαίωση για ολοκλήρωση"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Ολοκληρώθηκε ο έλεγχος ταυτότητας"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Χρήση PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Χρήση μοτίβου"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Κλείσιμο"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"πλήρης σίγαση"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"μόνο ξυπνητήρια"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Μην ενοχλείτε."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Ενεργό Bluetooth."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Το ξυπνητήρι έχει οριστεί στις <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Επιδόρπιο"</string> <string name="start_dreams" msgid="9131802557946276718">"Προφύλαξη οθόνης"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Μην ενοχλείτε"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Δεν υπάρχουν διαθέσιμες συσκευές σε σύζευξη"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Μπαταρία <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Ειδοποιήσεις"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Συζητήσεις"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Διαγραφή όλων των ειδοποιήσεων σε σίγαση"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Οι ειδοποιήσεις τέθηκαν σε παύση από τη λειτουργία \"Μην ενοχλείτε\""</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Έναρξη τώρα"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Δεν υπάρχουν ειδοποιήσεις"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Αυτή η συσκευή είναι διαχειριζόμενη από τον γονέα σου"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Κατάσταση:</b> Κατατάχθηκε χαμηλότερα"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Εμφανίζεται στην κορυφή των ειδοποιήσεων συζήτησης και ως φωτογραφία προφίλ στην οθόνη κλειδώματος"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Εμφανίζεται στην κορυφή των ειδοποιήσεων συζήτησης και ως φωτογραφία προφίλ στην οθόνη κλειδώματος, εμφανίζεται ως συννεφάκι"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Εμφανίζεται στην κορυφή των ειδοποιήσεων συζήτησης και ως φωτογραφία προφίλ στην οθόνη κλειδώματος, διακόπτει τη λειτουργία Μην ενοχλείτε"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Εμφανίζεται στην κορυφή των ειδοποιήσεων συζήτησης και ως φωτογραφία προφίλ στην οθόνη κλειδώματος, εμφανίζεται ως συννεφάκι, διακόπτει τη λειτουργία Μην ενοχλείτε"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Προτεραιότητα"</string> <string name="no_shortcut" msgid="8257177117568230126">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> δεν υποστηρίζει τις λειτουργίες συζήτησης"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Δεν είναι δυνατή η τροποποίηση αυτών των ειδοποιήσεων"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Μουσική"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Ημερολόγιο"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Μην ενοχλείτε"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Συντόμευση κουμπιών έντασης ήχου"</string> <string name="battery" msgid="769686279459897127">"Μπαταρία"</string> <string name="headset" msgid="4485892374984466437">"Ακουστικά"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Το Wi-Fi είναι ανενεργό"</string> <string name="bt_is_off" msgid="7436344904889461591">"Το Bluetooth είναι ανενεργό"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Η λειτουργία \"Μην ενοχλείτε\" είναι ανενεργή"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Η λειτουργία \"Μην ενοχλείτε\" ενεργοποιήθηκε από έναν αυτόματο κανόνα (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Η λειτουργία \"Μην ενοχλείτε\" ενεργοποιήθηκε από μια εφαρμογή (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Η λειτουργία \"Μην ενοχλείτε\" ενεργοποιήθηκε από έναν αυτόματο κανόνα ή μια εφαρμογή."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Εφαρμογές που εκτελούνται στο παρασκήνιο"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Πατήστε για λεπτομέρειες σχετικά με τη χρήση μπαταρίας και δεδομένων"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Απενεργοποίηση δεδομένων κινητής τηλεφωνίας;"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(εργασία)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Τηλεφωνική κλήση"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(μέσω <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"κάμερα"</string> <string name="privacy_type_location" msgid="7991481648444066703">"τοποθεσία"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"μικρόφωνο"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(αποσυνδέθηκε)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Δεν είναι δυνατή η εναλλαγή. Πατήστε για επανάληψη."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Σύζευξη νέας συσκευής"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Για μετάδοση της περιόδου σύνδεσης, ανοίξτε την εφαρμογή."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Άγνωστη εφαρμογή"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Αριθμός έκδοσης"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Ο αριθμός έκδοσης αντιγράφηκε στο πρόχειρο."</string> <string name="basic_status" msgid="2315371112182658176">"Άνοιγμα συνομιλίας"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Δείτε πρόσφατα μηνύματα, αναπάντητες κλήσεις και ενημερώσεις κατάστασης"</string> <string name="people_tile_title" msgid="6589377493334871272">"Συνομιλία"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Σε παύση από τη λειτουργία Μην ενοχλείτε"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"Ο χρήστης <xliff:g id="NAME">%1$s</xliff:g> έστειλε ένα μήνυμα: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"Ο χρήστης <xliff:g id="NAME">%1$s</xliff:g> έστειλε μια εικόνα"</string> <string name="new_status_content_description" msgid="6046637888641308327">"Ο χρήστης <xliff:g id="NAME">%1$s</xliff:g> έχει μια ενημέρωση κατάστασης: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ενεργές εφαρμογές</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> ενεργή εφαρμογή</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Νέες πληροφορίες"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Ενεργές εφαρμογές"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Διακοπή"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Διακόπηκε"</string> @@ -886,14 +907,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Αντιγράφηκε"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Από <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Παράβλεψη διεπαφής χρήστη αντιγραφής"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Επεξεργασία αντιγραμμένου κειμένου"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Επεξεργασία αντιγραμμένης εικόνας"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Αποστολή σε κοντινή συσκευή"</string> + <string name="add" msgid="81036585205287996">"Προσθήκη"</string> + <string name="manage_users" msgid="1823875311934643849">"Διαχείριση χρηστών"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Αυτή η ειδοποίηση δεν υποστηρίζει τη μεταφορά με σύρσιμο για χρήση του διαχωρισμού οθόνης."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Το Wi‑Fi δεν είναι διαθέσιμο"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Λειτουργία προτεραιότητας"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Το ξυπνητήρι ρυθμίστηκε"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Η λειτουργία επισκέπτη του Βοηθού ενεργοποιήθηκε"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Η κάμερα και το μικρόφωνο έχουν απενεργοποιηθεί"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# ειδοποίηση}other{# ειδοποιήσεις}}"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index f6dc3145bc9c..fcbe0a6927aa 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -20,7 +20,9 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"System UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Battery may run out soon"</string> + <string name="battery_low_title" msgid="5319680173344341779">"Turn on Battery Saver?"</string> + <string name="battery_low_description" msgid="3282977755476423966">"You have <xliff:g id="PERCENTAGE">%s</xliff:g> battery left. Battery Saver turns on Dark theme, restricts background activity and delays notifications."</string> + <string name="battery_low_intro" msgid="5148725009653088790">"Battery Saver turns on Dark theme, restricts background activity and delays notifications."</string> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Can\'t charge via USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Use the charger that came with your device"</string> @@ -128,6 +130,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Face authenticated"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmed"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Tap Confirm to complete"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authenticated"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Use PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Use pattern"</string> @@ -181,6 +185,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Close"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"total silence"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"alarms only"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Do Not Disturb."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth on."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarm set for <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +210,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessert Case"</string> <string name="start_dreams" msgid="9131802557946276718">"Screen saver"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Do Not Disturb"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"No paired devices available"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> battery"</string> @@ -348,6 +354,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifications"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversations"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Clear all silent notifications"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notifications paused by Do Not Disturb"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Start now"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No notifications"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"This device is managed by your parent"</string> @@ -491,6 +498,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> ranked lower"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Shows at the top of conversation notifications and as a profile picture on lock screen"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Shows at the top of conversation notifications and as a profile picture on lock screen, appears as a bubble"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Shows at the top of conversation notifications and as a profile picture on lock screen, interrupts Do Not Disturb"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Shows at the top of conversation notifications and as a profile picture on lock screen, appears as a bubble, interrupts Do Not Disturb"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Priority"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> doesn’t support conversation features"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"These notifications can\'t be modified."</string> @@ -566,6 +575,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Music"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Do Not Disturb"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Volume buttons shortcut"</string> <string name="battery" msgid="769686279459897127">"Battery"</string> <string name="headset" msgid="4485892374984466437">"Headset"</string> @@ -684,6 +694,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi is off"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth is off"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Do Not Disturb is off"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Do Not Disturb was turned on by an automatic rule (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Do Not Disturb was turned on by an app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Do Not Disturb was turned on by an automatic rule or app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apps running in background"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Tap for details on battery and data usage"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Turn off mobile data?"</string> @@ -708,6 +722,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(work)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Phone call"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(through <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"camera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"location"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"microphone"</string> @@ -806,6 +822,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(disconnected)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Can\'t switch. Tap to try again."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Pair new device"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"To cast this session, please open the app."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Unknown app"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Build number"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Build number copied to clipboard."</string> <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> @@ -839,6 +857,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"See recent messages, missed calls and status updates"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Paused by Do Not Disturb"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> sent a message: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> sent an image"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> has a status update: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +896,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> active apps</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> active app</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"New information"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Active apps"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stopped"</string> @@ -889,8 +907,18 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"Edit copied text"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Edit copied image"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Send to nearby device"</string> - <!-- no translation found for add (81036585205287996) --> + <string name="add" msgid="81036585205287996">"Add"</string> + <string name="manage_users" msgid="1823875311934643849">"Manage users"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"This notification does not support dragging to Split screen."</string> + <!-- no translation found for dream_overlay_status_bar_wifi_off (4497069245055003582) --> + <skip /> + <!-- no translation found for dream_overlay_status_bar_priority_mode (5428462123314728739) --> + <skip /> + <!-- no translation found for dream_overlay_status_bar_alarm_set (566707328356590886) --> + <skip /> + <!-- no translation found for dream_overlay_status_bar_assistant_guest_mode_enabled (3715897096012469615) --> <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <!-- no translation found for dream_overlay_status_bar_camera_mic_off (3199425257833773569) --> <skip /> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# notification}other{# notifications}}"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index 0b4e00945337..2e6514a3f77d 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -20,7 +20,9 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"System UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Battery may run out soon"</string> + <string name="battery_low_title" msgid="5319680173344341779">"Turn on Battery Saver?"</string> + <string name="battery_low_description" msgid="3282977755476423966">"You have <xliff:g id="PERCENTAGE">%s</xliff:g> battery left. Battery Saver turns on Dark theme, restricts background activity and delays notifications."</string> + <string name="battery_low_intro" msgid="5148725009653088790">"Battery Saver turns on Dark theme, restricts background activity and delays notifications."</string> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Can\'t charge via USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Use the charger that came with your device"</string> @@ -128,6 +130,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Face authenticated"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmed"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Tap Confirm to complete"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authenticated"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Use PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Use pattern"</string> @@ -181,6 +185,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Close"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"total silence"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"alarms only"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Do Not Disturb."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth on."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarm set for <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +210,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessert Case"</string> <string name="start_dreams" msgid="9131802557946276718">"Screen saver"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Do Not Disturb"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"No paired devices available"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> battery"</string> @@ -348,6 +354,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifications"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversations"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Clear all silent notifications"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notifications paused by Do Not Disturb"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Start now"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No notifications"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"This device is managed by your parent"</string> @@ -491,6 +498,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> ranked lower"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Shows at the top of conversation notifications and as a profile picture on lock screen"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Shows at the top of conversation notifications and as a profile picture on lock screen, appears as a bubble"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Shows at the top of conversation notifications and as a profile picture on lock screen, interrupts Do Not Disturb"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Shows at the top of conversation notifications and as a profile picture on lock screen, appears as a bubble, interrupts Do Not Disturb"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Priority"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> doesn’t support conversation features"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"These notifications can\'t be modified."</string> @@ -566,6 +575,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Music"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Do Not Disturb"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Volume buttons shortcut"</string> <string name="battery" msgid="769686279459897127">"Battery"</string> <string name="headset" msgid="4485892374984466437">"Headset"</string> @@ -684,6 +694,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi is off"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth is off"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Do Not Disturb is off"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Do Not Disturb was turned on by an automatic rule (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Do Not Disturb was turned on by an app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Do Not Disturb was turned on by an automatic rule or app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apps running in background"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Tap for details on battery and data usage"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Turn off mobile data?"</string> @@ -708,6 +722,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(work)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Phone call"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(through <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"camera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"location"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"microphone"</string> @@ -806,6 +822,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(disconnected)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Can\'t switch. Tap to try again."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Pair new device"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"To cast this session, please open the app."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Unknown app"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Build number"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Build number copied to clipboard."</string> <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> @@ -839,6 +857,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"See recent messages, missed calls and status updates"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Paused by Do Not Disturb"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> sent a message: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> sent an image"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> has a status update: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +896,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> active apps</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> active app</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"New information"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Active apps"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stopped"</string> @@ -889,8 +907,18 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"Edit copied text"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Edit copied image"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Send to nearby device"</string> - <!-- no translation found for add (81036585205287996) --> + <string name="add" msgid="81036585205287996">"Add"</string> + <string name="manage_users" msgid="1823875311934643849">"Manage users"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"This notification does not support dragging to Split screen."</string> + <!-- no translation found for dream_overlay_status_bar_wifi_off (4497069245055003582) --> + <skip /> + <!-- no translation found for dream_overlay_status_bar_priority_mode (5428462123314728739) --> + <skip /> + <!-- no translation found for dream_overlay_status_bar_alarm_set (566707328356590886) --> + <skip /> + <!-- no translation found for dream_overlay_status_bar_assistant_guest_mode_enabled (3715897096012469615) --> <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <!-- no translation found for dream_overlay_status_bar_camera_mic_off (3199425257833773569) --> <skip /> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# notification}other{# notifications}}"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index f6dc3145bc9c..fcbe0a6927aa 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -20,7 +20,9 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"System UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Battery may run out soon"</string> + <string name="battery_low_title" msgid="5319680173344341779">"Turn on Battery Saver?"</string> + <string name="battery_low_description" msgid="3282977755476423966">"You have <xliff:g id="PERCENTAGE">%s</xliff:g> battery left. Battery Saver turns on Dark theme, restricts background activity and delays notifications."</string> + <string name="battery_low_intro" msgid="5148725009653088790">"Battery Saver turns on Dark theme, restricts background activity and delays notifications."</string> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Can\'t charge via USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Use the charger that came with your device"</string> @@ -128,6 +130,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Face authenticated"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmed"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Tap Confirm to complete"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authenticated"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Use PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Use pattern"</string> @@ -181,6 +185,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Close"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"total silence"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"alarms only"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Do Not Disturb."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth on."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarm set for <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +210,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessert Case"</string> <string name="start_dreams" msgid="9131802557946276718">"Screen saver"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Do Not Disturb"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"No paired devices available"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> battery"</string> @@ -348,6 +354,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifications"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversations"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Clear all silent notifications"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notifications paused by Do Not Disturb"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Start now"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No notifications"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"This device is managed by your parent"</string> @@ -491,6 +498,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> ranked lower"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Shows at the top of conversation notifications and as a profile picture on lock screen"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Shows at the top of conversation notifications and as a profile picture on lock screen, appears as a bubble"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Shows at the top of conversation notifications and as a profile picture on lock screen, interrupts Do Not Disturb"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Shows at the top of conversation notifications and as a profile picture on lock screen, appears as a bubble, interrupts Do Not Disturb"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Priority"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> doesn’t support conversation features"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"These notifications can\'t be modified."</string> @@ -566,6 +575,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Music"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Do Not Disturb"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Volume buttons shortcut"</string> <string name="battery" msgid="769686279459897127">"Battery"</string> <string name="headset" msgid="4485892374984466437">"Headset"</string> @@ -684,6 +694,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi is off"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth is off"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Do Not Disturb is off"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Do Not Disturb was turned on by an automatic rule (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Do Not Disturb was turned on by an app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Do Not Disturb was turned on by an automatic rule or app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apps running in background"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Tap for details on battery and data usage"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Turn off mobile data?"</string> @@ -708,6 +722,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(work)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Phone call"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(through <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"camera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"location"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"microphone"</string> @@ -806,6 +822,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(disconnected)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Can\'t switch. Tap to try again."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Pair new device"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"To cast this session, please open the app."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Unknown app"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Build number"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Build number copied to clipboard."</string> <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> @@ -839,6 +857,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"See recent messages, missed calls and status updates"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Paused by Do Not Disturb"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> sent a message: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> sent an image"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> has a status update: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +896,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> active apps</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> active app</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"New information"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Active apps"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stopped"</string> @@ -889,8 +907,18 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"Edit copied text"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Edit copied image"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Send to nearby device"</string> - <!-- no translation found for add (81036585205287996) --> + <string name="add" msgid="81036585205287996">"Add"</string> + <string name="manage_users" msgid="1823875311934643849">"Manage users"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"This notification does not support dragging to Split screen."</string> + <!-- no translation found for dream_overlay_status_bar_wifi_off (4497069245055003582) --> + <skip /> + <!-- no translation found for dream_overlay_status_bar_priority_mode (5428462123314728739) --> + <skip /> + <!-- no translation found for dream_overlay_status_bar_alarm_set (566707328356590886) --> + <skip /> + <!-- no translation found for dream_overlay_status_bar_assistant_guest_mode_enabled (3715897096012469615) --> <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <!-- no translation found for dream_overlay_status_bar_camera_mic_off (3199425257833773569) --> <skip /> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# notification}other{# notifications}}"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index f6dc3145bc9c..fcbe0a6927aa 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -20,7 +20,9 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"System UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Battery may run out soon"</string> + <string name="battery_low_title" msgid="5319680173344341779">"Turn on Battery Saver?"</string> + <string name="battery_low_description" msgid="3282977755476423966">"You have <xliff:g id="PERCENTAGE">%s</xliff:g> battery left. Battery Saver turns on Dark theme, restricts background activity and delays notifications."</string> + <string name="battery_low_intro" msgid="5148725009653088790">"Battery Saver turns on Dark theme, restricts background activity and delays notifications."</string> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Can\'t charge via USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Use the charger that came with your device"</string> @@ -128,6 +130,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Face authenticated"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmed"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Tap Confirm to complete"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authenticated"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Use PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Use pattern"</string> @@ -181,6 +185,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Close"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"total silence"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"alarms only"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Do Not Disturb."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth on."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarm set for <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +210,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessert Case"</string> <string name="start_dreams" msgid="9131802557946276718">"Screen saver"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Do Not Disturb"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"No paired devices available"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> battery"</string> @@ -348,6 +354,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifications"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversations"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Clear all silent notifications"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notifications paused by Do Not Disturb"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Start now"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No notifications"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"This device is managed by your parent"</string> @@ -491,6 +498,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> ranked lower"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Shows at the top of conversation notifications and as a profile picture on lock screen"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Shows at the top of conversation notifications and as a profile picture on lock screen, appears as a bubble"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Shows at the top of conversation notifications and as a profile picture on lock screen, interrupts Do Not Disturb"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Shows at the top of conversation notifications and as a profile picture on lock screen, appears as a bubble, interrupts Do Not Disturb"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Priority"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> doesn’t support conversation features"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"These notifications can\'t be modified."</string> @@ -566,6 +575,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Music"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Do Not Disturb"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Volume buttons shortcut"</string> <string name="battery" msgid="769686279459897127">"Battery"</string> <string name="headset" msgid="4485892374984466437">"Headset"</string> @@ -684,6 +694,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi is off"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth is off"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Do Not Disturb is off"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Do Not Disturb was turned on by an automatic rule (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Do Not Disturb was turned on by an app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Do Not Disturb was turned on by an automatic rule or app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apps running in background"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Tap for details on battery and data usage"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Turn off mobile data?"</string> @@ -708,6 +722,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(work)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Phone call"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(through <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"camera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"location"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"microphone"</string> @@ -806,6 +822,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(disconnected)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Can\'t switch. Tap to try again."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Pair new device"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"To cast this session, please open the app."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Unknown app"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Build number"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Build number copied to clipboard."</string> <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> @@ -839,6 +857,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"See recent messages, missed calls and status updates"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Paused by Do Not Disturb"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> sent a message: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> sent an image"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> has a status update: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +896,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> active apps</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> active app</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"New information"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Active apps"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stopped"</string> @@ -889,8 +907,18 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"Edit copied text"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Edit copied image"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Send to nearby device"</string> - <!-- no translation found for add (81036585205287996) --> + <string name="add" msgid="81036585205287996">"Add"</string> + <string name="manage_users" msgid="1823875311934643849">"Manage users"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"This notification does not support dragging to Split screen."</string> + <!-- no translation found for dream_overlay_status_bar_wifi_off (4497069245055003582) --> + <skip /> + <!-- no translation found for dream_overlay_status_bar_priority_mode (5428462123314728739) --> + <skip /> + <!-- no translation found for dream_overlay_status_bar_alarm_set (566707328356590886) --> + <skip /> + <!-- no translation found for dream_overlay_status_bar_assistant_guest_mode_enabled (3715897096012469615) --> <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <!-- no translation found for dream_overlay_status_bar_camera_mic_off (3199425257833773569) --> <skip /> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# notification}other{# notifications}}"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index 18d87f3f6208..f05e75b187e4 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -20,7 +20,9 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"System UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Battery may run out soon"</string> + <string name="battery_low_title" msgid="5319680173344341779">"Turn on Battery Saver?"</string> + <string name="battery_low_description" msgid="3282977755476423966">"You have <xliff:g id="PERCENTAGE">%s</xliff:g> battery left. Battery Saver turns on Dark theme, restricts background activity, and delays notifications."</string> + <string name="battery_low_intro" msgid="5148725009653088790">"Battery Saver turns on Dark theme, restricts background activity, and delays notifications."</string> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Can\'t charge via USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Use the charger that came with your device"</string> @@ -128,6 +130,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Face authenticated"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmed"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Tap Confirm to complete"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authenticated"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Use PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Use pattern"</string> @@ -181,6 +185,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Close"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"total silence"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"alarms only"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Do Not Disturb."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth on."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarm set for <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +210,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessert Case"</string> <string name="start_dreams" msgid="9131802557946276718">"Screen saver"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Do Not Disturb"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"No paired devices available"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> battery"</string> @@ -348,6 +354,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifications"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversations"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Clear all silent notifications"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notifications paused by Do Not Disturb"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Start now"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No notifications"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"This device is managed by your parent"</string> @@ -491,6 +498,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Ranked Lower"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Shows at the top of conversation notifications and as a profile picture on lock screen"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Shows at the top of conversation notifications and as a profile picture on lock screen, appears as a bubble"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Shows at the top of conversation notifications and as a profile picture on lock screen, interrupts Do Not Disturb"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Shows at the top of conversation notifications and as a profile picture on lock screen, appears as a bubble, interrupts Do Not Disturb"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Priority"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> doesn’t support conversation features"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"These notifications can\'t be modified."</string> @@ -566,6 +575,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Music"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Do Not Disturb"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Volume buttons shortcut"</string> <string name="battery" msgid="769686279459897127">"Battery"</string> <string name="headset" msgid="4485892374984466437">"Headset"</string> @@ -684,6 +694,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi is off"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth is off"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Do Not Disturb is off"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Do Not Disturb was turned on by an automatic rule (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Do Not Disturb was turned on by an app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Do Not Disturb was turned on by an automatic rule or app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apps running in background"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Tap for details on battery and data usage"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Turn off mobile data?"</string> @@ -708,6 +722,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(work)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Phone call"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(through <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"camera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"location"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"microphone"</string> @@ -806,6 +822,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(disconnected)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Can\'t switch. Tap to try again."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Pair new device"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"To cast this session, please open the app."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Unknown app"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Build number"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Build number copied to clipboard."</string> <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> @@ -839,6 +857,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"See recent messages, missed calls, and status updates"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Paused by Do Not Disturb"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> sent a message: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> sent an image"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> has a status update: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -890,4 +909,11 @@ <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Send to nearby device"</string> <string name="add" msgid="81036585205287996">"Add"</string> <string name="manage_users" msgid="1823875311934643849">"Manage users"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"This notification does not support dragging to Splitscreen."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi unavailable"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Priority mode"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarm set"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistant guest mode enabled"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Camera and mic are off"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# notification}other{# notifications}}"</string> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 3f1cc42f880b..4363ce9c298f 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"IU del sistema"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Es posible que pronto se agote la batería"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g> de batería."</string> <string name="invalid_charger_title" msgid="938685362320735167">"No se puede cargar mediante USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Usa el cargador que se incluyó con el dispositivo"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Se autenticó el rostro"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmado"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Presiona Confirmar para completar"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticado"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Usar PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Usar patrón"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Cerrar"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"silencio total"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"solo alarmas"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"No interrumpir."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth activado"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarma: <xliff:g id="TIME">%s</xliff:g>"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Caja para postres"</string> <string name="start_dreams" msgid="9131802557946276718">"Protector pantalla"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"No interrumpir"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"No hay dispositivos sincronizados disponibles"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> de batería"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificaciones"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversaciones"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Borrar todas las notificaciones silenciosas"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notificaciones pausadas por el modo \"No interrumpir\""</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Comenzar ahora"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No hay notificaciones"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Tu padre o madre administra este dispositivo"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Estado:</b> Se clasificó en una posición inferior"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Aparece como foto de perfil en la parte superior de las notificaciones de conversación, en la pantalla de bloqueo"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Aparece en forma de burbuja y como foto de perfil en la parte superior de las notificaciones de conversación, en la pantalla de bloqueo"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Aparece como foto de perfil en la parte superior de las notificaciones de conversación, en la pantalla de bloqueo, y detiene el modo No interrumpir"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Aparece en forma de burbuja y como foto de perfil en la parte superior de las notificaciones de conversación, en la pantalla de bloqueo, y detiene el modo No interrumpir"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritaria"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> no admite funciones de conversación"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"No se pueden modificar estas notificaciones."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Música"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendario"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"No interrumpir"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Combinación de teclas de botones de volumen"</string> <string name="battery" msgid="769686279459897127">"Batería"</string> <string name="headset" msgid="4485892374984466437">"Auriculares"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi desactivado"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth desactivado"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"No interrumpir desactivado"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Se activó el modo No interrumpir con una regla automática (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Se activó el modo No interrumpir con una app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Se activó el modo No interrumpir con una app o regla automática."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apps que se ejecutan en segundo plano"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Presiona para obtener información sobre el uso de datos y de la batería"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"¿Deseas desactivar los datos móviles?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(trabajo)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Llamada telefónica"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(a través de <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"cámara"</string> <string name="privacy_type_location" msgid="7991481648444066703">"ubicación"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"micrófono"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(desconectado)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"No se pudo conectar. Presiona para volver a intentarlo."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Vincular dispositivo nuevo"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Para transmitir esta sesión, abre la app"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"App desconocida"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número de compilación"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Se copió el número de compilación en el portapapeles."</string> <string name="basic_status" msgid="2315371112182658176">"Conversación abierta"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g> o más"</string> <string name="people_tile_description" msgid="8154966188085545556">"Consulta mensajes recientes, llamadas perdidas y actualizaciones de estado"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversación"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Se detuvo por el modo No interrumpir"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> envió un mensaje: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> envió una imagen"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> actualizó su estado: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps activas</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> app activa</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nueva información"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Apps activas"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Detener"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Detenida"</string> @@ -886,14 +907,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Se copió"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"De <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Descartar la copia de la IU"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Editar el texto copiado"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Editar la imagen copiada"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Enviar a dispositivos cercanos"</string> + <string name="add" msgid="81036585205287996">"Agregar"</string> + <string name="manage_users" msgid="1823875311934643849">"Administrar usuarios"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Esta notificación no admite arrastrar entre pantallas divididas."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"La red Wi-Fi no está disponible"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Modo prioridad"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Se estableció la alarma"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Se habilitó el Modo de Invitado de Asistente"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"La cámara y el micrófono están apagados"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# notificación}other{# notificaciones}}"</string> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index b84ed6512bdb..0e7be44a61e0 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI del sistema"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Puede que te quedes sin batería pronto"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g> de batería"</string> <string name="invalid_charger_title" msgid="938685362320735167">"No se puede cargar por USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Utiliza el cargador original incluido con el dispositivo"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Cara autenticada"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmada"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Toca Confirmar para completar la acción"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Se ha autenticado"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Usar PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Usar patrón"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Cerrar"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"silencio total"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"solo alarmas"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"No molestar."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth activado."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"La alarma sonará a la(s) <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Caja para postres"</string> <string name="start_dreams" msgid="9131802557946276718">"Salvapantallas"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"No molestar"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"No hay dispositivos vinculados disponibles"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> de batería"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificaciones"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversaciones"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Borrar todas las notificaciones silenciosas"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notificaciones pausadas por el modo No molestar"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Empezar ahora"</string> <string name="empty_shade_text" msgid="8935967157319717412">"No hay notificaciones"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Este dispositivo lo gestionan tu padre o tu madre"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Estado:</b> posición más baja"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Se muestra encima de las notificaciones de conversaciones y como imagen de perfil en la pantalla de bloqueo"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Se muestra encima de las notificaciones de conversaciones y como imagen de perfil en la pantalla de bloqueo, y aparece como burbuja"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Se muestra encima de las notificaciones de conversaciones y como imagen de perfil en la pantalla de bloqueo, e interrumpe el modo No molestar"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Se muestra encima de las notificaciones de conversaciones y como imagen de perfil en la pantalla de bloqueo, aparece como burbuja e interrumpe el modo No molestar"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioridad"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> no admite funciones de conversación"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Estas notificaciones no se pueden modificar."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Música"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendario"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"No molestar"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Combinación de teclas para los botones de volumen"</string> <string name="battery" msgid="769686279459897127">"Batería"</string> <string name="headset" msgid="4485892374984466437">"Auriculares"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi desactivado"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth desactivado"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"No molestar está desactivado"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Una regla automática (<xliff:g id="ID_1">%s</xliff:g>) ha activado No molestar."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Una aplicación (<xliff:g id="ID_1">%s</xliff:g>) ha activado No molestar."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Una aplicación o una regla automática han activado No molestar."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Aplicaciones que se están ejecutando en segundo plano"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Toca para ver información detallada sobre el uso de datos y de la batería"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"¿Desactivar datos móviles?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(trabajo)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Llamada telefónica"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(a través de <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"cámara"</string> <string name="privacy_type_location" msgid="7991481648444066703">"ubicación"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"micrófono"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(desconectado)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"No se puede cambiar. Toca para volver a intentarlo."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Emparejar nuevo dispositivo"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Para enviar esta sesión, abre la aplicación."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Aplicación desconocida"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número de compilación"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Número de compilación copiado en el portapapeles."</string> <string name="basic_status" msgid="2315371112182658176">"Conversación abierta"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Consulta los mensajes recientes, las llamadas perdidas y los cambios de estado"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversación"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Pausado por No molestar"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> ha enviado un mensaje: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ha enviado una imagen"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ha cambiado su estado: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplicaciones activas</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplicación activa</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Información nueva"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aplicaciones activas"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Detener"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Detenida"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Copiado"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"<xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Cerrar la interfaz de copia"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Editar texto copiado"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Editar imagen copiada"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Enviar a dispositivo cercano"</string> + <string name="add" msgid="81036585205287996">"Añadir"</string> + <string name="manage_users" msgid="1823875311934643849">"Gestionar usuarios"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Esta notificación no se puede arrastrar a la pantalla dividida."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi no disponible"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Modo prioritario"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarma añadida"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Modo invitado del asistente habilitado"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"La cámara y el micrófono están desactivados"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 91250c384eb3..0c9d46ed868e 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Süsteemi UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Aku võib peagi tühjaks saada"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Jäänud on <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Ei saa USB kaudu laadida"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Kasutage seadmega kaasas olnud laadijat"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Nägu on autenditud"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Kinnitatud"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Lõpuleviimiseks puudutage nuppu Kinnita"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenditud"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Kasuta PIN-koodi"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Kasuta mustrit"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Sulgemine"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"täielik vaikus"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"ainult alarmid"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Mitte segada."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth on sees."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Määratud äratus: <xliff:g id="TIME">%s</xliff:g>"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Maiustusekorv"</string> <string name="start_dreams" msgid="9131802557946276718">"Ekraanisäästja"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Mitte segada"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Ühtegi seotud seadet pole saadaval"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> akut"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Märguanded"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Vestlused"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Kustuta kõik hääletud märguanded"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Režiim Mitte segada peatas märguanded"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Alusta kohe"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Märguandeid pole"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Seda seadet haldab sinu vanem"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Olek:</b> määrati madalam prioriteet"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Kuvatakse vestluste märguannete ülaosas ja profiilipildina lukustuskuval"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Kuvatakse mullina vestluste märguannete ülaosas ja profiilipildina lukustuskuval"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Kuvatakse vestluste märguannete ülaosas ja profiilipildina lukustuskuval ning katkestab režiimi Mitte segada"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Kuvatakse mullina vestluste märguannete ülaosas ja profiilipildina lukustuskuval ning katkestab režiimi Mitte segada"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioriteetne"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ei toeta vestlusfunktsioone"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Neid märguandeid ei saa muuta."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Muusika"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalender"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Mitte segada"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Helitugevuse nuppude otsetee"</string> <string name="battery" msgid="769686279459897127">"Aku"</string> <string name="headset" msgid="4485892374984466437">"Peakomplekt"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"WiFi on välja lülitatud"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth on välja lülitatud"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Funktsioon Mitte segada on välja lülitatud"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Automaatne reegel (<xliff:g id="ID_1">%s</xliff:g>) lülitas funktsiooni Mitte segada sisse."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Rakendus (<xliff:g id="ID_1">%s</xliff:g>) lülitas funktsiooni Mitte segada sisse."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Automaatne reegel või rakendus lülitas funktsiooni Mitte segada sisse."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Rakendusi käitatakse taustal"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Aku ja andmekasutuse üksikasjade nägemiseks puudutage"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Kas lülitada mobiilne andmeside välja?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(töö)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonikõne"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(rakenduse <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> kaudu)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kaamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"asukoht"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(ühendus on katkestatud)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Ei saa lülitada. Puudutage uuesti proovimiseks."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Uue seadme sidumine"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Selle seansi ülekandmiseks avage rakendus."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Tundmatu rakendus"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Järgunumber"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Järgunumber kopeeriti lõikelauale."</string> <string name="basic_status" msgid="2315371112182658176">"Avage vestlus"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Vaadake hiljutisi sõnumeid, vastamata kõnesid ja olekuvärskendusi"</string> <string name="people_tile_title" msgid="6589377493334871272">"Vestlus"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Peatas režiim Mitte segada"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> saatis sõnumi: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> saatis pildi"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> värskendas olekut: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktiivset rakendust</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aktiivne rakendus</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Uus teave"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktiivsed rakendused"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Peata"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Peatatud"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Kopeeritud"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Rakendusest <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Koopiast loobumise kasutajaliides"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Muuda kopeeritud teksti"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Muuda kopeeritud pilti"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Saada läheduses olevasse seadmesse"</string> + <string name="add" msgid="81036585205287996">"Lisa"</string> + <string name="manage_users" msgid="1823875311934643849">"Kasutajate haldamine"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"See märguanne ei toeta jagatud ekraanikuvale lohistamist."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"WiFi pole saadaval"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Režiim Prioriteetne"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarm on määratud"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistendi külalisrežiim on lubatud"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kaamera ja mikrofon on välja lülitatud"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index b531794dc7a9..90d24e507ba2 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Sistemaren interfazea"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Laster agortuko da bateria"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> gelditzen da"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Ezin da USB bidez kargatu"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Erabili gailuaren kargagailua"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Autentifikatu da aurpegia"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Berretsita"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Amaitzeko, sakatu \"Berretsi\""</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentifikatuta"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Erabili PINa"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Erabili eredua"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Itxi"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"isiltasun osoa"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"alarmak soilik"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Ez molestatzeko modua."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth-a."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth bidezko konexioa aktibatuta dago."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarma ordu honetarako ezarri da: <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Postreen kutxa"</string> <string name="start_dreams" msgid="9131802557946276718">"Pantaila-babeslea"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Ez molestatzeko modua"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth-a"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Ez dago parekatutako gailurik erabilgarri"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Bateria: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Jakinarazpenak"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Elkarrizketak"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Garbitu soinurik gabeko jakinarazpen guztiak"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Ez molestatzeko moduak pausatu egin ditu jakinarazpenak"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Hasi"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Ez dago jakinarazpenik"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Zure gurasoak kudeatzen du gailua"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"Mailaz jaitsi da <b>egoera:</b>"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Elkarrizketen jakinarazpenen goialdean eta profileko argazki gisa agertzen da pantaila blokeatuan"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Elkarrizketen jakinarazpenen goialdean eta profileko argazki gisa agertzen da pantaila blokeatuan, burbuila batean"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Elkarrizketen jakinarazpenen goialdean eta profileko argazki gisa agertzen da pantaila blokeatuan, eta ez molestatzeko modua eteten du"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Elkarrizketen jakinarazpenen goialdean eta profileko argazki gisa agertzen da pantaila blokeatuan, burbuila batean, eta ez molestatzeko modua eteten du"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Lehentasuna"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak ez ditu onartzen elkarrizketetarako eginbideak"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Jakinarazpen horiek ezin dira aldatu."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMSak"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Musika"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Ez molestatzeko modua"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Bolumen-botoietarako lasterbidea"</string> <string name="battery" msgid="769686279459897127">"Bateria"</string> <string name="headset" msgid="4485892374984466437">"Mikrofonodun entzungailua"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> (<xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>)"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi konexioa desaktibatuta dago"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth bidezko konexioa desaktibatuta dago"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Ez molestatzeko modua desaktibatuta dago"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Ez molestatzeko modua aktibatu du arau automatiko batek (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Ez molestatzeko modua aktibatu du aplikazio batek (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Ez molestatzeko modua aktibatu du arau automatiko edo aplikazio batek."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Aplikazioak abian dira atzeko planoan"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Sakatu bateria eta datuen erabilerari buruzko xehetasunak ikusteko"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Datu-konexioa desaktibatu nahi duzu?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(lanekoa)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefono-deia"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> aplikazioaren bidez)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"kokapena"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofonoa"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(deskonektatuta)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Ezin da aldatu. Berriro saiatzeko, sakatu hau."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Parekatu beste gailu batekin"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Saioa ireki nahi baduzu, ireki aplikazioa."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Aplikazio ezezaguna"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Konpilazio-zenbakia"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Kopiatu da konpilazio-zenbakia arbelean."</string> <string name="basic_status" msgid="2315371112182658176">"Elkarrizketa irekia"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Ikusi azken mezuak, dei galduak eta egoerari buruzko informazio eguneratua"</string> <string name="people_tile_title" msgid="6589377493334871272">"Elkarrizketa"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Ez molestatzeko moduak pausatu du"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzaileak mezu bat bidali du: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzaileak irudi bat bidali du"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzaileak egoera eguneratu du: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplikazio aktibo</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplikazio aktibo</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Informazio berria"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktibo dauden aplikazioak"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Gelditu"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Geldituta"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Kopiatu da"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Jatorria: <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Kopiatutako UIa baztertzeko botoia"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Editatu kopiatutako testua"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Editatu kopiatutako irudia"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Bidali inguruko gailu batera"</string> + <string name="add" msgid="81036585205287996">"Gehitu"</string> + <string name="manage_users" msgid="1823875311934643849">"Kudeatu erabiltzaileak"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Jakinarazpen hau ezin da arrastatu pantaila zatitura."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wifi-konexioa ez dago erabilgarri"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Lehentasun modua"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarma ezarrita dago"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Laguntzailea zerbitzuaren gonbidatu modua gaituta dago"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera eta mikrofonoa desaktibatuta daude"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 642a82635396..99e214b77fe2 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"میانای کاربر سیستم"</string> - <string name="battery_low_title" msgid="6891106956328275225">"ممکن است باتری بهزودی تمام شود"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> باقی مانده است"</string> <string name="invalid_charger_title" msgid="938685362320735167">"ازطریق USB شارژ نمیشود"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"از شارژر ارائهشده با دستگاه استفاده کنید"</string> @@ -111,7 +116,7 @@ <string name="accessibility_phone_button" msgid="4256353121703100427">"تلفن"</string> <string name="accessibility_voice_assist_button" msgid="6497706615649754510">"دستیار صوتی"</string> <string name="accessibility_wallet_button" msgid="1458258783460555507">"Wallet"</string> - <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"اسکنر رمزینه پاسخسریع"</string> + <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"کدخوان پاسخسریع"</string> <string name="accessibility_unlock_button" msgid="122785427241471085">"باز کردن قفل"</string> <string name="accessibility_lock_icon" msgid="661492842417875775">"دستگاه قفل است"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"درحال اسکن کردن چهره"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"چهره اصالتسنجی شد"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"تأیید شد"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"برای تکمیل، روی تأیید ضربه بزنید"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"راستیآزماییشده"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"استفاده از پین"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"استفاده از الگو"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"بستن"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"سکوت کامل"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"فقط زنگ ساعت"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"مزاحم نشوید."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"بلوتوث."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"بلوتوث روشن است."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"زنگ برای <xliff:g id="TIME">%s</xliff:g> تنظیم شد."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"ویترین دسر"</string> <string name="start_dreams" msgid="9131802557946276718">"محافظ صفحه"</string> <string name="ethernet_label" msgid="2203544727007463351">"اترنت"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"مزاحم نشوید"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"بلوتوث"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"هیچ دستگاه مرتبط شدهای موجود نیست"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"شارژ باتری <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"اعلانها"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"مکالمهها"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"پاک کردن همه اعلانهای بیصدا"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"اعلانها توسط «مزاحم نشوید» موقتاً متوقف شدند"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"اکنون شروع کنید"</string> <string name="empty_shade_text" msgid="8935967157319717412">"اعلانی موجود نیست"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"این دستگاه را ولیتان مدیریت میکند"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>وضعیت:</b> در ردهبندی پایینتری قرار گرفت"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"در بالای اعلانهای مکالمه و بهصورت عکس نمایه در صفحه قفل نشان داده میشود"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"در بالای اعلانهای مکالمه و بهصورت عکس نمایه در صفحه قفل نشان داده میشود، بهصورت حبابک ظاهر میشود"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"در بالای اعلانهای مکالمه و بهصورت عکس نمایه در صفحه قفل نشان داده میشود، در حالت «مزاحم نشوید» وقفه ایجاد میکند"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"در بالای اعلانهای مکالمه و بهصورت عکس نمایه در صفحه قفل نشان داده میشود، بهصورت حبابک ظاهر میشود، در حالت «مزاحم نشوید» وقفه ایجاد میکند"</string> <string name="notification_priority_title" msgid="2079708866333537093">"اولویت"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> از ویژگیهای مکالمه پشتیبانی نمیکند"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"این اعلانها قابل اصلاح نیستند."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"پیامک"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"موسیقی"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"تقویم"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"مزاحم نشوید"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"میانبر دکمههای صدا"</string> <string name="battery" msgid="769686279459897127">"باتری"</string> <string name="headset" msgid="4485892374984466437">"هدست"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>، <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi خاموش است"</string> <string name="bt_is_off" msgid="7436344904889461591">"بلوتوث خاموش است"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"«مزاحم نشوید» خاموش است"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"قانون خودکاری (<xliff:g id="ID_1">%s</xliff:g>) «مزاحم نشوید» را روشن کرد."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"برنامهای (<xliff:g id="ID_1">%s</xliff:g>) «مزاحم نشوید» را روشن کرد."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"برنامه یا قانون خودکاری، «مزاحم نشوید» را روشن کرد."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"برنامههایی که در پسزمینه اجرا میشوند"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"برای جزئیات مربوط به مصرف باتری و داده، ضربه بزنید"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"داده تلفن همراه خاموش شود؟"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(کاری)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"تماس تلفنی"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(ازطریق <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"دوربین"</string> <string name="privacy_type_location" msgid="7991481648444066703">"مکان"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"میکروفون"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(اتصال قطع شد)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"عوض نمیشود. برای تلاش مجدد ضربه بزنید."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"مرتبط کردن دستگاه جدید"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"برای ارسال محتوای این جلسه، لطفاً برنامه را باز کنید."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"برنامه ناشناس"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"شماره ساخت"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"شماره ساخت در بریدهدان کپی شد."</string> <string name="basic_status" msgid="2315371112182658176">"باز کردن مکالمه"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"بیشاز <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"دیدن بهروزرسانیهای وضعیت، تماسهای بیپاسخ، و پیامهای اخیر"</string> <string name="people_tile_title" msgid="6589377493334871272">"مکالمه"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"با «مزاحم نشوید» موقتاً متوقف شده است"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> پیامی ارسال کرد: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> تصویری ارسال کرد"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> وضعیتش را بهروزرسانی کرد: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> برنامه فعال</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> برنامه فعال</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"اطلاعات جدید"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"برنامههای فعال"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"توقف"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"متوقف شد"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"کپی شد"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"از <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"رد کردن رابط کاربری کپی کردن"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"ویرایش نوشتار کپیشده"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"ویرایش تصویر کپیشده"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"ارسال به دستگاهی در اطراف"</string> + <string name="add" msgid="81036585205287996">"افزودن"</string> + <string name="manage_users" msgid="1823875311934643849">"مدیریت کاربران"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"این اعلان از تنظیم کشیدن برای دو نیمه کردن صفحه پشتیبانی نمیکند."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi دردسترس نیست"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"حالت اولویت"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"زنگ ساعت تنظیم شد"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"«حالت مهمان» «دستیار» فعال شد"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"دوربین و میکروفون خاموش هستند"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index a9c11bce0360..5aca1cea9f7c 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Käyttöliitt."</string> - <string name="battery_low_title" msgid="6891106956328275225">"Akku voi loppua pian"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> jäljellä"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Lataaminen USB:llä ei onnistu"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Käytä laitteesi mukana tullutta laturia"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Kasvot tunnistettu"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Vahvistettu"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Valitse lopuksi Vahvista"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Todennettu"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Käytä PIN-koodia"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Käytä kuviota"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Sulje"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"hiljennä kaikki"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"vain herätykset"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Älä häiritse."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth on päällä."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Hälytys asetettu, aika: <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Jälkiruokavitriini"</string> <string name="start_dreams" msgid="9131802557946276718">"Näytönsäästäjä"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Älä häiritse"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Laitepareja ei ole käytettävissä"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Akun taso <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Ilmoitukset"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Keskustelut"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Tyhjennä kaikki hiljaiset ilmoitukset"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Älä häiritse ‑tila keskeytti ilmoitukset"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Aloita nyt"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Ei ilmoituksia"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Vanhempasi ylläpitää tätä laitetta"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Tila:</b> valittu vähemmän tärkeäksi"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Näkyy keskusteluilmoitusten yläosassa ja profiilikuvana lukitusnäytöllä"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Näkyy keskusteluilmoitusten yläosassa ja profiilikuvana lukitusnäytöllä, näkyy kuplana"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Näkyy keskusteluilmoitusten yläosassa ja profiilikuvana lukitusnäytöllä, keskeyttää Älä häiritse ‑tilan"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Näkyy keskusteluilmoitusten yläosassa ja profiilikuvana lukitusnäytöllä, näkyy kuplana, keskeyttää Älä häiritse ‑tilan"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Tärkeä"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ei tue keskusteluominaisuuksia"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Näitä ilmoituksia ei voi muokata"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"Tekstiviesti"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Musiikki"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalenteri"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Älä häiritse"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Äänenvoimakkuuspainikkeiden pikanäppäin"</string> <string name="battery" msgid="769686279459897127">"Akku"</string> <string name="headset" msgid="4485892374984466437">"Kuulokemikrofoni"</string> @@ -679,11 +692,15 @@ <string name="instant_apps_message_with_help" msgid="1816952263531203932">"Sovellus avattiin ilman asennusta. Katso lisätietoja napauttamalla."</string> <string name="app_info" msgid="5153758994129963243">"Sovelluksen tiedot"</string> <string name="go_to_web" msgid="636673528981366511">"Siirry selaimeen"</string> - <string name="mobile_data" msgid="4564407557775397216">"Mobiilitiedonsiirto"</string> + <string name="mobile_data" msgid="4564407557775397216">"Mobiilidata"</string> <string name="mobile_data_text_format" msgid="6806501540022589786">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string> <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi on pois päältä"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth ei ole käytössä"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Älä häiritse ‑tila on pois päältä"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Automaattinen sääntö otti käyttöön Älä häiritse ‑tilan (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Sovellus otti käyttöön Älä häiritse ‑tilan (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Automaattinen sääntö tai sovellus otti käyttöön Älä häiritse ‑tilan."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Sovelluksia käynnissä taustalla"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Katso lisätietoja akun ja datan käytöstä napauttamalla"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Laitetaanko mobiilidata pois päältä?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(työ)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Puhelu"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(kautta: <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"sijainti"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofoni"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(yhteys katkaistu)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Vaihtaminen ei onnistunut. Yritä uudelleen."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Muodosta uusi laitepari"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Jos haluat striimata tämän käyttökerran, avaa sovellus."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Tuntematon sovellus"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Koontiversion numero"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Koontiversion numero kopioitu leikepöydälle"</string> <string name="basic_status" msgid="2315371112182658176">"Avaa keskustelu"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"Yli <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Katso viimeaikaiset viestit, vastaamattomat puhelut ja tilapäivitykset"</string> <string name="people_tile_title" msgid="6589377493334871272">"Keskustelu"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Älä häiritse ‑tilan keskeyttämä"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> lähetti viestin: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> lähetti kuvan"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> on päivittänyt tilansa: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktiivista sovellusta</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aktiivinen sovellus</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Uutta tietoa"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktiiviset sovellukset"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Lopeta"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Pysäytetty"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Kopioitu"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Lähde: <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Hylkää kopioitu UI"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Muokkaa kopioitua tekstiä"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Muokkaa kopioitua kuvaa"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Lähetä lähellä olevaan laitteeseen"</string> + <string name="add" msgid="81036585205287996">"Lisää"</string> + <string name="manage_users" msgid="1823875311934643849">"Ylläpidä käyttäjiä"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Ilmoitus ei tue jaetulle näytölle vetämistä."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi ei ole saatavilla"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Tärkeät-tila"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Hälytys asetettu"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistantin vierastila käytössä"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera ja mikrofoni ovat pois päältä"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 3ee8efa56019..1a599b5ecaf7 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"IU système"</string> - <string name="battery_low_title" msgid="6891106956328275225">"La pile sera bientôt épuisée"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> restants"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Impossible de charger l\'appareil par USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Servez-vous du chargeur fourni avec votre appareil"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Visage authentifié"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmé"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Touchez Confirmer pour terminer"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authentifié"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Utiliser un NIP"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Utiliser un schéma"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Fermer"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"aucune interruption"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"alarmes seulement"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Ne pas déranger."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth activé."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarme réglée sur <xliff:g id="TIME">%s</xliff:g>"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Vitrine des desserts"</string> <string name="start_dreams" msgid="9131802557946276718">"Écran de veille"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Ne pas déranger"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Aucun des appareils associés n\'est disponible"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Pile : <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifications"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversations"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Effacer toutes les notifications silencieuses"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Les notifications sont suspendues par le mode Ne pas déranger"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Commencer"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Aucune notification"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Cet appareil est géré par ton parent"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>État :</b> abaissé d\'un niveau"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"S\'affiche dans le haut des notifications de conversation et comme photo de profil à l\'écran de verrouillage"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"S\'affiche dans le haut des notifications de conversation et comme photo de profil à l\'écran de verrouillage, s\'affiche comme bulle"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"S\'affiche dans le haut des notifications de conversation et comme photo de profil à l\'écran de verrouillage, interrompt le mode Ne pas déranger"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"S\'affiche dans le haut des notifications de conversation et comme photo de profil à l\'écran de verrouillage, s\'affiche comme bulle, interrompt le mode Ne pas déranger"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritaire"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ne prend pas en charge les fonctionnalités de conversation"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ces notifications ne peuvent pas être modifiées"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"Message texte"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Musique"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Agenda"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Ne pas déranger"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Raccourci des boutons de volume"</string> <string name="battery" msgid="769686279459897127">"Pile"</string> <string name="headset" msgid="4485892374984466437">"Écouteurs"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Le Wi-Fi est désactivé"</string> <string name="bt_is_off" msgid="7436344904889461591">"Le Bluetooth est désactivé"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Le mode Ne pas déranger est désactivé"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Le mode Ne pas déranger a été activé par une règle automatique (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Le mode Ne pas déranger a été activé par une application (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Le mode Ne pas déranger a été activé par une règle automatique ou une application."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Applications qui fonctionnent en arrière-plan"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Touchez pour afficher des détails sur l\'utilisation de la pile et des données"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Désactiver les données cellulaires?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(travail)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Appel téléphonique"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(par l\'intermédiaire de <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"appareil photo"</string> <string name="privacy_type_location" msgid="7991481648444066703">"position"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"microphone"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(déconnecté)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Changement impossible. Touchez pour réessayer."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Associer un autre appareil"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Pour diffuser cette session, veuillez ouvrir l\'application."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Application inconnue"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numéro de version"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Le numéro de version a été copié dans le presse-papiers."</string> <string name="basic_status" msgid="2315371112182658176">"Ouvrir la conversation"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Affichez les messages récents, les appels manqués et les mises à jour d\'état"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Interrompue par la fonctionnalité Ne pas déranger"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> a envoyé un message : <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> a envoyé une image"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> a mis à jour son état : <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> application active</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> applications actives</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nouvelle information"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Applications actives"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Arrêter"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Arrêtée"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Copié"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"À partir de <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Ignorer la copie de l\'IU"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Modifier le texte copié"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Modifier l\'image copiée"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Envoyer à un appareil à proximité"</string> + <string name="add" msgid="81036585205287996">"Ajouter"</string> + <string name="manage_users" msgid="1823875311934643849">"Gérer les utilisateurs"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Cette notification ne prend pas en charge le partage d\'écran par glissement."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi-Fi non disponible"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Mode priorité"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"L\'alarme a été réglée"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Mode Invité de l\'assistant activé"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"L\'appareil photo et le micro sont désactivés"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 0af35baae386..1465bdbc508b 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Interface"</string> - <string name="battery_low_title" msgid="6891106956328275225">"La batterie est bientôt épuisée"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> restants"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Impossible de recharger via USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Utiliser le chargeur d\'origine fourni avec votre appareil"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Visage authentifié"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmé"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Appuyez sur \"Confirmer\" pour terminer"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Authentifié"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Utiliser un code PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Utiliser un schéma"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Fermer"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"aucune interruption"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"alarmes uniquement"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Ne pas déranger."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth activé."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarme réglée sur <xliff:g id="TIME">%s</xliff:g>"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Vitrine des desserts"</string> <string name="start_dreams" msgid="9131802557946276718">"Économiseur d\'écran"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Ne pas déranger"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Aucun appareil associé disponible."</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> de batterie"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifications"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversations"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Effacer toutes les notifications silencieuses"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notifications suspendues par le mode Ne pas déranger"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Commencer"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Aucune notification"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Cet appareil est géré par tes parents"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>État ::</b> Abaissée d\'un niveau"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"S\'affiche en haut des notifications de conversation et en tant que photo de profil sur l\'écran de verrouillage"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"S\'affiche en haut des notifications de conversation et en tant que photo de profil sur l\'écran de verrouillage, apparaît sous forme de bulle"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"S\'affiche en haut des notifications de conversation et en tant que photo de profil sur l\'écran de verrouillage, interrompt le mode Ne pas déranger"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"S\'affiche en haut des notifications de conversation et en tant que photo de profil sur l\'écran de verrouillage, apparaît sous forme de bulle, interrompt le mode Ne pas déranger"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritaire"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> n\'est pas compatible avec les fonctionnalités de conversation"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Impossible de modifier ces notifications."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Musique"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Agenda"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Ne pas déranger"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Raccourci des boutons de volume"</string> <string name="battery" msgid="769686279459897127">"Batterie"</string> <string name="headset" msgid="4485892374984466437">"Casque"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi désactivé"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth désactivé"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Mode \"Ne pas déranger\" désactivé"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Le mode \"Ne pas déranger\" a été activé par une règle automatique (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Le mode \"Ne pas déranger\" a été activé par une application (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Le mode \"Ne pas déranger\" a été activé par une règle automatique ou une application."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Applications en cours d\'exécution en arrière-plan"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Appuyer pour obtenir des informations sur l\'utilisation de la batterie et des données"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Désactiver les données mobiles ?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(travail)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Appel téléphonique"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(via <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"l\'appareil photo"</string> <string name="privacy_type_location" msgid="7991481648444066703">"la position"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"le micro"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(déconnecté)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Impossible de changer. Appuyez pour réessayer."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Associer un nouvel appareil"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Pour caster cette session, veuillez ouvrir l\'appli."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Appli inconnue"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numéro de build"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Numéro de build copié dans le presse-papiers."</string> <string name="basic_status" msgid="2315371112182658176">"Conversation ouverte"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"+ de <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Voir les messages récents, les appels manqués et les notifications d\'état"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Mise en pause par Ne pas déranger"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> a envoyé un message : <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> a envoyé une image"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> a mis à jour son statut : <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> appli active</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> applis actives</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nouvelles informations"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Applis actives"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Arrêter"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Arrêtée"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Copié"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"De <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Désactiver l\'interface de copie"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Modifier le texte copié"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Modifier l\'image copiée"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Envoyer à un appareil à proximité"</string> + <string name="add" msgid="81036585205287996">"Ajouter"</string> + <string name="manage_users" msgid="1823875311934643849">"Gérer les utilisateurs"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Impossible de faire glisser cette notification vers l\'écran partagé."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi non disponible"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Mode Prioritaire"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarme réglée"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Mode Invité activé pour l\'Assistant"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Appareil photo et micro désactivés"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 81efcb54769b..5faa3df65171 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"IU do sistema"</string> - <string name="battery_low_title" msgid="6891106956328275225">"A batería pode esgotarse en breve"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Non se puido realizar a carga por USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Utiliza o cargador que incluía o dispositivo"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Autenticouse a cara"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmada"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Toca Confirmar para completar o proceso"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticado"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Usar PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Usar padrón"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Pechar"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"silencio total"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"só alarmas"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Modo Non molestar."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth activado."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarma definida para as <xliff:g id="TIME">%s</xliff:g>"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Caixa de sobremesa"</string> <string name="start_dreams" msgid="9131802557946276718">"Protector pantalla"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Non molestar"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Non hai dispositivos vinculados dispoñibles"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> de batería"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificacións"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversas"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Borra todas as notificacións silenciadas"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"O modo Non molestar puxo en pausa as notificacións"</string> <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="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"O teu pai ou nai xestiona este dispositivo"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Estado:</b> clasificouse nun nivel inferior"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Móstrase na parte superior das notificacións das conversas e como imaxe do perfil na pantalla de bloqueo"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Móstrase na parte superior das notificacións das conversas e como imaxe do perfil na pantalla de bloqueo, e aparece como unha burbulla"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Móstrase na parte superior das notificacións das conversas e como imaxe do perfil na pantalla de bloqueo, e interrompe o modo Non molestar"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Móstrase na parte superior das notificacións das conversas e como imaxe do perfil na pantalla de bloqueo, aparece como unha burbulla e interrompe o modo Non molestar"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioridade"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> non admite funcións de conversa"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Estas notificacións non se poden modificar."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Música"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Non molestar"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Atallo dos botóns de volume"</string> <string name="battery" msgid="769686279459897127">"Batería"</string> <string name="headset" msgid="4485892374984466437">"Auriculares"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"A wifi está desactivada"</string> <string name="bt_is_off" msgid="7436344904889461591">"O Bluetooth está desactivado"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"O modo Non molestar está desactivado"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Unha norma automática (<xliff:g id="ID_1">%s</xliff:g>) activou o modo Non molestar."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Unha aplicación (<xliff:g id="ID_1">%s</xliff:g>) activou o modo Non molestar."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Unha aplicación ou norma automática activou o modo Non molestar."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Aplicacións que se executan en segundo plano"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Toca para obter información sobre o uso de datos e a batería"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Queres desactivar os datos móbiles?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(traballo)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Chamada de teléfono"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(mediante <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"a cámara"</string> <string name="privacy_type_location" msgid="7991481648444066703">"a localiz."</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"o micrófono"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(desconectado)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Non se puido realizar o cambio. Toca para tentalo de novo."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Vincular dispositivo novo"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Para emitir esta sesión, abre a aplicación."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Aplicación descoñecida"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número de compilación"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Copiouse o número de compilación no portapapeis."</string> <string name="basic_status" msgid="2315371112182658176">"Conversa aberta"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"+ de <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Consulta as mensaxes recentes, as chamadas perdidas e as actualizacións dos estados"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversa"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Púxose en pausa debido ao modo Non molestar"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> enviou unha mensaxe: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> enviou unha imaxe"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> cambiou de estado: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplicacións activas</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplicación activa</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nova información"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aplicacións activas"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Deter"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Detida"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Copiouse"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"De <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Ignorar interface de copia"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Editar texto copiado"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Editar imaxe copiada"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Enviar a dispositivo próximo"</string> + <string name="add" msgid="81036585205287996">"Engadir"</string> + <string name="manage_users" msgid="1823875311934643849">"Xestionar usuarios"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Esta notificación non pode arrastrarse á pantalla dividida."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"A wifi non está dispoñible"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Modo de prioridade"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarma definida"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"O modo Convidados do Asistente está activado"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"A cámara e o micrófono están desactivados"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 98510d5012f6..763d39de4913 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"સિસ્ટમ UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"બૅટરી ટૂંક સમયમાં સમાપ્ત થશે"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> બાકી"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB મારફતે ચાર્જ કરી શકતા નથી"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"તમારા ઉપકરણ સાથે આવેલ ચાર્જરનો ઉપયોગ કરો"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"ચહેરાનું પ્રમાણીકરણ થયું"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"પુષ્ટિ કરી"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"પરીક્ષણ પૂર્ણ કરવા કન્ફર્મ કરોને ટૅપ કરો"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"પ્રમાણિત"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"પિનનો ઉપયોગ કરો"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"પૅટર્નનો ઉપયોગ કરો"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"બંધ કરો"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"બિલકુલ અવાજ નહીં"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"માત્ર અલાર્મ"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"ખલેલ પાડશો નહીં."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"બ્લૂટૂથ."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"બ્લૂટૂથ ચાલુ."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"<xliff:g id="TIME">%s</xliff:g> માટે એલાર્મ સેટ કર્યું."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"ડેઝર્ટ કેસ"</string> <string name="start_dreams" msgid="9131802557946276718">"સ્ક્રીન સેવર"</string> <string name="ethernet_label" msgid="2203544727007463351">"ઇથરનેટ"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"ખલેલ પાડશો નહીં"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"બ્લૂટૂથ"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"કોઈ જોડી કરેલ ઉપકરણો ઉપલબ્ધ નથી"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> બૅટરી"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"નોટિફિકેશન"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"વાતચીત"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"બધા સાઇલન્ટ નોટિફિકેશન સાફ કરો"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"ખલેલ પાડશો નહીં દ્વારા થોભાવેલ નોટિફિકેશન"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"હવે શરૂ કરો"</string> <string name="empty_shade_text" msgid="8935967157319717412">"કોઈ નોટિફિકેશન નથી"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"આ ડિવાઇસ તમારા માતાપિતા દ્વારા મેનેજ કરવામાં આવે છે"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>સ્ટેટસ:</b> નીચલી રેંક આપવામાં આવી"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"વાતચીતના નોટિફિકેશન વિભાગની ટોચ પર અને લૉક કરેલી સ્ક્રીન પર પ્રોફાઇલ ફોટો તરીકે બતાવે છે"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"વાતચીતના નોટિફિકેશન વિભાગની ટોચ પર અને લૉક કરેલી સ્ક્રીન પર પ્રોફાઇલ ફોટો તરીકે બતાવે છે, બબલ તરીકે દેખાય છે"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"વાતચીતના નોટિફિકેશન વિભાગની ટોચ પર અને લૉક કરેલી સ્ક્રીન પર પ્રોફાઇલ ફોટો તરીકે બતાવે છે, ખલેલ પાડશો નહીં મોડમાં વિક્ષેપ ઊભો કરે છે"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"વાતચીતના નોટિફિકેશન વિભાગની ટોચ પર અને લૉક કરેલી સ્ક્રીન પર પ્રોફાઇલ ફોટો તરીકે બતાવે છે, બબલ તરીકે દેખાય છે, ખલેલ પાડશો નહીં મોડમાં વિક્ષેપ ઊભો કરે છે"</string> <string name="notification_priority_title" msgid="2079708866333537093">"પ્રાધાન્યતા"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> વાતચીતની સુવિધાઓને સપોર્ટ આપતી નથી"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"આ નોટિફિકેશનમાં કોઈ ફેરફાર થઈ શકશે નહીં."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"સંગીત"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"ખલેલ પાડશો નહીં"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"વૉલ્યૂમ બટન્સ શૉર્ટકટ"</string> <string name="battery" msgid="769686279459897127">"બૅટરી"</string> <string name="headset" msgid="4485892374984466437">"હૅડસેટ"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"વાઇ-ફાઇ બંધ છે"</string> <string name="bt_is_off" msgid="7436344904889461591">"બ્લૂટૂથ બંધ છે"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"ખલેલ પાડશો નહીં બંધ છે"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"ખલેલ પાડશો નહીં એક સ્વચાલિત નિયમ દ્વારા ચાલુ કરાયું હતું (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"ખલેલ પાડશો નહીં એક ઍપ્લિકેશન દ્વારા ચાલુ કરાયું હતું (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"ખલેલ પાડશો નહીં એક સ્વચાલિત નિયમ અથવા ઍપ્લિકેશન દ્વારા ચાલુ કરાયું હતું."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"પૃષ્ઠભૂમિમાં ચાલી રહેલ ઍપ્લિકેશનો"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"બૅટરી અને ડેટા વપરાશ વિશેની વિગતો માટે ટૅપ કરો"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"મોબાઇલ ડેટા બંધ કરીએ?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ઑફિસ)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"ફોન કૉલ"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> મારફતે)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"કૅમેરા"</string> <string name="privacy_type_location" msgid="7991481648444066703">"સ્થાન"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"માઇક્રોફોન"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(ડિસ્કનેક્ટ કરેલું)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"સ્વિચ કરી શકતા નથી. ફરી પ્રયાસ કરવા માટે ટૅપ કરો."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"નવા ડિવાઇસ સાથે જોડાણ કરો"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"આ સત્ર કાસ્ટ કરવા માટે, કૃપા કરીને ઍપ ખોલો."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"અજાણી ઍપ"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"બિલ્ડ નંબર"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"બિલ્ડ નંબર ક્લિપબૉર્ડ પર કૉપિ કર્યો."</string> <string name="basic_status" msgid="2315371112182658176">"વાતચીત ખોલો"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"તાજેતરના સંદેશા, ચૂકી ગયેલા કૉલ અને સ્ટેટસ અપડેટ જુઓ"</string> <string name="people_tile_title" msgid="6589377493334871272">"વાતચીત"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"\'ખલેલ પાડશો નહીં\'ની સુવિધા દ્વારા થોભાવેલું"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> દ્વારા કોઈ સંદેશ મોકલવામાં આવ્યો: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> દ્વારા કોઈ છબી મોકલવામાં આવી"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> દ્વારા નવી સ્ટેટસ અપડેટ પોસ્ટ કરવામાં આવી: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> સક્રિય ઍપ</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> સક્રિય ઍપ</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"નવી માહિતી"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"સક્રિય ઍપ"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"રોકો"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"બંધ કરેલી છે"</string> @@ -886,14 +907,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"કૉપિ કરવામાં આવી"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"<xliff:g id="APPNAME">%1$s</xliff:g>માંથી"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"\'UI | યૂઝર ઇન્ટરફેસ (UI) કૉપિ કરો\'ને છોડી દો"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"કૉપિ કરેલી ટેક્સ્ટમાં ફેરફાર કરો"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"કૉપિ કરેલી છબીમાં ફેરફાર કરો"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"નજીકના ડિવાઇસને મોકલો"</string> + <string name="add" msgid="81036585205287996">"ઉમેરો"</string> + <string name="manage_users" msgid="1823875311934643849">"વપરાશકર્તાઓને મેનેજ કરો"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"આ નોટિફિકેશન તેને સ્પ્લિટસ્ક્રીનમાં ખેંચવાની સુવિધાને સપોર્ટ કરતું નથી."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"વાઇ-ફાઇ ઉપલબ્ધ નથી"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"પ્રાધાન્યતા મોડ"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"અલાર્મ સેટ"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistant અતિથિ મોડ ચાલુ કર્યો"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"કૅમેરા અને માઇક બંધ છે"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# નોટિફિકેશન}one{# નોટિફિકેશન}other{# નોટિફિકેશન}}"</string> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 2631f550d459..27e5091cdc59 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"सिस्टम यूआई"</string> - <string name="battery_low_title" msgid="6891106956328275225">"बैटरी जल्दी ही खत्म हो जाएगी"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> शेष"</string> <string name="invalid_charger_title" msgid="938685362320735167">"यूएसबी के ज़रिए चार्ज नहीं किया जा सकता"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"अपने डिवाइस के साथ मिलने वाले चार्जर का इस्तेमाल करें"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"चेहरे की पुष्टि हो गई"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"पुष्टि हो गई"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"\'पुष्टि करें\' पर टैप करके पूरा करें"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"पुष्टि हो गई"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"पिन इस्तेमाल करें"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"पैटर्न इस्तेमाल करें"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"बंद करें"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"कोई आवाज़ सुनाई नहीं देगी"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"सिर्फ़ अलार्म की आवाज़ सुनाई देगी"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"परेशान न करें."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"ब्लूटूथ."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"ब्लूटूथ चालू है."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"<xliff:g id="TIME">%s</xliff:g> के लिए अलार्म सेट किया गया."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"मिठाई का डिब्बा"</string> <string name="start_dreams" msgid="9131802557946276718">"स्क्रीन सेवर"</string> <string name="ethernet_label" msgid="2203544727007463351">"ईथरनेट"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"परेशान न करें"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ब्लूटूथ"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"कोई भी युग्मित डिवाइस उपलब्ध नहीं"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> बैटरी"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"सूचनाएं"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"बातचीत"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"बिना आवाज़ की सभी सूचनाएं हटाएं"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"\'परेशान न करें\' सुविधा के ज़रिए कुछ समय के लिए सूचनाएं दिखाना रोक दिया गया है"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"अभी शुरू करें"</string> <string name="empty_shade_text" msgid="8935967157319717412">"कोई सूचना नहीं है"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"इस डिवाइस का प्रबंधन आपके अभिभावक करते हैं"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>स्थिति:</b> रैंकिंग में नीचे किया गया"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"यह कई तरीकों से दिखती है, जैसे कि लॉक स्क्रीन पर प्रोफ़ाइल फ़ोटो के तौर पर और बातचीत वाली सूचनाओं में सबसे ऊपर"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"यह कई तरीकों से दिखती है, जैसे कि बातचीत वाली सूचनाओं में सबसे ऊपर, बबल के तौर पर, और लॉक स्क्रीन पर प्रोफ़ाइल फ़ोटो के तौर पर"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"यह कई तरीकों से दिखती है, जैसे कि लॉक स्क्रीन पर प्रोफ़ाइल फ़ोटो के तौर पर और बातचीत वाली सूचनाओं में सबसे ऊपर. साथ ही, इसकी वजह से, \'परेशान न करें\' सुविधा में भी रुकावट आती है"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"यह कई तरीकों से दिखती है, जैसे कि बातचीत वाली सूचनाओं में सबसे ऊपर, बबल के तौर पर, और लॉक स्क्रीन पर प्रोफ़ाइल फ़ोटो के तौर पर. साथ ही, इसकी वजह से, \'परेशान न करें\' सुविधा में भी रुकावट आती है"</string> <string name="notification_priority_title" msgid="2079708866333537093">"प्राथमिकता"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> पर बातचीत की सुविधाएं काम नहीं करतीं"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ये सूचनाएं नहीं बदली जा सकती हैं."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"मैसेज (एसएमएस) करें"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"संगीत"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"परेशान न करें"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"वॉल्यूम बटन का शॉर्टकट"</string> <string name="battery" msgid="769686279459897127">"बैटरी"</string> <string name="headset" msgid="4485892374984466437">"हेडसेट"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"वाई-फ़ाई बंद है"</string> <string name="bt_is_off" msgid="7436344904889461591">"ब्लूटूथ बंद है"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"परेशान न करें बंद है"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"एक ऑटोमैटिक नियम (<xliff:g id="ID_1">%s</xliff:g>) ने परेशान न करें को चालू कर दिया था."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"एक ऐप्लिकेशन (<xliff:g id="ID_1">%s</xliff:g>) ने परेशान न करें को चालू कर दिया था."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"एक ऑटोमैटिक नियम या ऐप्लिकेशन ने परेशान न करें को चालू कर दिया था."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"बैकग्राउंड में चल रहे ऐप्लिकेशन"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"बैटरी और डेटा खर्च की जानकारी के लिए छूएं"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"मोबाइल डेटा बंद करना चाहते हैं?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ऑफ़िस)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"फ़ोन कॉल"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> की मदद से)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"कैमरा"</string> <string name="privacy_type_location" msgid="7991481648444066703">"जगह"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"माइक्रोफ़ोन"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(डिसकनेक्ट हो गया)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"स्विच नहीं किया जा सकता. फिर से कोशिश करने के लिए टैप करें."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"नया डिवाइस जोड़ें"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"इस सेशन को कास्ट करने के लिए, कृपया ऐप्लिकेशन खोलें."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"अनजान ऐप्लिकेशन"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"बिल्ड नंबर"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"बिल्ड नंबर को क्लिपबोर्ड पर कॉपी किया गया."</string> <string name="basic_status" msgid="2315371112182658176">"ऐसी बातचीत जिसमें इंटरैक्शन डेटा मौजूद नहीं है"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"हाल के मैसेज, मिस्ड कॉल, और स्टेटस अपडेट देखें"</string> <string name="people_tile_title" msgid="6589377493334871272">"बातचीत"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"\'परेशान न करें\' की वजह से सूचनाएं नहीं दिख रहीं"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> ने एक मैसेज भेजा है: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ने एक इमेज भेजी है"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ने स्टेटस अपडेट किया है: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> ऐप्लिकेशन चालू है</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ऐप्लिकेशन चालू हैं</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"नई जानकारी"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ये ऐप्लिकेशन चालू हैं"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"बंद करें"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"रुका हुआ है"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"कॉपी किया गया"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"<xliff:g id="APPNAME">%1$s</xliff:g> से"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"कॉपी किया गया यूज़र इंटरफ़ेस (यूआई) खारिज करें"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"कॉपी किए गए टेक्स्ट में बदलाव करें"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"कॉपी की गई इमेज में बदलाव करें"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"कॉन्टेंट को आस-पास मौजूद डिवाइस पर भेजें"</string> + <string name="add" msgid="81036585205287996">"जोड़ें"</string> + <string name="manage_users" msgid="1823875311934643849">"उपयोगकर्ताओं को मैनेज करें"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"इस सूचना को स्प्लिट स्क्रीन मोड में, खींचा और छोड़ा नहीं जा सकता."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"वाई-फ़ाई उपलब्ध नहीं है"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"प्राथमिकता मोड"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"अलार्म सेट किया गया"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistant का मेहमान मोड चालू किया गया"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"कैमरा और माइक बंद हैं"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index da84b86547d1..d3905e7bb820 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI sustava"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Baterija bi se uskoro mogla isprazniti"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Preostalo <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Punjenje putem USB-a nije moguće"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Koristite punjač koji ste dobili s uređajem"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Lice je autentificirano"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Potvrđeno"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Dodirnite Potvrdi za dovršetak"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentičnost provjerena"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Koristite PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Koristite uzorak"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Zatvaranje"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"potpuna tišina"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"samo alarmi"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Ne uznemiravaj."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth uključen."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Vrijeme alarma: <xliff:g id="TIME">%s</xliff:g>."</string> @@ -206,6 +214,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Izlog za slastice"</string> <string name="start_dreams" msgid="9131802557946276718">"Čuvar zaslona"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Ne uznemiravaj"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Upareni uređaji nisu dostupni"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> baterije"</string> @@ -351,6 +360,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Obavijesti"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Razgovori"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Izbriši sve bešumne obavijesti"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Značajka Ne uznemiravaj pauzirala je Obavijesti"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Započni"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Nema obavijesti"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Ovim uređajem upravlja tvoj roditelj"</string> @@ -494,6 +504,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> niže rangirana"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Prikazuje se pri vrhu obavijesti razgovora i kao profilna slika na zaključanom zaslonu"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Prikazuje se pri vrhu obavijesti razgovora i kao profilna slika na zaključanom zaslonu, izgleda kao oblačić"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Prikazuje se pri vrhu obavijesti razgovora i kao profilna slika na zaključanom zaslonu, prekida Ne uznemiravaj"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Prikazuje se pri vrhu obavijesti razgovora i kao profilna slika na zaključanom zaslonu, izgleda kao oblačić, prekida Ne uznemiravaj"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritetno"</string> <string name="no_shortcut" msgid="8257177117568230126">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> ne podržava značajke razgovora"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Te se obavijesti ne mogu izmijeniti."</string> @@ -571,6 +583,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Glazba"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Ne uznemiravaj"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Prečac tipki za glasnoću"</string> <string name="battery" msgid="769686279459897127">"Baterija"</string> <string name="headset" msgid="4485892374984466437">"Slušalice"</string> @@ -689,6 +702,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi je isključen"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth je isključen"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Način Ne uznemiravaj isključen"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Način Ne uznemiravaj uključilo je automatsko pravilo (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Način Ne uznemiravaj 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 Ne uznemiravaj uključilo je automatsko pravilo ili aplikacija."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Izvođenje aplikacija u pozadini"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Dodirnite da biste vidjeli pojedinosti o potrošnji baterije i podatkovnom prometu"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Isključiti mobilne podatke?"</string> @@ -713,6 +730,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(posao)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonski poziv"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(putem apl. <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"fotoaparat"</string> <string name="privacy_type_location" msgid="7991481648444066703">"lokaciju"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -812,6 +831,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(nije povezano)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Nije prebačeno. Dodirnite da biste pokušali ponovo."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Uparite novi uređaj"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Da biste emitirali ovu sesiju, otvorite aplikaciju."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Nepoznata aplikacija"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Broj međuverzije"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Broj međuverzije kopiran je u međuspremnik."</string> <string name="basic_status" msgid="2315371112182658176">"Otvoreni razgovor"</string> @@ -845,6 +866,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Pogledajte nedavne poruke, propuštene pozive i ažuriranja statusa"</string> <string name="people_tile_title" msgid="6589377493334871272">"Razgovor"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Pauzirala značajka Ne uznemiravaj"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> šalje poruku: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"Korisnik <xliff:g id="NAME">%1$s</xliff:g> poslao je sliku"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ima ažuriranje statusa: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -884,8 +906,7 @@ <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> aktivne aplikacije</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktivnih aplikacija</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nove informacije"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktivne aplikacije"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Zaustavi"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Zaustavljeno"</string> @@ -893,14 +914,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Kopirano"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Iz aplikacije <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Odbaci kopiranje korisničkog sučelja"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Uredi kopirani tekst"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Uredi kopiranu sliku"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Pošalji uređaju u blizini"</string> + <string name="add" msgid="81036585205287996">"Dodaj"</string> + <string name="manage_users" msgid="1823875311934643849">"Upravljanje korisnicima"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Ova obavijest ne podržava povlačenje na podijeljeni zaslon."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi nije dostupan"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Prioritetni način rada"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarm je postavljen"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Omogućen je način rada za goste u Asistentu"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Fotoaparat i mikrofon su isključeni"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# obavijest}one{# obavijest}few{# obavijesti}other{# obavijesti}}"</string> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 30a5be844385..3b94d8f15d90 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Rendszer UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Az akkumulátor hamarosan lemerül"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> maradt"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Nem tölthető USB-n keresztül"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Használja az eszközhöz kapott eredeti töltőt"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Arc hitelesítve"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Megerősítve"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Koppintson a Megerősítés lehetőségre"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Hitelesítve"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN-kód használata"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Minta használata"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Bezárás"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"teljes némítás"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"csak ébresztések"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Ne zavarjanak."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth bekapcsolva."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Ébresztés időpontja: <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessert Case"</string> <string name="start_dreams" msgid="9131802557946276718">"Képernyővédő"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Ne zavarjanak"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Nem áll rendelkezésre párosított eszköz"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Akkumulátor: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Értesítések"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Beszélgetések"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Az összes néma értesítés törlése"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Ne zavarjanak funkcióval szüneteltetett értesítések"</string> <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="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Az eszközt a szülőd felügyeli"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Állapot:</b> hátrébb sorolva"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"A beszélgetésekre vonatkozó értesítések tetején látható, és megjeleníti a profilképet a lezárási képernyőn"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"A beszélgetésekre vonatkozó értesítések tetején, lebegő buborékként látható, és megjeleníti a profilképet a lezárási képernyőn"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"A beszélgetésekre vonatkozó értesítések tetején látható, megjeleníti a profilképet a lezárási képernyőn, és megszakítja a Ne zavarjanak funkciót"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"A beszélgetésekre vonatkozó értesítések tetején, lebegő buborékként látható, megjeleníti a profilképet a lezárási képernyőn, és megszakítja a Ne zavarjanak funkciót"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritás"</string> <string name="no_shortcut" msgid="8257177117568230126">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> nem támogatja a beszélgetési funkciókat"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ezeket az értesítéseket nem lehet módosítani."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS-üzenetek"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Zene"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Naptár"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Ne zavarjanak"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"A hangerőgombok gyorsbillentyűk"</string> <string name="battery" msgid="769686279459897127">"Akkumulátor"</string> <string name="headset" msgid="4485892374984466437">"Headset"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"A Wi-Fi ki van kapcsolva"</string> <string name="bt_is_off" msgid="7436344904889461591">"A Bluetooth ki van kapcsolva"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"A „Ne zavarjanak” mód ki van kapcsolva"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Az egyik automatikus szabály (<xliff:g id="ID_1">%s</xliff:g>) bekapcsolta a „Ne zavarjanak” módot."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Az egyik alkalmazás (<xliff:g id="ID_1">%s</xliff:g>) bekapcsolta a „Ne zavarjanak” módot."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Az egyik alkalmazás vagy automatikus szabály bekapcsolta a „Ne zavarjanak” módot."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"A háttérben még futnak alkalmazások"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Koppintson az akkumulátor- és adathasználat részleteinek megtekintéséhez"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Kikapcsolja a mobiladatokat?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(munkahely)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonhívás"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(a következőn keresztül: <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"helyadatok"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(leválasztva)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"A váltás nem sikerült. Próbálja újra."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Új eszköz párosítása"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"A munkamenet átküldéséhez nyissa meg az alkalmazást."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Ismeretlen alkalmazás"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Buildszám"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Buildszám a vágólapra másolva."</string> <string name="basic_status" msgid="2315371112182658176">"Beszélgetés megnyitása"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Megtekintheti a legutóbbi üzeneteket, a nem fogadott hívásokat és az állapotfrissítéseket."</string> <string name="people_tile_title" msgid="6589377493334871272">"Beszélgetés"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"A Ne zavarjanak mód által szüneteltetve"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> üzenetet küldött: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> képet küldött"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> frissítette állapotát: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktív alkalmazás</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aktív alkalmazás</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Új információ"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktív alkalmazások"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Leállítás"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Leállítva"</string> @@ -889,8 +910,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"Vágólapra másolt szöveg szerkesztése"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Vágólapra másolt kép szerkesztése"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Küldés közeli eszközre"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"Hozzáadás"</string> + <string name="manage_users" msgid="1823875311934643849">"Felhasználók kezelése"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Az értesítés nem támogatja a megosztott képernyőre való áthúzást."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"A Wi‑Fi nem áll rendelkezésre"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Prioritás mód"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Ébresztő beállítva"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"A Segéd vendég módja engedélyezve"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"A kamera és a mikrofon ki vannak kapcsolva"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# értesítés}other{# értesítés}}"</string> </resources> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 443da54eaf3d..488aa7674805 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Համակարգի ինտերֆեյս"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Մարտկոցի լիցքը շուտով կարող է սպառվել"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Մնաց <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Սարքը հնարավոր չէ լիցքավորել USB-ի միջոցով"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Օգտագործեք սարքի լիցքավորիչը"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Դեմքը ճանաչվեց"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Հաստատվեց"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Ավարտելու համար հպեք «Հաստատել»"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Նույնականացված է"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Օգտագործել PIN կոդ"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Օգտագործել նախշ"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Փակել"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"կատարյալ լռություն"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"միայն զարթուցիչը"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Չանհանգստացնել։"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth:"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth-ը միացված է:"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Զարթուցիչը դրված է <xliff:g id="TIME">%s</xliff:g>-ին:"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessert Case"</string> <string name="start_dreams" msgid="9131802557946276718">"Էկրանապահ"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Չանհանգստացնել"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Զուգակցված սարքեր չկան"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Մարտկոցի լիցքը՝ <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Ծանուցումներ"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Զրույցներ"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Ջնջել բոլոր անձայն ծանուցումները"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Ծանուցումները չեն ցուցադրվի «Չանհանգստացնել» ռեժիմում"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Սկսել հիմա"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Ծանուցումներ չկան"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Այս սարքը կառավարում է ձեր ծնողը"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Կարգավիճակը․</b> կարևորության մակարդակն իջեցվել է"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Ցուցադրվում է զրույցների ծանուցումների վերևում, ինչպես նաև կողպէկրանին որպես պրոֆիլի նկար"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Ցուցադրվում է զրույցների ծանուցումների վերևում, ինչպես նաև կողպէկրանին որպես պրոֆիլի նկար, հայտնվում է ամպիկի տեսքով"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Ցուցադրվում է զրույցների ծանուցումների վերևում, ինչպես նաև կողպէկրանին որպես պրոֆիլի նկար, ընդհատում է «Չանհանգստացնել» ռեժիմը"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Ցուցադրվում է զրույցների ծանուցումների վերևում, ինչպես նաև կողպէկրանին որպես պրոֆիլի նկար, հայտնվում է ամպիկի տեսքով, ընդհատում է «Չանհանգստացնել» ռեժիմը"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Կարևոր"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածը զրույցի գործառույթներ չի աջակցում"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Այս ծանուցումները չեն կարող փոփոխվել:"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Երաժշտություն"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Օրացույց"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Չանհանգստացնել"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Ձայնի կոճակների դյուրանցում"</string> <string name="battery" msgid="769686279459897127">"Մարտկոց"</string> <string name="headset" msgid="4485892374984466437">"Ականջակալ"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi-ն անջատված է"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth-ն անջատված է"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Չանհանգստացնելու ռեժիմն անջատված է"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Չանհանգստացնել գործառույթը միացված է ավտոմատ կանոնի կողմից (<xliff:g id="ID_1">%s</xliff:g>):"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Չանհանգստացնել գործառույթը միացված է հավելվածի կողմից (<xliff:g id="ID_1">%s</xliff:g>):"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Չանհանգստացնել գործառույթը միացված է ավտոմատ կանոնի կամ հավելվածի կողմից:"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Ֆոնային ռեժիմում աշխատող հավելվածներ"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Հպեք՝ մարտկոցի և թրաֆիկի մանրամասները տեսնելու համար"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Անջատե՞լ բջջային ինտերնետը"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(աշխատանքային)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Հեռախոսազանգ"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(հետևյալ հավելված(ներ)ի միջոցով՝ <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"տեսախցիկը"</string> <string name="privacy_type_location" msgid="7991481648444066703">"վայրը"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"խոսափողը"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(անջատված է)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Սխալ առաջացավ։ Հպեք՝ կրկնելու համար։"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Նոր սարքի զուգակցում"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Այս աշխատաշրջանը հեռարձակելու համար բացեք հավելվածը"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Անհայտ հավելված"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Կառուցման համարը"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Կառուցման համարը պատճենվեց սեղմատախտակին։"</string> <string name="basic_status" msgid="2315371112182658176">"Բաց զրույց"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Տեսեք վերջին հաղորդագրությունները, բաց թողնված զանգերը և կարգավիճակի մասին թարմացումները"</string> <string name="people_tile_title" msgid="6589377493334871272">"Զրույց"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Դադարեցվել է «Չանհանգստացնել» գործառույթի կողմից"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> օգտատերը հաղորդագրություն է ուղարկել. «<xliff:g id="NOTIFICATION">%2$s</xliff:g>»"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> օգտատերը պատկեր է ուղարկել"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> օգտատերը նոր կարգավիճակ է հրապարակել. «<xliff:g id="STATUS">%2$s</xliff:g>»"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> ակտիվ հավելված</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ակտիվ հավելված</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Նոր տեղեկություն"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Ակտիվ հավելվածներ"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Դադարեցնել"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Կանգնեցված է"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Պատճենվեց"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"<xliff:g id="APPNAME">%1$s</xliff:g> հավելվածից"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Փակել պատճենների միջերեսը"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Փոփոխել պատճենված տեքստը"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Փոփոխել պատճենված պատկերը"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Ուղարկել մոտակա սարքի"</string> + <string name="add" msgid="81036585205287996">"Ավելացնել"</string> + <string name="manage_users" msgid="1823875311934643849">"Օգտատերերի կառավարում"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Այս ծանուցումը հնարավոր չէ քաշել տրոհված էկրանի մեկ հատվածից մյուսը։"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi-ը հասանելի չէ"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Առաջնահերթության ռեժիմ"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Զարթուցիչը դրված է"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Օգնականի հյուրի ռեժիմը միացված է"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Տեսախցիկը և խոսափողն անջատված են"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index c7339c70eb71..0913166cc1eb 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI Sistem"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Baterai mungkin akan segera habis"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Tersisa <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Tidak dapat mengisi daya melalui USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Gunakan pengisi daya yang disertakan dengan perangkat"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Wajah diautentikasi"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Dikonfirmasi"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Ketuk Konfirmasi untuk menyelesaikan"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Diautentikasi"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Gunakan PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Gunakan pola"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Tutup"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"senyap total"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"hanya alarm"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Jangan Ganggu."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth aktif."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarm disetel ke <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Etalase Hidangan Penutup"</string> <string name="start_dreams" msgid="9131802557946276718">"Screen saver"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Jangan Ganggu"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Perangkat yang disandingkan tak tersedia"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Baterai <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifikasi"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Percakapan"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Hapus semua notifikasi senyap"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notifikasi dijeda oleh mode Jangan Ganggu"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Mulai sekarang"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Tidak ada notifikasi"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Perangkat ini dikelola oleh orang tuamu"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Diberi Peringkat Lebih Rendah"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Muncul di atas notifikasi percakapan dan sebagai foto profil di layar kunci"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Muncul di atas notifikasi percakapan dan sebagai foto profil di layar kunci, ditampilkan sebagai balon"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Muncul di atas notifikasi percakapan dan sebagai foto profil di layar kunci, mengganggu fitur Jangan Ganggu"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Muncul di atas notifikasi percakapan dan sebagai foto profil di layar kunci, ditampilkan sebagai balon, mengganggu fitur Jangan Ganggu"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritas"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> tidak mendukung fitur percakapan"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Notifikasi ini tidak dapat diubah."</string> @@ -566,6 +578,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="volume_and_do_not_disturb" msgid="502044092739382832">"Jangan Ganggu"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Pintasan tombol volume"</string> <string name="battery" msgid="769686279459897127">"Baterai"</string> <string name="headset" msgid="4485892374984466437">"Headset"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi nonaktif"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth nonaktif"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Fitur Jangan Ganggu nonaktif"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Mode Jangan Ganggu diaktifkan oleh aturan otomatis (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Mode Jangan Ganggu diaktifkan oleh aplikasi (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Mode Jangan Ganggu diaktifkan oleh aturan otomatis atau aplikasi."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Aplikasi yang sedang berjalan di latar belakang"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Ketuk untuk melihat detail penggunaan baterai dan data"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Nonaktifkan data seluler?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(kerja)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Panggilan telepon"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(melalui <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"lokasi"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(terputus)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Tidak dapat beralih. Ketuk untuk mencoba lagi."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Sambungkan perangkat baru"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Buka aplikasi untuk mentransmisikan sesi ini."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Aplikasi tidak dikenal"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Nomor build"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Nomor versi disalin ke papan klip."</string> <string name="basic_status" msgid="2315371112182658176">"Membuka percakapan"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Lihat pesan terbaru, panggilan tak terjawab, dan pembaruan status"</string> <string name="people_tile_title" msgid="6589377493334871272">"Percakapan"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Dijeda oleh fitur Jangan Ganggu"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> mengirim pesan: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> mengirim gambar"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> memposting pembaruan status: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplikasi aktif</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplikasi aktif</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Informasi baru"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aplikasi aktif"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Berhenti"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Dihentikan"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Disalin"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Dari <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Tutup UI salin"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Edit teks yang disalin"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Edit gambar yang disalin"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Kirim ke perangkat di sekitar"</string> + <string name="add" msgid="81036585205287996">"Tambahkan"</string> + <string name="manage_users" msgid="1823875311934643849">"Kelola pengguna"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Notifikasi ini tidak mendukung fitur tarik ke Layar terpisah."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi tidak tersedia"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Mode prioritas"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarm disetel"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Mode Tamu Asisten diaktifkan"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera dan mikrofon nonaktif"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index eddd24648a7b..cddb8f81fc09 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Kerfisviðmót"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Rafhlaðan gæti tæmst bráðlega"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> eftir"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Ekki er hægt að hlaða í gegnum USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Notaðu hleðslutækið sem fylgdi tækinu þínu"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Andlit staðfest"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Staðfest"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Ýttu á „Staðfesta“ til að ljúka"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Auðkennt"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Nota PIN-númer"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Nota mynstur"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Loka"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"algjör þögn"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"aðeins vekjarar"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Ónáðið ekki."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Kveikt á Bluetooth."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Vekjari stilltur á <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Eftirréttaborð"</string> <string name="start_dreams" msgid="9131802557946276718">"Skjávari"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Ónáðið ekki"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Engin pöruð tæki til staðar"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> rafhlöðuhleðsla"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Tilkynningar"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Samtöl"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Hreinsa allar þöglar tilkynningar"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Hlé gert á tilkynningum þar sem stillt er á „Ónáðið ekki“"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Byrja núna"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Engar tilkynningar"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Foreldri þitt stjórnar þessu tæki"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Staða:</b> fékk lægri stöðu"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Birtist efst í samtalstilkynningum og sem prófílmynd á lásskjánum"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Birtist efst í samtalstilkynningum og sem prófílmynd á lásskjánum, birtist sem blaðra"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Birtist efst í samtalstilkynningum og sem prófílmynd á lásskjánum. Truflar „Ónáðið ekki“"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Birtist efst í samtalstilkynningum og sem prófílmynd á lásskjánum. Birtist sem blaðra sem truflar „Ónáðið ekki“"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Forgangur"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> styður ekki samtalseiginleika"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ekki er hægt að breyta þessum tilkynningum."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS-skilaboð"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Tónlist"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Dagatal"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Ónáðið ekki"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Flýtihnappar fyrir hljóðstyrk"</string> <string name="battery" msgid="769686279459897127">"Rafhlaða"</string> <string name="headset" msgid="4485892374984466437">"Höfuðtól"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Slökkt á Wi-Fi"</string> <string name="bt_is_off" msgid="7436344904889461591">"Slökkt á Bluetooth"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Slökkt á „Ónáðið ekki“"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Sjálfvirk regla kveikti á „Ónáðið ekki“ (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Forrit kveikti á „Ónáðið ekki“ (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Sjálfvirk regla eða forrit kveikti á „Ónáðið ekki“"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Forrit sem keyra í bakgrunni"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Ýttu til að fá upplýsingar um rafhlöðu- og gagnanotkun"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Viltu slökkva á farsímagögnum?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(vinna)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Símtal"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(í gegnum <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"myndavél"</string> <string name="privacy_type_location" msgid="7991481648444066703">"staðsetning"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"hljóðnemi"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(aftengt)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Ekki er hægt að skipta. Ýttu til að reyna aftur."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Para nýtt tæki"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Opnaðu forritið til að senda þessa lotu út."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Óþekkt forrit"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Útgáfunúmer smíðar"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Útgáfunúmer smíðar afritað á klippiborð."</string> <string name="basic_status" msgid="2315371112182658176">"Opna samtal"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Sjá nýleg skilboð, ósvöruð símtöl og stöðuuppfærslur"</string> <string name="people_tile_title" msgid="6589377493334871272">"Samtal"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Sett í bið af „Ónáðið ekki“"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> sendi skilaboð: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> sendi mynd"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> er með stöðuuppfærslu: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> virkt forrit</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> virk forrit</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nýjar upplýsingar"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Virk forrit"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stöðva"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stöðvað"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Afritað"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Frá <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Loka afriti notendaviðmóts"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Breyta afrituðum texta"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Breyta afritaðri mynd"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Senda í nálægt tæki"</string> + <string name="add" msgid="81036585205287996">"Bæta við"</string> + <string name="manage_users" msgid="1823875311934643849">"Stjórna notendum"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Þessi tilkynning styður ekki að draga yfir á skiptan skjá."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"WiFi ekki tiltækt"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Forgangsstilling"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Vekjari stilltur"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Kveikt á gestastillingu Hjálpara"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Slökkt á myndavél og hljóðnema"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 6a07f79e9e6f..ed125cd306e8 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI sistema"</string> - <string name="battery_low_title" msgid="6891106956328275225">"La batteria potrebbe esaurirsi a breve"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> rimanente"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Impossibile ricaricare tramite USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Utilizza il caricabatterie fornito in dotazione con il dispositivo"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Volto autenticato"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confermato"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Tocca Conferma per completare"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticazione eseguita"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Utilizza PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Usa sequenza"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Chiudi"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"silenzio totale"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"solo sveglie"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Non disturbare."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth attivo."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Sveglia impostata per le <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Vetrina di dolci"</string> <string name="start_dreams" msgid="9131802557946276718">"Salvaschermo"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Non disturbare"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Nessun dispositivo accoppiato disponibile"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Batteria: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notifiche"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversazioni"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Cancella tutte le notifiche silenziose"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notifiche messe in pausa in base alla modalità Non disturbare"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Avvia adesso"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Nessuna notifica"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Questo dispositivo è gestito dai tuoi genitori"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Stato:</b> posizionata più in basso"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Appare in cima alle notifiche delle conversazioni e compare come immagine del profilo nella schermata di blocco"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Appare in cima alle notifiche delle conversazioni, nonché compare come immagine del profilo nella schermata di blocco e come bolla"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Appare in cima alle notifiche delle conversazioni, interrompe la modalità Non disturbare e compare come immagine del profilo nella schermata di blocco"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Appare in cima alle notifiche delle conversazioni, interrompe la modalità Non disturbare, nonché compare come immagine del profilo nella schermata di blocco e come bolla"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Priorità"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> non supporta le funzionalità delle conversazioni"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Impossibile modificare queste notifiche."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Musica"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendario"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Non disturbare"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Pulsanti del volume come scorciatoia"</string> <string name="battery" msgid="769686279459897127">"Batteria"</string> <string name="headset" msgid="4485892374984466437">"Auricolare"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi disattivato"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth non attivo"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Funzione Non disturbare disattivata"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"La funzione Non disturbare è stata attivata da una regola automatica (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"La funzione Non disturbare è stata attivata da un\'app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"La funzione Non disturbare è stata attivata da una regola automatica o da un\'app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"App in esecuzione in background"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Tocca per conoscere i dettagli sull\'utilizzo dei dati e della batteria"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Disattivare i dati mobili?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(lavoro)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonata"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(tramite <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"fotocamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"posizione"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"microfono"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(disconnesso)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Non puoi cambiare. Tocca per riprovare."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Accoppia nuovo dispositivo"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Per trasmettere questa sessione devi aprire l\'app."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"App sconosciuta"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numero build"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Numero build copiato negli appunti."</string> <string name="basic_status" msgid="2315371112182658176">"Apri conversazione"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"+<xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Visualizza messaggi recenti, chiamate senza risposta e aggiornamenti dello stato"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversazione"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"In pausa in base alla modalità Non disturbare"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> ha inviato un messaggio: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ha inviato un\'immagine"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ha aggiornato lo stato: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,22 +899,24 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> app attiva</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> app attive</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nuove informazioni"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"App attive"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Interrompi"</string> - <!-- no translation found for fgs_manager_app_item_stop_button_stopped_label (6950382004441263922) --> - <skip /> + <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Interrotta"</string> <string name="clipboard_edit_text_copy" msgid="770856373439969178">"Copia"</string> <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Copiato"</string> - <!-- no translation found for clipboard_edit_source (9156488177277788029) --> - <skip /> + <string name="clipboard_edit_source" msgid="9156488177277788029">"Da <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Ignora copia UI"</string> <string name="clipboard_edit_text_description" msgid="805254383912962103">"Modifica testo copiato"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Modifica immagine copiata"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Invia a dispositivo nelle vicinanze"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"Aggiungi"</string> + <string name="manage_users" msgid="1823875311934643849">"Gestisci utenti"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Non è possibile trascinare questa notifica tra le due parti dello schermo diviso."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi non disponibile"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Modalità Priorità"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Sveglia impostata"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Modalità Ospite dell\'assistente attiva"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Fotocamera e microfono non attivi"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# notifica}one{# notifica}other{# notifiche}}"</string> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index f959774c81ef..f88605a90adf 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"ממשק משתמש של המערכת"</string> - <string name="battery_low_title" msgid="6891106956328275225">"ייתכן שהסוללה תתרוקן בקרוב"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"נותרו <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"לא ניתן לטעון באמצעות USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"שימוש במטען שסופק עם המכשיר"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"זיהוי הפנים בוצע"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"יש אישור"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"יש להקיש על \'אישור\' לסיום התהליך"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"מאומת"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"שימוש בקוד אימות"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"שימוש בקו ביטול נעילה"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"סגירה"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"השתקה מוחלטת"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"רק התראות"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"נא לא להפריע."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth מופעל."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"ההתראה נקבעה ל-<xliff:g id="TIME">%s</xliff:g>."</string> @@ -207,6 +215,7 @@ <string name="dessert_case" msgid="9104973640704357717">"מזנון קינוחים"</string> <string name="start_dreams" msgid="9131802557946276718">"שומר מסך"</string> <string name="ethernet_label" msgid="2203544727007463351">"אתרנט"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"נא לא להפריע"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"אין מכשירים מותאמים זמינים"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> סוללה"</string> @@ -354,6 +363,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"התראות"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"שיחות"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"ניקוי כל ההתראות השקטות"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"התראות הושהו על ידי מצב \'נא לא להפריע\'"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"כן, אפשר להתחיל"</string> <string name="empty_shade_text" msgid="8935967157319717412">"אין התראות"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"המכשיר הזה מנוהל על ידי ההורה שלך"</string> @@ -497,6 +507,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>הסטטוס:</b> דורג נמוך יותר"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"מוצגת בחלק העליון של קטע ההתראות וכתמונת פרופיל במסך הנעילה"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"מוצגת בחלק העליון של קטע התראות השיחה וכתמונת פרופיל במסך הנעילה, מופיעה בבועה"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"מוצגת בחלק העליון של קטע התראות השיחה וכתמונת פרופיל במסך הנעילה, מפריעה במצב \'נא לא להפריע\'"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"מוצגת בחלק העליון של קטע התראות השיחה וכתמונת פרופיל במסך הנעילה, מופיעה בבועה צפה ומפריעה במצב \'נא לא להפריע\'"</string> <string name="notification_priority_title" msgid="2079708866333537093">"בעדיפות גבוהה"</string> <string name="no_shortcut" msgid="8257177117568230126">"האפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> לא תומכת בתכונות השיחה"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"לא ניתן לשנות את ההתראות האלה."</string> @@ -576,6 +588,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"מוזיקה"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"יומן"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"נא לא להפריע"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"קיצור דרך ללחצני עוצמת קול"</string> <string name="battery" msgid="769686279459897127">"סוללה"</string> <string name="headset" msgid="4485892374984466437">"אוזניות"</string> @@ -694,6 +707,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi כבוי"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth כבוי"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"מצב \'נא לא להפריע\' כבוי"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"מצב \'נא לא להפריע\' הופעל על ידי כלל אוטומטי (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"מצב \'נא לא להפריע\' הופעל על ידי אפליקציה (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"מצב \'נא לא להפריע\' הופעל על ידי אפליקציה או על ידי כלל אוטומטי."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"אפליקציות שפועלות ברקע"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"אפשר להקיש לקבלת פרטים על צריכה של נתונים וסוללה"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"לכבות את חבילת הגלישה?"</string> @@ -718,6 +735,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(עבודה)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"שיחת טלפון"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(באמצעות <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"מצלמה"</string> <string name="privacy_type_location" msgid="7991481648444066703">"מיקום"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"מיקרופון"</string> @@ -818,6 +837,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(מנותק)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"לא ניתן להחליף. צריך להקיש כדי לנסות שוב."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"התאמה של מכשיר חדש"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"כדי להעביר (cast) את הסשן הזה, צריך לפתוח את האפליקציה."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"אפליקציה לא ידועה"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"מספר Build"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"מספר ה-Build הועתק ללוח."</string> <string name="basic_status" msgid="2315371112182658176">"פתיחת שיחה"</string> @@ -851,6 +872,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ההודעות האחרונות, שיחות שלא נענו ועדכוני סטטוס"</string> <string name="people_tile_title" msgid="6589377493334871272">"שיחה"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"ההתראה הושהתה על ידי \'נא לא להפריע\'"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"התקבלה הודעה מ<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> שלח/ה תמונה"</string> <string name="new_status_content_description" msgid="6046637888641308327">"הסטטוס של <xliff:g id="NAME">%1$s</xliff:g> עודכן: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -891,8 +913,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> אפליקציות פעילות</item> <item quantity="one">אפליקציה פעילה אחת (<xliff:g id="COUNT_0">%s</xliff:g>)</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"מידע חדש"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"אפליקציות פעילות"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"עצירה"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"הופסקה"</string> @@ -900,14 +921,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"הועתק"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"המקור: <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"ביטול של העתקת ממשק המשתמש"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"עריכת הטקסט שהועתק"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"עריכת התמונה שהועתקה"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"שליחה למכשיר בקרבת מקום"</string> + <string name="add" msgid="81036585205287996">"הוספה"</string> + <string name="manage_users" msgid="1823875311934643849">"ניהול משתמשים"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"ההתראה הזו לא תומכת בגרירה למסך מפוצל."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi לא זמין"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"מצב עדיפות"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"ההתראה מוגדרת"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"מצב אורח ב‑Assistant מופעל"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"המצלמה והמיקרופון כבויים"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 05ddace4a496..b946344c8af5 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"システム UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"もうすぐ電池がなくなります"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"残量が<xliff:g id="PERCENTAGE">%s</xliff:g>です"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB 経由では充電できません"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"デバイスに付属の充電器を使用してください"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"顔を認証しました"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"確認しました"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"完了するには [確認] をタップしてください"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"認証済み"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN を使用"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"パターンを使用"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"閉じる"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"サイレント"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"アラームのみ"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"サイレント モード。"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"BluetoothがONです。"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"アラームは<xliff:g id="TIME">%s</xliff:g>に設定されています。"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"デザートケース"</string> <string name="start_dreams" msgid="9131802557946276718">"スクリーン セーバー"</string> <string name="ethernet_label" msgid="2203544727007463351">"イーサネット"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"サイレント モード"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"ペア設定されたデバイスがありません"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"バッテリー <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"通知"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"会話"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"サイレント通知がすべて消去されます"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"サイレント モードにより通知は一時停止中です"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"今すぐ開始"</string> <string name="empty_shade_text" msgid="8935967157319717412">"通知はありません"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"このデバイスは保護者によって管理されています"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>ステータス:</b> ランクが下がりました"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"会話通知の一番上に表示されると同時に、ロック画面にプロフィール写真として表示されます"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"会話通知の一番上に表示されると同時に、ロック画面にプロフィール写真として表示されるほか、バブルとして表示されます"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"会話通知の一番上に表示されると同時に、ロック画面にプロフィール写真として表示され、サイレント モードが中断されます"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"会話通知の一番上に表示されると同時に、ロック画面にプロフィール写真として表示されるほか、バブルとして表示され、サイレント モードが中断されます"</string> <string name="notification_priority_title" msgid="2079708866333537093">"優先"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g>は会話機能に対応していません"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"これらの通知は変更できません。"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"音楽"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"カレンダー"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"サイレント モード"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"音量ボタンのショートカット"</string> <string name="battery" msgid="769686279459897127">"バッテリー"</string> <string name="headset" msgid="4485892374984466437">"ヘッドセット"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>、<xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi は OFF です"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth は OFF です"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"サイレント モードは OFF です"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"サイレント モードが自動ルール（<xliff:g id="ID_1">%s</xliff:g>）によって ON になりました。"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"サイレント モードがアプリ（<xliff:g id="ID_1">%s</xliff:g>）によって ON になりました。"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"サイレント モードが自動ルールまたはアプリによって ON になりました。"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"バックグラウンドで実行中のアプリ"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"タップしてバッテリーやデータの使用量を確認"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"モバイルデータを OFF にしますか？"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"（業務用）"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"通話"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"（<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> 経由）"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"（<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>）"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"（<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>）"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"カメラ"</string> <string name="privacy_type_location" msgid="7991481648444066703">"現在地情報"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"マイク"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"（接続解除済み）"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"切り替えられません。タップしてやり直してください。"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"新しいデバイスとのペア設定"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"このセッションをキャストするには、アプリを開いてください。"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"不明なアプリ"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ビルド番号"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ビルド番号をクリップボードにコピーしました。"</string> <string name="basic_status" msgid="2315371112182658176">"空の会話"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g> 件以上"</string> <string name="people_tile_description" msgid="8154966188085545556">"最近のメッセージ、不在着信、最新のステータスが表示されます"</string> <string name="people_tile_title" msgid="6589377493334871272">"会話"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"サイレント モードにより一時停止"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> さんからのメッセージ: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> さんが画像を送信しました"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> さんの近況: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other">有効なアプリ: <xliff:g id="COUNT_1">%s</xliff:g> 個</item> <item quantity="one">有効なアプリ: <xliff:g id="COUNT_0">%s</xliff:g> 個</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"最新情報"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"有効なアプリ"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"停止"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"停止中"</string> @@ -889,8 +910,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"コピーしたテキストを編集"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"コピーした画像を編集"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"付近のデバイスに送信"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"追加"</string> + <string name="manage_users" msgid="1823875311934643849">"ユーザーの管理"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"この通知は、分割画面へのドラッグがサポートされていません。"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi-Fi を利用できません"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"優先順位モード"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"アラームを設定しました"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"アシスタント ゲストモードを有効にしました"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"カメラとマイクが OFF です"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# 件の通知}other{# 件の通知}}"</string> </resources> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index cf77cacaaa3d..31d760611843 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"სისტემის UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"ბატარეა შესაძლოა მალე ამოიწუროს"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"დარჩენილია <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB-თ დატენვა ვერ ხერხდება"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"გამოიყენეთ დამტენი, რომელიც თქვენს მოწყობილობას მოჰყვა"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"სახის ამოცნობილია"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"დადასტურებული"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"დასასრულებლად შეეხეთ „დადასტურებას“"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ავტორიზებულია"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN-კოდის გამოყენება"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ნიმუშის გამოყენება"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"დახურვა"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"სრული სიჩუმე"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"მხოლოდ მაღვიძარები"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"არ შემაწუხოთ."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth ჩართულია."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"მაღვიძარა დაყენებულია: <xliff:g id="TIME">%s</xliff:g>"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"სადესერტო ყუთი"</string> <string name="start_dreams" msgid="9131802557946276718">"ეკრანმზოგი"</string> <string name="ethernet_label" msgid="2203544727007463351">"ეთერნეტი"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"არ შემაწუხოთ"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"დაწყვილებული მოწყობილობები მიუწვდომელია"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> ბატარეა"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"შეტყობინებები"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"საუბრები"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"ყველა ჩუმი შეტყობინების გასუფთავება"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"შეტყობინებები დაპაუზდა „არ შემაწუხოთ“ რეჟიმის მეშვეობით"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"დაწყება ახლავე"</string> <string name="empty_shade_text" msgid="8935967157319717412">"შეტყობინებები არ არის."</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"მოწყობილობას თქვენი მშობელი მართავს"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>სტატუსი:</b> ნაკლებად პრიორიტეტული"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"გამოჩნდება საუბრის შეტყობინებების თავში და პროფილის სურათის სახით ჩაკეტილ ეკრანზე"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"გამოჩნდება საუბრის შეტყობინებების თავში და პროფილის სურათის სახით ჩაკეტილ ეკრანზე, ჩნდება ბუშტის სახით"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"გამოჩნდება საუბრის შეტყობინებების თავში და პროფილის სურათის სახით ჩაკეტილ ეკრანზე, წყვეტს ფუნქციას „არ შემაწუხოთ“"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"გამოჩნდება საუბრის შეტყობინებების თავში და პროფილის სურათის სახით ჩაკეტილ ეკრანზე, ჩნდება ბუშტის სახით, წყვეტს ფუნქციას „არ შემაწუხოთ“"</string> <string name="notification_priority_title" msgid="2079708866333537093">"პრიორიტეტი"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ს არ აქვს მიმოწერის ფუნქციების მხარდაჭერა"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ამ შეტყობინებების შეცვლა შეუძლებელია."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"მუსიკა"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"კალენდარი"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"არ შემაწუხოთ"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"ხმის ღილაკების მალსახმობი"</string> <string name="battery" msgid="769686279459897127">"ბატარეა"</string> <string name="headset" msgid="4485892374984466437">"ყურსაცვამი"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi გამორთულია"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth გამორთულია"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"„არ შემაწუხოთ“ რეჟიმი გამორთულია"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"„არ შემაწუხოთ“ ჩაირთო ავტომატური წესის მიხედვით (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"„არ შემაწუხოთ“ ჩაირთო აპის მიერ (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"„არ შემაწუხოთ“ ჩაირთო ავტომატური წესის მიხედვით ან აპის მიერ."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"ფონურ რეჟიმში გაშვებული აპები"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"შეეხეთ ბატარეისა და მონაცემების მოხმარების შესახებ დეტალური ინფორმაციისთვის"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"გსურთ მობილური ინტერნეტის გამორთვა?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(სამსახური)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"სატელეფონო ზარი"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>-ის მეშვეობით)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"კამერა"</string> <string name="privacy_type_location" msgid="7991481648444066703">"მდებარეობა"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"მიკროფონი"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(კავშირი გაწყვეტილია)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"ვერ გადაირთო. შეეხეთ ხელახლა საცდელად."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"ახალი მოწყობილობის დაწყვილება"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"ამ სესიის ტრანსლირებისთვის გახსენით აპი."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"უცნობი აპი"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ანაწყობის ნომერი"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ანაწყობის ნომერი დაკოპირებულია გაცვლის ბუფერში."</string> <string name="basic_status" msgid="2315371112182658176">"მიმოწერის გახსნა"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ბოლოდროინდელი შეტყობინებების, გამოტოვებული ზარების და სტატუსის განახლებების ნახვა"</string> <string name="people_tile_title" msgid="6589377493334871272">"მიმოწერა"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"დაპაუზებულია ფუნქციის „არ შემაწუხოთ“ მიერ"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g>-მა გაგზავნა შეტყობინება: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>-მ(ა) სურათი გამოგზავნა"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g>-მა განაახლა სტატუსი: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> აქტიური აპი</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> აქტიური აპი</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"ახალი ინფორმაცია"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"აქტიური აპები"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"შეწყვეტა"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"შეწყვეტილია"</string> @@ -889,8 +910,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"კოპირებული ტექსტის რედაქტირება"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"კოპირებული სურათის რედაქტირება"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"ახლომახლო მოწყობილობაზე გაგზავნა"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"დამატება"</string> + <string name="manage_users" msgid="1823875311934643849">"მომხმარებლების მართვა"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"ამ შეტყობინების გადათრევა გაყოფილ ეკრანებს შორის არ არის მხარდაჭერილი."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi მიუწვდომელია"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"პრიორიტეტული რეჟიმი"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"მაღვიძარა დაყენებულია"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"ასისტენტის სტუმრის რეჟიმი ჩართულია"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"კამერა და მიკროფონი გამორთულია"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# შეტყობინება}other{# შეტყობინება}}"</string> </resources> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 32d2e512f1a7..c8abf951d255 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Жүйе интерфейсі"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Батерея заряды жақын арада бітуі мүмкін"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> қалды"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB арқылы зарядтау мүмкін емес"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Құрылғымен бірге берілген зарядтау құралын пайдаланыңыз"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Бет танылды."</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Расталды"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Аяқтау үшін \"Растау\" түймесін түртіңіз."</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Аутентификацияланған"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN кодын пайдалану"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Өрнекті пайдалану"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Жабу"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"үнсіз"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"оятқыштар ғана"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Мазаламау."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth қосулы."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Дабыл <xliff:g id="TIME">%s</xliff:g> уақытына реттелген."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Десерт жағдайы"</string> <string name="start_dreams" msgid="9131802557946276718">"Скринсейвер"</string> <string name="ethernet_label" msgid="2203544727007463351">"Этернет"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Мазаламау"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Жұптасқан құрылғылар жоқ"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Батарея деңгейі: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Хабарландырулар"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Әңгімелер"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Барлық үнсіз хабарландыруларды өшіру"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Хабарландырулар Мазаламау режимінде кідіртілді"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Қазір бастау"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Хабарландырулар жоқ"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Бұл құрылғыны ата-анаңыз басқарады."</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Күйі:</b> маңыздылық деңгейі төмендетілген"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Әңгіме туралы хабарландырулардың жоғарғы жағында тұрады және құлыптаулы экранда профиль суреті ретінде көрсетіледі."</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Әңгіме туралы хабарландырулардың жоғарғы жағында тұрады және құлыптаулы экранда профиль суреті болып көрсетіледі, қалқыма хабар түрінде шығады."</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Әңгіме туралы хабарландырулардың жоғарғы жағында тұрады және құлыптаулы экранда профиль суреті ретінде көрсетіледі, Мазаламау режимін тоқтатады."</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Әңгіме туралы хабарландырулардың жоғарғы жағында тұрады және құлыптаулы экранда профиль суреті болып көрсетіледі, қалқыма хабар түрінде шығады, Мазаламау режимін тоқтатады."</string> <string name="notification_priority_title" msgid="2079708866333537093">"Маңызды"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> әңгіме функцияларын қолдамайды."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Бұл хабарландыруларды өзгерту мүмкін емес."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"Мәтіндік хабар"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Mузыка"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Күнтізбе"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Мазаламау"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Дыбыс деңгейі түймелерінің төте жолы"</string> <string name="battery" msgid="769686279459897127">"Батарея"</string> <string name="headset" msgid="4485892374984466437">"Құлақаспап жинағы"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi өшірулі"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth өшірулі"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Мазаламау режимі өшірулі"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Мазаламау режимі (<xliff:g id="ID_1">%s</xliff:g>) автоматты ережесі арқылы қосылды."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Мазаламау режимі (<xliff:g id="ID_1">%s</xliff:g>) қолданбасы арқылы қосылды."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Мазаламау режимі автоматты ереже немесе қолданба арқылы қосылды."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Фонда жұмыс істеп тұрған қолданбалар"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Батарея мен деректер трафигі туралы білу үшін түртіңіз"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Мобильдік деректер өшірілсін бе?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(жұмыс)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Телефон қоңырауы"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> арқылы)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"камера"</string> <string name="privacy_type_location" msgid="7991481648444066703">"геодерек"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"микрофон"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(ажыратулы)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Ауысу мүмкін емес. Әрекетті қайталау үшін түртіңіз."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Жаңа құрылғымен жұптау"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Бұл сеансты трансляциялау үшін қолданбаны ашыңыз."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Белгісіз қолданба"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Құрама нөмірі"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Құрама нөмірі буферге көшірілді."</string> <string name="basic_status" msgid="2315371112182658176">"Ашық әңгіме"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Соңғы хабарларды, өткізіп алған қоңыраулар мен жаңартылған күйлерді көруге болады."</string> <string name="people_tile_title" msgid="6589377493334871272">"Әңгіме"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Мазаламау режимі арқылы кідіртілді."</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> хабар жіберді: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> сурет жіберді."</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ағымдағы күйін жаңартты: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> белсенді қолданба</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> белсенді қолданба</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Жаңа ақпарат"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Белсенді қолданбалар"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Тоқтату"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Тоқтатылған"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Көшірілді"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"<xliff:g id="APPNAME">%1$s</xliff:g> қолданбасынан"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Көшіру интерфейсін жабу"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Көшірілген мәтінді өңдеу"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Көшірілген суретті өңдеу"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Маңайдағы құрылғыға жіберу"</string> + <string name="add" msgid="81036585205287996">"Қосу"</string> + <string name="manage_users" msgid="1823875311934643849">"Пайдаланушыларды басқару"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Бұл хабарландыруды бөлінген экранға сүйреп апару мүмкін емес."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi қолжетімсіз"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Басымдық режимі"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Оятқыш орнатылды"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistant қонақ режимі қосылды"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Камера мен микрофон өшірулі"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index 581d3e6bc6b2..78e6c8439f12 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI ប្រព័ន្ធ"</string> - <string name="battery_low_title" msgid="6891106956328275225">"អាចនឹងអស់ថ្មក្នុងពេលបន្តិចទៀត"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"នៅសល់ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"មិនអាចសាកតាម USB បានទេ"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"សូមប្រើឆ្នាំងសាកដែលភ្ជាប់មកជាមួយឧបករណ៍របស់អ្នក"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"បានផ្ទៀងផ្ទាត់មុខ"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"បានបញ្ជាក់"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"ចុច \"បញ្ជាក់\" ដើម្បីបញ្ចប់"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"បានផ្ទៀងផ្ទាត់"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ប្រើកូដ PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ប្រើលំនាំ"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"បិទ"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"បិទសំឡេងទាំងស្រុង"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"សំឡេងរោទ៍ប៉ុណ្ណោះ"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"កុំរំខាន។"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"ប៊្លូធូស"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"បើកប៊្លូធូស។"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"កំណត់សំឡេងរោទ៍សម្រាប់ <xliff:g id="TIME">%s</xliff:g> ។"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"ករណី Dessert"</string> <string name="start_dreams" msgid="9131802557946276718">"ធាតុរក្សាអេក្រង់"</string> <string name="ethernet_label" msgid="2203544727007463351">"អ៊ីសឺរណិត"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"កុំរំខាន"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ប៊្លូធូស"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"មិនមានឧបករណ៍ផ្គូផ្គងដែលអាចប្រើបាន"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"ថ្ម <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"ការជូនដំណឹង"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"ការសន្ទនា"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"សម្អាតការជូនដំណឹងស្ងាត់ទាំងអស់"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"ការជូនដំណឹងបានផ្អាកដោយមុខងារកុំរំខាន"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"ចាប់ផ្ដើមឥឡូវ"</string> <string name="empty_shade_text" msgid="8935967157319717412">"គ្មានការជូនដំណឹង"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"ឧបករណ៍នេះស្ថិតក្រោមការគ្រប់គ្រងរបស់មាតាបិតាអ្នក"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>ស្ថានភាព៖</b> បានចាត់ថ្នាក់ទាបជាងមុន"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"បង្ហាញនៅខាងលើការជូនដំណឹងអំពីការសន្ទនា និងជារូបភាពកម្រងព័ត៌មាននៅលើអេក្រង់ចាក់សោ"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"បង្ហាញនៅខាងលើការជូនដំណឹងអំពីការសន្ទនា និងជារូបភាពកម្រងព័ត៌មាននៅលើអេក្រង់ចាក់សោ បង្ហាញជាពពុះ"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"បង្ហាញនៅខាងលើការជូនដំណឹងអំពីការសន្ទនា និងជារូបភាពកម្រងព័ត៌មាននៅលើអេក្រង់ចាក់សោ បង្អាក់មុខងារកុំរំខាន"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"បង្ហាញនៅខាងលើការជូនដំណឹងអំពីការសន្ទនា និងជារូបភាពកម្រងព័ត៌មាននៅលើអេក្រង់ចាក់សោ បង្ហាញជាពពុះ បង្អាក់មុខងារកុំរំខាន"</string> <string name="notification_priority_title" msgid="2079708866333537093">"អាទិភាព"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> មិនអាចប្រើមុខងារសន្ទនាបានទេ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"មិនអាចកែប្រែការជូនដំណឹងទាំងនេះបានទេ។"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"សារ SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"តន្ត្រី"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"ប្រតិទិន"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"កុំរំខាន"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"ផ្លូវកាត់ប៊ូតុងកម្រិតសំឡេង"</string> <string name="battery" msgid="769686279459897127">"ថ្ម"</string> <string name="headset" msgid="4485892374984466437">"កាស"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi បានបិទ"</string> <string name="bt_is_off" msgid="7436344904889461591">"ប៊្លូធូសបានបិទ"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"មុខងារកុំរំខានបានបិទ"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"មុខងារកុំរំខានត្រូវបានបើកដោយច្បាប់ស្វ័យប្រវត្តិ (<xliff:g id="ID_1">%s</xliff:g>)។"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"មុខងារកុំរំខានត្រូវបានបើកដោយកម្មវិធី (<xliff:g id="ID_1">%s</xliff:g>)។"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"មុខងារកុំរំខានត្រូវបានបើកដោយច្បាប់ស្វ័យប្រវត្តិ ឬកម្មវិធី។"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"កម្មវិធីដែលកំពុងដំណើរការនៅផ្ទៃខាងក្រោយ"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"ចុចដើម្បីមើលព័ត៌មានលម្អិតអំពីការប្រើប្រាស់ទិន្នន័យ និងថ្ម"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"បិទទិន្នន័យទូរសព្ទចល័ត?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ការងារ)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"ការហៅទូរសព្ទ"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(តាមរយៈ <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"កាមេរ៉ា"</string> <string name="privacy_type_location" msgid="7991481648444066703">"ទីតាំង"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"មីក្រូហ្វូន"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(បានដាច់)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"មិនអាចប្ដូរបានទេ។ សូមចុចដើម្បីព្យាយាមម្ដងទៀត។"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"ផ្គូផ្គងឧបករណ៍ថ្មី"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"ដើម្បីភ្ជាប់វគ្គនេះ សូមបើកកម្មវិធី។"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"កម្មវិធីដែលមិនស្គាល់"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"លេខកំណែបង្កើត"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"បានចម្លងលេខកំណែបង្កើតទៅឃ្លីបបត។"</string> <string name="basic_status" msgid="2315371112182658176">"បើកការសន្ទនា"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"មើលព័ត៌មានថ្មីៗអំពីស្ថានភាព ការខកខានទទួល និងសារថ្មីៗ"</string> <string name="people_tile_title" msgid="6589377493334871272">"ការសន្ទនា"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"បានផ្អាកដោយមុខងារកុំរំខាន"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> បានផ្ញើសារ៖ <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> បានផ្ញើរូបភាព"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> មានបច្ចុប្បន្នភាពស្ថានភាព៖ <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other">កម្មវិធីសកម្ម <xliff:g id="COUNT_1">%s</xliff:g></item> <item quantity="one">កម្មវិធីសកម្ម <xliff:g id="COUNT_0">%s</xliff:g></item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"ព័ត៌មានថ្មី"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"កម្មវិធីសកម្ម"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ឈប់"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"បានឈប់"</string> @@ -886,14 +907,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"បានចម្លង"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"ពី <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"ច្រានចោល UI ចម្លង"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"កែអត្ថបទដែលបានចម្លង"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"កែរូបភាពដែលបានចម្លង"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"ផ្ញើទៅឧបករណ៍នៅជិត"</string> + <string name="add" msgid="81036585205287996">"បញ្ចូល"</string> + <string name="manage_users" msgid="1823875311934643849">"គ្រប់គ្រងអ្នកប្រើប្រាស់"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"ការជូនដំណឹងនេះមិនអាចឱ្យអូសដើម្បីបំបែកអេក្រង់បានទេ។"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi ត្រូវបានបិទ"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"មុខងារអាទិភាព"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"រូបកំណត់ម៉ោងរោទ៍"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"បានបើកមុខងារភ្ញៀវរបស់ Assistant"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"កាមេរ៉ា និងមីក្រូហ្វូនត្រូវបានបិទ"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{ការជូនដំណឹង #}other{ការជូនដំណឹង #}}"</string> </resources> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index f1428a0abce2..e10f5d393787 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"ಸಿಸ್ಟಂ UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"ಬ್ಯಾಟರಿ ಸದ್ಯದಲ್ಲೇ ಖಾಲಿಯಾಗಬಹುದು"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> ಉಳಿದಿದೆ"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB ಮೂಲಕ ಚಾರ್ಜ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"ನಿಮ್ಮ ಸಾಧನದೊಂದಿಗೆ ನೀಡಲಾಗಿರುವ ಚಾರ್ಜರ್ ಬಳಸಿ"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"ಮುಖವನ್ನು ದೃಢೀಕರಿಸಲಾಗಿದೆ"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"ದೃಢೀಕರಿಸಲಾಗಿದೆ"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"ಪೂರ್ಣಗೊಳಿಸಲು ದೃಢೀಕರಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ದೃಢೀಕರಿಸಲಾಗಿದೆ"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ಪಿನ್ ಬಳಸಿ"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ಪ್ಯಾಟರ್ನ್ ಬಳಸಿ"</string> @@ -176,11 +183,12 @@ <skip /> <string name="accessibility_desc_notification_shade" msgid="5355229129428759989">"ಅಧಿಸೂಚನೆಯ ಛಾಯೆ."</string> <string name="accessibility_desc_quick_settings" msgid="4374766941484719179">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳು."</string> - <string name="accessibility_desc_lock_screen" msgid="5983125095181194887">"ಲಾಕ್ ಪರದೆ."</string> + <string name="accessibility_desc_lock_screen" msgid="5983125095181194887">"ಲಾಕ್ ಸ್ಕ್ರೀನ್."</string> <string name="accessibility_desc_work_lock" msgid="4355620395354680575">"ಕೆಲಸದ ಲಾಕ್ ಪರದೆ"</string> <string name="accessibility_desc_close" msgid="8293708213442107755">"ಮುಚ್ಚು"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"ಸಂಪೂರ್ಣ ನಿಶ್ಯಬ್ಧ"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"ಅಲಾರಮ್ಗಳು ಮಾತ್ರ"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"ಅಡಚಣೆ ಮಾಡಬೇಡ."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"ಬ್ಲೂಟೂತ್."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗಿದೆ."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"<xliff:g id="TIME">%s</xliff:g> ಗಂಟೆಗೆ ಅಲಾರಮ್ ಹೊಂದಿಸಲಾಗಿದೆ."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"ಡೆಸರ್ಟ್ ಕೇಸ್"</string> <string name="start_dreams" msgid="9131802557946276718">"ಸ್ಕ್ರೀನ್ ಸೇವರ್"</string> <string name="ethernet_label" msgid="2203544727007463351">"ಇಥರ್ನೆಟ್"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"ಅಡಚಣೆ ಮಾಡಬೇಡ"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ಬ್ಲೂಟೂತ್"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"ಯಾವುದೇ ಜೋಡಿಸಲಾದ ಸಾಧನಗಳು ಲಭ್ಯವಿಲ್ಲ"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> ಬ್ಯಾಟರಿ"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"ಅಧಿಸೂಚನೆಗಳು"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"ಸಂಭಾಷಣೆಗಳು"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"ಎಲ್ಲಾ ನಿಶ್ಶಬ್ಧ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೆರವುಗೊಳಿಸಿ"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಎನ್ನುವ ಮೂಲಕ ಅಧಿಸೂಚನೆಗಳನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"ಈಗ ಪ್ರಾರಂಭಿಸಿ"</string> <string name="empty_shade_text" msgid="8935967157319717412">"ಯಾವುದೇ ಅಧಿಸೂಚನೆಗಳಿಲ್ಲ"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"ಈ ಸಾಧನವನ್ನು ನಿಮ್ಮ ಪೋಷಕರು ನಿರ್ವಹಿಸುತ್ತಿದ್ದಾರೆ"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>ಸ್ಥಿತಿ:</b> ಕಡಿಮೆ ಸ್ಥಾನವನ್ನು ಹೊಂದಿದೆ"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"ಸಂಭಾಷಣೆ ಅಧಿಸೂಚನೆಗಳ ಮೇಲ್ಭಾಗದಲ್ಲಿ ಹಾಗೂ ಲಾಕ್ ಸ್ಕ್ರೀನ್ನ ಮೇಲೆ ಪ್ರೊಫೈಲ್ ಚಿತ್ರವಾಗಿ ತೋರಿಸುತ್ತದೆ"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"ಸಂಭಾಷಣೆ ಅಧಿಸೂಚನೆಗಳ ಮೇಲ್ಭಾಗದಲ್ಲಿ ಹಾಗೂ ಲಾಕ್ ಸ್ಕ್ರೀನ್ನ ಮೇಲೆ ಪ್ರೊಫೈಲ್ ಚಿತ್ರವಾಗಿ ತೋರಿಸುತ್ತದೆ, ಬಬಲ್ನಂತೆ ಗೋಚರಿಸುತ್ತದೆ"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"ಸಂಭಾಷಣೆ ಅಧಿಸೂಚನೆಗಳ ಮೇಲ್ಭಾಗದಲ್ಲಿ ಹಾಗೂ ಲಾಕ್ ಸ್ಕ್ರೀನ್ನ ಮೇಲೆ ಪ್ರೊಫೈಲ್ ಚಿತ್ರವಾಗಿ ತೋರಿಸುತ್ತದೆ, ಅಡಚಣೆ ಮಾಡಬೇಡ ಮೋಡ್ಗೆ ಅಡ್ಡಿಯುಂಟುಮಾಡುತ್ತದೆ"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"ಸಂಭಾಷಣೆ ಅಧಿಸೂಚನೆಗಳ ಮೇಲ್ಭಾಗದಲ್ಲಿ ಹಾಗೂ ಲಾಕ್ ಸ್ಕ್ರೀನ್ನ ಮೇಲೆ ಪ್ರೊಫೈಲ್ ಚಿತ್ರವಾಗಿ ತೋರಿಸುತ್ತದೆ, ಬಬಲ್ನಂತೆ ಗೋಚರಿಸುತ್ತದೆ, ಅಡಚಣೆ ಮಾಡಬೇಡ ಮೋಡ್ಗೆ ಅಡ್ಡಿಯುಂಟುಮಾಡುತ್ತದೆ"</string> <string name="notification_priority_title" msgid="2079708866333537093">"ಆದ್ಯತೆ"</string> <string name="no_shortcut" msgid="8257177117568230126">"ಸಂವಾದ ಫೀಚರ್ಗಳನ್ನು <xliff:g id="APP_NAME">%1$s</xliff:g> ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"ಎಸ್ಎಂಎಸ್"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"ಸಂಗೀತ"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"ಅಡಚಣೆ ಮಾಡಬೇಡ"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"ವಾಲ್ಯೂಮ್ ಬಟನ್ಗಳ ಶಾರ್ಟ್ಕಟ್"</string> <string name="battery" msgid="769686279459897127">"ಬ್ಯಾಟರಿ"</string> <string name="headset" msgid="4485892374984466437">"ಹೆಡ್ಸೆಟ್"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"ವೈ-ಫೈ ಆಫ್ ಆಗಿದೆ"</string> <string name="bt_is_off" msgid="7436344904889461591">"ಬ್ಲೂಟೂತ್ ಆಫ್ ಆಗಿದೆ"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆಫ್ ಆಗಿದೆ"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"(<xliff:g id="ID_1">%s</xliff:g>) ಸ್ವಯಂಚಾಲಿತ ನಿಯಮದ ಮೂಲಕ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಆಗಿದೆ."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"(<xliff:g id="ID_1">%s</xliff:g>) ಅಪ್ಲಿಕೇಶನ್ ಮೂಲಕ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಆಗಿದೆ."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"ಸ್ವಯಂಚಾಲಿತ ನಿಯಮ ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್ ಮೂಲಕ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಆಗಿದೆ."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"ಅಪ್ಲಿಕೇಶನ್ಗಳು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗುತ್ತಿವೆ"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"ಬ್ಯಾಟರಿ,ಡೇಟಾ ಬಳಕೆಯ ವಿವರಗಳಿಗಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"ಮೊಬೈಲ್ ಡೇಟಾ ಆಫ್ ಮಾಡಬೇಕೆ?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ಉದ್ಯೋಗ)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"ಫೋನ್ ಕರೆ"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> ಮೂಲಕ)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"ಕ್ಯಾಮರಾ"</string> <string name="privacy_type_location" msgid="7991481648444066703">"ಸ್ಥಳ"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"ಮೈಕ್ರೋಫೋನ್"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(ಡಿಸ್ಕನೆಕ್ಟ್ ಆಗಿದೆ)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಪುನಃ ಪ್ರಯತ್ನಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"ಹೊಸ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"ಈ ಸೆಶನ್ ಕಾಸ್ಟ್ ಮಾಡಲು, ಆ್ಯಪ್ ಅನ್ನು ತೆರೆಯಿರಿ."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"ಅಪರಿಚಿತ ಆ್ಯಪ್"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ಬಿಲ್ಡ್ ಸಂಖ್ಯೆ"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ಬಿಲ್ಡ್ ಸಂಖ್ಯೆಯನ್ನು ಕ್ಲಿಪ್ಬೋರ್ಡ್ನಲ್ಲಿ ನಕಲಿಸಲಾಗಿದೆ."</string> <string name="basic_status" msgid="2315371112182658176">"ಸಂಭಾಷಣೆಯನ್ನು ತೆರೆಯಿರಿ"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ಇತ್ತೀಚಿನ ಸಂದೇಶಗಳು, ಮಿಸ್ಡ್ ಕಾಲ್ಗಳು ಮತ್ತು ಸ್ಥಿತಿ ಅಪ್ಡೇಟ್ಗಳು"</string> <string name="people_tile_title" msgid="6589377493334871272">"ಸಂಭಾಷಣೆ"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"\'ಅಡಚಣೆ ಮಾಡಬೇಡಿ\' ನಿಂದ ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರು ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಿದ್ದಾರೆ: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರು ಚಿತ್ರವನ್ನು ಕಳುಹಿಸಿದ್ದಾರೆ"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರು ಸ್ಥಿತಿಯ ಅಪ್ಡೇಟ್ ಹೊಂದಿದ್ದಾರೆ: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> ಸಕ್ರಿಯ ಆ್ಯಪ್ಗಳು</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ಸಕ್ರಿಯ ಆ್ಯಪ್ಗಳು</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"ಹೊಸ ಮಾಹಿತಿ"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ಸಕ್ರಿಯ ಆ್ಯಪ್ಗಳು"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ನಿಲ್ಲಿಸಿ"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ನಿಲ್ಲಿಸಿದೆ"</string> @@ -889,8 +910,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"ನಕಲಿಸಿದ ಪಠ್ಯವನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"ನಕಲಿಸಿದ ಚಿತ್ರವನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"ಸಮೀಪದಲ್ಲಿರುವ ಸಾಧನಕ್ಕೆ ಕಳುಹಿಸಿ"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"ಸೇರಿಸಿ"</string> + <string name="manage_users" msgid="1823875311934643849">"ಬಳಕೆದಾರರನ್ನು ನಿರ್ವಹಿಸಿ"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್ಗೆ ಡ್ರ್ಯಾಗ್ ಮಾಡುವುದನ್ನು ಈ ಅಧಿಸೂಚನೆಯು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"ವೈ-ಫೈ ಲಭ್ಯವಿಲ್ಲ"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"ಆದ್ಯತೆ ಮೋಡ್"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"ಅಲಾರಾಂ ಹೊಂದಿಸಲಾಗಿದೆ"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistant ಅತಿಥಿ ಮೋಡ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"ಕ್ಯಾಮರಾ ಮತ್ತು ಮೈಕ್ ಆಫ್ ಆಗಿದೆ"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# ಅಧಿಸೂಚನೆ}one{# ಅಧಿಸೂಚನೆಗಳು}other{# ಅಧಿಸೂಚನೆಗಳು}}"</string> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 02246b48d4b1..ba6ef05d7ba1 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"시스템 UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"배터리가 얼마 남지 않음"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> 남았습니다."</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB로 충전할 수 없습니다."</string> <string name="invalid_charger_text" msgid="2339310107232691577">"기기와 함께 제공된 충전기를 사용하세요."</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"얼굴이 인증되었습니다."</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"확인함"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"완료하려면 확인을 탭하세요."</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"인증됨"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN 사용"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"패턴 사용"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"닫기"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"모두 음소거"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"알람만 허용"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"방해 금지 모드"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"블루투스"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"블루투스: 사용"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"알람이 <xliff:g id="TIME">%s</xliff:g>(으)로 설정되었습니다."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"디저트 케이스"</string> <string name="start_dreams" msgid="9131802557946276718">"화면 보호기"</string> <string name="ethernet_label" msgid="2203544727007463351">"이더넷"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"방해 금지 모드"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"블루투스"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"페어링된 기기가 없습니다"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"배터리 <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"알림"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"대화"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"무음 알림 모두 삭제"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"방해 금지 모드로 알림이 일시중지됨"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"시작하기"</string> <string name="empty_shade_text" msgid="8935967157319717412">"알림 없음"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"부모님이 관리하는 기기입니다."</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>상태:</b> 순위 낮춤"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"대화 알림 상단에 표시, 잠금 화면에 프로필 사진으로 표시"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"대화 알림 상단에 표시, 잠금 화면에 프로필 사진으로 표시, 대화창으로 표시"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"대화 알림 상단에 표시, 잠금 화면에 프로필 사진으로 표시, 방해 금지 모드를 무시함"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"대화 알림 상단에 표시, 잠금 화면에 프로필 사진으로 표시, 대화창으로 표시, 방해 금지 모드를 무시함"</string> <string name="notification_priority_title" msgid="2079708866333537093">"우선순위"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> 앱은 대화 기능을 지원하지 않습니다."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"이 알림은 수정할 수 없습니다."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"음악"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"캘린더"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"방해 금지 모드"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"볼륨 버튼 단축키"</string> <string name="battery" msgid="769686279459897127">"배터리"</string> <string name="headset" msgid="4485892374984466437">"헤드셋"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi가 사용 중지됨"</string> <string name="bt_is_off" msgid="7436344904889461591">"블루투스가 사용 중지됨"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"방해 금지 모드가 사용 중지됨"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"방해 금지 모드가 자동 규칙(<xliff:g id="ID_1">%s</xliff:g>)에 의해 사용 설정되었습니다."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"방해 금지 모드가 앱(<xliff:g id="ID_1">%s</xliff:g>)에 의해 사용 설정되었습니다."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"방해 금지 모드가 자동 규칙 또는 앱에 의해 사용 설정되었습니다."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"백그라운드에서 실행 중인 앱"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"탭하여 배터리 및 데이터 사용량 확인"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"모바일 데이터를 사용 중지하시겠습니까?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(직장)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"전화 통화"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> 사용)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"카메라"</string> <string name="privacy_type_location" msgid="7991481648444066703">"위치"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"마이크"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(연결 끊김)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"전환할 수 없습니다. 다시 시도하려면 탭하세요."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"새 기기와 페어링"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"세션을 전송하려면 앱을 열어 주세요"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"알 수 없는 앱"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"빌드 번호"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"빌드 번호가 클립보드에 복사되었습니다."</string> <string name="basic_status" msgid="2315371112182658176">"대화 열기"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"최근 메시지, 부재중 전화, 상태 업데이트 보기"</string> <string name="people_tile_title" msgid="6589377493334871272">"대화"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"방해 금지 모드로 인해 일시중지됨"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g>님이 메시지를 보냈습니다: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>님이 이미지를 보냈습니다."</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g>님의 상태가 업데이트되었습니다: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other">활성 상태의 앱 <xliff:g id="COUNT_1">%s</xliff:g>개</item> <item quantity="one">활성 상태의 앱 <xliff:g id="COUNT_0">%s</xliff:g>개</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"새로운 정보"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"활성 상태의 앱"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"중지"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"중지됨"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"복사됨"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"복사한 위치: <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"UI 복사 닫기"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"복사된 텍스트 편집"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"복사된 이미지 편집"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"근처 기기에 전송"</string> + <string name="add" msgid="81036585205287996">"추가"</string> + <string name="manage_users" msgid="1823875311934643849">"사용자 관리"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"드래그하여 화면을 분할하는 기능이 지원되지 않는 알림입니다."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi를 이용할 수 없습니다."</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"우선순위 모드입니다."</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"알람이 설정되었습니다."</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"어시스턴트 게스트 모드가 사용 설정되었습니다."</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"카메라 및 마이크가 사용 중지되었습니다."</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index c8c56caa9dea..a31ab6d3f0bf 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Тутум UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Батарея жакында отуруп калышы мүмкүн"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> калды"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB аркылуу кубатталбай жатат"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Түзмөгүңүз менен келген кубаттагычты колдонуңуз"</string> @@ -111,7 +116,7 @@ <string name="accessibility_phone_button" msgid="4256353121703100427">"Телефон"</string> <string name="accessibility_voice_assist_button" msgid="6497706615649754510">"Үн жардамчысы"</string> <string name="accessibility_wallet_button" msgid="1458258783460555507">"Капчык"</string> - <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"QR кодунун сканери"</string> + <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"QR коддорунун сканери"</string> <string name="accessibility_unlock_button" msgid="122785427241471085">"Кулпусун ачуу"</string> <string name="accessibility_lock_icon" msgid="661492842417875775">"Түзмөк кулпуланды"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Жүз скандалууда"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Жүздүн аныктыгы текшерилди"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Ырасталды"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Бүтүрүү үчүн \"Ырастоо\" баскычын басыңыз"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Аныктыгы текшерилди"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN кодду колдонуу"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Графикалык ачкычты колдонуу"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Жабуу"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"тымтырс"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"ойготкуч гана"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Тынчымды алба."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth күйүк."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Ойготкуч кийинкиге коюлган: <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Десерт себети"</string> <string name="start_dreams" msgid="9131802557946276718">"Көшөгө"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Тынчымды алба"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Жупташкан түзмөктөр жок"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Батареянын деңгээли <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Билдирмелер"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Сүйлөшүүлөр"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Бардык үнсүз билдирмелерди өчүрүү"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"\"Тынчымды алба\" режиминде билдирмелер тындырылды"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Азыр баштоо"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Билдирме жок"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Бул түзмөктү ата-энең башкарат"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Абалы:</b> Төмөндөдү"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Сүйлөшүүлөр тууралуу билдирмелердин жогору жагында, ошондой эле кулпуланган экранда профилдин сүрөтү түрүндө көрүнөт"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Cүйлөшүүлөр тууралуу билдирмелердин жогору жагында жана кулпуланган экранда профилдин сүрөтү, ошондой эле калкып чыкма билдирме түрүндө көрүнөт"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Cүйлөшүүлөр тууралуу билдирмелердин жогору жагында жана кулпуланган экранда профилдин сүрөтү түрүндө көрүнүп, \"Тынчымды алба\" режимин токтотот"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Cүйлөшүүлөр тууралуу билдирмелердин жогору жагында жана кулпуланган экранда профилдин сүрөтү, ошондой эле калкып чыкма билдирме түрүндө көрүнүп, \"Тынчымды алба\" режимин токтотот"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Маанилүүлүгү"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосунда оозеки сүйлөшкөнгө болбойт"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Бул билдирмелерди өзгөртүүгө болбойт."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Музыка"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Жылнаама"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Тынчымды алба"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Үндү көзөмөлдөөчү баскычтардын кыска жолдору"</string> <string name="battery" msgid="769686279459897127">"Батарея"</string> <string name="headset" msgid="4485892374984466437">"Гарнитура"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi өчүк"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth өчүк"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"\"Тынчымды алба\" режими өчүк"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Автоматтык эреже \"Тынчымды алба\" режимин күйгүздү (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Колдонмо \"Тынчымды алба\" режимин күйгүздү (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Автоматтык эреже же колдонмо \"Тынчымды алба\" режимин күйгүздү."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Фондо иштеп жаткан колдонмолор"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Батареянын кубаты жана трафиктин көлөмү жөнүндө билүү үчүн таптап коюңуз"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Мобилдик Интернетти өчүрөсүзбү?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(жумуш)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Телефон чалуу"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> аркылуу)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"камера"</string> <string name="privacy_type_location" msgid="7991481648444066703">"жайгашкан жер"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"микрофон"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(ажыратылды)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Которулбай жатат. Кайталоо үчүн басыңыз."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Жаңы түзмөктү жупташтыруу"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Бул сеансты тышкы экранга чыгаруу үчүн колдонмону ачыңыз."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Белгисиз колдонмо"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Курама номери"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Курама номери алмашуу буферине көчүрүлдү."</string> <string name="basic_status" msgid="2315371112182658176">"Ачык сүйлөшүү"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Акыркы билдирүүлөрдү, жооп берилбеген чалууларды жана статустардын жаңырганын көрөсүз"</string> <string name="people_tile_title" msgid="6589377493334871272">"Сүйлөшүү"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"\"Тынчымды алба\" режими тындырды"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> билдирүү жөнөттү: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> сүрөт жөнөттү"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> жаңы абалы тууралуу жарыялады: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> жигердүү колдонмо</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> жигердүү колдонмо</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Жаңы маалымат"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Жигердүү колдонмолор"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Токтотуу"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Токтотулду"</string> @@ -886,14 +907,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Көчүрүлдү"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"<xliff:g id="APPNAME">%1$s</xliff:g> колдонмосунан"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Көчүрмөнү жабуу интерфейси"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Көчүрүлгөн текстти түзөтүү"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Көчүрүлгөн сүрөттү түзөтүү"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Жакын жердеги түзмөккө жөнөтүү"</string> + <string name="add" msgid="81036585205287996">"Кошуу"</string> + <string name="manage_users" msgid="1823875311934643849">"Колдонуучуларды башкаруу"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Бул билдирмени бөлүнгөн экранда сүйрөөгө болбойт."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi жеткиликсиз"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Маанилүү сүйлөшүүлөр режими"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Ойготкуч коюлду"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Жардамчынын конок режими иштетилди"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Камера жана микрофон өчүк"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# билдирме}other{# билдирме}}"</string> </resources> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index 6b96c1a57d55..204e3d92a3a6 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"ສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ຂອງລະບົບ"</string> - <string name="battery_low_title" msgid="6891106956328275225">"ແບັດເຕີຣີໃກ້ຈະໝົດແລ້ວ"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"ຍັງເຫຼືອ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"ບໍ່ສາມາດສາກຜ່ານ USB ໄດ້"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"ກະລຸນາໃຊ້ຕົວສາກທີ່ມາພ້ອມກັບອຸປະກອນຂອງທ່ານ"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"ພິສູດຢືນຢັນໃບໜ້າແລ້ວ"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"ຢືນຢັນແລ້ວ"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"ແຕະຢືນຢັນເພື່ອສຳເລັດ"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ຮັບຮອງຄວາມຖືກຕ້ອງແລ້ວ"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ໃຊ້ PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ໃຊ້ຮູບແບບ"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"ປິດ"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"ງຽບທັງໝົດ"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"ໂມງປຸກເທົ່ານັ້ນ"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"ຫ້າມລົບກວນ."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth ເປີດ."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"ຕັ້ງໂມງປຸກ <xliff:g id="TIME">%s</xliff:g> ແລ້ວ."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"ກ່ອງຂອງຫວານ"</string> <string name="start_dreams" msgid="9131802557946276718">"ພາບພັກໜ້າຈໍ"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"ຫ້າມລົບກວນ"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"ບໍ່ມີອຸປະກອນທີ່ສາມາດຈັບຄູ່ໄດ້"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"ແບັດເຕີຣີ <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"ການແຈ້ງເຕືອນ"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"ການສົນທະນາ"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"ລຶບລ້າງການແຈ້ງເຕືອນແບບງຽບທັງໝົດ"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"ຢຸດການແຈ້ງເຕືອນໂດຍໂໝດຫ້າມລົບກວນແລ້ວ"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"ເລີ່ມດຽວນີ້"</string> <string name="empty_shade_text" msgid="8935967157319717412">"ບໍ່ມີການແຈ້ງເຕືອນ"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"ອຸປະກອນນີ້ແມ່ນຈັດການໂດຍພໍ່ແມ່ຂອງທ່ານ"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>ສະຖານະ:</b> ມີອັນດັບຕ່ຳລົງແລ້ວ"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"ສະແດງຢູ່ເທິງສຸດຂອງການແຈ້ງເຕືອນການສົນທະນາ ແລະ ເປັນຮູບໂປຣໄຟລ໌ຢູ່ໜ້າຈໍລັອກ"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"ສະແດງຢູ່ເທິງສຸດຂອງການແຈ້ງເຕືອນການສົນທະນາ ແລະ ເປັນຮູບໂປຣໄຟລ໌ຢູ່ໜ້າຈໍລັອກ, ປາກົດເປັນຟອງ"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"ສະແດງຢູ່ເທິງສຸດຂອງການແຈ້ງເຕືອນການສົນທະນາ ແລະ ເປັນຮູບໂປຣໄຟລ໌ຢູ່ໜ້າຈໍລັອກ, ສະແດງໃນໂໝດຫ້າມລົບກວນໄດ້"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"ສະແດງຢູ່ເທິງສຸດຂອງການແຈ້ງເຕືອນການສົນທະນາ ແລະ ເປັນຮູບໂປຣໄຟລ໌ຢູ່ໜ້າຈໍລັອກ, ປາກົດເປັນຟອງ, ສະແດງໃນໂໝດຫ້າມລົບກວນໄດ້"</string> <string name="notification_priority_title" msgid="2079708866333537093">"ສຳຄັນ"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ່ຮອງຮັບຄຸນສົມບັດການສົນທະນາ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ບໍ່ສາມາດແກ້ໄຂການແຈ້ງເຕືອນເຫຼົ່ານີ້ໄດ້."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"ຂໍ້ຄວາມສັ້ນ(SMS)"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"ດົນຕີ"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"ປະຕິທິນ"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"ຫ້າມລົບກວນ"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"ທາງລັດປຸ່ມສຽງ"</string> <string name="battery" msgid="769686279459897127">"ແບັດເຕີຣີ"</string> <string name="headset" msgid="4485892374984466437">"ຊຸດຫູຟັງ"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi ປິດຢູ່"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth ປິດຢູ່"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"ຫ້າມລົບກວນ ປິດຢູ່"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"ໂໝດຫ້າມລົບກວນຖືກເປີດໃຊ້ໂດຍກົດອັດຕະໂນມັດ (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"ມີແອັບເປີດໃຊ້ໂໝດຫ້າມລົບກວນ (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"ໂໝດຫ້າມລົບກວນຖືກເປີດໃຊ້ໂດຍກົດອັດຕະໂນມັດ ຫຼື ແອັບໃດໜຶ່ງ."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"ແອັບທີ່ກຳລັງເຮັດວຽກໃນພື້ນຫຼັງ"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"ແຕະເພື່ອເບິ່ງລາຍລະອຽດການນຳໃຊ້ແບັດເຕີຣີ ແລະ ອິນເຕີເນັດ"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"ປິດອິນເຕີເນັດມືຖືໄວ້ບໍ?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ວຽກ)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"ໂທລະສັບ"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(ຜ່ານ <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"ກ້ອງຖ່າຍຮູບ"</string> <string name="privacy_type_location" msgid="7991481648444066703">"ສະຖານທີ່"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"ໄມໂຄຣໂຟນ"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(ຕັດການເຊື່ອມຕໍ່ແລ້ວ)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"ບໍ່ສາມາດສະຫຼັບໄດ້. ແຕະເພື່ອລອງໃໝ່."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"ຈັບຄູ່ອຸປະກອນໃໝ່"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"ເພື່ອສົ່ງສັນຍານເຊດຊັນນີ້, ກະລຸນາເປີດແອັບ."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"ແອັບທີ່ບໍ່ຮູ້ຈັກ"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ໝາຍເລກສ້າງ"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ສຳເນົາໝາຍເລກສ້າງໄປໃສ່ຄລິບບອດແລ້ວ."</string> <string name="basic_status" msgid="2315371112182658176">"ເປີດການສົນທະນາ"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ເບິ່ງຂໍ້ຄວາມຫຼ້າສຸດ, ສາຍບໍ່ໄດ້ຮັບ ແລະ ອັບເດດສະຖານະ"</string> <string name="people_tile_title" msgid="6589377493334871272">"ການສົນທະນາ"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"ຢຸດຊົ່ວຄາວແລ້ວໂດຍໂໝດຫ້າມລົບກວນ"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> ສົ່ງຂໍ້ຄວາມ: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ສົ່ງຮູບພາບແລ້ວ"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ອັບເດດສະຖານະ: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other">ແອັບທີ່ນຳໃຊ້ຢູ່ <xliff:g id="COUNT_1">%s</xliff:g> ແອັບ</item> <item quantity="one">ແອັບທີ່ນຳໃຊ້ຢູ່ <xliff:g id="COUNT_0">%s</xliff:g> ແອັບ</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"ຂໍ້ມູນໃໝ່"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ແອັບທີ່ນຳໃຊ້ຢູ່"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ຢຸດ"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ຢຸດແລ້ວ"</string> @@ -889,8 +910,14 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"ແກ້ໄຂຂໍ້ຄວາມທີ່ສຳເນົາແລ້ວ"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"ແກ້ໄຂຮູບທີ່ສຳເນົາແລ້ວ"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"ສົ່ງໄປຫາອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງ"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="add" msgid="81036585205287996">"ເພີ່ມ"</string> + <string name="manage_users" msgid="1823875311934643849">"ຈັດການຜູ້ໃຊ້"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"ການແຈ້ງເຕືອນນີ້ບໍ່ຮອງຮັບການລາກໄປໃສ່ Splitscreen."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"ບໍ່ສາມາດໃຊ້ Wi‑Fi ໄດ້"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"ໂໝດຄວາມສຳຄັນ"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"ຕັ້ງໂມງປຸກແລ້ວ"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"ເປີດການນຳໃຊ້ໂໝດແຂກຜູ້ຊ່ວຍແລ້ວ"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"ປິດກ້ອງຖ່າຍຮູບ ແລະ ໄມແລ້ວ"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 5179ad9d3e15..6bcfa0e91678 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Sistemos NS"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Akumuliatoriaus energija gali netrukus išsekti"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Liko <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Negalima įkrauti naudojant USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Naudokite originalų su įrenginiu pateiktą įkroviklį"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Veidas autentifikuotas"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Patvirtinta"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Paliesk. „Patvirtinti“, kad užbaigtumėte"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentifikuota"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Naudoti PIN kodą"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Naudoti atrakinimo piešinį"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Uždaryti"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"visiška tyla"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"tik įspėjimai"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Netrukdymo režimas."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"„Bluetooth“."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"„Bluetooth“ įjungtas."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Signalas nustatytas <xliff:g id="TIME">%s</xliff:g>."</string> @@ -207,6 +215,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Desertų dėklas"</string> <string name="start_dreams" msgid="9131802557946276718">"Ekrano užsklanda"</string> <string name="ethernet_label" msgid="2203544727007463351">"Eternetas"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Netrukdymo režimas"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Nėra pasiekiamų susietų įrenginių"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Akumuliatorius: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -354,6 +363,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Pranešimai"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Pokalbiai"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Išvalyti visus tylius pranešimus"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Pranešimai pristabdyti naudojant netrukdymo režimą"</string> <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="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Šį įrenginį tvarko vienas iš tavo tėvų"</string> @@ -497,6 +507,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Būsenos:</b> reitingas sumažintas"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Rodoma pokalbių pranešimų viršuje ir kaip profilio nuotrauka užrakinimo ekrane"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Rodoma pokalbių pranešimų viršuje ir kaip profilio nuotrauka užrakinimo ekrane, burbule"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Rodoma pokalbių pranešimų viršuje ir kaip profilio nuotrauka užrakinimo ekrane, pertraukia netrukdymo režimą"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Rodoma pokalbių pranešimų viršuje ir kaip profilio nuotrauka užrakinimo ekrane, debesėlyje, pertraukia netrukdymo režimą"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritetiniai"</string> <string name="no_shortcut" msgid="8257177117568230126">"Programa „<xliff:g id="APP_NAME">%1$s</xliff:g>“ nepalaiko pokalbių funkcijų"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Šių pranešimų keisti negalima."</string> @@ -576,6 +588,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Muzika"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalendorius"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Netrukdymo režimas"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Garsumo mygtukų spartusis klavišas"</string> <string name="battery" msgid="769686279459897127">"Akumuliatorius"</string> <string name="headset" msgid="4485892374984466437">"Ausinės"</string> @@ -694,6 +707,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"„<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"„Wi-Fi“ išjungtas"</string> <string name="bt_is_off" msgid="7436344904889461591">"„Bluetooth“ išjungtas"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Netrukdymo režimas išjungtas"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Netrukdymo režimą įjungė automatinė taisyklė (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Netrukdymo režimą įjungė programa (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Netrukdymo režimą įjungė automatinė taisyklė arba programa."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Programos, veikiančios fone"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Palieskite ir sužinokite išsamios informacijos apie akumuliatoriaus bei duomenų naudojimą"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Išjungti mobiliojo ryšio duomenis?"</string> @@ -718,6 +735,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(darbas)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefono skambutis"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(naud. <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"fotoaparatą"</string> <string name="privacy_type_location" msgid="7991481648444066703">"vietovę"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofoną"</string> @@ -818,6 +837,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(atjungta)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Nepavyko perjungti. Bandykite vėl palietę."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Naujo įrenginio susiejimas"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Jei norite perduoti šį seansą, atidarykite programą."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Nežinoma programa"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Versijos numeris"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Versijos numeris nukopijuotas į iškarpinę."</string> <string name="basic_status" msgid="2315371112182658176">"Atidaryti pokalbį"</string> @@ -851,6 +872,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g> +"</string> <string name="people_tile_description" msgid="8154966188085545556">"Peržiūrėkite naujausius pranešimus, praleistus skambučius ir būsenos atnaujinimus"</string> <string name="people_tile_title" msgid="6589377493334871272">"Pokalbis"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Pristabdyta dėl netrukdymo režimo"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> išsiuntė pranešimą: „<xliff:g id="NOTIFICATION">%2$s</xliff:g>“"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> išsiuntė vaizdą"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> atnaujino būseną: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -891,8 +913,7 @@ <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> aktyvios programos</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktyvių programų</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nauja informacija"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktyvios programos"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Sustabdyti"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Sustabdyta"</string> @@ -903,8 +924,14 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"Redaguoti nukopijuotą tekstą"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Redaguoti nukopijuotą vaizdą"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Siųsti į įrenginį netoliese"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="add" msgid="81036585205287996">"Pridėti"</string> + <string name="manage_users" msgid="1823875311934643849">"Tvarkyti naudotojus"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Šio pranešimo vilkimas išskaidyto ekrano režimu nepalaikomas."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"„Wi‑Fi“ ryšys nepasiekiamas"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Prioriteto režimas"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Signalas nustatytas"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Įgalintas Padėjėjo svečio režimas"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Vaizdo kamera ir mikrofonas išjungti"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 63b6b2e01d96..286cdecc6c4b 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Sistēmas UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Akumulators, iespējams, drīz izlādēsies"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Atlikuši <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Nevar veikt uzlādi, izmantojot USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Izmantojiet ierīces komplektācijā iekļauto lādētāju"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Seja autentificēta"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Apstiprināts"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Lai pabeigtu, pieskarieties Apstiprināt"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentifikācija veikta"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Izmantot PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Izmantot kombināciju"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Aizvērt"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"pilnīgs klusums"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"tikai signāli"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Režīms “Netraucēt”."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth savienojums ir ieslēgts."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Signāls ir iestatīts uz: <xliff:g id="TIME">%s</xliff:g>."</string> @@ -206,6 +214,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Saldo ēdienu stends"</string> <string name="start_dreams" msgid="9131802557946276718">"Ekrānsaudzētājs"</string> <string name="ethernet_label" msgid="2203544727007463351">"Tīkls Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Režīms “Netraucēt”"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Nav pieejama neviena pārī savienota ierīce."</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Akumulators: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -351,6 +360,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Paziņojumi"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Sarunas"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Notīrīt visus klusos paziņojumus"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Paziņojumi pārtraukti, izmantojot iestatījumu “Netraucēt”"</string> <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="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Šo ierīci pārvalda viens no jūsu vecākiem."</string> @@ -494,6 +504,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Statuss:</b> rangs pazemināts"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Parādās sarunu paziņojumu augšdaļā un kā profila attēls bloķēšanas ekrānā."</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Parādās sarunu paziņojumu augšdaļā un kā profila attēls bloķēšanas ekrānā, arī kā burbulis."</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Parādās sarunu paziņojumu augšdaļā un kā profila attēls bloķēšanas ekrānā, pārtrauc režīmu “Netraucēt”."</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Parādās sarunu paziņojumu augšdaļā un kā profila attēls bloķēšanas ekrānā, arī kā burbulis, pārtrauc režīmu “Netraucēt”."</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritārs"</string> <string name="no_shortcut" msgid="8257177117568230126">"Lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g> netiek atbalstītas sarunu funkcijas."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Šos paziņojumus nevar modificēt."</string> @@ -571,6 +583,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"Īsziņas"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Mūzika"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalendārs"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Režīms “Netraucēt”"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Skaļuma pogu saīsne"</string> <string name="battery" msgid="769686279459897127">"Akumulators"</string> <string name="headset" msgid="4485892374984466437">"Austiņas"</string> @@ -689,6 +702,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi ir izslēgts"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth ir izslēgts"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Režīms “Netraucēt” ir izslēgts"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Režīmu “Netraucēt” ieslēdza automātiska kārtula (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Režīmu “Netraucēt” ieslēdza lietotne (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Režīmu “Netraucēt” ieslēdza automātiska kārtula vai lietotne."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Lietotnes, kas darbojas fonā"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Pieskarieties, lai skatītu detalizētu informāciju par akumulatora un datu lietojumu"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Vai izslēgt mobilos datus?"</string> @@ -713,6 +730,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(darbs)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Tālruņa zvans"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(izmantojot: <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"atrašanās vieta"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofons"</string> @@ -812,6 +831,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(savienojums pārtraukts)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Nevar pārslēgt. Pieskarieties, lai mēģinātu vēlreiz."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Savienošana pārī ar jaunu ierīci"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Lai apraidītu šo sesiju, lūdzu, atveriet lietotni."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Nezināma lietotne"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Versijas numurs"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Versijas numurs ir kopēts starpliktuvē."</string> <string name="basic_status" msgid="2315371112182658176">"Atvērt sarunu"</string> @@ -845,6 +866,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Skatiet jaunākos ziņojumus, neatbildētos zvanus un statusa atjauninājumus."</string> <string name="people_tile_title" msgid="6589377493334871272">"Saruna"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Rādīšana pārtraukta režīma Netraucēt dēļ"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> nosūtīja ziņojumu: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> nosūtīja attēlu"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> atjaunināja statusu: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -884,8 +906,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> aktīva lietotne</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktīvas lietotnes</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Jauna informācija"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktīvās lietotnes"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Apturēt"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Apturēta"</string> @@ -893,14 +914,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Nokopēts"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"No lietotnes <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Noraidīt ar kopēšanu saistīto lietotāja saskarnes elementu"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Rediģēt nokopēto tekstu"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Rediģēt nokopēto attēlu"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Sūtīt uz tuvumā esošu ierīci"</string> + <string name="add" msgid="81036585205287996">"Pievienot"</string> + <string name="manage_users" msgid="1823875311934643849">"Pārvaldīt lietotājus"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Šis paziņojums neatbalsta vilkšanu uz dalīto ekrānu."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi nav pieejams"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Prioritātes režīms"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Signāls ir iestatīts"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Asistenta viesa režīms ir iespējots"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera un mikrofons ir izslēgti"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 7642a9af994e..ffa0e58b88b5 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Кориснички интерфејс на систем"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Наскоро може да снема батерија"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Преостануваат <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Не може да се полни преку USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Користете го полначот што дојде со вашиот уред"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Лицето е проверено"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Потврдено"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Допрете „Потврди“ за да се заврши"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Проверена"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Користи PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Користи шема"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Затвори"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"целосна тишина"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"само аларми"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Не вознемирувај."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth е вклучен."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Аларм наместен за <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessert Case"</string> <string name="start_dreams" msgid="9131802557946276718">"Заштитник на екран"</string> <string name="ethernet_label" msgid="2203544727007463351">"Етернет"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Не вознемирувај"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Нема достапни спарени уреди"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> батерија"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Известувања"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Разговори"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Избриши ги сите бесчујни известувања"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Известувањата се паузирани од „Не вознемирувај“"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Започни сега"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Нема известувања"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Родителот управува со уредов"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Статус:</b> рангирано пониско"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Се прикажува најгоре во известувањата за разговор и како профилна слика на заклучен екран"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Се прикажува најгоре во известувањата за разговор и како профилна слика на заклучен екран, се појавува како балонче"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Се прикажува најгоре во известувањата за разговор и како профилна слика на заклучен екран, го прекинува „Не вознемирувај“"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Се прикажува најгоре во известувањата за разговор и како профилна слика на заклучен екран, се појавува како балонче, го прекинува „Не вознемирувај“"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Приоритетно"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> не поддржува функции за разговор"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Овие известувања не може да се изменат"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Музика"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Календар"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Не вознемирувај"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Кратенка за копчињата за јачина на звук"</string> <string name="battery" msgid="769686279459897127">"Батерија"</string> <string name="headset" msgid="4485892374984466437">"Слушалки"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi е исклучено"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth е исклучен"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"„Не вознемирувај“ е исклучено"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Едно автоматско правило (<xliff:g id="ID_1">%s</xliff:g>) ја вклучи „Не вознемирувај“."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Една апликација (<xliff:g id="ID_1">%s</xliff:g>) ја вклучи „Не вознемирувај“."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Едно автоматско правило или апликација ја вклучи „Не вознемирувај“."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Апликациите се извршуваат во заднина"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Допрете за детали за батеријата и потрошениот интернет"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Да се исклучи мобилниот интернет?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(службена)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Телефонски повик"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(преку <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"камера"</string> <string name="privacy_type_location" msgid="7991481648444066703">"локација"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"микрофон"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(врската е прекината)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Не се префрла. Допрете и обидете се пак."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Спарете нов уред"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"За да ја емитувате сесијава, отворете ја апликацијата."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Непозната апликација"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Број на верзија"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Бројот на верзијата е копиран во привремената меморија."</string> <string name="basic_status" msgid="2315371112182658176">"Започни разговор"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Видете ги неодамнешните пораки, пропуштени повици и промени на статусот"</string> <string name="people_tile_title" msgid="6589377493334871272">"Разговор"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Паузирано од „Не вознемирувај“"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> испрати порака: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> испрати слика"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> има ажурирање на статусот: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> активна апликација</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> активни апликации</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Нови информации"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Активни апликации"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Крај"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Запрено"</string> @@ -886,14 +907,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Копирано"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Од <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Отфрли го корисничкиот интерфејс за копирање"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Изменете го копираниот текст"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Изменете ја копираната слика"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Испратете до уред во близина"</string> + <string name="add" msgid="81036585205287996">"Додај"</string> + <string name="manage_users" msgid="1823875311934643849">"Управувајте со корисниците"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Известувањево не поддржува влечење на поделен екран."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi е недостапна"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Приоритетен режим"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Алармот е наместен"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Режимот на гостин за „Помошникот“ е овозможен"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Камерата и микрофонот се исклучени"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# известување}one{# известување}other{# известувања}}"</string> </resources> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index 1bde5a008916..6aeb7e75e0da 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"സിസ്റ്റം UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"ബാറ്ററി ഉടൻ തീർന്നേക്കാം"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> ശേഷിക്കുന്നു"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB വഴി ചാർജ് ചെയ്യാനാകില്ല"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"ഉപകരണത്തിനൊപ്പം ലഭിച്ച ചാർജർ ഉപയോഗിക്കുക"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"മുഖം പരിശോധിച്ചുറപ്പിച്ചു"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"സ്ഥിരീകരിച്ചു"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"പൂർത്തിയാക്കാൻ സ്ഥിരീകരിക്കുക ടാപ്പ് ചെയ്യൂ"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"പരിശോധിച്ചുറപ്പിച്ചു"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"പിൻ ഉപയോഗിക്കുക"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"പാറ്റേൺ ഉപയോഗിക്കുക"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"അവസാനിപ്പിക്കുക"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"പൂർണ്ണ നിശബ്ദത"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"അലാറങ്ങൾ മാത്രം"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"ശല്യപ്പെടുത്തരുത്."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"ബ്ലൂടൂത്ത് ഓണാണ്."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"<xliff:g id="TIME">%s</xliff:g>-ന് അലാറം സജ്ജീകരിച്ചു."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"ഡെസേർട്ട് കെയ്സ്"</string> <string name="start_dreams" msgid="9131802557946276718">"സ്ക്രീൻ സേവർ"</string> <string name="ethernet_label" msgid="2203544727007463351">"ഇതർനെറ്റ്"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"ശല്യപ്പെടുത്തരുത്"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"ജോടിയാക്കിയ ഉപകരണങ്ങളൊന്നും ലഭ്യമല്ല"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> ബാറ്ററി"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"അറിയിപ്പുകൾ"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"സംഭാഷണങ്ങൾ"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"എല്ലാ നിശബ്ദ അറിയിപ്പുകളും മായ്ക്കുക"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"\'ശല്യപ്പെടുത്തരുത്\' വഴി അറിയിപ്പുകൾ താൽക്കാലികമായി നിർത്തി"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"ഇപ്പോൾ ആരംഭിക്കുക"</string> <string name="empty_shade_text" msgid="8935967157319717412">"അറിയിപ്പുകൾ ഒന്നുമില്ല"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"ഈ ഉപകരണം മാനേജ് ചെയ്യുന്നത് നിങ്ങളുടെ രക്ഷിതാവാണ്"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>നില:</b> താഴ്ന്ന റാങ്കിംഗ് നൽകി"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"സംഭാഷണ അറിയിപ്പുകളുടെ മുകളിലും സ്ക്രീൻ ലോക്കായിരിക്കുമ്പോൾ ഒരു പ്രൊഫൈൽ ചിത്രമായും കാണിക്കുന്നു"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"സംഭാഷണ അറിയിപ്പുകളുടെ മുകളിലും സ്ക്രീൻ ലോക്കായിരിക്കുമ്പോൾ ഒരു പ്രൊഫൈൽ ചിത്രമായും കാണിക്കുന്നു, ഒരു ബബിൾ രൂപത്തിൽ ദൃശ്യമാകുന്നു"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"സംഭാഷണ അറിയിപ്പുകളുടെ മുകളിലും സ്ക്രീൻ ലോക്കായിരിക്കുമ്പോൾ ഒരു പ്രൊഫൈൽ ചിത്രമായും കാണിക്കുന്നു, ശല്യപ്പെടുത്തരുത് മോഡ് തടസ്സപ്പെടുത്തുന്നു"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"സംഭാഷണ അറിയിപ്പുകളുടെ മുകളിലും സ്ക്രീൻ ലോക്കായിരിക്കുമ്പോൾ ഒരു പ്രൊഫൈൽ ചിത്രമായും ബബിൾ രൂപത്തിൽ ദൃശ്യമാകുന്നു, ശല്യപ്പെടുത്തരുത് മോഡ് തടസ്സപ്പെടുത്തുന്നു"</string> <string name="notification_priority_title" msgid="2079708866333537093">"മുൻഗണന"</string> <string name="no_shortcut" msgid="8257177117568230126">"സംഭാഷണ ഫീച്ചറുകളെ <xliff:g id="APP_NAME">%1$s</xliff:g> പിന്തുണയ്ക്കുന്നില്ല"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ഈ അറിയിപ്പുകൾ പരിഷ്ക്കരിക്കാനാവില്ല."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS:"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"സംഗീതം"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"ശല്യപ്പെടുത്തരുത്"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"വോളിയം ബട്ടൺ കുറുക്കുവഴി"</string> <string name="battery" msgid="769686279459897127">"ബാറ്ററി"</string> <string name="headset" msgid="4485892374984466437">"ഹെഡ്സെറ്റ്"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"വൈഫൈ ഓഫാണ്"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth ഓഫാണ്"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"\'ശല്യപ്പെടുത്തരുത്\' ഓഫാണ്"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"സ്വയമേവയുള്ള ഒരു നയം (<xliff:g id="ID_1">%s</xliff:g>) \'ശല്യപ്പെടുത്തരുത്\' ഓണാക്കിയിരിക്കുന്നു."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"ഒരു ആപ്പ് (<xliff:g id="ID_1">%s</xliff:g>) \'ശല്യപ്പെടുത്തരുത്\' ഓണാക്കിയിരിക്കുന്നു."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"സ്വയമേവയുള്ള ഒരു നയമോ ആപ്പോ \'ശല്യപ്പെടുത്തരുത്\' ഓണാക്കിയിരിക്കുന്നു."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"ആപ്പുകൾ പശ്ചാത്തലത്തിൽ റൺ ചെയ്യുന്നു"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"ബാറ്ററി, ഡാറ്റ ഉപയോഗം എന്നിവയുടെ വിശദാംശങ്ങളറിയാൻ ടാപ്പുചെയ്യുക"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"മൊബൈൽ ഡാറ്റ ഓഫാക്കണോ?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ഔദ്യോഗികം)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"ഫോൺ കോൾ"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> എന്നതിലൂടെ)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"ക്യാമറ"</string> <string name="privacy_type_location" msgid="7991481648444066703">"ലൊക്കേഷന്"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"മൈക്രോഫോൺ"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(വിച്ഛേദിച്ചു)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"മാറാനാകുന്നില്ല. വീണ്ടും ശ്രമിക്കാൻ ടാപ്പ് ചെയ്യുക."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"പുതിയ ഉപകരണവുമായി ജോടിയാക്കുക"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"ഈ സെഷൻ കാസ്റ്റ് ചെയ്യാൻ, ആപ്പ് തുറക്കുക."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"അജ്ഞാതമായ ആപ്പ്"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ബിൽഡ് നമ്പർ"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ക്ലിപ്പ്ബോർഡിലേക്ക് ബിൽഡ് നമ്പർ പകർത്തി."</string> <string name="basic_status" msgid="2315371112182658176">"സംഭാഷണം തുറക്കുക"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"അടുത്തിടെയുള്ള സന്ദേശങ്ങൾ, മിസ്ഡ് കോൾ, സ്റ്റാറ്റസ് അപ്ഡേറ്റുകൾ എന്നിവ കാണൂ"</string> <string name="people_tile_title" msgid="6589377493334871272">"സംഭാഷണം"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"\'ശല്യപ്പെടുത്തരുത്\' ഓണായതിനാൽ തൽക്കാലം നിർത്തി"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> ഒരു സന്ദേശം അയച്ചു: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>, ഒരു ചിത്രം അയച്ചു"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> എന്നയാൾ സ്റ്റാറ്റസ് അപ്ഡേറ്റ് ചെയ്തു: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other">സജീവമായ <xliff:g id="COUNT_1">%s</xliff:g> ആപ്പുകൾ</item> <item quantity="one">സജീവമായ <xliff:g id="COUNT_0">%s</xliff:g> ആപ്പ്</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"പുതിയ വിവരങ്ങൾ"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"സജീവമായ ആപ്പുകൾ"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"നിർത്തുക"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"നിർത്തി"</string> @@ -889,8 +910,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"പകർത്തിയ ടെക്സ്റ്റ് എഡിറ്റ് ചെയ്യുക"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"പകർത്തിയ ചിത്രം എഡിറ്റ് ചെയ്യുക"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"സമീപത്തുള്ള ഉപകരണത്തിലേക്ക് അയയ്ക്കുക"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"ചേർക്കുക"</string> + <string name="manage_users" msgid="1823875311934643849">"ഉപയോക്താക്കളെ മാനേജ് ചെയ്യുക"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"സ്പ്ലിറ്റ് സ്ക്രീനിലേക്ക് വലിച്ചിടുന്നതിനെ ഈ അറിയിപ്പ് പിന്തുണയ്ക്കുന്നില്ല."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"വൈഫൈ ലഭ്യമല്ല"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"മുൻഗണനാ മോഡ്"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"അലാറം സജ്ജീകരിച്ചു"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"സഹായി അതിഥി മോഡ് പ്രവർത്തനക്ഷമമാക്കി"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"ക്യാമറയും മൈക്കും ഓഫാണ്"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# അറിയിപ്പ്}other{# അറിയിപ്പുകൾ}}"</string> </resources> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index c63bd3d7d9dc..4abfe1b0bb48 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Систем UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Батaрей удахгүй дуусaж болзошгүй"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> үлдсэн"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB-р цэнэглэх боломжгүй байна"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Төхөөрөмждөө дагалдаж ирсэн цэнэглэгчийг ашиглах"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Царайг баталгаажууллаа"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Баталгаажсан"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Дуусгахын тулд баталгаажуулахыг товших"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Баталгаажуулагдсан"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ПИН ашиглах"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Хээ ашиглах"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Хаах"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"бүх дууг хаах"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"зөвхөн сэрүүлэг"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Бүү саад бол."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth идэвхтэй."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Сэрүүлгийг <xliff:g id="TIME">%s</xliff:g>-д тохируулсан."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Амттаны хайрцаг"</string> <string name="start_dreams" msgid="9131802557946276718">"Дэлгэц амраагч"</string> <string name="ethernet_label" msgid="2203544727007463351">"Этернет"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Бүү саад бол"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Хослуулсан төхөөрөмж байхгүй"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> батерей"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Мэдэгдлүүд"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Харилцан яриа"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Бүх чимээгүй мэдэгдлийг арилгах"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Бүү саад бол горимын түр зогсоосон мэдэгдэл"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Одоо эхлүүлэх"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Мэдэгдэл байхгүй"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Энэ төхөөрөмжийг таны эцэг эх удирддаг"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Төлөв:</b> Доогуур зэрэглэл хийсэн"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Харилцан ярианы дээд талд болон түгжигдсэн дэлгэц дээр профайл зураг байдлаар харуулна"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Харилцан ярианы мэдэгдлийн дээд талд болон түгжигдсэн дэлгэц дээр профайл зураг байдлаар харуулах бөгөөд бөмбөлөг хэлбэрээр харагдана"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Харилцан ярианы мэдэгдлийн дээд талд болон түгжигдсэн дэлгэц дээр профайл зураг байдлаар харуулах бөгөөд Бүү саад бол горимыг тасалдуулна"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Харилцан ярианы мэдэгдлийн дээд талд болон түгжигдсэн дэлгэц дээр профайл зураг байдлаар харуулах бөгөөд бөмбөлөг хэлбэрээр харагдана. Бүү саад бол горимыг тасалдуулна"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Чухал"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> нь харилцан ярианы онцлогуудыг дэмждэггүй"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Эдгээр мэдэгдлийг өөрчлөх боломжгүй."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Хөгжим"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Календарь"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Бүү саад бол"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Дууны түвшний товчлуурын товчлол"</string> <string name="battery" msgid="769686279459897127">"Батарей"</string> <string name="headset" msgid="4485892374984466437">"Чихэвч"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi унтраалттай байна"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth унтраалттай байна"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Бүү саад бол горим унтраалттай байна"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Автомат дүрэм (<xliff:g id="ID_1">%s</xliff:g>) Бүү саад бол горимыг асаасан."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Апп (<xliff:g id="ID_1">%s</xliff:g>) Бүү саад бол горимыг асаасан."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Автомат дүрэм эсвэл апп Бүү саад бол горимыг асаасан."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Цаана ажиллаж буй апп"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Батерей, дата ашиглалтын талаар дэлгэрэнгүйг харахын тулд товшино уу"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Мобайл датаг унтраах уу?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ажил)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Утасны дуудлага"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>-р)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"камер"</string> <string name="privacy_type_location" msgid="7991481648444066703">"байршил"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"микрофон"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(салсан)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Сэлгэх боломжгүй. Дахин оролдохын тулд товшино уу."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Шинэ төхөөрөмж хослуулах"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Энэ үйл явдлыг дамжуулахын тулд аппыг нээнэ үү."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Үл мэдэгдэх апп"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Хийцийн дугаар"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Хийцийн дугаарыг түр санах ойд хуулсан."</string> <string name="basic_status" msgid="2315371112182658176">"Харилцан яриаг нээх"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Саяхны мессеж, аваагүй дуудлага болон төлөвийн шинэчлэлтийг харах"</string> <string name="people_tile_title" msgid="6589377493334871272">"Харилцан яриа"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Бүү саад бол горимоор түр зогсоосон"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> мессеж илгээсэн: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> зураг илгээсэн"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> төлөвийн шинэчлэлт хийсэн байна: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other">Идэвхтэй <xliff:g id="COUNT_1">%s</xliff:g> апп</item> <item quantity="one">Идэвхтэй <xliff:g id="COUNT_0">%s</xliff:g> апп</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Шинэ мэдээлэл"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Идэвхтэй аппууд"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Зогсоох"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Зогсоосон"</string> @@ -889,8 +910,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"Хуулсан текстийг засах"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Хуулсан зургийг засах"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Ойролцоох төхөөрөмж рүү илгээх"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"Нэмэх"</string> + <string name="manage_users" msgid="1823875311934643849">"Хэрэглэгчдийг удирдах"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Энэ мэдэгдэл нь Дэлгэцийг хуваах горим руу чирэхийг дэмждэггүй."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi боломжгүй"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Чухал горим"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Сэрүүлгийг тохируулсан"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Туслахын зочны горимыг идэвхжүүлсэн"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Камер болон микрофон унтраалттай байна"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# мэдэгдэл}other{# мэдэгдэл}}"</string> </resources> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index fca67d2c5295..2ec0073808b2 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"सिस्टीम UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"बॅटरी लवकर संपू शकते"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> शिल्लक"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB द्वारे चार्ज होऊ शकत नाही"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"तुमच्या डिव्हाइससह आलेल्या चार्जरचा वापर करा"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"चेहरा ऑथेंटिकेशन केलेला आहे"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"निश्चित केले"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"पूर्ण करण्यासाठी खात्री करा वर टॅप करा"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ऑथेंटिकेशन केलेले"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"पिन वापरा"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"पॅटर्न वापरा"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"बंद करा"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"संपूर्ण शांतता"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"फक्त अलार्म"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"व्यत्यय आणू नका."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"ब्लूटूथ."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"ब्लूटूथ सुरू."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"<xliff:g id="TIME">%s</xliff:g> साठी अलार्म सेट केला."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"मिष्ठान्न प्रकरण"</string> <string name="start_dreams" msgid="9131802557946276718">"स्क्रीन सेव्हर"</string> <string name="ethernet_label" msgid="2203544727007463351">"इथरनेट"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"व्यत्यय आणू नका"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ब्लूटूथ"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"कोणतेही जोडलेले डिव्हाइसेस उपलब्ध नाहीत"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> बॅटरी"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"सूचना"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"संभाषणे"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"सर्व सायलंट सूचना साफ करा"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"व्यत्यय आणून नकाद्वारे सूचना थांबवल्या"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"आता सुरू करा"</string> <string name="empty_shade_text" msgid="8935967157319717412">"सूचना नाहीत"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"हे डिव्हाइस तुमच्या पालकाने व्यवस्थापित केले आहे"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>स्थिती</b> ला थोडी कमी म्हणून रँक केले गेले"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"संभाषण सूचनांच्या वरती आणि लॉक स्क्रीनवरील प्रोफाइल फोटो म्हणून दिसते"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"संभाषण सूचनांच्या वरती आणि लॉक स्क्रीनवरील प्रोफाइल फोटो म्हणून दिसते, बबल म्हणून दिसते"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"संभाषण सूचनांच्या वरती आणि लॉक स्क्रीनवरील प्रोफाइल फोटो म्हणून दिसते, व्यत्यय आणू नका यामध्ये अडथळा आणते"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"संभाषण सूचनांच्या वरती आणि लॉक स्क्रीनवरील प्रोफाइल फोटो म्हणून दिसते, बबल म्हणून दिसते, व्यत्यय आणू नका यामध्ये अडथळा आणते"</string> <string name="notification_priority_title" msgid="2079708866333537093">"प्राधान्य"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> हे संभाषण वैशिष्ट्यांना सपोर्ट करत नाही"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"या सूचनांमध्ये सुधारणा केली जाऊ शकत नाही."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"संगीत"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"कॅलेंडर"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"व्यत्यय आणू नका"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"आवाजाच्या बटणांचा शार्टकट"</string> <string name="battery" msgid="769686279459897127">"बॅटरी"</string> <string name="headset" msgid="4485892374984466437">"हेडसेट"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"वाय-फाय बंद आहे"</string> <string name="bt_is_off" msgid="7436344904889461591">"ब्लूटूथ बंद आहे"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"व्यत्यय आणू नका बंद आहे"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"व्यत्यय आणू नका एका <xliff:g id="ID_1">%s</xliff:g> स्वयंचलित नियमाने सुरू केले."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"व्यत्यय आणू नका (<xliff:g id="ID_1">%s</xliff:g>) ॲपने सुरू केले."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"व्यत्यय आणू नका एका स्वयंचलित नियमाने किंवा ॲपने सुरू केले."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"अॅप्स बॅकग्राउंडमध्ये सुरू आहेत"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"बॅटरी आणि डेटा वापराच्या तपशीलांसाठी टॅप करा"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"मोबाइल डेटा बंद करायचा?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ऑफिस)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"फोन कॉल"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> द्वारे)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"camera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"स्थान"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"मायक्रोफोन"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(डिस्कनेक्ट केलेले)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"स्विच करू शकत नाही. पुन्हा प्रयत्न करण्यासाठी टॅप करा."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"नवीन डिव्हाइससोबत पेअर करा"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"हे सेशन कास्ट करण्यासाठी, कृपया ॲप उघडा."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"अज्ञात अॅप"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"बिल्ड नंबर"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"बिल्ड नंबर क्लिपबोर्डवर कॉपी केला."</string> <string name="basic_status" msgid="2315371112182658176">"संभाषण उघडा"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"अलीकडील मेसेज, मिस्ड कॉल आणि स्टेटस अपडेट पहा"</string> <string name="people_tile_title" msgid="6589377493334871272">"संभाषण"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"व्यत्यय आणू नका द्वारे थांबवले गेले"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> यांनी मेसेज पाठवला: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> यांनी इमेज पाठवली"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> यांनी स्टेटस अपडेट केले: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> अॅक्टिव्ह ॲप्स</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> अॅक्टिव्ह ॲप</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"नवीन माहिती"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"अॅक्टिव्ह ॲप्स"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"थांबवा"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"थांबवले"</string> @@ -889,8 +910,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"कॉपी केलेला मजकूर संपादित करा"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"कॉपी केलेली इमेज संपादित करा"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"जवळपासच्या डिव्हाइसवर पाठवा"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"जोडा"</string> + <string name="manage_users" msgid="1823875311934643849">"वापरकर्ते व्यवस्थापित करा"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"ही सूचना स्प्लिटस्क्रीनवर ड्रॅग करण्याला सपोर्ट करत नाही."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"वाय-फाय उपलब्ध नाही"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"प्राधान्य मोड"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"अलार्म सेट केला"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistant चा अतिथी मोड सुरू केला"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"कॅमेरा आणि माइक बंद आहेत"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# सूचना}other{# सूचना}}"</string> </resources> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index b87a79cca38e..06270d71427e 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI Sistem"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Bateri mungkin kehabisan tidak lama lagi"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> yang tinggal"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Tidak dapat mengecas melalui USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Gunakan pengecas yang disertakan dengan peranti anda"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Wajah disahkan"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Disahkan"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Ketik Sahkan untuk menyelesaikan"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Disahkan"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Gunakan PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Gunakan corak"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Tutup"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"senyap sepenuhnya"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"penggera sahaja"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Jangan Ganggu."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth dihidupkan."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Penggera ditetapkan pada <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Bekas Pencuci Mulut"</string> <string name="start_dreams" msgid="9131802557946276718">"Penyelamat skrin"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Jangan Ganggu"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Tiada peranti berpasangan tersedia"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> bateri"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Pemberitahuan"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Perbualan"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Kosongkan semua pemberitahuan senyap"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Pemberitahuan dijeda oleh Jangan Ganggu"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Mulakan sekarang"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Tiada pemberitahuan"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Peranti ini diurus oleh ibu bapa anda"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Dinilai Lebih Rendah"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Ditunjukkan di bahagian atas pemberitahuan perbualan dan sebagai gambar profil pada skrin kunci"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Ditunjukkan di bahagian atas pemberitahuan perbualan dan sebagai gambar profil pada skrin kunci, muncul sebagai gelembung"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Ditunjukkan di bahagian atas pemberitahuan perbualan dan sebagai gambar profil pada skrin kunci, mengganggu Jangan Ganggu"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Ditunjukkan di bahagian atas pemberitahuan perbualan dan sebagai gambar profil pada skrin kunci, muncul sebagai gelembung, mengganggu Jangan Ganggu"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Keutamaan"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> tidak menyokong ciri perbualan"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Pemberitahuan ini tidak boleh diubah suai."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Muzik"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Jangan Ganggu"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Pintasan butang kelantangan"</string> <string name="battery" msgid="769686279459897127">"Bateri"</string> <string name="headset" msgid="4485892374984466437">"Set Kepala"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi dimatikan"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth dimatikan"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Jangan Ganggu dimatikan"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Jangan Ganggu dihidupkan oleh peraturan automatik (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Jangan Ganggu dihidupkan oleh apl (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Jangan Ganggu dihidupkan oleh peraturan automatik atau apl."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apl yang berjalan di latar belakang"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Ketik untuk mendapatkan butiran tentang penggunaan kuasa bateri dan data"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Matikan data mudah alih?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(kerja)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Panggilan telefon"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(melalui <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"lokasi"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(diputuskan sambungan)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Tidak dapat menukar. Ketik untuk mencuba lagi."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Gandingkan peranti baharu"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Untuk menghantar sesi ini, sila buka apl."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Apl yang tidak diketahui"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Nombor binaan"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Nombor binaan disalin ke papan keratan."</string> <string name="basic_status" msgid="2315371112182658176">"Buka perbualan"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Lihat mesej terbaharu, panggilan terlepas dan kemaskinian status"</string> <string name="people_tile_title" msgid="6589377493334871272">"Perbualan"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Dijeda oleh Jangan Ganggu"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> menghantar mesej: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> menghantar imej"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> mempunyai kemaskinian status: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apl aktif</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> apl aktif</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Maklumat baharu"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Apl aktif"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Berhenti"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Dihentikan"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Disalin"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Daripada <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Ketepikan penyalinan UI"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Edit teks yang disalin"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Edit imej yang disalin"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Hantar ke peranti berdekatan"</string> + <string name="add" msgid="81036585205287996">"Tambah"</string> + <string name="manage_users" msgid="1823875311934643849">"Urus pengguna"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Pemberitahuan ini tidak menyokong penyeretan ke Skrin pisah."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi dimatikan"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Mod keutamaan"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Penggera ditetapkan"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Mod tetamu Assistant didayakan"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera dan mikrofon dimatikan"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index 0248d10fdda5..4a4f1a16f517 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"စနစ်၏ UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"မကြာမီ ဘက်ထရီကုန်သွားနိုင်ပါသည်"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> ကျန်ရှိနေ"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB ဖြင့် အားသွင်း၍မရပါ"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"သင့်စက်ပစ္စည်းနှင့် အတူပါလာသည့် အားသွင်းကိရိယာကို အသုံးပြုပါ"</string> @@ -111,7 +116,7 @@ <string name="accessibility_phone_button" msgid="4256353121703100427">"ဖုန်း"</string> <string name="accessibility_voice_assist_button" msgid="6497706615649754510">"အသံ အကူအညီ"</string> <string name="accessibility_wallet_button" msgid="1458258783460555507">"Wallet"</string> - <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"QR ကုဒ် စကင်ဖတ်စနစ်"</string> + <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"QR ကုဒ်ဖတ်စနစ်"</string> <string name="accessibility_unlock_button" msgid="122785427241471085">"သော့ဖွင့်ရန်"</string> <string name="accessibility_lock_icon" msgid="661492842417875775">"စက်ပစ္စည်းကို လော့ခ်ချထားသည်"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"မျက်နှာ စကင်ဖတ်နေသည်"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"မျက်နှာ အထောက်အထားစိစစ်ပြီးပြီ"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"အတည်ပြုပြီးပြီ"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"အပြီးသတ်ရန်အတွက် \'အတည်ပြုရန်\' ကို တို့ပါ"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"အထောက်အထားစိစစ်ပြီးပြီ"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ပင်နံပါတ်သုံးရန်"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ပုံစံကို သုံးရန်"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"ပိတ်ရန်"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"လုံးဝ အသံပိတ်ထားရန်"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"နှိုးစက်များသာ"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"မနှောင့်ယှက်ရ။"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"ဘလူးတုသ်။"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"ဘလူးတုသ် ဖွင့်ထား။"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"နိုးစက်ပေးထားသော အချိန် <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"မုန့်ထည့်သော ပုံး"</string> <string name="start_dreams" msgid="9131802557946276718">"ဖန်သားပြင်အသုံးပြုမှု ချွေတာမှုစနစ်"</string> <string name="ethernet_label" msgid="2203544727007463351">"အီသာနက်"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"မနှောင့်ယှက်ရ"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ဘလူးတုသ်"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"ချိတ်တွဲထားသည့် ကိရိယာများ မရှိ"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> ဘက်ထရီ"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"အကြောင်းကြားချက်များ"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"စကားဝိုင်းများ"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"အသံတိတ် အကြောင်းကြားချက်များအားလုံးကို ရှင်းလင်းရန်"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"အကြောင်းကြားချက်များကို \'မနှောင့်ယှက်ရ\' က ခေတ္တရပ်ထားသည်"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"ယခု စတင်ပါ"</string> <string name="empty_shade_text" msgid="8935967157319717412">"အကြောင်းကြားချက်များ မရှိ"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"ဤစက်ပစ္စည်းကို သင့်မိဘက စီမံခန့်ခွဲသည်"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>အခြေအနေ-</b> အဆင့်လျှော့ထားသည်"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"စကားဝိုင်း အကြောင်းကြားချက်များ၏ ထိပ်ပိုင်းတွင် ပြ၍ လော့ခ်မျက်နှာပြင်တွင် ပရိုဖိုင်ပုံအဖြစ် ပြသည်"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"စကားဝိုင်း အကြောင်းကြားချက်များ၏ ထိပ်ပိုင်းတွင် ပြ၍ လော့ခ်မျက်နှာပြင်တွင် ပရိုဖိုင်ပုံအဖြစ် ပြကာ ပူဖောင်းကွက်အဖြစ် မြင်ရသည်"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"စကားဝိုင်း အကြောင်းကြားချက်များ၏ ထိပ်ပိုင်းတွင် ပြ၍ လော့ခ်မျက်နှာပြင်တွင် ပရိုဖိုင်ပုံအဖြစ် ပြကာ ‘မနှောင့်ယှက်ရ’ ကို ရပ်တန့်သည်"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"စကားဝိုင်း အကြောင်းကြားချက်များ၏ ထိပ်ပိုင်းတွင် ပြ၍ လော့ခ်မျက်နှာပြင်တွင် ပရိုဖိုင်ပုံအဖြစ် ပြကာ ပူဖောင်းကွက်အဖြစ် မြင်ရပြီး ‘မနှောင့်ယှက်ရ’ ကို ရပ်တန့်သည်"</string> <string name="notification_priority_title" msgid="2079708866333537093">"ဦးစားပေး"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> က စကားဝိုင်းဝန်ဆောင်မှုများကို မပံ့ပိုးပါ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ဤအကြောင်းကြားချက်များကို ပြုပြင်၍ မရပါ။"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS စာတိုစနစ်"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Music"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"ပြက္ခဒိန်"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"မနှောင့်ယှက်ရ"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"အသံထိန်းချုပ်သည့်ခလုတ် ဖြတ်လမ်း"</string> <string name="battery" msgid="769686279459897127">"ဘက်ထရီ"</string> <string name="headset" msgid="4485892374984466437">"မိုက်ခွက်ပါနားကြပ်"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>၊ <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi ပိတ်ထားသည်"</string> <string name="bt_is_off" msgid="7436344904889461591">"ဘလူးတုသ်ကို ပိတ်ထားသည်"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"\"မနှောင့်ယှက်ရ\" ကို ပိတ်ထားသည်"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"\"မနှောင့်ယှက်ရ\" ကို အလိုအလျောက်စည်းမျဉ်း (<xliff:g id="ID_1">%s</xliff:g>) က ဖွင့်ခဲ့သည်။"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"\"မနှောင့်ယှက်ရ\" ကို အက်ပ် (<xliff:g id="ID_1">%s</xliff:g>) က ဖွင့်ခဲ့သည်။"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"\"မနှောင့်ယှက်ရ\" ကို အလိုအလျောက်စည်းမျဉ်းတစ်ခု သို့မဟုတ် အက်ပ်တစ်ခုက ဖွင့်ခဲ့သည်။"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"နောက်ခံတွင် ပွင့်နေသော အက်ပ်များ"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"ဘက်ထရီနှင့် ဒေတာအသုံးပြုမှု အသေးစိတ်ကို ကြည့်ရန် တို့ပါ"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"မိုဘိုင်းဒေတာ ပိတ်မလား။"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(လုပ်ငန်းသုံး)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"ဖုန်းခေါ်ဆိုမှု"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> မှတစ်ဆင့်)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"ကင်မရာ"</string> <string name="privacy_type_location" msgid="7991481648444066703">"တည်နေရာ"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"မိုက်ခရိုဖုန်း"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(ချိတ်ဆက်မှု မရှိပါ)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"ပြောင်း၍ မရပါ။ ပြန်စမ်းကြည့်ရန် တို့ပါ။"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"စက်အသစ် တွဲချိတ်ရန်"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"အက်ပ်ဖွင့်ပြီး ဤစက်ရှင်ကို ကာစ်လုပ်နိုင်သည်။"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"အမည်မသိ အက်ပ်"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"တည်ဆောက်မှုနံပါတ်"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"တည်ဆောက်မှုနံပါတ်ကို ကလစ်ဘုတ်သို့ မိတ္တူကူးပြီးပါပြီ။"</string> <string name="basic_status" msgid="2315371112182658176">"စကားဝိုင်းကို ဖွင့်ရန်"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"မကြာသေးမီက မက်ဆေ့ဂျ်၊ လွတ်သွားသောခေါ်ဆိုမှုနှင့် အခြေအနေအပ်ဒိတ်များကို ကြည့်နိုင်သည်"</string> <string name="people_tile_title" msgid="6589377493334871272">"စကားဝိုင်း"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"‘မနှောင့်ယှက်ရ’ ဖြင့် ခဏရပ်ထားသည်"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> က မက်ဆေ့ဂျ်ပို့လိုက်သည်- <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> က ပုံပို့လိုက်သည်"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> က အခြေအနေ အပ်ဒိတ်လုပ်လိုက်သည်- <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other">ပွင့်နေသည့်အက်ပ် <xliff:g id="COUNT_1">%s</xliff:g> ခု</item> <item quantity="one">ပွင့်နေသည့်အက်ပ် <xliff:g id="COUNT_0">%s</xliff:g> ခု</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"အချက်အလက်သစ်"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ပွင့်နေသည့်အက်ပ်များ"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ရပ်ရန်"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ရပ်ထားသည်"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"ကူးပြီးပါပြီ"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"<xliff:g id="APPNAME">%1$s</xliff:g> ထံမှ"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"UI မိတ္တူမကူးတော့ရန်"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"ကူးထားသည့်စာသားကို တည်းဖြတ်ရန်"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"ကူးထားသည့်ပုံကို ပြင်ဆင်ရန်"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"အနီးတစ်ဝိုက်ရှိ စက်များသို့ ပို့ရန်"</string> + <string name="add" msgid="81036585205287996">"ထည့်ရန်"</string> + <string name="manage_users" msgid="1823875311934643849">"အသုံးပြုသူများ စီမံရန်"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"ဤအကြောင်းကြားချက်သည် ‘မျက်နှာပြင်ခွဲ၍ပြသမှု’ သို့ ဖိဆွဲခြင်းကို မပံ့ပိုးပါ။"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi မရပါ"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"ဦးစားပေးမုဒ်"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"နိုးစက် သတ်မှတ်ထားသည်"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistant ဧည့်သည်သုံးခွင့်မုဒ် ဖွင့်ထားသည်"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"ကင်မရာနှင့် မိုက် ပိတ်ထားသည်"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 76cfef5704b1..5ccf52890432 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"System-UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Batteriet går kanskje snart tomt"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> gjenstår"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Kan ikke lade via USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Bruk laderen som fulgte med enheten"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Ansiktet er autentisert"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Bekreftet"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Trykk på Bekreft for å fullføre"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentisert"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Bruk PIN-kode"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Bruk mønster"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Lukk"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"total stillhet"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"bare alarmer"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Ikke forstyrr."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth er på."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarmen ble stilt for <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessertmonter"</string> <string name="start_dreams" msgid="9131802557946276718">"Skjermsparer"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Ikke forstyrr"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Ingen sammenkoblede enheter er tilgjengelige"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> batteri"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Varsler"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Samtaler"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Fjern alle lydløse varsler"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Varsler er satt på pause av «Ikke forstyrr»"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Start nå"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Ingen varsler"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Denne enheten administreres av forelderen din"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Rangert lavere"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Vises øverst på samtalevarsler og som et profilbilde på låseskjermen"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Vises øverst på samtalevarsler og som et profilbilde på låseskjermen, vises som en boble"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Vises øverst på samtalevarsler og som et profilbilde på låseskjermen, avbryter «Ikke forstyrr»"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Vises øverst på samtalevarsler og som et profilbilde på låseskjermen, vises som en boble, avbryter «Ikke forstyrr»"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritet"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> støtter ikke samtalefunksjoner"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Disse varslene kan ikke endres."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Musikk"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalender"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Ikke forstyrr"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Hurtigtast for volumknappene"</string> <string name="battery" msgid="769686279459897127">"Batteri"</string> <string name="headset" msgid="4485892374984466437">"Hodetelefoner"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi er av"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth er av"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Ikke forstyrr er av"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Ikke forstyrr ble slått på av en automatisk regel (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Ikke forstyrr ble slått på av en app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Ikke forstyrr ble slått på av en automatisk regel eller en app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apper kjører i bakgrunnen"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Trykk for detaljer om batteri- og databruk"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Vil du slå av mobildata?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(jobb)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonsamtale"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(via <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kameraet"</string> <string name="privacy_type_location" msgid="7991481648444066703">"posisjon"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofonen"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(frakoblet)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Kan ikke bytte. Trykk for å prøve igjen."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Koble til en ny enhet"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"For å caste denne økten, åpne appen."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Ukjent app"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Delversjonsnummer"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Delversjonsnummeret er kopiert til utklippstavlen."</string> <string name="basic_status" msgid="2315371112182658176">"Åpen samtale"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Se nylige meldinger, tapte anrop og statusoppdateringer"</string> <string name="people_tile_title" msgid="6589377493334871272">"Samtale"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Satt på pause av «Ikke forstyrr»"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> har sendt en melding: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> har sendt et bilde"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> har en statusoppdatering: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktive apper</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aktiv app</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Ny informasjon"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktive apper"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stopp"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stoppet"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Kopiert"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Fra <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Lukk kopi-UI"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Rediger den kopierte teksten"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Rediger det kopierte bildet"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Send til en enhet i nærheten"</string> + <string name="add" msgid="81036585205287996">"Legg til"</string> + <string name="manage_users" msgid="1823875311934643849">"Administrer brukere"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Dette varselet støtter ikke at du drar det til en delt skjerm."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi er utilgjengelig"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Prioriteringsmodus"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarmen er stilt inn"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Gjestemodus for assistenten er slått på"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera og mikrofon er av"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 158a8913071a..471bf14152d8 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"सिस्टम UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"ब्याट्री चाँडै सकिन सक्छ"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> बाँकी"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB मार्फत चार्ज गर्न सकिँदैन"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"तपाईंको यन्त्रसँगै आएको चार्जर प्रयोग गर्नुहोस्"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"अनुहार प्रमाणीकरण गरियो"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"पुष्टि भयो"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"पूरा गर्नका लागि पुष्टि गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"प्रमाणीकरण गरियो"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN प्रयोग गर्नुहोस्"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ढाँचा प्रयोग गर्नुहोस्"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"बन्द गर्नुहोस्"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"पूर्ण मौनता"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"अलार्महरू मात्र"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"बाधा नपुऱ्याउनुहोस्।"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"ब्लुटुथ।"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"ब्लुटुथ खुला छ।"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"<xliff:g id="TIME">%s</xliff:g>को लागि सङ्केत घन्टी सेट गरिएको"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessert Case"</string> <string name="start_dreams" msgid="9131802557946276718">"स्क्रिन सेभर"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"बाधा नपुऱ्याउनुहोस्"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ब्लुटुथ"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"जोडी उपकरणहरू उपलब्ध छैन"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> ब्याट्री"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"सूचनाहरू"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"वार्तालापहरू"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"सबै मौन सूचनाहरू हटाउनुहोस्"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"बाधा नपुऱ्याउनुहोस् नामक मोडमार्फत पज पारिएका सूचनाहरू"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"अहिले न"</string> <string name="empty_shade_text" msgid="8935967157319717412">"कुनै सूचनाहरू छैनन्"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"यो डिभाइस तपाईंका अभिभावक व्यवस्थापन गर्नुहुन्छ"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>स्थिति:</b> कम महत्त्वपूर्ण सूचनाका रूपमा सेट गरिएको छ"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"यो वार्तालापका सूचनाहरूको सिरानमा र लक स्क्रिनमा प्रोफाइल फोटोका रूपमा देखिन्छ"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"यो वार्तालापका सूचनाहरूको सिरानमा, बबलका रूपमा र लक स्क्रिनमा प्रोफाइल फोटोका रूपमा देखिन्छ"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"यो वार्तालापका सूचनाहरूको सिरानमा र लक स्क्रिनमा प्रोफाइल फोटोका रूपमा देखिन्छ। साथै, यसले गर्दा \'बाधा नपुऱ्याउनुहोस्\' नामक सुविधामा अवरोध आउँछ"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"यो वार्तालापका सूचनाहरूको सिरानमा, बबलका रूपमा र लक स्क्रिनमा प्रोफाइल फोटोका रूपमा देखिन्छ। साथै, यसले गर्दा \'बाधा नपुऱ्याउनुहोस्\' नामक सुविधामा अवरोध आउँछ"</string> <string name="notification_priority_title" msgid="2079708866333537093">"प्राथमिकता"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> मा वार्तालापसम्बन्धी सुविधा प्रयोग गर्न मिल्दैन"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"यी सूचनाहरू परिमार्जन गर्न मिल्दैन।"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"सङ्गीत"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"पात्रो"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"बाधा नपुऱ्याउनुहोस्"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"भोल्युम बटनका सर्टकट"</string> <string name="battery" msgid="769686279459897127">"ब्याट्री"</string> <string name="headset" msgid="4485892374984466437">"हेडसेट"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi‑Fi निष्क्रिय छ"</string> <string name="bt_is_off" msgid="7436344904889461591">"ब्लुटुथ निष्क्रिय छ"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"बाधा नपुर्याउनुहोस् नामक विकल्प निष्क्रिय छ"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"कुनै स्वचालित नियमले बाधा नपुऱ्याउनुहोस् नामक विकल्पलाई सक्रियो गऱ्यो (<xliff:g id="ID_1">%s</xliff:g>)।"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"कुनै अनुप्रयोगले बाधा नपुऱ्याउनुहोस् नामक विकल्पलाई सक्रिय गऱ्यो (<xliff:g id="ID_1">%s</xliff:g>)।"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"कुनै स्वचालित नियम वा अनुप्रयोगले बाधा नपुऱ्याउनुहोस् नामक विकल्पलाई सक्रिय गऱ्यो।"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"पृष्ठभूमिमा चल्ने एपहरू"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"ब्याट्री र डेटाका प्रयोग सम्बन्धी विवरणहरूका लागि ट्याप गर्नुहोस्"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"मोबाइल डेटा निष्क्रिय पार्ने हो?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(कार्यालय)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"फोन कल"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> मार्फत)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"क्यामेरा"</string> <string name="privacy_type_location" msgid="7991481648444066703">"स्थान"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"माइक्रोफोन"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(डिस्कनेक्ट गरिएको छ)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"बदल्न सकिएन। फेरि प्रयास गर्न ट्याप गर्नुहोस्।"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"नयाँ डिभाइस कनेक्ट गर्नुहोस्"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"यो सत्र कास्ट गर्न चाहनुहुन्छ भने कृपया एप खोल्नुहोस्।"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"अज्ञात एप"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"बिल्ड नम्बर"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"बिल्ड नम्बर कपी गरी क्लिपबोर्डमा सारियो।"</string> <string name="basic_status" msgid="2315371112182658176">"वार्तालाप खोल्नुहोस्"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"हालसालैका म्यासेज, मिस कल र स्ट्याटस अपडेट हेर्नुहोस्"</string> <string name="people_tile_title" msgid="6589377493334871272">"वार्तालाप"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"\'बाधा नपुऱ्याउनुहोस्\' ले पज गरेको छ"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> ले एउटा म्यासेज पठाउनुभएको छ: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ले एउटा फोटो पठाउनुभयो"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ले स्ट्याटस अपडेट गर्नुभएको छ: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> वटा सक्रिय एप</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> सक्रिय एप</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"नयाँ जानकारी"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"सक्रिय एपहरू"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"रोक्नुहोस्"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"रोकिएको छ"</string> @@ -889,8 +910,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"कपी गरिएको टेक्स्ट सम्पादन गर्नुहोस्"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"कपी गरिएको फोटो सम्पादन गर्नुहोस्"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"नजिकैको डिभाइसमा पठाउनुहोस्"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"हाल्नुहोस्"</string> + <string name="manage_users" msgid="1823875311934643849">"प्रयोगकर्ताहरूको व्यवस्थापन गर्नुहोस्"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"यो सूचना ड्र्याग गरेर स्प्लिटस्क्रिनमा लैजान मिल्दैन।"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi उपलब्ध छैन"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"प्राथमिकता मोड"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"अलार्म सेट गरिएको छ"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"सहायकको अतिथि मोड अन गरिएको छ"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"क्यामेरा र माइक अफ छन्"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# वटा सूचना}other{# वटा सूचनाहरू}}"</string> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index f85bbee74115..047f99f130b7 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Systeem-UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Batterij is bijna leeg"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Nog <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Kan niet opladen via USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Gebruik de oplader die bij je apparaat is geleverd"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Gezicht geverifieerd"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Bevestigd"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Tik op Bevestigen om te voltooien"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Geverifieerd"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Pincode gebruiken"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Patroon gebruiken"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Sluiten"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"totale stilte"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"alleen wekkers"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Niet storen."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth aan."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Wekker is ingesteld op <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessertshowcase"</string> <string name="start_dreams" msgid="9131802557946276718">"Screensaver"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Niet storen"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Geen gekoppelde apparaten beschikbaar"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> batterijniveau"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Meldingen"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Gesprekken"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Alle stille meldingen wissen"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Meldingen onderbroken door \'Niet storen\'"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Nu starten"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Geen meldingen"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Dit apparaat wordt beheerd door je ouder"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> lager gerangschikt"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Wordt getoond bovenaan gespreksmeldingen en als profielfoto op het vergrendelscherm"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Wordt getoond bovenaan gespreksmeldingen en als profielfoto op het vergrendelscherm, verschijnt als bubbel"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Wordt getoond bovenaan gespreksmeldingen en als profielfoto op het vergrendelscherm, onderbreekt Niet storen"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Wordt getoond bovenaan gespreksmeldingen en als profielfoto op het vergrendelscherm, verschijnt als bubbel, onderbreekt Niet storen"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioriteit"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ondersteunt geen gespreksfuncties"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Deze meldingen kunnen niet worden aangepast."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"Sms"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Muziek"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Agenda"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Niet storen"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Volumeknoppen als sneltoets"</string> <string name="battery" msgid="769686279459897127">"Batterij"</string> <string name="headset" msgid="4485892374984466437">"Headset"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wifi staat uit"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth staat uit"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Niet storen staat uit"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Niet storen is aangezet door een automatische regel (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Niet storen is aangezet door een app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Niet storen is aangezet door een automatische regel of app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apps uitgevoerd op achtergrond"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Tik voor batterij- en datagebruik"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Mobiele data uitzetten?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(werk)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefoongesprek"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(via <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"camera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"locatie"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"microfoon"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(verbinding verbroken)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Kan niet schakelen. Tik om het opnieuw te proberen."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Nieuw apparaat koppelen"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Als je deze sessie wilt casten, open je de app."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Onbekende app"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Build-nummer"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Build-nummer naar klembord gekopieerd."</string> <string name="basic_status" msgid="2315371112182658176">"Gesprek openen"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Bekijk recente berichten, gemiste gesprekken en statusupdates"</string> <string name="people_tile_title" msgid="6589377493334871272">"Gesprek"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Onderbroken door Niet storen"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> heeft een bericht gestuurd: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> heeft een afbeelding gestuurd"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> heeft een statusupdate: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> actieve apps</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> actieve app</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nieuwe informatie"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Actieve apps"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stoppen"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Gestopt"</string> @@ -886,14 +907,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Gekopieerd"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Uit <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"UI voor kopiëren sluiten"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Gekopieerde tekst bewerken"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Gekopieerde afbeelding bewerken"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Naar apparaat in de buurt sturen"</string> + <string name="add" msgid="81036585205287996">"Toevoegen"</string> + <string name="manage_users" msgid="1823875311934643849">"Gebruikers beheren"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Deze melding biedt geen ondersteuning voor slepen naar het gesplitste scherm."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wifi niet beschikbaar"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Prioriteitsmodus"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Wekker gezet"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Gastmodus voor de Assistent staat aan"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Camera en microfoon staan uit"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# melding}other{# meldingen}}"</string> </resources> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index dab199b72aa3..0dca918eccce 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"ସିଷ୍ଟମ୍ UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"ଖୁବ୍ ଶୀଘ୍ର ବ୍ୟାଟେରୀ ସରିଯାଇପାରେ"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> ବାକି ଅଛି"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB ଦ୍ଵାରା ଚାର୍ଜ କରିହେବନାହିଁ"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"ଆପଣଙ୍କ ଡିଭାଇସ୍ ପାଇଁ ଥିବା ଚାର୍ଜର୍କୁ ବ୍ୟବହାର କରନ୍ତୁ"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"ମୁହଁ ପ୍ରାମାଣିକତା ହୋଇଛି"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"ସୁନିଶ୍ଚିତ କରାଯାଇଛି"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"ସମ୍ପୂର୍ଣ୍ଣ କରିବାକୁ ସୁନିଶ୍ଚିତ କରନ୍ତୁରେ ଟାପ୍ କରନ୍ତୁ"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ପ୍ରାମାଣିକତା ହୋଇଛି"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN ବ୍ୟବହାର କରନ୍ତୁ"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ପାଟର୍ନ ବ୍ୟବହାର କରନ୍ତୁ"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"ବନ୍ଦ କରନ୍ତୁ"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"ସମ୍ପୂର୍ଣ୍ଣ ନୀରବତା"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"କେବଳ ଆଲାର୍ମ"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ।"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"ବ୍ଲୁଟୁଥ।"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"ବ୍ଲୁଟୂଥ୍ ଚାଲୁ ଅଛି।"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"<xliff:g id="TIME">%s</xliff:g>ରେ ଆଲାର୍ମ ସେଟ୍ କରାଯାଇଛି।"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"ଡେଜର୍ଟ କେସ୍"</string> <string name="start_dreams" msgid="9131802557946276718">"ସ୍କ୍ରିନ୍ ସେଭର୍"</string> <string name="ethernet_label" msgid="2203544727007463351">"ଇଥରନେଟ୍"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ବ୍ଲୁଟୁଥ"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"ପେୟାର୍ ହୋଇଥିବା କୌଣସି ଡିଭାଇସ୍ ଉପଲବ୍ଧ ନାହିଁ"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> ବ୍ୟାଟେରୀ"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"ସମସ୍ତ ନୀରବ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ଖାଲି କରନ୍ତୁ"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ବିକଳ୍ପ ଦ୍ୱାରା ବିଜ୍ଞପ୍ତି ପଜ୍ ହୋଇଛି"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"ବର୍ତ୍ତମାନ ଆରମ୍ଭ କରନ୍ତୁ"</string> <string name="empty_shade_text" msgid="8935967157319717412">"କୌଣସି ବିଜ୍ଞପ୍ତି ନାହିଁ"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"ଏହି ଡିଭାଇସ୍ ଆପଣଙ୍କ ବାପାମାଙ୍କ ଦ୍ୱାରା ପରିଚାଳିତ"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>ସ୍ଥିତି:</b> ରେଙ୍କ ତଳକୁ କରାଯାଇଛି"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"ବାର୍ତ୍ତାଳାପ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକର ଶୀର୍ଷରେ ଏବଂ ଲକ୍ ସ୍କ୍ରିନରେ ଏକ ପ୍ରୋଫାଇଲ୍ ଛବି ଭାବେ ଦେଖାଏ"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"ବାର୍ତ୍ତାଳାପ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକର ଶୀର୍ଷରେ ଏବଂ ଲକ୍ ସ୍କ୍ରିନରେ ଏକ ପ୍ରୋଫାଇଲ୍ ଛବି ଭାବେ ଦେଖାଏ, ଏକ ବବଲ୍ ଭାବେ ଦେଖାଯାଏ"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"ବାର୍ତ୍ତାଳାପ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକର ଶୀର୍ଷରେ ଏବଂ ଲକ୍ ସ୍କ୍ରିନରେ ଏକ ପ୍ରୋଫାଇଲ୍ ଛବି ଭାବେ ଦେଖାଏ, \'ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\'କୁ ବାଧା ଦିଏ"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"ବାର୍ତ୍ତାଳାପ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକର ଶୀର୍ଷରେ ଏବଂ ଲକ୍ ସ୍କ୍ରିନରେ ଏକ ପ୍ରୋଫାଇଲ୍ ଛବି ଭାବେ ଦେଖାଏ, ଏକ ବବଲ୍ ଭାବେ ଦେଖାଯାଏ, \'ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\'କୁ ବାଧା ଦିଏ"</string> <string name="notification_priority_title" msgid="2079708866333537093">"ପ୍ରାଥମିକତା"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ବାର୍ତ୍ତାଳାପ ଫିଚରଗୁଡ଼ିକୁ ସମର୍ଥନ କରେ ନାହିଁ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ଏହି ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପରିବର୍ତ୍ତନ କରିହେବ ନାହିଁ।"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"ମ୍ୟୁଜିକ୍"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"କ୍ୟାଲେଣ୍ଡର୍"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"ଭଲ୍ୟୁମ ବଟନ୍ ଶର୍ଟକଟ୍"</string> <string name="battery" msgid="769686279459897127">"ବ୍ୟାଟେରୀ"</string> <string name="headset" msgid="4485892374984466437">"ହେଡସେଟ୍"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"ୱାଇ-ଫାଇ ଅଫ୍ ଅଛି"</string> <string name="bt_is_off" msgid="7436344904889461591">"ବ୍ଲୁଟୂଥ୍ ଅଫ୍ ଅଛି"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଅଫ୍ ଅଛି"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"ଏକ (<xliff:g id="ID_1">%s</xliff:g>) ନିୟମ ଦ୍ୱାରା \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ସ୍ୱଚାଳିତ ଭାବେ ଅନ୍ କରାଗଲା।"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"ଏକ ଆପ୍ (<xliff:g id="ID_1">%s</xliff:g>) ଦ୍ୱାରା \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଅନ୍ କରାଗଲା।"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"ଏକ ସ୍ୱଚାଳିତ ନିୟମ କିମ୍ବା ଆପ୍ ଦ୍ୱାରା \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଅନ୍ କରାଗଲା।"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"ବ୍ୟାକଗ୍ରାଉଣ୍ଡରେ ଆପ୍ ଚାଲୁଛି"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"ବ୍ୟାଟେରୀ ଏବଂ ଡାଟା ବ୍ୟବହାର ଉପରେ ବିବରଣୀ ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"ମୋବାଇଲ୍ ଡାଟା ବନ୍ଦ କରିବେ?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ୱାର୍କ)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"ଫୋନ୍ କଲ୍"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> ମାଧ୍ୟମରେ)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"କ୍ୟାମେରା"</string> <string name="privacy_type_location" msgid="7991481648444066703">"ଲୋକେସନ୍"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"ମାଇକ୍ରୋଫୋନ୍"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(ବିଚ୍ଛିନ୍ନ କରାଯାଇଛି)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"ସ୍ୱିଚ କରାଯାଇପାରିବ ନାହିଁ। ପୁଣି ଚେଷ୍ଟା କରିବାକୁ ଟାପ କରନ୍ତୁ।"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"ନୂଆ ଡିଭାଇସକୁ ପେୟାର୍ କରନ୍ତୁ"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"ଏହି ସେସନକୁ କାଷ୍ଟ କରିବା ପାଇଁ, ଦୟାକରି ଆପ ଖୋଲନ୍ତୁ।"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"ଅଜଣା ଆପ"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ବିଲ୍ଡ ନମ୍ୱର"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"କ୍ଲିପବୋର୍ଡକୁ କପି କରାଯାଇଥିବା ବିଲ୍ଡ ନମ୍ୱର।"</string> <string name="basic_status" msgid="2315371112182658176">"ବାର୍ତ୍ତାଳାପ ଖୋଲନ୍ତୁ"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ବର୍ତ୍ତମାନର ମେସେଜ୍, ମିସ୍ଡ କଲ୍ ଏବଂ ସ୍ଥିତି ଅପଡେଟଗୁଡ଼ିକୁ ଦେଖନ୍ତୁ"</string> <string name="people_tile_title" msgid="6589377493334871272">"ବାର୍ତ୍ତାଳାପ"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଦ୍ୱାରା ବିରତ କରାଯାଇଛି"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> ଏକ ମେସେଜ୍ ପଠାଇଛନ୍ତି: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ଏକ ଛବି ପଠାଇଛନ୍ତି"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ଏକ ସ୍ଥିତି ଅପଡେଟ୍ କରିଛନ୍ତି: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g>ଟି ସକ୍ରିୟ ଆପ</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g>ଟି ସକ୍ରିୟ ଆପ</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"ନୂଆ ସୂଚନା"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ସକ୍ରିୟ ଆପଗୁଡ଼ିକ"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ବନ୍ଦ କରନ୍ତୁ"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ବନ୍ଦ ହୋଇଛି"</string> @@ -889,8 +910,14 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"କପି କରାଯାଇଥିବା ଟେକ୍ସଟକୁ ଏଡିଟ କରନ୍ତୁ"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"କପି କରାଯାଇଥିବା ଇମେଜକୁ ଏଡିଟ କରନ୍ତୁ"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"ନିକଟସ୍ଥ ଡିଭାଇସକୁ ପଠାନ୍ତୁ"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="add" msgid="81036585205287996">"ଯୋଗ କରନ୍ତୁ"</string> + <string name="manage_users" msgid="1823875311934643849">"ଉପଯୋଗକର୍ତ୍ତାମାନଙ୍କୁ ପରିଚାଳନା କରନ୍ତୁ"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"ଏହି ବିଜ୍ଞପ୍ତି ସ୍ପ୍ଲିଟସ୍କ୍ରିନକୁ ଡ୍ରାଗ କରିବାକୁ ସମର୍ଥନ କରେ ନାହିଁ।"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"ୱାଇ-ଫାଇ ଉପଲବ୍ଧ ନାହିଁ"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"ପ୍ରାଥମିକତା ମୋଡ"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"ଆଲାରାମ ସେଟ"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistantର ଅତିଥି ମୋଡ ସକ୍ଷମ କରାଯାଇଛି"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"କ୍ୟାମେରା ଏବଂ ମାଇକ ବନ୍ଦ ଅଛି"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index 20b5bf21ded3..faa206224214 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"ਸਿਸਟਮ UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"ਬੈਟਰੀ ਛੇਤੀ ਹੀ ਖਤਮ ਹੋ ਸਕਦੀ ਹੈ"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> ਬਾਕੀ"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB ਰਾਹੀਂ ਚਾਰਜ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"ਆਪਣੇ ਡੀਵਾਈਸ ਨਾਲ ਮਿਲੇ ਚਾਰਜਰ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"ਚਿਹਰਾ ਪ੍ਰਮਾਣੀਕਿਰਤ ਹੋਇਆ"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"ਪੁਸ਼ਟੀ ਕੀਤੀ ਗਈ"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"ਪੂਰਾ ਕਰਨ ਲਈ ਪੁਸ਼ਟੀ ਕਰੋ \'ਤੇ ਟੈਪ ਕਰੋ"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ਪ੍ਰਮਾਣਿਤ ਹੋਇਆ"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ਪਿੰਨ ਵਰਤੋ"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ਪੈਟਰਨ ਵਰਤੋ"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"ਬੰਦ ਕਰੋ"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"ਪੂਰਾ ਸ਼ਾਂਤ"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"ਸਿਰਫ਼ ਅਲਾਰਮ"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ।"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"ਬਲੂਟੁੱਥ।"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth ਚਾਲੂ।"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"ਅਲਾਰਮ <xliff:g id="TIME">%s</xliff:g> ਲਈ ਸੈੱਟ ਕੀਤਾ ਗਿਆ।"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"ਡੈਜ਼ਰਟ ਕੇਸ"</string> <string name="start_dreams" msgid="9131802557946276718">"ਸਕ੍ਰੀਨ ਸੇਵਰ"</string> <string name="ethernet_label" msgid="2203544727007463351">"ਈਥਰਨੈਟ"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ਬਲੂਟੁੱਥ"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"ਕੋਈ ਜੋੜਾਬੱਧ ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂ ਉਪਲਬਧ ਨਹੀਂ"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> ਬੈਟਰੀ"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"ਸੂਚਨਾਵਾਂ"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"ਗੱਲਾਂਬਾਤਾਂ"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"ਸਾਰੀਆਂ ਖਾਮੋਸ਼ ਸੂਚਨਾਵਾਂ ਕਲੀਅਰ ਕਰੋ"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਰੋਕਿਆ ਗਿਆ"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"ਹੁਣ ਚਾਲੂ ਕਰੋ"</string> <string name="empty_shade_text" msgid="8935967157319717412">"ਕੋਈ ਸੂਚਨਾਵਾਂ ਨਹੀਂ"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ ਤੁਹਾਡੇ ਮਾਂ-ਪਿਓ ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>ਸਥਿਤੀ:</b> ਦਰਜਾ ਘਟਾਇਆ ਗਿਆ"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"ਗੱਲਬਾਤ ਸੂਚਨਾਵਾਂ ਦੇ ਸਿਖਰ \'ਤੇ ਅਤੇ ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਪ੍ਰੋਫਾਈਲ ਤਸਵੀਰ ਵਜੋਂ ਦਿਖਾਉਂਦਾ ਹੈ"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"ਗੱਲਬਾਤ ਸੂਚਨਾਵਾਂ ਦੇ ਸਿਖਰ \'ਤੇ ਅਤੇ ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਪ੍ਰੋਫਾਈਲ ਤਸਵੀਰ ਵਜੋਂ ਦਿਖਾਈਆਂ ਜਾਂਦੀਆਂ ਹਨ, ਜੋ ਕਿ ਬਬਲ ਵਜੋਂ ਦਿਸਦੀਆਂ ਹਨ"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"ਗੱਲਬਾਤ ਸੂਚਨਾਵਾਂ ਦੇ ਸਿਖਰ \'ਤੇ ਅਤੇ ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਪ੍ਰੋਫਾਈਲ ਤਸਵੀਰ ਵਜੋਂ ਦਿਖਾਉਂਦਾ ਹੈ, \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਸੁਵਿਧਾ ਵਿੱਚ ਵੀ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"ਗੱਲਬਾਤ ਸੂਚਨਾਵਾਂ ਦੇ ਸਿਖਰ \'ਤੇ ਅਤੇ ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਪ੍ਰੋਫਾਈਲ ਤਸਵੀਰ ਵਜੋਂ ਦਿਖਾਈਆਂ ਜਾਂਦੀਆਂ ਹਨ, ਜੋ ਕਿ ਬਬਲ ਵਜੋਂ ਦਿਸਦੀਆਂ ਹਨ ਅਤੇ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਸੁਵਿਧਾ ਵਿੱਚ ਵਿਘਨ ਵੀ ਪਾ ਸਕਦੀਆਂ ਹਨ"</string> <string name="notification_priority_title" msgid="2079708866333537093">"ਤਰਜੀਹ"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਐਪ ਗੱਲਬਾਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"ਸੰਗੀਤ"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"ਵੌਲਿਊਮ ਬਟਨ ਸ਼ਾਰਟਕੱਟ"</string> <string name="battery" msgid="769686279459897127">"ਬੈਟਰੀ"</string> <string name="headset" msgid="4485892374984466437">"ਹੈੱਡਸੈੱਟ"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"ਵਾਈ-ਫਾਈ ਬੰਦ ਹੈ"</string> <string name="bt_is_off" msgid="7436344904889461591">"ਬਲੂਟੁੱਥ ਬੰਦ ਹੈ"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਬੰਦ ਹੈ"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"ਸਵੈਚਲਿਤ ਨਿਯਮ (<xliff:g id="ID_1">%s</xliff:g>) ਦੁਆਰਾ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਚਾਲੂ ਕੀਤਾ ਗਿਆ ਸੀ।"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"ਐਪ (<xliff:g id="ID_1">%s</xliff:g>) ਵੱਲੋਂ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਚਾਲੂ ਕੀਤਾ ਗਿਆ ਸੀ।"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"ਇੱਕ ਸਵੈਚਲਿਤ ਨਿਯਮ ਜਾਂ ਐਪ ਵੱਲੋਂ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਚਾਲੂ ਕੀਤਾ ਗਿਆ ਸੀ।"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲ ਰਹੀਆਂ ਐਪਾਂ"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"ਬੈਟਰੀ ਅਤੇ ਡਾਟਾ ਵਰਤੋਂ ਸਬੰਧੀ ਵੇਰਵਿਆਂ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"ਕੀ ਮੋਬਾਈਲ ਡਾਟਾ ਬੰਦ ਕਰਨਾ ਹੈ?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ਕਾਰਜ-ਸਥਾਨ)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"ਫ਼ੋਨ ਕਾਲ"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> ਰਾਹੀਂ)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"ਕੈਮਰਾ"</string> <string name="privacy_type_location" msgid="7991481648444066703">"ਟਿਕਾਣਾ"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"ਮਾਈਕ੍ਰੋਫ਼ੋਨ"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(ਡਿਸਕਨੈਕਟ ਹੈ)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"ਨਵਾਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"ਇਸ ਸੈਸ਼ਨ ਨੂੰ ਕਾਸਟ ਕਰਨ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਖੋਲ੍ਹੋ।"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"ਅਗਿਆਤ ਐਪ"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ਬਿਲਡ ਨੰਬਰ"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ਬਿਲਡ ਨੰਬਰ ਨੂੰ ਕਲਿੱਪਬੋਰਡ \'ਤੇ ਕਾਪੀ ਕੀਤਾ ਗਿਆ।"</string> <string name="basic_status" msgid="2315371112182658176">"ਗੱਲਬਾਤ ਖੋਲ੍ਹੋ"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ਹਾਲੀਆ ਸੁਨੇਹੇ, ਮਿਸ ਕਾਲਾਂ ਅਤੇ ਸਥਿਤੀ ਸੰਬੰਧੀ ਅੱਪਡੇਟ ਦੇਖੋ"</string> <string name="people_tile_title" msgid="6589377493334871272">"ਗੱਲਬਾਤ"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਵਿਸ਼ੇਸ਼ਤਾ ਨੇ ਰੋਕ ਦਿੱਤਾ"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> ਨੇ ਸੁਨੇਹਾ ਭੇਜਿਆ: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ਨੇ ਇੱਕ ਚਿੱਤਰ ਭੇਜਿਆ ਹੈ"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ਨੇ ਸਥਿਤੀ ਅੱਪਡੇਟ ਕੀਤੀ ਹੈ: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਐਪ</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਐਪਾਂ</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"ਨਵੀਂ ਜਾਣਕਾਰੀ"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ਕਿਰਿਆਸ਼ੀਲ ਐਪਾਂ"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ਬੰਦ ਕਰੋ"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ਬੰਦ ਹੈ"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"ਕਾਪੀ ਕੀਤੀ ਗਈ"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"<xliff:g id="APPNAME">%1$s</xliff:g> ਤੋਂ"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"ਕਾਪੀ ਕੀਤੇ UI ਨੂੰ ਖਾਰਜ ਕਰੋ"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"ਕਾਪੀ ਕੀਤੀ ਲਿਖਤ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"ਕਾਪੀ ਕੀਤੇ ਗਏ ਚਿੱਤਰ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸ \'ਤੇ ਭੇਜੋ"</string> + <string name="add" msgid="81036585205287996">"ਸ਼ਾਮਲ ਕਰੋ"</string> + <string name="manage_users" msgid="1823875311934643849">"ਵਰਤੋਂਕਾਰਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"ਇਹ ਸੂਚਨਾ ਸਪਲਿਟ ਸਕ੍ਰੀਨ \'ਤੇ ਘਸੀਟਣ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ ਹੈ।"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"ਵਾਈ-ਫਾਈ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"ਤਰਜੀਹੀ ਮੋਡ"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"ਅਲਾਰਮ ਸੈੱਟ ਹੈ"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistant ਮਹਿਮਾਨ ਮੋਡ ਚਾਲੂ ਹੈ"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"ਕੈਮਰਾ ਅਤੇ ਮਾਈਕ ਬੰਦ ਹਨ"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 4572922d60a5..5d61dfe567d2 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI systemu"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Bateria może się wkrótce wyczerpać"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Pozostało <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Nie można naładować przez USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Użyj ładowarki dostarczonej z urządzeniem"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Twarz rozpoznana"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Potwierdzono"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Aby zakończyć, kliknij Potwierdź"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Uwierzytelniono"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Użyj kodu PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Użyj wzoru"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Zamknij"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"całkowita cisza"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"tylko alarmy"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Nie przeszkadzać."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth włączony."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarm ustawiony na <xliff:g id="TIME">%s</xliff:g>."</string> @@ -207,6 +215,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Półka ze słodkościami"</string> <string name="start_dreams" msgid="9131802557946276718">"Wygaszacz ekranu"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Nie przeszkadzać"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Brak dostępnych sparowanych urządzeń"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> naładowania baterii"</string> @@ -354,6 +363,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Powiadomienia"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Rozmowy"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Usuń wszystkie ciche powiadomienia"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Powiadomienia wstrzymane przez tryb Nie przeszkadzać"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Rozpocznij teraz"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Brak powiadomień"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Tym urządzeniem zarządza Twój rodzic"</string> @@ -497,6 +507,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Stan:</b> obniżono ważność"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Wyświetla się u góry powiadomień w rozmowach oraz jako zdjęcie profilowe na ekranie blokady"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Wyświetla się u góry powiadomień w rozmowach oraz jako zdjęcie profilowe na ekranie blokady, jako dymek"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Wyświetla się u góry powiadomień w rozmowach oraz jako zdjęcie profilowe na ekranie blokady, przerywa działanie trybu Nie przeszkadzać"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Wyświetla się u góry powiadomień w rozmowach oraz jako zdjęcie profilowe na ekranie blokady, jako dymek, przerywa działanie trybu Nie przeszkadzać"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Priorytetowe"</string> <string name="no_shortcut" msgid="8257177117568230126">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> nie obsługuje funkcji rozmów"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Tych powiadomień nie można zmodyfikować."</string> @@ -576,6 +588,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Muzyka"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalendarz"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Nie przeszkadzać"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Wł./wył. przyciskami głośności"</string> <string name="battery" msgid="769686279459897127">"Bateria"</string> <string name="headset" msgid="4485892374984466437">"Zestaw słuchawkowy"</string> @@ -694,6 +707,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi jest wyłączone"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth jest wyłączony"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Tryb Nie przeszkadzać jest wyłączony"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Tryb Nie przeszkadzać został włączony przez regułę automatyczną (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Tryb Nie przeszkadzać został włączony przez aplikację (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Tryb Nie przeszkadzać został włączony przez regułę automatyczną lub aplikację."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Aplikacje działające w tle"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Kliknij, by wyświetlić szczegóły wykorzystania baterii i użycia danych"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Wyłączyć mobilną transmisję danych?"</string> @@ -718,6 +735,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(praca)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Rozmowa telefoniczna"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(przez: <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"aparat"</string> <string name="privacy_type_location" msgid="7991481648444066703">"lokalizacja"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -818,6 +837,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(odłączono)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Nie można przełączyć. Spróbuj ponownie."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Sparuj nowe urządzenie"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Aby przesłać tę sesję, otwórz aplikację."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Nieznana aplikacja"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numer kompilacji"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Numer kompilacji został skopiowany do schowka."</string> <string name="basic_status" msgid="2315371112182658176">"Otwarta rozmowa"</string> @@ -851,6 +872,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"+ <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Zobacz ostatnie wiadomości, nieodebrane połączenia i stany"</string> <string name="people_tile_title" msgid="6589377493334871272">"Rozmowa"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Wstrzymane przez tryb Nie przeszkadzać"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> wysyła wiadomość: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> wysyła zdjęcie"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ma nowy stan: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -891,8 +913,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktywnej aplikacji</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aktywna aplikacja</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nowa informacja"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktywne aplikacje"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Zatrzymaj"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Zatrzymano"</string> @@ -900,14 +921,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Skopiowano"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Od: <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Zamknij UI kopiowania"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Edytuj skopiowany tekst"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Edytuj skopiowany obraz"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Wyślij na urządzenie w pobliżu"</string> + <string name="add" msgid="81036585205287996">"Dodaj"</string> + <string name="manage_users" msgid="1823875311934643849">"Zarządzaj użytkownikami"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"To powiadomienie nie obsługuje dzielenia ekranu przez przeciąganie."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Sieć Wi‑Fi niedostępna"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Tryb priorytetowy"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarm ustawiony"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Tryb gościa w Asystencie włączony"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Aparat i mikrofon są wyłączone"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 1c902b0b8d65..d9bb15b66a11 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Interface do sistema"</string> - <string name="battery_low_title" msgid="6891106956328275225">"A bateria pode acabar em breve"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> restantes"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Não é possível carregar via USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Usar o carregador que acompanha o dispositivo"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Rosto autenticado"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmada"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Toque em \"Confirmar\" para concluir"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticado"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Usar PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Usar padrão"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Fechar"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"silêncio total"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"somente alarmes"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Não perturbe."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth ativado."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarme definido para <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Mostruário de sobremesas"</string> <string name="start_dreams" msgid="9131802557946276718">"Protetor de tela"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Não perturbe"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Não há dispositivos pareados disponíveis"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Bateria: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificações"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversas"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Apagar todas as notificações silenciosas"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notificações pausadas pelo modo \"Não perturbe\""</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Iniciar agora"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Sem notificações"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Este dispositivo é gerenciado pelo seu pai/mãe"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> classificada com menor prioridade"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Aparece na parte superior das notificações de conversa e como uma foto do perfil na tela de bloqueio"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Aparece na parte superior das notificações de conversa, como uma foto do perfil na tela de bloqueio e como um balão"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Aparece na parte superior das notificações de conversa e como uma foto do perfil na tela de bloqueio. Interrompe o Não perturbe"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Aparece na parte superior das notificações de conversa, como uma foto do perfil na tela de bloqueio e como um balão. Interrompe o Não perturbe"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritárias"</string> <string name="no_shortcut" msgid="8257177117568230126">"O app <xliff:g id="APP_NAME">%1$s</xliff:g> não é compatível com recursos de conversa"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Não é possível modificar essas notificações."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Música"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Agenda"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Não perturbe"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Atalho de botões de volume"</string> <string name="battery" msgid="769686279459897127">"Bateria"</string> <string name="headset" msgid="4485892374984466437">"Fone de ouvido"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"O Wi-Fi está desativado"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth desativado"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"O recurso Não perturbe está desativado"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"O recurso Não perturbe foi ativado por uma regra automática (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"O recurso Não perturbe foi ativado por um app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"O recurso Não perturbe foi ativado por uma regra automática ou app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apps sendo executados em segundo plano"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Tocar para ver detalhes sobre a bateria e o uso de dados"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Desativar os dados móveis?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(trabalho)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Chamada telefônica"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(por <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"câmera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"localização"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"microfone"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(sem conexão)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Não foi possível mudar. Toque para tentar novamente."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Parear novo dispositivo"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Abra o app para transmitir esta sessão."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"App desconhecido"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número da versão"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Número da versão copiado para a área de transferência."</string> <string name="basic_status" msgid="2315371112182658176">"Conversa aberta"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Veja mensagens recentes, chamadas perdidas e atualizações de status"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversa"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Pausado pelo Não perturbe"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma mensagem: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma imagem"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> atualizou o status: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> app ativo</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps ativos</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nova informação"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Apps ativos"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Parar"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Parado"</string> @@ -886,14 +907,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Copiado"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Do app <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Dispensar cópia da IU"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Editar texto copiado"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Editar imagem copiada"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Enviar para dispositivo próximo"</string> + <string name="add" msgid="81036585205287996">"Adicionar"</string> + <string name="manage_users" msgid="1823875311934643849">"Gerenciar usuários"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Esta notificação não tem suporte para ser arrastada para a tela dividida."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi-Fi indisponível"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Modo de prioridade"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarme definido"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Modo visitante do Google Assistente ativado"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"A câmera e o microfone estão desativados"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# notificação}one{# notificação}other{# notificações}}"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 1562abc674ec..73ef834df64d 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"IU do sistema"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Pode ficar sem bateria em breve"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Não é possível carregar através de USB."</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Utilize o carregador fornecido com o dispositivo."</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Rosto autenticado"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmado"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Toque em Confirmar para concluir."</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticado"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Utilizar PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Utilizar padrão"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Fechar"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"silêncio total"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"apenas alarmes"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Não incomodar."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth ligado."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarme definido para <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Vitrina de sobremesas"</string> <string name="start_dreams" msgid="9131802557946276718">"Proteção de ecrã"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Não incomodar"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Sem dispositivos sincronizados disponíveis"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> de bateria"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificações"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversas"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Limpar todas as notificações silenciosas"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notificações colocadas em pausa pelo modo Não incomodar."</string> <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="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Este dispositivo é gerido pelos teus pais"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Estado:</b> passou para classificação inferior"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Aparece na parte superior das notificações de conversas e como uma imagem do perfil no ecrã de bloqueio"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Aparece na parte superior das notificações de conversas e como uma imagem do perfil no ecrã de bloqueio, surge como um balão"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Aparece na parte superior das notificações de conversas e como uma imagem do perfil no ecrã de bloqueio, interrompe o modo Não incomodar"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Aparece na parte superior das notificações de conversas e como uma imagem do perfil no ecrã de bloqueio, surge como um balão, interrompe o modo Não incomodar"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioridade"</string> <string name="no_shortcut" msgid="8257177117568230126">"A app <xliff:g id="APP_NAME">%1$s</xliff:g> não suporta funcionalidades de conversa."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Não é possível modificar estas notificações."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Música"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendário"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Não incomodar"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Atalho dos botões de volume"</string> <string name="battery" msgid="769686279459897127">"Bateria"</string> <string name="headset" msgid="4485892374984466437">"Ausc. com microfone integrado"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi desativado"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth desativado"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Não incomodar desativado"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"O modo Não incomodar foi ativado por uma regra automática (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"O modo Não incomodar foi ativado por uma app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"O modo Não incomodar foi ativado por uma regra automática ou por uma app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apps em execução em segundo plano"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Toque para obter detalhes acerca da utilização da bateria e dos dados"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Pretende desativar os dados móveis?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(trabalho)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Chamada"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(através de <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"câmara"</string> <string name="privacy_type_location" msgid="7991481648444066703">"localização"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"microfone"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(desligado)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Não é possível mudar. Toque para tentar novamente."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Sincronize o novo dispositivo"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Para transmitir esta sessão, abra a app."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"App desconhecida"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número da compilação"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Número da compilação copiado para a área de transferência."</string> <string name="basic_status" msgid="2315371112182658176">"Abrir conversa"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Veja mensagens recentes, chamadas não atendidas e atualizações de estado"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversa"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Colocado em pausa pelo modo Não incomodar"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma mensagem: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma imagem"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> tem uma atualização de estado: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> app ativa</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps ativas</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Novas informações"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Apps ativas"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Parar"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Parada"</string> @@ -886,14 +907,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Copiado"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Da app <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Ignorar cópia de IU"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Editar texto copiado"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Editar imagem copiada"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Enviar para dispositivo próximo"</string> + <string name="add" msgid="81036585205287996">"Adicionar"</string> + <string name="manage_users" msgid="1823875311934643849">"Gerir utilizadores"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Esta notificação não pode ser arrastada para o ecrã dividido."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi indisponível"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Modo Prioridade"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarme definido"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Modo convidado do Assistente ativado"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"A câmara e o microfone estão desativados"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# notificação}one{# notificação(ões)}other{# notificações}}"</string> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 1c902b0b8d65..d9bb15b66a11 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Interface do sistema"</string> - <string name="battery_low_title" msgid="6891106956328275225">"A bateria pode acabar em breve"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> restantes"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Não é possível carregar via USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Usar o carregador que acompanha o dispositivo"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Rosto autenticado"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmada"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Toque em \"Confirmar\" para concluir"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autenticado"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Usar PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Usar padrão"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Fechar"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"silêncio total"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"somente alarmes"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Não perturbe."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth ativado."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarme definido para <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Mostruário de sobremesas"</string> <string name="start_dreams" msgid="9131802557946276718">"Protetor de tela"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Não perturbe"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Não há dispositivos pareados disponíveis"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Bateria: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificações"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversas"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Apagar todas as notificações silenciosas"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notificações pausadas pelo modo \"Não perturbe\""</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Iniciar agora"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Sem notificações"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Este dispositivo é gerenciado pelo seu pai/mãe"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> classificada com menor prioridade"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Aparece na parte superior das notificações de conversa e como uma foto do perfil na tela de bloqueio"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Aparece na parte superior das notificações de conversa, como uma foto do perfil na tela de bloqueio e como um balão"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Aparece na parte superior das notificações de conversa e como uma foto do perfil na tela de bloqueio. Interrompe o Não perturbe"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Aparece na parte superior das notificações de conversa, como uma foto do perfil na tela de bloqueio e como um balão. Interrompe o Não perturbe"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritárias"</string> <string name="no_shortcut" msgid="8257177117568230126">"O app <xliff:g id="APP_NAME">%1$s</xliff:g> não é compatível com recursos de conversa"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Não é possível modificar essas notificações."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Música"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Agenda"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Não perturbe"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Atalho de botões de volume"</string> <string name="battery" msgid="769686279459897127">"Bateria"</string> <string name="headset" msgid="4485892374984466437">"Fone de ouvido"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"O Wi-Fi está desativado"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth desativado"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"O recurso Não perturbe está desativado"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"O recurso Não perturbe foi ativado por uma regra automática (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"O recurso Não perturbe foi ativado por um app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"O recurso Não perturbe foi ativado por uma regra automática ou app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Apps sendo executados em segundo plano"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Tocar para ver detalhes sobre a bateria e o uso de dados"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Desativar os dados móveis?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(trabalho)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Chamada telefônica"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(por <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"câmera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"localização"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"microfone"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(sem conexão)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Não foi possível mudar. Toque para tentar novamente."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Parear novo dispositivo"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Abra o app para transmitir esta sessão."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"App desconhecido"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número da versão"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Número da versão copiado para a área de transferência."</string> <string name="basic_status" msgid="2315371112182658176">"Conversa aberta"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Veja mensagens recentes, chamadas perdidas e atualizações de status"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversa"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Pausado pelo Não perturbe"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma mensagem: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma imagem"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> atualizou o status: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> app ativo</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps ativos</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nova informação"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Apps ativos"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Parar"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Parado"</string> @@ -886,14 +907,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Copiado"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Do app <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Dispensar cópia da IU"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Editar texto copiado"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Editar imagem copiada"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Enviar para dispositivo próximo"</string> + <string name="add" msgid="81036585205287996">"Adicionar"</string> + <string name="manage_users" msgid="1823875311934643849">"Gerenciar usuários"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Esta notificação não tem suporte para ser arrastada para a tela dividida."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi-Fi indisponível"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Modo de prioridade"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarme definido"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Modo visitante do Google Assistente ativado"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"A câmera e o microfone estão desativados"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# notificação}one{# notificação}other{# notificações}}"</string> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index d520d509edf6..ff409d33fc94 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI sistem"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Este posibil ca bateria să se descarce în curând"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Procent rămas din baterie: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Nu se poate realiza încărcarea prin USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Folosiți încărcătorul livrat împreună cu dispozitivul"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Chip autentificat"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Confirmat"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Atingeți Confirmați pentru a finaliza"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentificat"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Folosiți PIN-ul"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Folosiți modelul"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Închideți"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"niciun sunet"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"numai alarme"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Nu deranja."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Conexiunea prin Bluetooth este activată."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarmă setată pentru <xliff:g id="TIME">%s</xliff:g>."</string> @@ -206,6 +214,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Vitrina cu dulciuri"</string> <string name="start_dreams" msgid="9131802557946276718">"Economizor de ecran"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Nu deranja"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Niciun dispozitiv conectat disponibil"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Nivelul bateriei: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -351,6 +360,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Notificări"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Conversații"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Ștergeți toate notificările silențioase"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notificări întrerupte prin „Nu deranja”"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Începeți acum"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Nicio notificare"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Dispozitivul este gestionat de unul dintre părinți"</string> @@ -494,6 +504,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Stare:</b> clasificată mai jos"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Se afișează în partea de sus a notificărilor pentru conversații și ca fotografie de profil pe ecranul de blocare"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Se afișează în partea de sus a notificărilor pentru conversații și ca fotografie de profil pe ecranul de blocare, apare ca un balon"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Se afișează în partea de sus a notificărilor pentru conversații și ca fotografie de profil pe ecranul de blocare, întrerupe funcția Nu deranja"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Se afișează în partea de sus a notificărilor pentru conversații și ca fotografie de profil pe ecranul de blocare, apare ca un balon, întrerupe funcția Nu deranja"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritate"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> nu acceptă funcții pentru conversații"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Aceste notificări nu pot fi modificate."</string> @@ -571,6 +583,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Muzică"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Nu deranja"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Comandă rapidă din butoanele de volum"</string> <string name="battery" msgid="769686279459897127">"Baterie"</string> <string name="headset" msgid="4485892374984466437">"Set căști-microfon"</string> @@ -689,6 +702,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Conexiunea Wi-Fi este dezactivată"</string> <string name="bt_is_off" msgid="7436344904889461591">"Funcția Bluetooth este dezactivată"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Funcția Nu deranja este dezactivată"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Funcția Nu deranja a fost activată de o regulă automată (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Funcția Nu deranja a fost activată de o aplicație (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Funcția Nu deranja a fost activată de o regulă automată sau de o aplicație."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Aplicațiile rulează în fundal"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Atingeți pentru mai multe detalii privind bateria și utilizarea datelor"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Dezactivați datele mobile?"</string> @@ -713,6 +730,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(serviciu)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Apel telefonic"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(prin <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"cameră foto"</string> <string name="privacy_type_location" msgid="7991481648444066703">"locație"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"microfon"</string> @@ -812,6 +831,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(deconectat)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Nu se poate comuta. Atingeți pentru a încerca din nou."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Asociați un nou dispozitiv"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Pentru a proiecta această sesiune, deschideți aplicația."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Aplicație necunoscută"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numărul versiunii"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Numărul versiunii s-a copiat în clipboard."</string> <string name="basic_status" msgid="2315371112182658176">"Deschideți conversația"</string> @@ -845,6 +866,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Vedeți mesaje recente, apeluri pierdute și actualizări de stare"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversație"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Întrerupt de Nu deranja"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> a trimis un mesaj: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> a trimis o imagine"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> are o nouă stare: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -884,8 +906,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> de aplicații active</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplicație activă</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Informații noi"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aplicații active"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Opriți"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Oprită"</string> @@ -896,8 +917,14 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"Editați textul copiat"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Editați imaginea copiată"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Trimiteți către un dispozitiv din apropiere"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="add" msgid="81036585205287996">"Adăugați"</string> + <string name="manage_users" msgid="1823875311934643849">"Gestionați utilizatorii"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Notificarea nu acceptă tragerea pe ecranul împărțit."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi indisponibil"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Modul Prioritate"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarmă setată"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Modul pentru invitați al Asistentului este activat"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Camera și microfonul sunt dezactivate"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 310a87e1a6da..a79c247b882c 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Интерфейс системы"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Батарея скоро разрядится"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Осталось: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Невозможно выполнить зарядку через USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Используйте зарядное устройство из комплекта."</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Лицо распознано"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Подтверждено"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Нажмите \"Подтвердить\""</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Аутентификация выполнена"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN-код"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Использовать графический ключ"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Закрыть"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"полная тишина"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"только будильник"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Не беспокоить."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Модуль Bluetooth включен."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Будильник установлен на <xliff:g id="TIME">%s</xliff:g>"</string> @@ -207,6 +215,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Коробка со сладостями"</string> <string name="start_dreams" msgid="9131802557946276718">"Заставка"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Не беспокоить"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Нет доступных сопряженных устройств"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Заряд: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -354,6 +363,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Уведомления"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Разговоры"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Отклонить все беззвучные уведомления"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"В режиме \"Не беспокоить\" уведомления заблокированы"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Начать"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Нет уведомлений"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Устройством управляет один из родителей."</string> @@ -497,6 +507,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Статус:</b> уровень важности понижен"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Появляется в верхней части уведомлений о сообщениях, а также в качестве фото профиля на заблокированном экране"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Появляется в верхней части уведомлений о сообщениях, в виде всплывающего чата, а также в качестве фото профиля на заблокированном экране."</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Появляется в верхней части уведомлений о сообщениях, а также в качестве фото профиля на заблокированном экране, прерывает режим \"Не беспокоить\"."</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Появляется в верхней части уведомлений о сообщениях, в виде всплывающего чата, а также в качестве фото профиля на заблокированном экране, прерывает режим \"Не беспокоить\"."</string> <string name="notification_priority_title" msgid="2079708866333537093">"Приоритет"</string> <string name="no_shortcut" msgid="8257177117568230126">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" не поддерживает функции разговоров."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Эти уведомления нельзя изменить."</string> @@ -576,6 +588,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Музыка"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Календарь"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Не беспокоить"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Кнопки регулировки громкости"</string> <string name="battery" msgid="769686279459897127">"Батарея"</string> <string name="headset" msgid="4485892374984466437">"Гарнитура"</string> @@ -694,6 +707,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Модуль Wi-Fi отключен"</string> <string name="bt_is_off" msgid="7436344904889461591">"Модуль Bluetooth отключен"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Режим \"Не беспокоить\" отключен"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Режим \"Не беспокоить\" был включен специальным правилом (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Режим \"Не беспокоить\" был включен приложением (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Режим \"Не беспокоить\" был включен специальным правилом или приложением."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Приложения, работающие в фоновом режиме"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Нажмите, чтобы проверить энергопотребление и трафик"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Отключить мобильный Интернет?"</string> @@ -718,6 +735,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(работа)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Телефонный звонок"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(через приложение \"<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>\")"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"камера"</string> <string name="privacy_type_location" msgid="7991481648444066703">"местоположение"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"микрофон"</string> @@ -818,6 +837,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(нет подключения)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Не удается переключиться. Нажмите, чтобы повторить попытку."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Подключить новое устройство"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Чтобы начать трансляцию сеанса, откройте приложение"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Неизвестное приложение"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Номер сборки"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Номер сборки скопирован в буфер обмена."</string> <string name="basic_status" msgid="2315371112182658176">"Открытый чат"</string> @@ -851,6 +872,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Будьте в курсе последних сообщений, пропущенных вызовов и обновлений статуса."</string> <string name="people_tile_title" msgid="6589377493334871272">"Чат"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Приостановлено в режиме \"Не беспокоить\""</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"Пользователь <xliff:g id="NAME">%1$s</xliff:g> отправил сообщение: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"Пользователь <xliff:g id="NAME">%1$s</xliff:g> отправил изображение"</string> <string name="new_status_content_description" msgid="6046637888641308327">"Пользователь <xliff:g id="NAME">%1$s</xliff:g> обновил статус: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -891,8 +913,7 @@ <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> активных приложений</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> активного приложения</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Новая информация"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Активные приложения"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Остановить"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Остановлено"</string> @@ -900,14 +921,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Скопировано."</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Из приложения \"<xliff:g id="APPNAME">%1$s</xliff:g>\""</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Закрыть меню копирования"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Изменить скопированный текст"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Изменить скопированное изображение"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Отправить на устройство поблизости"</string> + <string name="add" msgid="81036585205287996">"Добавить"</string> + <string name="manage_users" msgid="1823875311934643849">"Управление пользователями"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Это уведомление нельзя перетаскивать между частями разделенного экрана."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Сеть Wi‑Fi недоступна"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Режим приоритета"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Будильник установлен"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Гостевой режим для Ассистента включен"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Камера и микрофон отключены"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# уведомление}one{# уведомление}few{# уведомления}many{# уведомлений}other{# уведомления}}"</string> </resources> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index e730bb06b222..ffaa4bfccf92 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"පද්ධති UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"බැටරිය ඉක්මනින් අවසන් විය හැකිය"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> ඉතිරිව තිබේ"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB හරහා ආරෝපණය කළ නොහැකිය"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"ඔබේ උපාංගය සමඟ පැමිණි ආරෝපකය භාවිත කරන්න"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"මුහුණ සත්යාපන කළා"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"තහවුරු කළා"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"සම්පූර්ණ කිරීමට තහවුරු කරන්න තට්ටු කර."</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"සත්යාපනය විය"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN භාවිත කරන්න"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"රටාව භාවිත කරන්න"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"වසන්න"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"සම්පූර්ණ නිහඬතාව"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"එලාම පමණි"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"බාධා නොකරන්න."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"බ්ලූටූත්."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"බ්ලූටූත් ක්රියාත්මකයි."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"<xliff:g id="TIME">%s</xliff:g> සඳහා සීනුව සකස් කර ඇත."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"අතුරුපස අවස්තාව"</string> <string name="start_dreams" msgid="9131802557946276718">"තිර සුරැකුම"</string> <string name="ethernet_label" msgid="2203544727007463351">"ඊතර නෙට්"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"බාධා නොකරන්න"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"බ්ලූටූත්"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"යුගල කළ උපාංග නොතිබේ"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"බැටරිය <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"දැනුම් දීම්"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"සංවාද"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"සියලු නිහඬ දැනුම්දීම් හිස් කරන්න"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"බාධා නොකරන්න මගින් විරාම කරන ලද දැනුම්දීම්"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"දැන් අරඹන්න"</string> <string name="empty_shade_text" msgid="8935967157319717412">"දැනුම්දීම් නැත"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"මෙම උපාංගය ඔබගේ මාපියන්ගෙන් අයකු විසින් කළමනාකරණය කෙරේ"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>තත්ත්වය:</b> පහළට ශ්රේණිගත කරන ලදි"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"සංවාද දැනුම්දීම්වල ඉහළින්ම සහ අගුලු තිරයේ ඇති පැතිකඩ පින්තූරයක් ලෙස පෙන්වයි"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"සංවාද දැනුම්දීම්වල ඉහළින්ම සහ අගුලු තිරයේ ඇති පැතිකඩ පින්තූරයක් ලෙස පෙන්වයි, බුබුළක් ලෙස දිස් වේ"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"සංවාද දැනුම්දීම්වල ඉහළින්ම සහ අගුලු තිරයේ ඇති පැතිකඩ පින්තූරයක් ලෙස පෙන්වයි, බාධා නොකරන්න සඳහා බාධා කරයි"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"සංවාද දැනුම්දීම්වල ඉහළින්ම සහ අගුලු තිරයේ ඇති පැතිකඩ පින්තූරයක් ලෙස පෙන්වයි, බුබුළක් ලෙස දිස් වේ, බාධා නොකරන්න සඳහා බාධා කරයි"</string> <string name="notification_priority_title" msgid="2079708866333537093">"ප්රමුඛතාව"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> සංවාද විශේෂාංගවලට සහාය නොදක්වයි"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"මෙම දැනුම්දීම් වෙනස් කළ නොහැක."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"සංගීතය"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"දින දර්ශනය"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"බාධා නොකරන්න"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"හඩ පරිමා බොත්තම් කෙටිමග"</string> <string name="battery" msgid="769686279459897127">"බැටරිය"</string> <string name="headset" msgid="4485892374984466437">"හෙඩ්සෙට්"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi ක්රියා විරහිතයි"</string> <string name="bt_is_off" msgid="7436344904889461591">"බ්ලූටූත් ක්රියා විරහිතයි"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"බාධා නොකරන්න ක්රියා විරහිතයි"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"ස්වයංක්රිය රීතියක් මගින් බාධා නොකරන්න ක්රියාත්මක කරන ලදී (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"යෙදුමක් මගින් බාධා නොකරන්න ක්රියාත්මක කරන ලදී (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"ස්වයංක්රිය රීතියක් හෝ යෙදුමක් මගින් බාධා නොකරන්න ක්රියාත්මක කරන ලදී."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"පසුබිමින් ධාවනය වන යෙදුම්"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"බැටරි හා දත්ත භාවිතය පිළිබඳව විස්තර සඳහා තට්ටු කරන්න"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"ජංගම දත්ත ක්රියාවිරහිත කරන්නද?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"කාර්යාලය"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"දුරකථන ඇමතුම"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> හරහා)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"කැමරාව"</string> <string name="privacy_type_location" msgid="7991481648444066703">"ස්ථානය"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"මයික්රෝෆෝනය"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(විසන්ධි විය)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"මාරු කිරීමට නොහැකිය. නැවත උත්සාහ කිරීමට තට්ටු කරන්න."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"නව උපාංගය යුගල කරන්න"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"මෙම සැසිය විකාශය කිරීමට, කරුණාකර යෙදුම විවෘත කරන්න."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"නොදන්නා යෙදුම"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"නිමැවුම් අංකය"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"නිමැවුම් අංකය පසුරු පුවරුවට පිටපත් කරන ලදි."</string> <string name="basic_status" msgid="2315371112182658176">"සංවාදය විවෘත කරන්න"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"මෑත පණිවිඩ, මඟ හැරුණු ඇමතුම් සහ තත්ත්ව යාවත්කාලීන කිරීම් බලන්න"</string> <string name="people_tile_title" msgid="6589377493334871272">"සංවාදය"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"බාධා නොකිරීම මගින් විරාම කර ඇත"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> පණිවිඩයක් එවා ඇත: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> රූපයක් යවන ලදී"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> හට තත්ත්ව යාවත්කාලීනයක් ඇත: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one">සක්රිය යෙදුම් <xliff:g id="COUNT_1">%s</xliff:g></item> <item quantity="other">සක්රිය යෙදුම් <xliff:g id="COUNT_1">%s</xliff:g></item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"නව තොරතුරු"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"සක්රිය යෙදුම්"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"නවත්වන්න"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"නවත්වන ලදි"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"පිටපත් කරන ලදි"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"<xliff:g id="APPNAME">%1$s</xliff:g> සිට"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Dismiss copy UI"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"පිටපත් කළ පෙළ සංස්කරණය කරන්න"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"පිටපත් කළ රූපය සංස්කරණය කරන්න"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"අවට උපාංගය වෙත යවන්න"</string> + <string name="add" msgid="81036585205287996">"එක් කරන්න"</string> + <string name="manage_users" msgid="1823875311934643849">"පරිශීලකයන් කළමනාකරණය කරන්න"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"මෙම දැනුම්දීම බෙදුම් තිරය වෙත ඇද ගෙන යාමට සහාය නොදක්වයි."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi ලබා ගත නොහැකිය"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"ප්රමුඛතා ප්රකාරය"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"සීනුව සකසන ලදි"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"සහායක ආගන්තුක ප්රකාරය සබලයි"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"කැමරාව සහ මයික් ක්රියාවිරහිතයි"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index a3bbe44a3272..2c2a7c881ff6 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI systému"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Batéria sa môže čoskoro minúť"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Zostáva <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Nedá sa nabíjať cez USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Použite nabíjačku dodanú so zariadením"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Tvár bola overená"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Potvrdené"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Overenie dokončíte klepnutím na Potvrdiť"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Overené"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Použiť PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Použiť vzor"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Zavrieť"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"úplné ticho"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"iba budíky"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Režim bez vyrušení."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Rozhranie Bluetooth je zapnuté."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Budík nastavený na <xliff:g id="TIME">%s</xliff:g>."</string> @@ -207,6 +215,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Pult s dezertami"</string> <string name="start_dreams" msgid="9131802557946276718">"Šetrič obrazovky"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Režim bez vyrušení"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Nie sú k dispozícii žiadne spárované zariadenia"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Batéria: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -354,6 +363,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Upozornenia"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Konverzácie"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Vymazať všetky tiché upozornenia"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Upozornenia sú pozastavené režimom bez vyrušení"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Spustiť"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Žiadne upozornenia"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Toto zariadenie spravuje tvoj rodič"</string> @@ -497,6 +507,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Stav:</b> Preradené nižšie"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Zobrazuje sa v hornej časti upozornení konverzácie a ako profilová fotka na uzamknutej obrazovke"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Zobrazuje sa ako bublina v hornej časti upozornení konverzácie a profilová fotka na uzamknutej obrazovke"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Zobrazuje sa v hornej časti upozornení konverzácie a ako profilová fotka na uzamknutej obrazovke, preruší režim bez vyrušení"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Zobrazuje sa ako bublina v hornej časti upozornení konverzácie a profilová fotka na uzamknutej obrazovke, preruší režim bez vyrušení"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Priorita"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> nepodporuje funkcie konverzácie"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Tieto upozornenia sa nedajú upraviť."</string> @@ -576,6 +588,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Hudba"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalendár"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Režim bez vyrušení"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Skratka tlačidiel hlasitosti"</string> <string name="battery" msgid="769686279459897127">"Batéria"</string> <string name="headset" msgid="4485892374984466437">"Náhlavná súprava"</string> @@ -694,6 +707,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Pripojenie Wi‑Fi je vypnuté"</string> <string name="bt_is_off" msgid="7436344904889461591">"Rozhranie Bluetooth je vypnuté"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Režim bez vyrušení je vypnutý"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Režim bez vyrušení bol zapnutý automatickým pravidlom (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Režim bez vyrušení bol zapnutý aplikáciou (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Režim bez vyrušení bol zapnutý automatickým pravidlom alebo aplikáciou."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Aplikácie sú spustené na pozadí"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Klepnutím zobrazíte podrobnosti o batérii a spotrebe dát"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Chcete vypnúť mobilné dáta?"</string> @@ -718,6 +735,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(práca)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonický hovor"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(prostredníctvom aplikácie <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"fotoaparát"</string> <string name="privacy_type_location" msgid="7991481648444066703">"poloha"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofón"</string> @@ -818,6 +837,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(odpojené)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Nedá sa prepnúť. Zopakujte klepnutím."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Spárovať nové zariadenie"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Ak chcete túto reláciu prenášať, otvorte aplikáciu."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Neznáma aplikácia"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Číslo zostavy"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Číslo zostavy bolo skopírované do schránky."</string> <string name="basic_status" msgid="2315371112182658176">"Otvorená konverzácia"</string> @@ -851,6 +872,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Pozrite si nedávne správy, zmeškané hovory a aktualizácie stavu"</string> <string name="people_tile_title" msgid="6589377493334871272">"Konverzácia"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Pozastavené režimom bez vyrušení"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> poslal(a) správu: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> poslal(a) obrázok"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> má aktualizáciu statusu: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -891,8 +913,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktívnych aplikácií</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aktívna aplikácia</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nové informácie"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktívne aplikácie"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Ukončiť"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Zastavená"</string> @@ -903,8 +924,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"Upraviť skopírovaný text"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Upraviť skopírovaný obrázok"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Odoslať do zariadenia v okolí"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"Pridať"</string> + <string name="manage_users" msgid="1823875311934643849">"Spravovať používateľov"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Toto upozornenie nepodporuje presun na rozdelenú obrazovku."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi nie je k dispozícii"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Režim priority"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Budík je nastavený"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Režim Asistenta pre hostí je aktivovaný"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera a mikrofón sú vypnuté"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# upozornenie}few{# upozornenia}many{# notifications}other{# upozornení}}"</string> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index d657277431ca..6996d56f2861 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Sistemski uporabniški vmesnik"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Baterija bo morda kmalu izpraznjena"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Še <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Ni mogoče polniti prek USB-ja"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Uporabite polnilnik, ki je bil priložen napravi"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Pristnost obraza je potrjena"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Potrjeno"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Za dokončanje se dotaknite »Potrdite«"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Preverjena pristnost"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Uporabi kodo PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Uporabi vzorec"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Zapri"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"popolna tišina"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"samo alarmi"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Ne moti."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth je vklopljen."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarm je nastavljen čez: <xliff:g id="TIME">%s</xliff:g>."</string> @@ -207,6 +215,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Vitrina za sladice"</string> <string name="start_dreams" msgid="9131802557946276718">"Ohranjeval. zaslona"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Ne moti"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Na voljo ni nobene seznanjene naprave"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Baterija na <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -354,6 +363,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Obvestila"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Pogovori"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Brisanje vseh tihih obvestil"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Prikazovanje obvestil je začasno zaustavljeno z načinom »ne moti«"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Začni zdaj"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Ni obvestil"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"To napravo upravlja tvoj starš"</string> @@ -497,6 +507,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Stanje:</b> Uvrščeno nižje"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Prikaz na vrhu razdelka z obvestili za pogovor in kot profilna slika na zaklenjenem zaslonu"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Prikaz v obliki oblačka na vrhu razdelka z obvestili za pogovor in kot profilna slika na zaklenjenem zaslonu."</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Prikaz na vrhu razdelka z obvestili za pogovor in kot profilna slika na zaklenjenem zaslonu, preglasitev načina Ne moti."</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Prikaz v obliki oblačka na vrhu razdelka z obvestili za pogovor in kot profilna slika na zaklenjenem zaslonu, preglasitev načina Ne moti."</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prednostno"</string> <string name="no_shortcut" msgid="8257177117568230126">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> ne podpira pogovornih funkcij."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Za ta obvestila ni mogoče spremeniti nastavitev."</string> @@ -576,6 +588,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"Sporočila SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Glasba"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Koledar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Ne moti"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Bližnjica z gumboma za glasnost"</string> <string name="battery" msgid="769686279459897127">"Baterija"</string> <string name="headset" msgid="4485892374984466437">"Slušalke z mikrofonom"</string> @@ -694,6 +707,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi je izklopljen"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth je izklopljen"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Način »ne moti« je izklopljen"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Samodejno pravilo (<xliff:g id="ID_1">%s</xliff:g>) je vklopilo način »ne moti«."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Aplikacija (<xliff:g id="ID_1">%s</xliff:g>) je vklopila način »ne moti«."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Način »ne moti« je bil vklopljen zaradi samodejnega pravila ali aplikacije."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Aplikacije, ki se izvajajo v ozadju"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Dotaknite se za prikaz podrobnosti porabe baterije in prenosa podatkov"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Želite izklopiti prenos podatkov v mobilnih omrežjih?"</string> @@ -718,6 +735,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(za delo)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonski klic"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(prek aplikacije <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"fotoaparat"</string> <string name="privacy_type_location" msgid="7991481648444066703">"lokacijo"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -818,6 +837,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(povezava je prekinjena)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Preklop ni mogoč. Če želite poskusiti znova, se dotaknite."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Seznanitev nove naprave"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Če želite predvajati to sejo, odprite aplikacijo."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Neznana aplikacija"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Delovna različica"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Delovna različica je bila kopirana v odložišče."</string> <string name="basic_status" msgid="2315371112182658176">"Odprt pogovor"</string> @@ -851,6 +872,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"Več kot <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Ogled nedavnih sporočil, neodgovorjenih klicev in posodobitev stanj"</string> <string name="people_tile_title" msgid="6589377493334871272">"Pogovor"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"To je začasno zaustavil način »ne moti«."</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"Oseba <xliff:g id="NAME">%1$s</xliff:g> je poslala sporočilo: <xliff:g id="NOTIFICATION">%2$s</xliff:g>."</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"Oseba <xliff:g id="NAME">%1$s</xliff:g> je poslala sliko."</string> <string name="new_status_content_description" msgid="6046637888641308327">"Oseba <xliff:g id="NAME">%1$s</xliff:g> je posodobila stanje: <xliff:g id="STATUS">%2$s</xliff:g>."</string> @@ -891,8 +913,7 @@ <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> aktivne aplikacije</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktivnih aplikacij</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nove informacije"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktivne aplikacije"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Ustavi"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Ustavljeno"</string> @@ -903,8 +924,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"Uredi kopirano besedilo"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Uredi kopirano sliko"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Pošlji v napravo v bližini"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"Dodaj"</string> + <string name="manage_users" msgid="1823875311934643849">"Upravljanje uporabnikov"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"To obvestilo ne podpira vlečenja v razdeljen zaslon."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi ni na voljo."</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Prednostni način"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarm je nastavljen."</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Način za goste je omogočen za Pomočnika."</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Fotoaparat in mikrofon sta izklopljena."</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# obvestilo}one{# obvestilo}two{# obvestili}few{# obvestila}other{# obvestil}}"</string> </resources> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index f8ba65af9300..bea8d835c39b 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Ndërfaqja e përdoruesit të sistemit"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Bateria mund të mbarojë së shpejti"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Ka mbetur edhe <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Nuk mund të ngarkohet përmes USB-së"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Përdor karikuesin që ke marrë me pajisjen"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Fytyra u vërtetua"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Konfirmuar"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Trokit \"Konfirmo\" për ta përfunduar"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"U vërtetua"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Përdor kodin PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Përdor motivin"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Mbylle"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"heshtje e plotë"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"vetëm alarmet"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Mos shqetëso."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth-i."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"\"Bluetooth-i\" është i aktivizuar."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarmi u caktua për në <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"\"Kutia e ëmbëlsirës\""</string> <string name="start_dreams" msgid="9131802557946276718">"Mbrojtësi i ekranit"</string> <string name="ethernet_label" msgid="2203544727007463351">"Eternet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Mos shqetëso"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Nuk ofrohet për përdorim asnjë pajisje e çiftuar"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> bateri"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Njoftimet"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Bisedat"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Pastro të gjitha njoftimet në heshtje"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Njoftimet janë vendosur në pauzë nga modaliteti \"Mos shqetëso\""</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Fillo tani"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Asnjë njoftim"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Kjo pajisje menaxhohet nga prindi yt"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Statusi:</b> Renditur më poshtë"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Shfaqet në krye të njoftimeve të bisedës dhe si fotografia e profilit në ekranin e kyçjes"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Shfaqet në krye të njoftimeve të bisedës, shfaqet si fotografia e profilit në ekranin e kyçjes dhe shfaqet si flluskë"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Shfaqet në krye të njoftimeve të bisedës, shfaqet si fotografia e profilit në ekranin e kyçjes dhe ndërpret modalitetin \"Mos shqetëso\""</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Shfaqet në krye të njoftimeve të bisedës dhe si fotografia e profilit në ekranin e kyçjes, shfaqet si flluskë dhe ndërpret modalitetin \"Mos shqetëso\""</string> <string name="notification_priority_title" msgid="2079708866333537093">"Me përparësi"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> nuk mbështet veçoritë e bisedës"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Këto njoftime nuk mund të modifikohen."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Muzikë"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalendari"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Mos shqetëso"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Shkurtorja e butonave të volumit"</string> <string name="battery" msgid="769686279459897127">"Bateria"</string> <string name="headset" msgid="4485892374984466437">"Kufjet me mikrofon"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi është joaktiv"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth-i është joaktiv"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Modaliteti \"Mos shqetëso\" është joaktiv"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Modaliteti \"Mos shqetëso\" është aktivizuar nga një rregull automatik (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Modaliteti \"Mos shqetëso\" është aktivizuar nga një aplikacion (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Modaliteti \"Mos shqetëso\" është aktivizuar nga një rregull automatik ose një aplikacion."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Aplikacionet që ekzekutohen në sfond"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Trokit për detaje mbi baterinë dhe përdorimin e të dhënave"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Të çaktivizohen të dhënat celulare?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(puna)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonata"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(nëpërmjet <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kamerën"</string> <string name="privacy_type_location" msgid="7991481648444066703">"vendndodhjen"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofonin"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(shkëputur)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Nuk mund të ndërrohet. Trokit për të provuar përsëri."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Çifto pajisjen e re"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Hap aplikacionin për të transmetuar këtë seancë."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Aplikacion i panjohur"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numri i ndërtimit"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Numri i ndërtimit u kopjua te kujtesa e fragmenteve"</string> <string name="basic_status" msgid="2315371112182658176">"Hap bisedën"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"Mbi <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Shiko mesazhet e fundit, telefonatat e humbura dhe përditësimet e statusit"</string> <string name="people_tile_title" msgid="6589377493334871272">"Biseda"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Vendosur në pauzë nga \"Mos shqetëso\""</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> dërgoi një mesazh: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> dërgoi një imazh"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ka një përditësim të statusit: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplikacione aktive</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplikacion aktiv</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Informacion i ri"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aplikacionet aktive"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Ndalo"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Ndaluar"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"U kopjua"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Nga <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Hiq kopjen e ndërfaqes së përdoruesit"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Modifiko tekstin e kopjuar"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Modifiko imazhin e kopjuar"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Dërgo te pajisja në afërsi"</string> + <string name="add" msgid="81036585205287996">"Shto"</string> + <string name="manage_users" msgid="1823875311934643849">"Menaxho përdoruesit"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Ky njoftim nuk mbështet zvarritjen në \"Ekranin e ndarë\"."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi nuk ofrohet"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Modaliteti \"Me përparësi\""</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarmi është caktuar"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Modaliteti \"vizitor\" i \"Asistentit\" është aktivizuar"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera dhe mikrofoni janë joaktivë"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 5d89cf1d3e6c..f373eea9d8e3 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI система"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Батерија ће се можда ускоро испразнити"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Још <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Пуњење преко USB-а није успело"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Користите пуњач који сте добили уз уређај"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Лице је потврђено"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Потврђено"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Додирните Потврди да бисте завршили"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Идентитет је потврђен"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Користите PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Користите шаблон"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Затвори"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"потпуна тишина"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"само аларми"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Не узнемиравај."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth је укључен."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Аларм је подешен за <xliff:g id="TIME">%s</xliff:g>."</string> @@ -206,6 +214,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Витрина са посластицама"</string> <string name="start_dreams" msgid="9131802557946276718">"Чувар екрана"</string> <string name="ethernet_label" msgid="2203544727007463351">"Етернет"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Не узнемиравај"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Није доступан ниједан упарени уређај"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Ниво батерије је <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -351,6 +360,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Обавештења"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Конверзације"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Обришите сва нечујна обавештења"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Обавештења су паузирана режимом Не узнемиравај"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Започни"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Нема обавештења"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Овим уређајем управља родитељ"</string> @@ -494,6 +504,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Статус:</b> Рангирано ниже"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Приказује се у врху обавештења о конверзацијама и као слика профила на закључаном екрану"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Приказује се у врху обавештења о конверзацијама и као слика профила на закључаном екрану, појављује се као облачић"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Приказује се у врху обавештења о конверзацијама и као слика профила на закључаном екрану, прекида режим Не узнемиравај"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Приказује се у врху обавештења о конверзацијама и као слика профила на закључаном екрану, појављује се као облачић, прекида режим Не узнемиравај"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Приоритет"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> не подржава функције конверзације"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ова обавештења не могу да се мењају."</string> @@ -571,6 +583,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Музика"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Календар"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Не узнемиравај"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Пречица за дугмад за јачину звука"</string> <string name="battery" msgid="769686279459897127">"Батерија"</string> <string name="headset" msgid="4485892374984466437">"Наглавне слушалице"</string> @@ -689,6 +702,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"WiFi је искључен"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth је искључен"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Режим Не узнемиравај је искључен"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Аутоматско правило (<xliff:g id="ID_1">%s</xliff:g>) је укључило режим Не узнемиравај."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Апликација (<xliff:g id="ID_1">%s</xliff:g>) је укључила режим Не узнемиравај."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Аутоматско правило или апликација су укључили режим Не узнемиравај."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Апликације покренуте у позадини"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Додирните за детаље о батерији и потрошњи података"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Желите да искључите мобилне податке?"</string> @@ -713,6 +730,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(посао)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Телефонски позив"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(преко: <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"камеру"</string> <string name="privacy_type_location" msgid="7991481648444066703">"локацију"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"микрофон"</string> @@ -812,6 +831,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(веза је прекинута)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Пребацивање није успело. Пробајте поново."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Упари нови уређај"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Да бисте пребацивали ову сесију, отворите апликацију."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Непозната апликација"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Број верзије"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Број верзије је копиран у привремену меморију."</string> <string name="basic_status" msgid="2315371112182658176">"Отворите конверзацију"</string> @@ -845,6 +866,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Погледајте недавне поруке, пропуштене позиве и ажурирања статуса"</string> <string name="people_tile_title" msgid="6589377493334871272">"Конверзација"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Паузирано режимом Не узнемиравај"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> је послао/ла поруку: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> шаље слику"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> има ажурирање статуса: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -884,8 +906,7 @@ <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> активне апликације</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> активних апликација</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Нове информације"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Активне апликације"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Заустави"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Заустављено"</string> @@ -893,14 +914,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Копирано је"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Из: <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Одбаци копирање корисничког интерфејса"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Измените копирани текст"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Измените копирану слику"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Пошаљи на уређај у близини"</string> + <string name="add" msgid="81036585205287996">"Додај"</string> + <string name="manage_users" msgid="1823875311934643849">"Управљаjте корисницима"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Ово обавештење не подржава превлачење на подељени екран."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"WiFi није доступан"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Приоритетни режим"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Аларм је подешен"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Омогућен је режим госта у Помоћнику"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Камера и микрофон су искључени"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index b9a3ab106fcd..638ba9f7e4f2 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Gränssnitt"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Batteriet kan ta slut snart"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> kvar"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Det går inte att ladda via USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Använd laddaren som följde med enheten."</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Ansiktet har autentiserats"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Bekräftat"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Slutför genom att trycka på Bekräfta"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentiserad"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Använd pinkod"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Använd mönster"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Stäng"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"helt tyst"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"endast alarm"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Stör ej."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth på."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarmet ringer <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessertdisken"</string> <string name="start_dreams" msgid="9131802557946276718">"Skärmsläckare"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Stör ej"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Det finns inga kopplade enheter tillgängliga"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> batteri"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Aviseringar"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Konversationer"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Rensa alla ljudlösa aviseringar"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Aviseringar har pausats via Stör ej"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Starta nu"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Inga aviseringar"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Den här enheten hanteras av din förälder"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Sänkt"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Visas högst upp i konversationsaviseringarna och som profilbild på låsskärmen"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Visas högst upp i konversationsaviseringarna och som profilbild på låsskärmen, visas som bubbla"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Visas högst upp i konversationsaviseringarna och som profilbild på låsskärmen, åsidosätter Stör ej"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Visas högst upp i konversationsaviseringarna och som profilbild på låsskärmen, visas som bubbla, åsidosätter Stör ej"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritet"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> har inte stöd för konversationsfunktioner"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Det går inte att ändra de här aviseringarna."</string> @@ -566,6 +578,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="volume_and_do_not_disturb" msgid="502044092739382832">"Stör ej"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Genväg till volymknappar"</string> <string name="battery" msgid="769686279459897127">"Batteri"</string> <string name="headset" msgid="4485892374984466437">"Headset"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"wifi är inaktiverat"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth är inaktiverat"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Stör ej är inaktiverat"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Stör ej aktiverades via en automatisk regel (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Stör ej aktiverades via en app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Stör ej aktiverades via en automatisk regel eller en app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Appar körs i bakgrunden"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Tryck för information om batteri- och dataanvändning"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Vill du inaktivera mobildata?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(jobb)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefonsamtal"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(via <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"plats"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(frånkopplad)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Misslyckat byte. Tryck och försök igen."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Parkoppla en ny enhet"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Öppna appen om du vill casta den här sessionen."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Okänd app"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Versionsnummer"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Versionsnumret har kopierats till urklipp."</string> <string name="basic_status" msgid="2315371112182658176">"Öppen konversation"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"över <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Se de senaste meddelandena, missade samtal och statusuppdateringar"</string> <string name="people_tile_title" msgid="6589377493334871272">"Konversation"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Pausad av Stör ej"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> skickade ett meddelande: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> skickade en bild"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> har gjort en statusuppdatering: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aktiva appar</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aktiv app</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Ny information"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktiva appar"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stoppa"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stoppad"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Kopierades"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Från <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Stäng användargränssnittet för kopiering"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Redigera kopierad text"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Redigera kopierad bild"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Skicka till enhet i närheten"</string> + <string name="add" msgid="81036585205287996">"Lägg till"</string> + <string name="manage_users" msgid="1823875311934643849">"Hantera användare"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Det går inte att dra den här aviseringen till delad skärm."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wifi är inte tillgängligt"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Prioritetsläge"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarmet är aktiverat"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Gästläget för assistenten är aktiverat"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kameran och mikrofonen är avstängda"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 803a2b56067c..931f6343b7df 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Kiolesura"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Chaji inaweza kuisha hivi karibuni"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Imebakisha <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Haiwezi kuchaji kupitia USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Tumia chaja ambayo ilikuja na kifaa chako"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Uso umethibitishwa"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Imethibitishwa"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Gusa Thibitisha ili ukamilishe"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Umethibitishwa"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Tumia PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Tumia mchoro"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Funga"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"kimya kabisa"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"kengele pekee"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Usinisumbue."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth imewashwa."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Kengele imewashwa na italia <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Sanduku la Vitindamlo"</string> <string name="start_dreams" msgid="9131802557946276718">"Taswira ya skrini"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Usinisumbue"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Hakuna vifaa vilivyooanishwa vinavyopatikana"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Chaji ya betri ni <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Arifa"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Mazungumzo"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Futa arifa zote zisizo na sauti"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Kipengele cha Usinisumbue kimesitisha arifa"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Anza sasa"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Hakuna arifa"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Kifaa hiki kinadhibitiwa na mzazi wako"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Hali:</b> Imeorodheshwa Katika Nafasi ya Chini"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Huonyeshwa kwenye sehemu ya juu ya arifa za mazungumzo na kama picha ya wasifu kwenye skrini iliyofungwa"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Huonyeshwa kwenye sehemu ya juu ya arifa za mazungumzo na kama picha ya wasifu kwenye skrini iliyofungwa. Huonekana kama kiputo"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Huonyeshwa kwenye sehemu ya juu ya arifa za mazungumzo na kama picha ya wasifu kwenye skrini iliyofungwa. Hukatiza kipengele cha Usinisumbue"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Huonyeshwa kwenye sehemu ya juu ya arifa za mazungumzo na kama picha ya wasifu kwenye skrini iliyofungwa. Huonekana kama kiputo na hukatiza kipengele cha Usinisumbue"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Kipaumbele"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> haitumii vipengele vya mazungumzo"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Arifa hizi haziwezi kubadilishwa."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Muziki"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalenda"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Usinisumbue"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Njia ya mkato ya vitufe vya sauti"</string> <string name="battery" msgid="769686279459897127">"Betri"</string> <string name="headset" msgid="4485892374984466437">"Vifaa vya sauti"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi imezimwa"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth imezimwa"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Kipengele cha Usinisumbue kimezimwa"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Kipengele cha Usinisumbue kimewashwa na sheria ya kiotomatiki <xliff:g id="ID_1">%s</xliff:g>."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Kipengele cha usinisumbue kimewashwa na programu (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Kipengele cha Usinisumbue kimewashwa na sheria ya kiotomatiki au programu."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Programu zinatumika chinichini"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Gusa ili upate maelezo kuhusu betri na matumizi ya data"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Ungependa kuzima data ya mtandao wa simu?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(kazini)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Simu"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(kupitia <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"mahali"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"maikrofoni"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(imetenganishwa)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Imeshindwa kubadilisha. Gusa ili ujaribu tena."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Oanisha kifaa kipya"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Ili utume kipindi hiki, tafadhali fungua programu."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Programu isiyojulikana"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Nambari ya muundo"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Nambari ya muundo imewekwa kwenye ubao wa kunakili."</string> <string name="basic_status" msgid="2315371112182658176">"Fungua mazungumzo"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Angalia ujumbe wa hivi majuzi, simu ambazo hukujibu na taarifa za hali"</string> <string name="people_tile_title" msgid="6589377493334871272">"Mazungumzo"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Imesimamishwa na kipengele cha Usinisumbue"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> ametuma ujumbe: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ametuma picha"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ana taarifa kuhusu hali: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other">Programu <xliff:g id="COUNT_1">%s</xliff:g> zinatumika</item> <item quantity="one">Programu <xliff:g id="COUNT_0">%s</xliff:g> inatumika</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Maelezo mapya"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Programu zinazotumika"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Simamisha"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Imesimamishwa"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Imenakiliwa"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Kutoka <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Ondoa kiolesura cha nakala"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Badilisha maandishi yaliyonakiliwa"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Badilisha picha iliyonakiliwa"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Tuma kwenye kifaa kilicho karibu"</string> + <string name="add" msgid="81036585205287996">"Weka"</string> + <string name="manage_users" msgid="1823875311934643849">"Dhibiti watumiaji"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Arifa hii hairuhusu kuburuta kwenye Skrini iliyogawanyika."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi-Fi haipatikani"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Hali ya kipaumbele"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Kengele imewekwa"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Matumizi ya wageni ya Mratibu yamewashwa"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera na maikrofoni zimezimwa"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res/values-sw600dp-land/dimens.xml index 4f95811b21b3..117404bad46e 100644 --- a/packages/SystemUI/res/values-sw600dp-land/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp-land/dimens.xml @@ -34,17 +34,45 @@ <item name="controls_task_view_width_percentage" translatable="false" format="float" type="dimen">0.45</item> <dimen name="controls_task_view_right_margin">8dp</dimen> - <!-- Distance that the full shade transition takes in order for qs to fully transition to the - shade --> - <dimen name="lockscreen_shade_qs_transition_distance">200dp</dimen> + <!-- Distance that the full shade transition takes in order to complete by tapping on a button + like "expand". --> + <dimen name="lockscreen_shade_transition_by_tap_distance">200dp</dimen> - <!-- Distance that the full shade transition takes in order for scrim to fully transition to - the shade (in alpha) --> - <dimen name="lockscreen_shade_scrim_transition_distance">200dp</dimen> + <!-- Distance that the full shade transition takes in order to complete. --> + <dimen name="lockscreen_shade_full_transition_distance">200dp</dimen> <!-- Distance that the full shade transition takes in order for media to fully transition to - the shade --> + the shade --> <dimen name="lockscreen_shade_media_transition_distance">200dp</dimen> + <!-- Distance that the full shade transition takes in order for scrim to fully transition to + the shade (in alpha) --> + <dimen name="lockscreen_shade_scrim_transition_distance">80dp</dimen> + + <!-- Distance that the full shade transition takes in order for the keyguard content on + NotificationPanelViewController to fully fade (e.g. Clock & Smartspace) --> + <dimen name="lockscreen_shade_npvc_keyguard_content_alpha_transition_distance">80dp</dimen> + + <!-- Distance that the full shade transition takes in order for the notification shell to fully + expand. --> + <dimen name="lockscreen_shade_notif_shelf_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen> + + <!-- Distance that the full shade transition takes in order for the Quick Settings to fully + fade and expand. --> + <dimen name="lockscreen_shade_qs_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen> + + <!-- Distance that the full shade transition takes in order for depth of the wallpaper to fully + change. + On split-shade, there should be no depth effect, so setting the value to 0. --> + <dimen name="lockscreen_shade_depth_controller_transition_distance">0dp</dimen> + + <!-- Distance that the full shade transition takes in order for the UDFPS Keyguard View to fully + fade. --> + <dimen name="lockscreen_shade_udfps_keyguard_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen> + + <!-- Used for StatusBar to know that a transition is in progress. At the moment it only checks + whether the progress is > 0, therefore this value is not very important. --> + <dimen name="lockscreen_shade_status_bar_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen> + <dimen name="notification_panel_margin_horizontal">12dp</dimen> </resources> diff --git a/packages/SystemUI/res/values-sw720dp-land/dimens.xml b/packages/SystemUI/res/values-sw720dp-land/dimens.xml index 71c195896051..139146181a47 100644 --- a/packages/SystemUI/res/values-sw720dp-land/dimens.xml +++ b/packages/SystemUI/res/values-sw720dp-land/dimens.xml @@ -24,4 +24,6 @@ <dimen name="keyguard_split_shade_top_margin">72dp</dimen> <dimen name="notification_panel_margin_horizontal">24dp</dimen> + + <dimen name="split_shade_header_height">56dp</dimen> </resources> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index 094559fb7a53..e856294f2ed3 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"சாதனத்தின் UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"பேட்டரி விரைவில் தீர்ந்துவிடக்கூடும்"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> உள்ளது"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB மூலம், சார்ஜ் செய்ய முடியாது"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"உங்கள் சாதனத்துடன் வழங்கப்பட்ட சார்ஜரைப் பயன்படுத்தவும்"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"முகம் அங்கீகரிக்கப்பட்டது"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"உறுதிப்படுத்தப்பட்டது"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"முடிக்க \'உறுதிப்படுத்துக\' என்பதை தட்டவும்"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"அங்கீகரிக்கப்பட்டது"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"பின்னைப் பயன்படுத்து"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"பேட்டர்னைப் பயன்படுத்து"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"மூடு"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"முழு அமைதி"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"அலாரங்கள் மட்டும்"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"தொந்தரவு செய்ய வேண்டாம்."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"புளூடூத்."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"புளூடூத் இயக்கத்தில்."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"<xliff:g id="TIME">%s</xliff:g> மணிக்கு அலாரம் அமைக்கப்பட்டது."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"இனிப்பு வடிவங்கள்"</string> <string name="start_dreams" msgid="9131802557946276718">"ஸ்கிரீன் சேவர்"</string> <string name="ethernet_label" msgid="2203544727007463351">"ஈதர்நெட்"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"தொந்தரவு செய்ய வேண்டாம்"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"புளூடூத்"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"இணைக்கப்பட்ட சாதனங்கள் இல்லை"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> பேட்டரி"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"அறிவிப்புகள்"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"உரையாடல்கள்"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"சைலன்ட் அறிவிப்புகள் அனைத்தையும் அழிக்கும்"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"\'தொந்தரவு செய்ய வேண்டாம்\' அம்சத்தின் மூலம் அறிவிப்புகள் இடைநிறுத்தப்பட்டுள்ளன"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"இப்போது தொடங்கு"</string> <string name="empty_shade_text" msgid="8935967157319717412">"அறிவிப்புகள் இல்லை"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"இந்தச் சாதனம் உங்கள் பெற்றோரால் நிர்வகிக்கப்படுகிறது"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>நிலை:</b> முக்கியத்துவம் குறைக்கப்பட்டது"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"உரையாடல் அறிவிப்புகளின் மேற்பகுதியில் காட்டப்படும், திரை பூட்டப்பட்டிருக்கும்போது சுயவிவரப் படமாகக் காட்டப்படும்"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"உரையாடல் அறிவிப்புகளின் மேற்பகுதியில் காட்டப்படும், திரை பூட்டப்பட்டிருக்கும்போது சுயவிவரப் படமாகக் காட்டப்படும், குமிழாகத் தோன்றும்"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"உரையாடல் அறிவிப்புகளின் மேற்பகுதியில் காட்டப்படும், திரை பூட்டப்பட்டிருக்கும்போது சுயவிவரப் படமாகக் காட்டப்படும், தொந்தரவு செய்ய வேண்டாம் அம்சம் இயக்கப்பட்டிருக்கும்போதும் காட்டப்படும்"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"உரையாடல் அறிவிப்புகளின் மேற்பகுதியில் காட்டப்படும், திரை பூட்டப்பட்டிருக்கும்போது சுயவிவரப் படமாகக் காட்டப்படும், குமிழாகத் தோன்றும், தொந்தரவு செய்ய வேண்டாம் அம்சம் இயக்கப்பட்டிருக்கும்போதும் காட்டப்படும்"</string> <string name="notification_priority_title" msgid="2079708866333537093">"முன்னுரிமை"</string> <string name="no_shortcut" msgid="8257177117568230126">"உரையாடல் அம்சங்களை <xliff:g id="APP_NAME">%1$s</xliff:g> ஆதரிக்காது"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"இந்த அறிவிப்புகளை மாற்ற இயலாது."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"மியூசிக்"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"தொந்தரவு செய்ய வேண்டாம்"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"ஒலியளவுப் பொத்தான்களுக்கான ஷார்ட்கட்"</string> <string name="battery" msgid="769686279459897127">"பேட்டரி"</string> <string name="headset" msgid="4485892374984466437">"ஹெட்செட்"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"வைஃபை முடக்கத்தில் உள்ளது"</string> <string name="bt_is_off" msgid="7436344904889461591">"புளூடூத் முடக்கத்தில் உள்ளது"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"\"தொந்தரவு செய்ய வேண்டாம்\" முடக்கத்தில் உள்ளது"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"\"தொந்தரவு செய்ய வேண்டாம்\" எனும் பயன்முறையை, தானியங்கு விதி (<xliff:g id="ID_1">%s</xliff:g>) இயக்கியுள்ளது."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"\"தொந்தரவு செய்ய வேண்டாம்\" எனும் பயன்முறையை, ஆப்ஸ் (<xliff:g id="ID_1">%s</xliff:g>) இயக்கியுள்ளது."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"\"தொந்தரவு செய்ய வேண்டாம்\" எனும் பயன்முறையை, தானியங்கு விதி அல்லது ஆப்ஸ் இயக்கியுள்ளது."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"பின்னணியில் இயங்கும் ஆப்ஸ்"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"பேட்டரி மற்றும் டேட்டா உபயோக விவரங்களைக் காண, தட்டவும்"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"மொபைல் டேட்டாவை ஆஃப் செய்யவா?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(பணி)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"மொபைல் அழைப்பு"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> மூலம்)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"கேமரா"</string> <string name="privacy_type_location" msgid="7991481648444066703">"இருப்பிடம்"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"மைக்ரோஃபோன்"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(துண்டிக்கப்பட்டது)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"இணைக்க முடியவில்லை. மீண்டும் முயல தட்டவும்."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"புதிய சாதனத்தை இணைத்தல்"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"இந்த அமர்வை அலைபரப்ப ஆப்ஸைத் திறங்கள்."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"அறியப்படாத ஆப்ஸ்"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"பதிப்பு எண்"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"பதிப்பு எண் கிளிப்போர்டுக்கு நகலெடுக்கப்பட்டது."</string> <string name="basic_status" msgid="2315371112182658176">"திறந்தநிலை உரையாடல்"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"சமீபத்திய மெசேஜ்களையும் தவறிய அழைப்புகளையும் ஸ்டேட்டஸ் அப்டேட்களையும் பார்க்கலாம்"</string> <string name="people_tile_title" msgid="6589377493334871272">"உரையாடல்"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"தொந்தரவு செய்ய வேண்டாம் அம்சத்தால் இடைநிறுத்தப்பட்டது"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> ஒரு மெசேஜ் அனுப்பியுள்ளார்: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ஒரு படம் அனுப்பியுள்ளார்"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> புதிய ஸ்டேட்டஸ் வைத்துள்ளார்: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ஆப்ஸ் செயலில் உள்ளன</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> ஆப்ஸ் செயலில் உள்ளது</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"புதிய தகவல்கள்"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"செயலிலுள்ள ஆப்ஸ்"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"நிறுத்து"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"இயங்கவில்லை"</string> @@ -889,8 +910,14 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"நகலெடுத்த வார்த்தைகளைத் திருத்து"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"நகலெடுத்த படத்தைத் திருத்து"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"அருகிலுள்ள சாதனத்திற்கு அனுப்பு"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="add" msgid="81036585205287996">"சேர்"</string> + <string name="manage_users" msgid="1823875311934643849">"பயனர்களை நிர்வகித்தல்"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"பிரிக்கப்பட்ட திரைக்குள் இந்த அறிவிப்பை இழுத்துவிட முடியாது."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"வைஃபை கிடைக்கவில்லை"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"முன்னுரிமைப் பயன்முறை"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"அலாரம் அமைக்கப்பட்டுள்ளது"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistant கெஸ்ட் பயன்முறை இயக்கப்பட்டுள்ளது"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"கேமராவும் மைக்கும் ஆஃப் செய்யப்பட்டுள்ளன"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index 59e8ef4a6e87..6ef8f5086535 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"సిస్టమ్ UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"బ్యాటరీ త్వరలో ఖాళీ అవ్వచ్చు"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> మిగిలి ఉంది"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB ద్వారా ఛార్జ్ చేయలేరు"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"మీ పరికరంతో వచ్చిన ఛార్జర్ను ఉపయోగించండి"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"ముఖం ప్రామాణీకరించబడింది"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"నిర్ధారించబడింది"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"పూర్తి చేయడానికి \"నిర్ధారించు\" నొక్కండి"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ప్రామాణీకరించబడింది"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"పిన్ను ఉపయోగించు"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ఆకృతిని ఉపయోగించు"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"మూసివేస్తుంది"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"మొత్తం నిశ్శబ్దం"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"అలారాలు మాత్రమే"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"అంతరాయం కలిగించవద్దు."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"బ్లూటూత్."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"బ్లూటూత్ ఆన్లో ఉంది."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"<xliff:g id="TIME">%s</xliff:g>కి అలారం సెట్ చేయబడింది."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"డెజర్ట్ కేస్"</string> <string name="start_dreams" msgid="9131802557946276718">"స్క్రీన్ సేవర్"</string> <string name="ethernet_label" msgid="2203544727007463351">"ఈథర్నెట్"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"అంతరాయం కలిగించవద్దు"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"బ్లూటూత్"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"జత చేసిన పరికరాలు ఏవీ అందుబాటులో లేవు"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> బ్యాటరీ"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"నోటిఫికేషన్లు"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"సంభాషణలు"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"అన్ని నిశ్శబ్ద నోటిఫికేషన్లను క్లియర్ చేస్తుంది"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"అంతరాయం కలిగించవద్దు ద్వారా నోటిఫికేషన్లు పాజ్ చేయబడ్డాయి"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"ఇప్పుడే ప్రారంభించు"</string> <string name="empty_shade_text" msgid="8935967157319717412">"నోటిఫికేషన్లు లేవు"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"ఈ పరికరాన్ని మీ తల్లి/తండ్రి మేనేజ్ చేస్తున్నారు"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>స్టేటస్:</b> తక్కువ ర్యాంక్కు సర్దుబాటు చేయబడింది"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"సంభాషణ నోటిఫికేషన్ల ఎగువున, లాక్ స్క్రీన్లో ప్రొఫైల్ ఫోటోగా చూపిస్తుంది"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"సంభాషణ నోటిఫికేషన్ల ఎగువున, లాక్ స్క్రీన్లో ప్రొఫైల్ ఫోటోగా చూపిస్తుంది, బబుల్గా కనిపిస్తుంది"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"సంభాషణ నోటిఫికేషన్ల ఎగువున, లాక్ స్క్రీన్లో ప్రొఫైల్ ఫోటోగా చూపిస్తుంది, \'అంతరాయం కలిగించవద్దు\'ను అంతరాయం కలిగిస్తుంది"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"సంభాషణ నోటిఫికేషన్ల ఎగువున, లాక్ స్క్రీన్లో ప్రొఫైల్ ఫోటోగా చూపిస్తుంది, బబుల్గా కనిపిస్తుంది, \'అంతరాయం కలిగించవద్దు\'ను అంతరాయం కలిగిస్తుంది"</string> <string name="notification_priority_title" msgid="2079708866333537093">"ప్రాధాన్యత"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> సంభాషణ ఫీచర్లను సపోర్ట్ చేయదు"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ఈ నోటిఫికేషన్లను సవరించడం వీలుపడదు."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"మ్యూజిక్"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendar"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"అంతరాయం కలిగించవద్దు"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"వాల్యూమ్ బటన్ల షార్ట్కట్"</string> <string name="battery" msgid="769686279459897127">"బ్యాటరీ"</string> <string name="headset" msgid="4485892374984466437">"హెడ్సెట్"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi ఆఫ్లో ఉంది"</string> <string name="bt_is_off" msgid="7436344904889461591">"బ్లూటూత్ ఆఫ్లో ఉంది"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"అంతరాయం కలిగించవద్దు ఆఫ్లో ఉంది"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"ఆటోమేటిక్ నియమం (<xliff:g id="ID_1">%s</xliff:g>) ద్వారా అంతరాయం కలిగించవద్దు ఆన్ చేయబడింది."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"యాప్ (<xliff:g id="ID_1">%s</xliff:g>) ద్వారా అంతరాయం కలిగించవద్దు ఆన్ చేయబడింది."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"ఆటోమేటిక్ నియమం లేదా యాప్ ద్వారా అంతరాయం కలిగించవద్దు ఆన్ చేయబడింది."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"నేపథ్యంలో అమలు అవుతున్న ఆప్లు"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"బ్యాటరీ మరియు డేటా వినియోగ వివరాల కోసం నొక్కండి"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"మొబైల్ డేటాను ఆఫ్ చేయాలా?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ఆఫీస్)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"ఫోన్ కాల్"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> ద్వారా)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"కెమెరా"</string> <string name="privacy_type_location" msgid="7991481648444066703">"లొకేషన్"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"మైక్రోఫోన్"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(డిస్కనెక్ట్ అయ్యింది)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"స్విచ్ చేయడం సాధ్యం కాదు. మళ్ళీ ట్రై చేయడానికి ట్యాప్ చేయండి."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"కొత్త పరికరాన్ని పెయిర్ చేయండి"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"ఈ సెషన్ను ప్రసారం చేయడానికి, దయచేసి యాప్ను తెరవండి."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"తెలియని యాప్"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"బిల్డ్ నంబర్"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"బిల్డ్ నంబర్, క్లిప్బోర్డ్కు కాపీ చేయబడింది."</string> <string name="basic_status" msgid="2315371112182658176">"సంభాషణను తెరవండి"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ఇటీవలి మెసేజ్లు, మిస్స్డ్ కాల్స్, అలాగే స్టేటస్ అప్డేట్లను చూడండి"</string> <string name="people_tile_title" msgid="6589377493334871272">"సంభాషణ"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"అంతరాయం కలిగించవద్దు ద్వారా పాజ్ చేయబడింది"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> మెసేజ్ను పంపారు: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ఇమేజ్ను పంపారు"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g>, స్టేటస్ను గురించిన అప్డేట్ను కలిగి ఉన్నారు: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> యాక్టివ్గా ఉన్న యాప్లు</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> యాక్టివ్గా ఉన్న యాప్</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"కొత్త సమాచారం"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"యాక్టివ్గా ఉన్న యాప్లు"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ఆపివేయండి"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ఆపివేయబడింది"</string> @@ -889,8 +910,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"కాపీ చేసిన టెక్స్ట్ను ఎడిట్ చేయండి"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"కాపీ చేసిన ఇమేజ్లను ఎడిట్ చేయండి"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"సమీపంలోని పరికరానికి పంపండి"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"జోడించండి"</string> + <string name="manage_users" msgid="1823875311934643849">"యూజర్లను మేనేజ్ చేయండి"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"ఈ నోటిఫికేషన్ స్ప్లిట్స్క్రీన్కు లాగడానికి సపోర్ట్ చేయదు."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi అందుబాటులో లేదు"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"ముఖ్యమైన ఫైల్స్ మోడ్"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"అలారం సెట్ చేశాను"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"అసిస్టెంట్ గెస్ట్ మోడ్ ఎనేబుల్ చేయబడింది"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"కెమెరా, మైక్ ఆఫ్లో ఉన్నాయి"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# నోటిఫికేషన్}other{# నోటిఫికేషన్లు}}"</string> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index a20744794360..9072db444912 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"อินเทอร์เฟซผู้ใช้ของระบบ"</string> - <string name="battery_low_title" msgid="6891106956328275225">"แบตเตอรี่อาจหมดเร็วๆ นี้"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"เหลืออีก <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"ชาร์จผ่าน USB ไม่ได้"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"ใช้ที่ชาร์จที่ให้มาพร้อมกับอุปกรณ์"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"ตรวจสอบสิทธิ์ใบหน้าแล้ว"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"ยืนยันแล้ว"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"แตะยืนยันเพื่อดำเนินการให้เสร็จสมบูรณ์"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"ตรวจสอบสิทธิ์แล้ว"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"ใช้ PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"ใช้รูปแบบ"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"ปิด"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"ปิดเสียงทั้งหมด"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"เฉพาะปลุกเท่านั้น"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"ห้ามรบกวน"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"บลูทูธ"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"บลูทูธเปิดอยู่"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"ตั้งเวลาปลุกไว้ที่ <xliff:g id="TIME">%s</xliff:g>"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"ชั้นแสดงของหวาน"</string> <string name="start_dreams" msgid="9131802557946276718">"โปรแกรมรักษาหน้าจอ"</string> <string name="ethernet_label" msgid="2203544727007463351">"อีเทอร์เน็ต"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"ห้ามรบกวน"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"บลูทูธ"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"ไม่มีอุปกรณ์ที่จับคู่ที่สามารถใช้ได้"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"แบตเตอรี่ <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"การแจ้งเตือน"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"การสนทนา"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"ล้างการแจ้งเตือนแบบไม่มีเสียงทั้งหมด"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"หยุดการแจ้งเตือนชั่วคราวโดย \"ห้ามรบกวน\""</string> <string name="media_projection_action_text" msgid="3634906766918186440">"เริ่มเลย"</string> <string name="empty_shade_text" msgid="8935967157319717412">"ไม่มีการแจ้งเตือน"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"อุปกรณ์นี้จัดการโดยผู้ปกครอง"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>สถานะ:</b> อันดับต่ำลง"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"แสดงที่ด้านบนของการแจ้งเตือนการสนทนาและเป็นรูปโปรไฟล์บนหน้าจอล็อก"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"แสดงที่ด้านบนของการแจ้งเตือนการสนทนาและเป็นรูปโปรไฟล์บนหน้าจอล็อก ปรากฏเป็นบับเบิล"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"แสดงที่ด้านบนของการแจ้งเตือนการสนทนาและเป็นรูปโปรไฟล์บนหน้าจอล็อก แสดงในโหมดห้ามรบกวน"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"แสดงที่ด้านบนของการแจ้งเตือนการสนทนาและเป็นรูปโปรไฟล์บนหน้าจอล็อก ปรากฏเป็นบับเบิล แสดงในโหมดห้ามรบกวน"</string> <string name="notification_priority_title" msgid="2079708866333537093">"สำคัญ"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ไม่รองรับฟีเจอร์การสนทนา"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"แก้ไขการแจ้งเตือนเหล่านี้ไม่ได้"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"เพลง"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"ปฏิทิน"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"ห้ามรบกวน"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"ทางลัดปุ่มปรับระดับเสียง"</string> <string name="battery" msgid="769686279459897127">"แบตเตอรี่"</string> <string name="headset" msgid="4485892374984466437">"ชุดหูฟัง"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi ปิดอยู่"</string> <string name="bt_is_off" msgid="7436344904889461591">"บลูทูธปิดอยู่"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"\"ห้ามรบกวน\" ปิดอยู่"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"มีการเปิด \"ห้ามรบกวน\" โดยกฎอัตโนมัติ (<xliff:g id="ID_1">%s</xliff:g>)"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"มีการเปิด \"ห้ามรบกวน\" โดยแอป (<xliff:g id="ID_1">%s</xliff:g>)"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"มีการเปิด \"ห้ามรบกวน\" โดยกฎอัตโนมัติหรือแอป"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"แอปที่กำลังทำงานในเบื้องหลัง"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"แตะเพื่อดูรายละเอียดเกี่ยวกับแบตเตอรี่และปริมาณการใช้อินเทอร์เน็ต"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"ปิดอินเทอร์เน็ตมือถือไหม"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ที่ทำงาน)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"การโทร"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(ผ่านทาง <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"กล้องถ่ายรูป"</string> <string name="privacy_type_location" msgid="7991481648444066703">"ตำแหน่ง"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"ไมโครโฟน"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(ยกเลิกการเชื่อมต่อแล้ว)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"เปลี่ยนไม่ได้ แตะเพื่อลองอีกครั้ง"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"จับคู่อุปกรณ์ใหม่"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"โปรดเปิดแอปหากต้องการแคสต์เซสชันนี้"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"แอปที่ไม่รู้จัก"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"หมายเลขบิลด์"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"คัดลอกหมายเลขบิลด์ไปยังคลิปบอร์ดแล้ว"</string> <string name="basic_status" msgid="2315371112182658176">"เปิดการสนทนา"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ดูข้อความล่าสุด สายที่ไม่ได้รับ และการอัปเดตสถานะ"</string> <string name="people_tile_title" msgid="6589377493334871272">"การสนทนา"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"หยุดชั่วคราวโดยฟีเจอร์ห้ามรบกวน"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> ส่งข้อความ: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ส่งรูปภาพ"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> มีการอัปเดตสถานะ: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other">มี <xliff:g id="COUNT_1">%s</xliff:g> แอปที่ใช้งานอยู่</item> <item quantity="one">มี <xliff:g id="COUNT_0">%s</xliff:g> แอปที่ใช้งานอยู่</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"ข้อมูลใหม่"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"แอปที่ใช้งานอยู่"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"หยุด"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"หยุดแล้ว"</string> @@ -886,14 +907,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"คัดลอกแล้ว"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"จาก <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"ปิด UI การคัดลอก"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"แก้ไขข้อความที่คัดลอก"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"แก้ไขรูปภาพที่คัดลอก"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"ส่งไปยังอุปกรณ์ที่อยู่ใกล้เคียง"</string> + <string name="add" msgid="81036585205287996">"เพิ่ม"</string> + <string name="manage_users" msgid="1823875311934643849">"จัดการผู้ใช้"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"การแจ้งเตือนนี้ไม่รองรับการลากเพื่อแบ่งหน้าจอ"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"ใช้ Wi‑Fi ไม่ได้"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"โหมดลำดับความสำคัญ"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"ตั้งปลุกแล้ว"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"เปิดใช้โหมดผู้มาเยือนของ Assistant แล้ว"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"กล้องและไมค์ปิดอยู่"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{การแจ้งเตือน # รายการ}other{การแจ้งเตือน # รายการ}}"</string> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index db9c788037f9..b518c603458d 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"UI ng System"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Malapit nang maubos ang baterya"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> na lang ang natitira"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Hindi makapag-charge sa pamamagitan ng USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Gamitin ang charger na kasama ng iyong device"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Na-authenticate ang mukha"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Nakumpirma"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"I-tap ang Kumpirmahin para kumpletuhin"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Na-authenticate"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Gumamit ng PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Gumamit ng pattern"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Isara"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"ganap na katahimikan"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"mga alarm lang"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Huwag Istorbohin."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Naka-on ang Bluetooth."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Nakatakda ang alarm nang <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessert Case"</string> <string name="start_dreams" msgid="9131802557946276718">"Screen saver"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Huwag Istorbohin"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Walang available na mga magkapares na device"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> na baterya"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Mga Notification"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Mga Pag-uusap"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"I-clear ang lahat ng silent na notification"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Mga notification na na-pause ng Huwag Istorbohin"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Magsimula ngayon"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Walang mga notification"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Pinapamahalaan ng magulang mo itong device"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Na-rank nang Mas Mababa"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Makikita sa itaas ng mga notification ng pag-uusap at bilang larawan sa profile sa lock screen"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Makikita sa itaas ng mga notification ng pag-uusap at bilang larawan sa profile sa lock screen, lumalabas bilang bubble"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Makikita sa itaas ng mga notification ng pag-uusap at bilang larawan sa profile sa lock screen, naaabala ang Huwag Istorbohin"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Makikita sa itaas ng mga notification ng pag-uusap at bilang larawan sa profile sa lock screen, lumalabas bilang bubble, naaabala ang Huwag Istorbohin"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Priyoridad"</string> <string name="no_shortcut" msgid="8257177117568230126">"Hindi sinusuportahan ng <xliff:g id="APP_NAME">%1$s</xliff:g> ang mga feature ng pag-uusap"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Hindi puwedeng baguhin ang mga notification na ito."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Music"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Kalendaryo"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Huwag Istorbohin"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Shortcut ng mga button ng volume"</string> <string name="battery" msgid="769686279459897127">"Baterya"</string> <string name="headset" msgid="4485892374984466437">"Headset"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Naka-off ang Wi-Fi"</string> <string name="bt_is_off" msgid="7436344904889461591">"Naka-off ang Bluetooth"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Naka-off ang Huwag Istorbohin"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Na-on ang Huwag Istorbohin dahil sa isang awtomatikong panuntunan (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Na-on ang Huwag Istorbohin dahil sa isang app (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Na-on ang Huwag Istorbohin dahil sa isang awtomatikong panuntunan o app."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Tumatakbo ang mga app sa background"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"I-tap para sa mga detalye tungkol sa paggamit ng baterya at data"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"I-off ang mobile data?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(trabaho)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Tawag sa telepono"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(sa pamamagitan ng <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"camera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"lokasyon"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikropono"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(nadiskonekta)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Hindi makalipat. I-tap para subukan ulit."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Magpares ng bagong device"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Para ma-cast ang session na ito, buksan ang app."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Hindi kilalang app"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numero ng build"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Nakopya sa clipboard ang numero ng build."</string> <string name="basic_status" msgid="2315371112182658176">"Buksan ang pag-uusap"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Tingnan ang mga kamakailang mensahe, hindi nasagot na tawag, at update sa status"</string> <string name="people_tile_title" msgid="6589377493334871272">"Pag-uusap"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Na-pause ng Huwag Istorbohin"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"Nagpadala si <xliff:g id="NAME">%1$s</xliff:g> ng mensahe: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"Nagpadala si <xliff:g id="NAME">%1$s</xliff:g> ng larawan"</string> <string name="new_status_content_description" msgid="6046637888641308327">"May update sa status si <xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> aktibong app</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> na aktibong app</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Bagong impormasyon"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Mga aktibong app"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Ihinto"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Inihinto"</string> @@ -886,14 +907,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Nakopya"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Mula sa <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"I-dismiss ang UI ng pagkopya"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"I-edit ang kinopyang text"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"I-edit ang kinopyang larawan"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Ipadala sa kalapit na device"</string> + <string name="add" msgid="81036585205287996">"Magdagdag"</string> + <string name="manage_users" msgid="1823875311934643849">"Pamahalaan ang mga user"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Hindi sinusuportahan ng notification na ito ang pag-drag sa Splitscreen."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Hindi available ang Wi‑Fi"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Priority mode"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Nakatakda ang alarm"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Naka-enable ang guest mode ng Assistant"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Naka-off ang camera at mikropono"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# notification}one{# notification}other{# na notification}}"</string> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 308af4f3cb3a..0f56057ef082 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Sistem Arayüzü"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Pil kısa süre sonra bitebilir"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> kaldı"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB ile şarj edilemiyor"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Cihazınızla birlikte gelen şarj cihazını kullanın"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Yüz kimliği doğrulandı"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Onaylandı"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Tamamlamak için Onayla\'ya dokunun"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Kimliği Doğrulandı"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN kullan"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Deseni kullan"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Kapat"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"tamamen sessiz"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"yalnızca alarmlar"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Rahatsız Etmeyin."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth açık."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarm saati: <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Tatlı Kutusu"</string> <string name="start_dreams" msgid="9131802557946276718">"Ekran koruyucu"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Rahatsız Etmeyin"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Kullanılabilir eşlenmiş cihaz yok"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Pil düzeyi <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Bildirimler"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Görüşmeler"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Sessiz bildirimlerin tümünü temizle"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Bildirimler, Rahatsız Etmeyin özelliği tarafından duraklatıldı"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Şimdi başlat"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Bildirim yok"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Bu cihaz ebeveyniniz tarafından yönetiliyor"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Durum:</b> Daha Düşük Sıralandı"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Görüşme bildirimlerinin üstünde ve kilit ekranında profil resmi olarak gösterilir"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Görüşme bildirimlerinin üstünde ve kilit ekranında profil resmi olarak gösterilir, baloncuk olarak görünür"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Görüşme bildirimlerinin üstünde ve kilit ekranında profil resmi olarak gösterilir, Rahatsız Etmeyin\'i kesintiye uğratır"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Görüşme bildirimlerinin üstünde ve kilit ekranında profil resmi olarak gösterilir, baloncuk olarak görünür, Rahatsız Etmeyin\'i kesintiye uğratır"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Öncelikli"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g>, sohbet özelliklerini desteklemiyor"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Bu bildirimler değiştirilemez."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Müzik"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Takvim"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Rahatsız Etmeyin"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Ses düğmeleri kısayolu"</string> <string name="battery" msgid="769686279459897127">"Pil"</string> <string name="headset" msgid="4485892374984466437">"Mikrofonlu kulaklık"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>, <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Kablosuz bağlantı kapalı"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth kapalı"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Rahatsız Etmeyin kapalı"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Rahatsız Etmeyin ayarı bir otomatik kural (<xliff:g id="ID_1">%s</xliff:g>) tarafından açıldı."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Rahatsız Etmeyin ayarı bir uygulama (<xliff:g id="ID_1">%s</xliff:g>) tarafından açıldı."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Rahatsız Etmeyin ayarı bir otomatik kural veya uygulama tarafından açıldı."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Arka planda çalışan uygulamalar"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Pil ve veri kullanımı ile ilgili ayrıntılar için dokunun"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Mobil veri kapatılsın mı?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(iş)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Sesli arama"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> aracılığıyla)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"konum"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(bağlantı kesildi)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Geçiş yapılamıyor. Tekrar denemek için dokunun."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Yeni cihaz eşle"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Bu oturumu yayınlamak için lütfen uygulamayı açın."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Bilinmeyen uygulama"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Derleme numarası"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Derleme numarası panoya kopyalandı."</string> <string name="basic_status" msgid="2315371112182658176">"Görüşmeyi aç"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Yeni mesajları, cevapsız aramaları ve durum güncellemelerini görün"</string> <string name="people_tile_title" msgid="6589377493334871272">"Görüşme"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Rahatsız Etmeyin özelliği tarafından duraklatıldı"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> bir mesaj gönderdi: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> bir resim gönderdi"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g>, durumunu güncelledi: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> etkin uygulama</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> etkin uygulama</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Yeni bilgi"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Etkin uygulamalar"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Durdur"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Durduruldu"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Kopyalandı"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"<xliff:g id="APPNAME">%1$s</xliff:g> uygulamasından"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Kopyalanan kullanıcı arayüzünü kapat"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Kopyalanan metni düzenle"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Kopyalanan resmi düzenle"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Yakındaki cihaza gönder"</string> + <string name="add" msgid="81036585205287996">"Ekle"</string> + <string name="manage_users" msgid="1823875311934643849">"Kullanıcıları yönet"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Bu bildirim, bölünmüş ekrana sürüklenmeyi desteklemiyor."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Kablosuz kullanılamıyor"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Öncelik modu"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarm kuruldu"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Asistan misafir modu etkinleştirildi"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera ve mikrofon kapalı"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 01610607154e..fa9af2e1c77f 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Інтерфейс системи"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Акумулятор може невдовзі розрядитися"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Залишилося <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Не вдається зарядити через USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Використовуйте зарядний пристрій, який входить у комплект пристрою"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Обличчя автентифіковано"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Підтверджено"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Щоб завершити, натисніть \"Підтвердити\""</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Автентифіковано"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Ввести PIN-код"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Намалювати ключ"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Закрити"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"без сигналів"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"лише будильники"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Не турбувати."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth увімк."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Сигнал установлено на <xliff:g id="TIME">%s</xliff:g>."</string> @@ -207,6 +215,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Вітрина десертів"</string> <string name="start_dreams" msgid="9131802557946276718">"Заставка"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Не турбувати"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Немає спарених пристроїв"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> заряду акумулятора"</string> @@ -354,6 +363,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Сповіщення"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Розмови"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Очистити всі беззвучні сповіщення"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Режим \"Не турбувати\" призупинив сповіщення"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Почати зараз"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Сповіщень немає"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Цим пристроєм керує батько або мати"</string> @@ -497,6 +507,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Статус</b>: пріоритет знижено"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"З’являється вгорі сповіщень про розмови та як зображення профілю на заблокованому екрані"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"З’являється вгорі сповіщень про розмови та як зображення профілю на заблокованому екрані, показується у вигляді спливаючої підказки"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"З’являється вгорі сповіщень про розмови та як зображення профілю на заблокованому екрані, показується навіть у режимі \"Не турбувати\""</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"З’являється вгорі сповіщень про розмови та як зображення профілю на заблокованому екрані, відображається як спливаючий чат, перериває режим \"Не турбувати\""</string> <string name="notification_priority_title" msgid="2079708866333537093">"Пріоритет"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> не підтримує функції розмов"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ці сповіщення не можна змінити."</string> @@ -576,6 +588,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Музика"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Календар"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Не турбувати"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Кнопки гучності на корпусі"</string> <string name="battery" msgid="769686279459897127">"Акумулятор"</string> <string name="headset" msgid="4485892374984466437">"Гарнітура"</string> @@ -694,6 +707,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi вимкнено"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth вимкнено"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Режим \"Не турбувати\" вимкнено"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Автоматичне правило ввімкнуло режим \"Не турбувати\" (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Додаток увімкнув режим \"Не турбувати\" (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Автоматичне правило або додаток увімкнули режим \"Не турбувати\"."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Додатки, які працюють у фоновому режимі"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Торкніться, щоб перевірити використання акумулятора й трафік"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Вимкнути мобільний Інтернет?"</string> @@ -718,6 +735,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(робота)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Телефонний дзвінок"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(через <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"камера"</string> <string name="privacy_type_location" msgid="7991481648444066703">"місце"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"мікрофон"</string> @@ -818,6 +837,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(від’єднано)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Не вдалося змінити підключення. Натисніть, щоб повторити спробу."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Підключити новий пристрій"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Щоб транслювати цей сеанс, відкрийте додаток."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Невідомий додаток"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Номер складання"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Номер складання скопійовано в буфер обміну."</string> <string name="basic_status" msgid="2315371112182658176">"Відкрита розмова"</string> @@ -851,6 +872,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Переглядайте останні повідомлення, пропущені виклики й оновлення статусу"</string> <string name="people_tile_title" msgid="6589377493334871272">"Розмова"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Призупинено функцією \"Не турбувати\""</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> надсилає повідомлення: \"<xliff:g id="NOTIFICATION">%2$s</xliff:g>\""</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> надсилає зображення"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> публікує новий статус: \"<xliff:g id="STATUS">%2$s</xliff:g>\""</string> @@ -891,8 +913,7 @@ <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> активних додатків</item> <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> активного додатка</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Нова інформація"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Активні додатки"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Зупинити"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Зупинено"</string> @@ -900,14 +921,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Скопійовано"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"З додатка <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Закрити вікно копіювання"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Редагувати скопійований текст"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Редагувати скопійоване зображення"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Надіслати на пристрій поблизу"</string> + <string name="add" msgid="81036585205287996">"Додати"</string> + <string name="manage_users" msgid="1823875311934643849">"Керувати користувачами"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Це сповіщення не підтримує режим розділеного екрана."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Мережа Wi-Fi недоступна"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Режим пріоритету"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Будильник установлено"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Увімкнено режим гостя Асистента"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Камеру й мікрофон вимкнено"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index ce492dd71fb4..35760212155d 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"سسٹم UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"بیٹری جلد ہی ختم ہو سکتی ہے"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> باقی ہے"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB کے ذریعے چارج نہیں کر سکتے"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"اپنے آلہ کے ساتھ ملنے والے چارجر کا استعمال کریں"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"چہرے کی تصدیق ہو گئی"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"تصدیق شدہ"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"مکمل کرنے کیلئے \'تصدیق کریں\' تھپتھپائیں"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"تصدیق کردہ"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN استعمال کریں"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"پیٹرن کا استعمال کریں"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"بند کریں"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"مکمل خاموشی"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"صرف الارمز"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"ڈسٹرب نہ کریں۔"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"بلوٹوتھ۔"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"بلوٹوتھ آن ہے۔"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"الارم <xliff:g id="TIME">%s</xliff:g> کیلئے سیٹ ہے۔"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"ڈیزرٹ کیس"</string> <string name="start_dreams" msgid="9131802557946276718">"اسکرین سیور"</string> <string name="ethernet_label" msgid="2203544727007463351">"ایتھرنیٹ"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"ڈسٹرب نہ کریں"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"بلوٹوتھ"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"کوئی جوڑا بنائے ہوئے آلات دستیاب نہیں ہیں"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> بیٹری"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"اطلاعات"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"گفتگوئیں"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"سبھی خاموش اطلاعات کو صاف کریں"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"\'ڈسٹرب نہ کریں\' کے ذریعے اطلاعات کو موقوف کیا گیا"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"ابھی شروع کریں"</string> <string name="empty_shade_text" msgid="8935967157319717412">"کوئی اطلاعات نہیں ہیں"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"یہ آلہ آپ کے والدین کے زیر انتظام ہے"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>اسٹیٹس:</b> کو کم درجہ دیا گیا"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"یہ گفتگو کی اطلاعات کے اوپری حصّے پر اور مقفل اسکرین پر پروفائل کی تصویر کے بطور دکھائی دیتا ہے"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"یہ گفتگو کی اطلاعات کے اوپری حصّے پر اور مقفل اسکرین پر پروفائل کی تصویر کے بطور دکھائی دیتا ہے، بلبلے کے بطور ظاہر ہوتا ہے"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"یہ گفتگو کی اطلاعات کے اوپری حصّے پر اور مقفل اسکرین پر پروفائل کی تصویر کے بطور دکھائی دیتا ہے، \'ڈسٹرب نہ کریں\' میں مداخلت کرتا ہے"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"یہ گفتگو کی اطلاعات کے اوپری حصّے پر اور مقفل اسکرین پر پروفائل کی تصویر کے بطور دکھائی دیتا ہے، بلبلے کے بطور ظاہر ہوتا ہے، \'ڈسٹرب نہ کریں\' میں مداخلت کرتا ہے"</string> <string name="notification_priority_title" msgid="2079708866333537093">"ترجیح"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ایپ گفتگو کی خصوصیات کو سپورٹ نہیں کرتی ہے"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ان اطلاعات کی ترمیم نہیں کی جا سکتی۔"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"موسیقی"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"کیلنڈر"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"ڈسٹرب نہ کریں"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"والیوم بٹنز کے شارٹ کٹ"</string> <string name="battery" msgid="769686279459897127">"بیٹری"</string> <string name="headset" msgid="4485892374984466437">"ہیڈ سیٹ"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>، <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi آف ہے"</string> <string name="bt_is_off" msgid="7436344904889461591">"بلوٹوتھ آف ہے"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"\'ڈسٹرب نہ کریں\' آف ہے"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"\'ڈسٹرب نہ کریں\' کسی خودکار اصول (<xliff:g id="ID_1">%s</xliff:g>) کے ذریعہ آن ہو گیا تھا۔"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"\'ڈسٹرب نہ کریں\' کسی ایپ (<xliff:g id="ID_1">%s</xliff:g>) کے ذریعہ آن ہو گیا تھا۔"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"\'ڈسٹرب نہ کریں\' کسی خودکار اصول یا ایپ کے ذریعے آن ہو گیا تھا۔"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"ایپس پس منظر میں چل رہی ہیں"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"بیٹری اور ڈیٹا استعمال کے بارے میں تفصیلات کے لیے تھپتھپائیں"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"موبائل ڈیٹا آف کریں؟"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(دفتر)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"فون کال"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> کے ذریعے)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"کیمرا"</string> <string name="privacy_type_location" msgid="7991481648444066703">"مقام"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"مائیکروفون"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(غیر منسلک ہے)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"سوئچ نہیں کر سکتے۔ دوبارہ کوشش کرنے کے لیے تھپتھپائیں۔"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"نئے آلہ کا جوڑا بنائیں"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"اس سیشن کو کاسٹ کرنے کیلئے، براہ کرم ایپ کھولیں۔"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"نامعلوم ایپ"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"بلڈ نمبر"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"بلڈ نمبر کلپ بورڈ میں کاپی ہو گیا۔"</string> <string name="basic_status" msgid="2315371112182658176">"گفتگو کھولیں"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"+<xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"حالیہ پیغامات، چھوٹی ہوئی کالز اور اسٹیٹس اپ ڈیٹس دیکھیں"</string> <string name="people_tile_title" msgid="6589377493334871272">"گفتگو"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"\'ڈسٹرب نہ کریں\' کے ذریعے موقوف کیا گیا"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> نے ایک پیغام بھیجا: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> نے ایک تصویر بھیجی"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> نے اسٹیٹس کو اپ ڈیٹ کر دیا ہے: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> فعال ایپس</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> فعال ایپ</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"نئی معلومات"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"فعال ایپس"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"روکیں"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"رکی ہوئی ہے"</string> @@ -889,8 +910,13 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"کاپی کردہ ٹیکسٹ میں ترمیم کریں"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"کاپی کردہ تصویر میں ترمیم کریں"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"قریبی آلے کو بھیجیں"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="add" msgid="81036585205287996">"شامل کریں"</string> + <string name="manage_users" msgid="1823875311934643849">"صارفین کا نظم کریں"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"یہ اطلاع اسپلٹ اسکرین کو گھسیٹنے کو سپورٹ نہیں کرتا ہے۔"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi-Fi دستیاب نہیں ہے"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"ترجیحی وضع"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"الارم سیٹ ہوگیا"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"اسسٹنٹ مہمان وضع فعال ہے"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"کیمرا اور مائیک آف ہیں"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# اطلاع}other{# اطلاعات}}"</string> </resources> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index 6d6c3714fcdc..0cead719b0a4 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Tizim interfeysi"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Batareya tez orada tugaydi"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> qoldi"</string> <string name="invalid_charger_title" msgid="938685362320735167">"USB orqali quvvatlash imkonsiz"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Qurilmangiz bilan kelgan quvvatlash moslamasidan foydalaning"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Yuzingiz aniqlandi"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Tasdiqlangan"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Tasdiqlash uchun tegining"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Tasdiqlandi"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"PIN kod kiritish"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Grafik kalitdan foydalanish"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Yopish"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"jimjitlik"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"faqat signallar"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Bezovta qilinmasin."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth yoqilgan."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Signal <xliff:g id="TIME">%s</xliff:g> da chalinadi."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessert Case"</string> <string name="start_dreams" msgid="9131802557946276718">"Ekran lavhasi"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Bezovta qilinmasin"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Ulangan qurilmalar topilmadi"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"Batareya quvvati: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Bildirishnomalar"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Suhbatlar"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Barcha sokin bildirishnomalarni tozalash"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Bezovta qilinmasin rejimida bildirishnomalar pauza qilinadi"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Boshlash"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Bildirishnomalar yo‘q"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Bu qurilmani ota-onangiz boshqaradi"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Holati:</b> Quyi darajaga tushirildi"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Suhbat bildirishnomalari tepasida va ekran qulfida profil rasmi sifatida chiqariladi"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Suhbat bildirishnomalari tepasida va ekran qulfida profil rasmi sifatida chiqariladi, bulutcha sifatida chiqadi"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Suhbat bildirishnomalari tepasida va ekran qulfida profil rasmi sifatida chiqariladi, Bezovta qilinmasin rejimini bekor qiladi"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Suhbat bildirishnomalari tepasida va ekran qulfida profil rasmi sifatida chiqariladi, bulutcha sifatida chiqadi, Bezovta qilinmasin rejimini bekor qiladi"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Muhim"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasida suhbat funksiyalari ishlamaydi"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Bu bildirishnomalarni tahrirlash imkonsiz."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Musiqa"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Taqvim"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Bezovta qilinmasin"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Ovoz balandligini boshqarish tugmalari"</string> <string name="battery" msgid="769686279459897127">"Batareya"</string> <string name="headset" msgid="4485892374984466437">"Audio moslama"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi o‘chiq"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth o‘chiq"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Bezovta qilinmasin rejimi o‘chiq"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Bezovta qilinmasin rejimi avtomatik qoida (<xliff:g id="ID_1">%s</xliff:g>) tomonidan yoqilgan."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Bezovta qilinmasin rejimi ilova (<xliff:g id="ID_1">%s</xliff:g>) tomonidan yoqilgan."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Bezovta qilinmasin rejimi ilova yoki avtomatik qoida tomonidan yoqilgan."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Fonda ishlayotgan ilovalar"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Batareya va trafik sarfi tafsilotlari uchun ustiga bosing"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Mobil internet uzilsinmi?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(ish)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Telefon chaqiruvi"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g> orqali)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"kamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"joylashuv"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"mikrofon"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(uzildi)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Xatolik. Qayta urinish uchun bosing."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Yangi qurilmani ulash"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Bu seansni translatsiya qilish uchun ilovani oching."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Notanish ilova"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Nashr raqami"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Nashr raqami vaqtinchalik xotiraga nusxalandi."</string> <string name="basic_status" msgid="2315371112182658176">"Suhbatni ochish"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Oxirgi xabarlar, javobsiz chaqiruvlar va holat yangilanishlari"</string> <string name="people_tile_title" msgid="6589377493334871272">"Suhbat"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Bezovta qilinmasin rejimi pauza qildi"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> xabar yubordi: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> rasm yubordi"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> ahvolini yangiladi: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ta faol ilova</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> ta faol ilova</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Yangi axborot"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Faol ilovalar"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Toʻxtatildi"</string> @@ -886,14 +907,16 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Nusxa olindi"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Manba: <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"UI nusxasini bekor qilish"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> - <skip /> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Nusxa olingan matnni tahrirlash"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Nusxa olingan rasmni tahrirlash"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Yaqin-atrofdagi qurilmaga yuborish"</string> + <string name="add" msgid="81036585205287996">"Kiritish"</string> + <string name="manage_users" msgid="1823875311934643849">"Foydalanuvchilarni boshqarish"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Bu bildirishnoma ikkiga ajratilgan ekranda ishlamaydi."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi ishlamayapti"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Imtiyozli rejim"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Signal oʻrnatildi"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Assistentli mehmon rejimi yoqildi"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Kamera va mikrofon yoqilmagan"</string> + <string name="dream_overlay_status_bar_notification_indicator" msgid="8091389255691081711">"{count,plural, =1{# ta bildirishnoma}other{# ta bildirishnoma}}"</string> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 5d69e030b194..a5609eb8a6d7 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Giao diện người dùng hệ thống"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Có thể sắp hết pin"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"Còn lại <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Không thể sạc qua USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Sử dụng bộ sạc đi kèm với thiết bị"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Đã xác thực khuôn mặt"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Ðã xác nhận"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Nhấn vào Xác nhận để hoàn tất"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Đã xác thực"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Dùng mã PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Dùng hình mở khóa"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Đóng"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"hoàn toàn tắt tiếng"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"chỉ chuông báo"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Không làm phiền."</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth bật."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Báo thức được đặt cho <xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Tủ trưng bày bánh ngọt"</string> <string name="start_dreams" msgid="9131802557946276718">"Trình bảo vệ m.hình"</string> <string name="ethernet_label" msgid="2203544727007463351">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Không làm phiền"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Không có thiết bị nào được ghép nối"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> pin"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Thông báo"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Cuộc trò chuyện"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Xóa tất cả thông báo im lặng"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Chế độ Không làm phiền đã tạm dừng thông báo"</string> <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="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Thiết bị này do cha mẹ của bạn quản lý"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Trạng thái:</b> Đã giảm mức độ quan trọng"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Hiện ở đầu phần thông báo cuộc trò chuyện và ở dạng ảnh hồ sơ trên màn hình khóa"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Hiện ở đầu phần thông báo cuộc trò chuyện và ở dạng ảnh hồ sơ trên màn hình khóa, xuất hiện ở dạng bong bóng"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Hiện ở đầu phần thông báo cuộc trò chuyện và ở dạng ảnh hồ sơ trên màn hình khóa, làm gián đoạn chế độ Không làm phiền"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Hiện ở đầu phần thông báo cuộc trò chuyện và ở dạng ảnh hồ sơ trên màn hình khóa, xuất hiện ở dạng bong bóng, làm gián đoạn chế độ Không làm phiền"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Mức độ ưu tiên"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> không hỗ trợ các tính năng trò chuyện"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Không thể sửa đổi các thông báo này."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Âm nhạc"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Lịch"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Không làm phiền"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Phím tắt các nút âm lượng"</string> <string name="battery" msgid="769686279459897127">"Pin"</string> <string name="headset" msgid="4485892374984466437">"Tai nghe"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi tắt"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth tắt"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Không làm phiền tắt"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Không làm phiền đã được một quy tắc tự động (<xliff:g id="ID_1">%s</xliff:g>) bật."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Không làm phiền đã được một ứng dụng (<xliff:g id="ID_1">%s</xliff:g>) bật."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Không làm phiền đã được một quy tắc tự động hoặc ứng dụng bật."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Ứng dụng đang chạy trong nền"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Nhấn để biết chi tiết về mức sử dụng dữ liệu và pin"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Tắt dữ liệu di động?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(công việc)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Cuộc gọi điện thoại"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(thông qua <xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"máy ảnh"</string> <string name="privacy_type_location" msgid="7991481648444066703">"vị trí"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"micrô"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(đã ngắt kết nối)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Không thể chuyển đổi. Hãy nhấn để thử lại."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Ghép nối thiết bị mới"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Vui lòng mở ứng dụng để truyền phiên này."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Ứng dụng không xác định"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Số bản dựng"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Đã sao chép số bản dựng vào bảng nhớ tạm."</string> <string name="basic_status" msgid="2315371112182658176">"Mở cuộc trò chuyện"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"Hơn <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="people_tile_description" msgid="8154966188085545556">"Xem các tin nhắn, cuộc gọi nhỡ và thông tin cập nhật trạng thái gần đây"</string> <string name="people_tile_title" msgid="6589377493334871272">"Cuộc trò chuyện"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Đã tạm dừng do chế độ Không làm phiền"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> đã gửi một tin nhắn: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> đã gửi một hình ảnh"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g> đã cập nhật trạng thái: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ứng dụng đang hoạt động</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> ứng dụng đang hoạt động</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Thông tin mới"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Ứng dụng đang hoạt động"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Dừng"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Đã dừng"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"Đã sao chép"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"Từ <xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"Đóng giao diện người dùng sao chép"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"Chỉnh sửa văn bản đã sao chép"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Chỉnh sửa hình ảnh đã sao chép"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Gửi đến thiết bị ở gần"</string> + <string name="add" msgid="81036585205287996">"Thêm"</string> + <string name="manage_users" msgid="1823875311934643849">"Quản lý người dùng"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Thông báo này không hỗ trợ thao tác kéo để Chia đôi màn hình."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Không có Wi‑Fi"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Chế độ ưu tiên"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Đã đặt chuông báo"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Đã bật chế độ khách cho Trợ lý"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Máy ảnh và micrô đang tắt"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index f03290709a48..0610b5917f46 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"系统界面"</string> - <string name="battery_low_title" msgid="6891106956328275225">"电池电量可能很快就要耗尽"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"剩余<xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"无法通过 USB 充电"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"使用设备随附的充电器"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"面孔身份验证成功"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"已确认"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"点按“确认”即可完成"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"已经过身份验证"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"使用 PIN 码"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"使用图案"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"关闭"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"完全静音"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"仅限闹钟"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"勿扰。"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"蓝牙。"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"蓝牙开启。"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"闹钟已设置为：<xliff:g id="TIME">%s</xliff:g>。"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"甜品盒"</string> <string name="start_dreams" msgid="9131802557946276718">"屏保"</string> <string name="ethernet_label" msgid="2203544727007463351">"有线网络"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"勿扰"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"蓝牙"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"没有可用的配对设备"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> 的电量"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"通知"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"对话"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"清除所有无声通知"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"勿扰模式暂停的通知"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"立即开始"</string> <string name="empty_shade_text" msgid="8935967157319717412">"没有通知"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"此设备由您的家长管理"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>状态</b>：已调低顺序"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"显示在对话通知顶部（屏幕锁定时显示为个人资料照片）"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"以气泡形式显示在对话通知顶部（屏幕锁定时显示为个人资料照片）"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"显示在对话通知顶部（屏幕锁定时显示为个人资料照片），并且会中断勿扰模式"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"以气泡形式显示在对话通知顶部（屏幕锁定时显示为个人资料照片），并且会中断勿扰模式"</string> <string name="notification_priority_title" msgid="2079708866333537093">"优先"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g>不支持对话功能"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"无法修改这些通知。"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"短信"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"音乐"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"日历"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"勿扰"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"音量按钮快捷键"</string> <string name="battery" msgid="769686279459897127">"电池"</string> <string name="headset" msgid="4485892374984466437">"耳机"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>，<xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"WLAN 已关闭"</string> <string name="bt_is_off" msgid="7436344904889461591">"蓝牙已关闭"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"“勿扰”模式已关闭"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"某个自动规则（<xliff:g id="ID_1">%s</xliff:g>）已开启勿扰模式。"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"某个应用（<xliff:g id="ID_1">%s</xliff:g>）已开启勿扰模式。"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"某个自动规则或应用已开启勿扰模式。"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"在后台运行的应用"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"点按即可详细了解电量和流量消耗情况"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"要关闭移动数据网络吗？"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"（工作）"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"电话"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"（通过“<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>”）"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"相机"</string> <string name="privacy_type_location" msgid="7991481648444066703">"位置信息"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"麦克风"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"（已断开连接）"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"无法切换。点按即可重试。"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"与新设备配对"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"如需投射此会话，请打开相关应用。"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"未知应用"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"版本号"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"已将版本号复制到剪贴板。"</string> <string name="basic_status" msgid="2315371112182658176">"开放式对话"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"查看近期的消息、未接电话和状态更新"</string> <string name="people_tile_title" msgid="6589377493334871272">"对话"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"勿扰模式已暂停通知"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g>发送了一条消息：<xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>发送了一张图片"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g>更新了状态：<xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> 个使用中的应用</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> 个使用中的应用</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"新信息"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"使用中的应用"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"停止"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"已停止"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"已复制"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"来自<xliff:g id="APPNAME">%1$s</xliff:g>"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"关闭复制界面"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"修改所复制的文字"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"编辑所复制的图片"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"发送到附近的设备"</string> + <string name="add" msgid="81036585205287996">"添加"</string> + <string name="manage_users" msgid="1823875311934643849">"管理用户"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"此通知不支持拖动到分屏中。"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"WLAN 已关闭"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"优先模式"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"闹钟已设置"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Google 助理访客模式已启用"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"摄像头和麦克风已关闭"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index dbb4ffc85d38..860085974d4f 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"系統使用者介面"</string> - <string name="battery_low_title" msgid="6891106956328275225">"電池電量可能即將耗盡"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"剩餘 <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"無法透過 USB 充電"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"使用裝置隨附的充電器"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"臉孔已經驗證"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"已確認"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"輕按 [確定] 以完成"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"驗證咗"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"使用 PIN"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"使用圖案"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"關閉"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"完全靜音"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"只限鬧鐘"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"請勿騷擾。"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"藍牙。"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"藍牙已開啟。"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"鬧鐘已設定為：<xliff:g id="TIME">%s</xliff:g>。"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessert Case"</string> <string name="start_dreams" msgid="9131802557946276718">"螢幕保護程式"</string> <string name="ethernet_label" msgid="2203544727007463351">"以太網"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"請勿騷擾"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"藍牙"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"找不到配對的裝置"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"電量：<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"通知"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"對話"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"清除所有靜音通知"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"「請勿騷擾」模式已將通知暫停"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"立即開始"</string> <string name="empty_shade_text" msgid="8935967157319717412">"沒有通知"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"此裝置由您的家長管理"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>狀態：</b>已調低次序"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"顯示在對話通知頂部 (在上鎖畫面會顯示為個人檔案相片)"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"以對話氣泡形式顯示在對話通知頂部 (在上鎖畫面會顯示為個人檔案相片)"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"顯示在對話通知頂部 (在上鎖畫面會顯示為個人檔案相片)，並會中斷「請勿打擾」模式"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"以對話氣泡形式顯示在對話通知頂部 (在上鎖畫面會顯示為個人檔案相片)，並會中斷「請勿打擾」模式"</string> <string name="notification_priority_title" msgid="2079708866333537093">"優先"</string> <string name="no_shortcut" msgid="8257177117568230126">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」不支援對話功能"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"無法修改這些通知。"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"短訊"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"音樂"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"日曆"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"請勿騷擾"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"音量按鈕快速鍵"</string> <string name="battery" msgid="769686279459897127">"電池"</string> <string name="headset" msgid="4485892374984466437">"耳機"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>，<xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi 已關閉"</string> <string name="bt_is_off" msgid="7436344904889461591">"藍牙已關閉"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"「請勿騷擾」已關閉"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"「<xliff:g id="ID_1">%s</xliff:g>」自動規則已開啟「請勿騷擾」功能。"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"「<xliff:g id="ID_1">%s</xliff:g>」應用程式已開啟「請勿騷擾」功能。"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"某個自動規則或應用程式已開啟「請勿騷擾」功能。"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"正在背景中執行的應用程式"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"輕按即可查看電池和數據用量詳情"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"要關閉流動數據嗎？"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(公司)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"電話"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(透過「<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>」)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"相機"</string> <string name="privacy_type_location" msgid="7991481648444066703">"位置"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"麥克風"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(已中斷連線)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"無法切換，輕按即可重試。"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"配對新裝置"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"如要投放此工作階段，請開啟應用程式。"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"不明應用程式"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"版本號碼"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"版本號碼已複製到剪貼簿。"</string> <string name="basic_status" msgid="2315371112182658176">"開啟對話"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"查看最近的訊息、未接來電和狀態更新"</string> <string name="people_tile_title" msgid="6589377493334871272">"對話"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"「請勿騷擾」已暫停通知"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g>傳送了訊息：<xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>傳送了圖片"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g>有狀態更新：<xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> 個使用中的應用程式</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> 個使用中的應用程式</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"新資料"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"使用中的應用程式"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"停止"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"已停止"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"已複製"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"來自「<xliff:g id="APPNAME">%1$s</xliff:g>」"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"關閉剪貼簿使用者介面"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"編輯已複製的文字"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"編輯已複製的圖片"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"傳送至附近的裝置"</string> + <string name="add" msgid="81036585205287996">"新增"</string> + <string name="manage_users" msgid="1823875311934643849">"管理使用者"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"此通知無法拖曳到分割螢幕中。"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi 已關閉"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"優先模式"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"已設定鬧鐘"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"已啟用「Google 助理」訪客模式"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"相機和麥克風已關閉"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index d7185a489e4b..0206a9e30360 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"系統 UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"電池電力可能很快就會耗盡"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"僅剩 <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="invalid_charger_title" msgid="938685362320735167">"無法透過 USB 充電"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"使用裝置隨附的充電器"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"臉孔驗證成功"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"確認完畢"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"輕觸 [確認] 完成驗證設定"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"已通過驗證"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"使用 PIN 碼"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"使用解鎖圖案"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"關閉"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"完全靜音"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"僅限鬧鐘"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"零打擾。"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"藍牙。"</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"藍牙已開啟。"</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"鬧鐘已設定為：<xliff:g id="TIME">%s</xliff:g>。"</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Dessert Case"</string> <string name="start_dreams" msgid="9131802557946276718">"螢幕保護程式"</string> <string name="ethernet_label" msgid="2203544727007463351">"乙太網路"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"零打擾"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"藍牙"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"找不到配對的裝置"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"電量：<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g>"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"通知"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"對話"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"清除所有靜音通知"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"「零打擾」模式已將通知設為暫停"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"立即開始"</string> <string name="empty_shade_text" msgid="8935967157319717412">"沒有通知"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"這個裝置是由你的家長管理"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>狀態：</b>已調降順序"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"顯示在對話通知頂端 (螢幕鎖定時會顯示為個人資料相片)"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"以對話框的形式顯示在對話通知頂端 (螢幕鎖定時會顯示為個人資料相片)"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"顯示在對話通知頂端 (螢幕鎖定時會顯示為個人資料相片)，並會中斷「零打擾」模式"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"以對話框的形式顯示在對話通知頂端 (螢幕鎖定時會顯示為個人資料相片)，並會中斷「零打擾」模式"</string> <string name="notification_priority_title" msgid="2079708866333537093">"優先"</string> <string name="no_shortcut" msgid="8257177117568230126">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」不支援對話功能"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"無法修改這些通知。"</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"簡訊"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"音樂"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"日曆"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"零打擾"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"音量按鈕快速鍵"</string> <string name="battery" msgid="769686279459897127">"電池"</string> <string name="headset" msgid="4485892374984466437">"耳機"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>，<xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi 已關閉"</string> <string name="bt_is_off" msgid="7436344904889461591">"藍牙已關閉"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"零打擾模式已關閉"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"「<xliff:g id="ID_1">%s</xliff:g>」自動規則已將零打擾模式開啟。"</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"「<xliff:g id="ID_1">%s</xliff:g>」應用程式已將零打擾模式開啟。"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"某個自動規則或應用程式已將零打擾模式開啟。"</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"在背景執行的應用程式"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"輕觸即可查看電池和數據用量詳情"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"要關閉行動數據嗎？"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(工作)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"電話"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(透過「<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>」)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"相機"</string> <string name="privacy_type_location" msgid="7991481648444066703">"位置"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"麥克風"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(連線中斷)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"無法切換，輕觸即可重試。"</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"配對新裝置"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"如要投放這個工作階段，請開啟應用程式。"</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"不明的應用程式"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"版本號碼"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"已將版本號碼複製到剪貼簿。"</string> <string name="basic_status" msgid="2315371112182658176">"開放式對話"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"查看最近的訊息、未接來電和狀態更新"</string> <string name="people_tile_title" msgid="6589377493334871272">"對話"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"零打擾模式已將通知暫停"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g>傳送了一則訊息：<xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>傳送了一張圖片"</string> <string name="new_status_content_description" msgid="6046637888641308327">"<xliff:g id="NAME">%1$s</xliff:g>更新了狀態：<xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> 個使用中的應用程式</item> <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> 個使用中的應用程式</item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"新資訊"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"使用中的應用程式"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"停止"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"已停止"</string> @@ -886,14 +907,17 @@ <string name="clipboard_overlay_text_copied" msgid="1872624400464891363">"已複製"</string> <string name="clipboard_edit_source" msgid="9156488177277788029">"來自「<xliff:g id="APPNAME">%1$s</xliff:g>」"</string> <string name="clipboard_dismiss_description" msgid="7544573092766945657">"關閉剪貼簿 UI"</string> - <!-- no translation found for clipboard_edit_text_description (805254383912962103) --> - <skip /> - <!-- no translation found for clipboard_edit_image_description (8904857948976041306) --> - <skip /> - <!-- no translation found for clipboard_send_nearby_description (4629769637846717650) --> - <skip /> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="clipboard_edit_text_description" msgid="805254383912962103">"編輯複製的文字"</string> + <string name="clipboard_edit_image_description" msgid="8904857948976041306">"編輯複製的圖片"</string> + <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"傳送到鄰近裝置"</string> + <string name="add" msgid="81036585205287996">"新增"</string> + <string name="manage_users" msgid="1823875311934643849">"管理使用者"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"這項通知無法拖曳到分割畫面中。"</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi 已關閉"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"優先模式"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"鬧鐘設定成功"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"已啟用 Google 助理訪客模式"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"已關閉相機和麥克風"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 5425b268ba7d..98e7fc40e7ab 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -20,7 +20,12 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"Uhlelo lwe-UI"</string> - <string name="battery_low_title" msgid="6891106956328275225">"Ibhethri lingaphela maduze"</string> + <!-- no translation found for battery_low_title (5319680173344341779) --> + <skip /> + <!-- no translation found for battery_low_description (3282977755476423966) --> + <skip /> + <!-- no translation found for battery_low_intro (5148725009653088790) --> + <skip /> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> okusele"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Ayikwazi ukushaja nge-USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Sebenzisa ishaja eze nedivayisi yakho"</string> @@ -128,6 +133,8 @@ <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Ubuso bufakazelwe ubuqiniso"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Kuqinisekisiwe"</string> <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Thepha okuthi Qinisekisa ukuze uqedele"</string> + <!-- no translation found for biometric_dialog_tap_confirm_with_face (1597899891472340950) --> + <skip /> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Kugunyaziwe"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Sebenzisa iphinikhodi"</string> <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Sebenzisa iphethini"</string> @@ -181,6 +188,7 @@ <string name="accessibility_desc_close" msgid="8293708213442107755">"Vala"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"ukuthula okuphelele"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"ama-alamu kuphela"</string> + <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Ungaphazamisi"</string> <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"I-Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"I-Bluetooth ivuliwe."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"I-alamu isethiwe ngo-<xliff:g id="TIME">%s</xliff:g>."</string> @@ -205,6 +213,7 @@ <string name="dessert_case" msgid="9104973640704357717">"Isikhwama soswidi"</string> <string name="start_dreams" msgid="9131802557946276718">"Isigcini sihenqo"</string> <string name="ethernet_label" msgid="2203544727007463351">"I-Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Ungaphazamisi"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"I-Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Awekho amadivayisi abhanqiwe atholakalayo"</string> <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> ibhethri"</string> @@ -348,6 +357,7 @@ <string name="notification_section_header_alerting" msgid="5581175033680477651">"Izaziso"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Izingxoxo"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Sula zonke izaziso ezithulile"</string> + <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Izaziso zimiswe okwesikhashana ukungaphazamisi"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Qala manje"</string> <string name="empty_shade_text" msgid="8935967157319717412">"Azikho izaziso"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"Le divayisi iphethwe ngumzali wakho"</string> @@ -491,6 +501,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Isimo:</b> Silinganiselwe phansi"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Ivela phezu kwezaziso zengxoxo nanjengesithombe sephrofayela esikrinini sokukhiya"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Ivela phezu kwezaziso zengxoxo futhi njengesithombe sephrofayela esikrinini sokukhiya, ivela njengebhamuza"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Ivela phezu kwezaziso zengxoxo futhi njengesithombe sephrofayela esikrinini sokukhiya, ukuphazamisa okuthi Ungaphazamisi"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Ivela phezu kwezaziso zengxoxo futhi njengesithombe sephrofayela esikrinini sokukhiya, ivela njengebhamuza, ukuphazamisa okuthi Ungaphazamisi"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Okubalulekile"</string> <string name="no_shortcut" msgid="8257177117568230126">"I-<xliff:g id="APP_NAME">%1$s</xliff:g> ayisekeli izici zengxoxo"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Lezi zaziso azikwazi ukushintshwa."</string> @@ -566,6 +578,7 @@ <string name="keyboard_shortcut_group_applications_sms" msgid="6912633831752843566">"I-SMS"</string> <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Umculo"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Ikhalenda"</string> + <string name="volume_and_do_not_disturb" msgid="502044092739382832">"Ungaphazamisi"</string> <string name="volume_dnd_silent" msgid="4154597281458298093">"Izinqamuleli zezinkinobho zevolomu"</string> <string name="battery" msgid="769686279459897127">"Ibhethri"</string> <string name="headset" msgid="4485892374984466437">"Ama-earphone"</string> @@ -684,6 +697,10 @@ <string name="mobile_carrier_text_format" msgid="8912204177152950766">"I-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"I-Wi-Fi ivaliwe"</string> <string name="bt_is_off" msgid="7436344904889461591">"I-Bluetooth ivaliwe"</string> + <string name="dnd_is_off" msgid="3185706903793094463">"Ungaphazamisi kuvaliwe"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="3535469468310002616">"Okuthi ungaphazamisi kuvulwe umthetho ozenzakalelayo (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Okuthi ungaphazamisi kuvulwe uhlelo lokusebenza (<xliff:g id="ID_1">%s</xliff:g>)."</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Okuthi ungaphazamisi kuvulwe umthetho ozenzakalelayo noma uhlelo lokusebenza."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Izinhlelo zokusebenza zisebenza ngasemuva"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Thepha ngemininingwane ekusetshenzisweni kwebhethri nedatha"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Vala idatha yeselula?"</string> @@ -708,6 +725,8 @@ <string name="ongoing_privacy_dialog_enterprise" msgid="3003314125311966061">"(umsebenzi)"</string> <string name="ongoing_privacy_dialog_phonecall" msgid="4487370562589839298">"Ikholi yefoni"</string> <string name="ongoing_privacy_dialog_attribution_text" msgid="4738795925380373994">"(kuya ku-<xliff:g id="APPLICATION_NAME_S_">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_label" msgid="3385241594101496292">"(<xliff:g id="ATTRIBUTION_LABEL">%s</xliff:g>)"</string> + <string name="ongoing_privacy_dialog_attribution_proxy_label" msgid="1111829599659403249">"(<xliff:g id="ATTRIBUTION_LABEL">%1$s</xliff:g> • <xliff:g id="PROXY_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_type_camera" msgid="7974051382167078332">"ikhamera"</string> <string name="privacy_type_location" msgid="7991481648444066703">"indawo"</string> <string name="privacy_type_microphone" msgid="9136763906797732428">"imakrofoni"</string> @@ -806,6 +825,8 @@ <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(inqamukile)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Akukwazi ukushintsha. Thepha ukuze uzame futhi."</string> <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Bhangqa idivayisi entsha"</string> + <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Ukuze usakaze le seshini, sicela uvule i-app."</string> + <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"I-app engaziwa"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Yakha inombolo"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Yakha inombolo ekopishelwe kubhodi yokunamathisela."</string> <string name="basic_status" msgid="2315371112182658176">"Vula ingxoxo"</string> @@ -839,6 +860,7 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Bona imiyalezo yakamuva, amakholi akuphuthile, nezibuyekezo zesimo"</string> <string name="people_tile_title" msgid="6589377493334871272">"Ingxoxo"</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Kumiswe okuthi Ungaphazamisi"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"U-<xliff:g id="NAME">%1$s</xliff:g> uthumele umlayezo: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"U-<xliff:g id="NAME">%1$s</xliff:g> uthumele isithombe"</string> <string name="new_status_content_description" msgid="6046637888641308327">"U-<xliff:g id="NAME">%1$s</xliff:g> unesibuyekezo sesimo: <xliff:g id="STATUS">%2$s</xliff:g>"</string> @@ -877,8 +899,7 @@ <item quantity="one">ama-app asebenzayo angu-<xliff:g id="COUNT_1">%s</xliff:g></item> <item quantity="other">ama-app asebenzayo angu-<xliff:g id="COUNT_1">%s</xliff:g></item> </plurals> - <!-- no translation found for fgs_dot_content_description (2865071539464777240) --> - <skip /> + <string name="fgs_dot_content_description" msgid="2865071539464777240">"Ulwazi olusha"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Ama-app asebenzayo"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Misa"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Imisiwe"</string> @@ -889,8 +910,14 @@ <string name="clipboard_edit_text_description" msgid="805254383912962103">"Hlela umbhalo okopishiwe"</string> <string name="clipboard_edit_image_description" msgid="8904857948976041306">"Hlela umfanekiso okopishiwe"</string> <string name="clipboard_send_nearby_description" msgid="4629769637846717650">"Thumela kudivayisi eseduze"</string> - <!-- no translation found for add (81036585205287996) --> - <skip /> - <!-- no translation found for manage_users (1823875311934643849) --> + <string name="add" msgid="81036585205287996">"Faka"</string> + <string name="manage_users" msgid="1823875311934643849">"Phatha abasebenzisi"</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"Lesi saziso asikusekeli ukuhudulela ku-Splitscreen."</string> + <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"I-Wi-Fi ayitholakali"</string> + <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Imodi ebalulekile"</string> + <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"I-alamu isethiwe"</string> + <string name="dream_overlay_status_bar_assistant_guest_mode_enabled" msgid="3715897096012469615">"Imodi yesivakashi somsizi inikwe amandla"</string> + <string name="dream_overlay_status_bar_camera_mic_off" msgid="3199425257833773569">"Ikhamera nemakrofoni kuvaliwe"</string> + <!-- no translation found for dream_overlay_status_bar_notification_indicator (8091389255691081711) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 5a7efca3dece..5ca7285d3f73 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1122,13 +1122,40 @@ <dimen name="media_output_dialog_title_anim_y_delta">12.5dp</dimen> <dimen name="media_output_dialog_app_tier_icon_size">20dp</dimen> - <!-- Distance that the full shade transition takes in order for qs to fully transition to the - shade --> - <dimen name="lockscreen_shade_qs_transition_distance">200dp</dimen> + <!-- Distance that the full shade transition takes in order to complete by tapping on a button + like "expand". --> + <dimen name="lockscreen_shade_transition_by_tap_distance">200dp</dimen> + + <!-- Distance that the full shade transition takes in order to complete. --> + <dimen name="lockscreen_shade_full_transition_distance">80dp</dimen> <!-- Distance that the full shade transition takes in order for scrim to fully transition to the shade (in alpha) --> - <dimen name="lockscreen_shade_scrim_transition_distance">80dp</dimen> + <dimen name="lockscreen_shade_scrim_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen> + + <!-- Distance that the full shade transition takes in order for the keyguard content on + NotificationPanelViewController to fully fade (e.g. Clock & Smartspace) --> + <dimen name="lockscreen_shade_npvc_keyguard_content_alpha_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen> + + <!-- Distance that the full shade transition takes in order for the notification shelf to fully + expand. --> + <dimen name="lockscreen_shade_notif_shelf_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen> + + <!-- Distance that the full shade transition takes in order for the Quick Settings to fully + fade and expand. --> + <dimen name="lockscreen_shade_qs_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen> + + <!-- Distance that the full shade transition takes in order for depth of the wallpaper to fully + change. --> + <dimen name="lockscreen_shade_depth_controller_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen> + + <!-- Distance that the full shade transition takes in order for the UDFPS Keyguard View to fully + fade. --> + <dimen name="lockscreen_shade_udfps_keyguard_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen> + + <!-- Used for StatusBar to know that a transition is in progress. At the moment it only checks + whether the progress is > 0, therefore this value is not very important. --> + <dimen name="lockscreen_shade_status_bar_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen> <!-- Distance that the full shade transition takes in order for media to fully transition to the shade --> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 9e1f57bbfa75..9f2f1c1978c6 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -66,7 +66,10 @@ <string name="battery_saver_confirmation_ok">Turn on</string> <!-- Battery saver notification action [CHAR LIMIT=NONE]--> - <string name="battery_saver_start_action">Turn on Battery Saver</string> + <string name="battery_saver_start_action">Turn on</string> + + <!-- Battery saver notification dismiss action: Do not turn on battery saver. [CHAR LIMIT=NONE]--> + <string name="battery_saver_dismiss_action">No thanks</string> <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] --> @@ -2223,6 +2226,8 @@ <string name="media_output_dialog_launch_app_text">To cast this session, please open the app.</string> <!-- App name when can't get app name [CHAR LIMIT=60] --> <string name="media_output_dialog_unknown_launch_app_name">Unknown app</string> + <!-- Button text for stopping casting [CHAR LIMIT=60] --> + <string name="media_output_dialog_button_stop_casting">Stop casting</string> <!-- Label for clip data when copying the build number off QS [CHAR LIMIT=NONE]--> @@ -2425,8 +2430,6 @@ <string name="dream_overlay_status_bar_priority_mode">Priority mode</string> <!-- Content description for the alarm set icon in the dream overlay status bar [CHAR LIMIT=NONE] --> <string name="dream_overlay_status_bar_alarm_set">Alarm set</string> - <!-- Content description for the assistant guest mode enabled icon in the dream overlay status bar [CHAR LIMIT=NONE] --> - <string name="dream_overlay_status_bar_assistant_guest_mode_enabled">Assistant guest mode enabled</string> <!-- Content description for the camera and mic off icon in the dream overlay status bar [CHAR LIMIT=NONE] --> <string name="dream_overlay_status_bar_camera_mic_off">Camera and mic are off</string> <!-- Content description for the notifications indicator icon in the dream overlay status bar [CHAR LIMIT=NONE] --> diff --git a/packages/SystemUI/src/com/android/systemui/dagger/qualifiers/UiBackground.java b/packages/SystemUI/shared/src/com/android/systemui/dagger/qualifiers/UiBackground.java index bf2237aa8c11..bf2237aa8c11 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/qualifiers/UiBackground.java +++ b/packages/SystemUI/shared/src/com/android/systemui/dagger/qualifiers/UiBackground.java diff --git a/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldSharedComponent.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldSharedComponent.kt index ac62cf9f9d5b..15593ea5f0e4 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldSharedComponent.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldSharedComponent.kt @@ -22,6 +22,7 @@ import android.hardware.SensorManager import android.hardware.devicestate.DeviceStateManager import android.os.Handler import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.dagger.qualifiers.UiBackground import com.android.systemui.unfold.config.UnfoldTransitionConfig import com.android.systemui.unfold.updates.screen.ScreenStatusProvider import com.android.systemui.unfold.util.UnfoldTransitionATracePrefix @@ -53,6 +54,7 @@ internal interface UnfoldSharedComponent { @BindsInstance sensorManager: SensorManager, @BindsInstance @Main handler: Handler, @BindsInstance @Main executor: Executor, + @BindsInstance @UiBackground backgroundExecutor: Executor, @BindsInstance @UnfoldTransitionATracePrefix tracingTagPrefix: String, @BindsInstance contentResolver: ContentResolver = context.contentResolver ): UnfoldSharedComponent diff --git a/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldSharedModule.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldSharedModule.kt index 23e4c97fc271..c612995241ef 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldSharedModule.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldSharedModule.kt @@ -17,6 +17,7 @@ package com.android.systemui.unfold import android.hardware.SensorManager +import com.android.systemui.dagger.qualifiers.UiBackground import com.android.systemui.unfold.config.UnfoldTransitionConfig import com.android.systemui.unfold.progress.FixedTimingTransitionProgressProvider import com.android.systemui.unfold.progress.PhysicsBasedUnfoldTransitionProgressProvider @@ -30,6 +31,7 @@ import com.android.systemui.unfold.util.ScaleAwareTransitionProgressProvider import dagger.Module import dagger.Provides import java.util.Optional +import java.util.concurrent.Executor import javax.inject.Singleton @Module @@ -67,10 +69,11 @@ class UnfoldSharedModule { @Provides fun hingeAngleProvider( config: UnfoldTransitionConfig, - sensorManager: SensorManager + sensorManager: SensorManager, + @UiBackground executor: Executor ): HingeAngleProvider = if (config.isHingeAngleEnabled) { - HingeSensorAngleProvider(sensorManager) + HingeSensorAngleProvider(sensorManager, executor) } else { EmptyHingeAngleProvider } diff --git a/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldTransitionFactory.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldTransitionFactory.kt index d5d636208747..8e4ff9bc9133 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldTransitionFactory.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldTransitionFactory.kt @@ -42,6 +42,7 @@ fun createUnfoldTransitionProgressProvider( sensorManager: SensorManager, mainHandler: Handler, mainExecutor: Executor, + backgroundExecutor: Executor, tracingTagPrefix: String ): UnfoldTransitionProgressProvider = DaggerUnfoldSharedComponent.factory() @@ -53,6 +54,7 @@ fun createUnfoldTransitionProgressProvider( sensorManager, mainHandler, mainExecutor, + backgroundExecutor, tracingTagPrefix) .unfoldTransitionProvider .orElse(null) diff --git a/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/hinge/HingeSensorAngleProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/hinge/HingeSensorAngleProvider.kt index a50d852e9b36..c93412b53817 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/hinge/HingeSensorAngleProvider.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/hinge/HingeSensorAngleProvider.kt @@ -6,21 +6,29 @@ import android.hardware.SensorEventListener import android.hardware.SensorManager import android.os.Trace import androidx.core.util.Consumer +import java.util.concurrent.Executor -internal class HingeSensorAngleProvider(private val sensorManager: SensorManager) : +internal class HingeSensorAngleProvider( + private val sensorManager: SensorManager, + private val executor: Executor +) : HingeAngleProvider { private val sensorListener = HingeAngleSensorListener() private val listeners: MutableList<Consumer<Float>> = arrayListOf() - override fun start() { + override fun start() = executor.execute { Trace.beginSection("HingeSensorAngleProvider#start") val sensor = sensorManager.getDefaultSensor(Sensor.TYPE_HINGE_ANGLE) - sensorManager.registerListener(sensorListener, sensor, SensorManager.SENSOR_DELAY_FASTEST) + sensorManager.registerListener( + sensorListener, + sensor, + SensorManager.SENSOR_DELAY_FASTEST + ) Trace.endSection() } - override fun stop() { + override fun stop() = executor.execute { sensorManager.unregisterListener(sensorListener) } diff --git a/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java b/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java index c4b02f62f291..ffd15460ce91 100644 --- a/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java +++ b/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java @@ -107,10 +107,10 @@ public class EmergencyButton extends Button { return super.performLongClick(); } - void updateEmergencyCallButton(boolean isInCall, boolean isVoiceCapable, boolean simLocked) { + void updateEmergencyCallButton(boolean isInCall, boolean hasTelephonyRadio, boolean simLocked) { boolean visible = false; - if (isVoiceCapable) { - // Emergency calling requires voice capability. + if (hasTelephonyRadio) { + // Emergency calling requires a telephony radio. if (isInCall) { visible = true; // always show "return to call" if phone is off-hook } else { diff --git a/packages/SystemUI/src/com/android/keyguard/EmergencyButtonController.java b/packages/SystemUI/src/com/android/keyguard/EmergencyButtonController.java index e7215b8ebe49..f28910576073 100644 --- a/packages/SystemUI/src/com/android/keyguard/EmergencyButtonController.java +++ b/packages/SystemUI/src/com/android/keyguard/EmergencyButtonController.java @@ -21,6 +21,7 @@ import static com.android.systemui.DejankUtils.whitelistIpcs; import android.app.ActivityOptions; import android.app.ActivityTaskManager; import android.content.Intent; +import android.content.pm.PackageManager; import android.content.res.Configuration; import android.os.PowerManager; import android.os.SystemClock; @@ -116,7 +117,8 @@ public class EmergencyButtonController extends ViewController<EmergencyButton> { if (mView != null) { mView.updateEmergencyCallButton( mTelecomManager != null && mTelecomManager.isInCall(), - mTelephonyManager.isVoiceCapable(), + getContext().getPackageManager().hasSystemFeature( + PackageManager.FEATURE_TELEPHONY), mKeyguardUpdateMonitor.isSimPinVoiceSecure()); } } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordViewController.java index 0529cdbcbb13..28f21af5b56b 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordViewController.java @@ -183,7 +183,7 @@ public class KeyguardPasswordViewController @Override void resetState() { mPasswordEntry.setTextOperationUser(UserHandle.of(KeyguardUpdateMonitor.getCurrentUser())); - mMessageAreaController.setMessage(""); + mMessageAreaController.setMessage(R.string.keyguard_enter_your_password); final boolean wasDisabled = mPasswordEntry.isEnabled(); mView.setPasswordEntryEnabled(true); mView.setPasswordEntryInputEnabled(true); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java index 41f92407a683..7635f919567a 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java @@ -358,7 +358,7 @@ public class KeyguardPatternViewController } private void displayDefaultSecurityMessage() { - mMessageAreaController.setMessage(""); + mMessageAreaController.setMessage(R.string.keyguard_enter_your_pattern); } private void handleAttemptLockout(long elapsedRealtimeDeadline) { diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java index 8de4e7b557f3..a9c03d1ac08e 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java @@ -132,5 +132,6 @@ public abstract class KeyguardPinBasedInputViewController<T extends KeyguardPinB @Override void resetState() { mView.setPasswordEntryEnabled(true); + mMessageAreaController.setMessage(R.string.keyguard_enter_your_pin); } } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinViewController.java index 9f4585fb1a92..160d82af98fe 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinViewController.java @@ -76,12 +76,6 @@ public class KeyguardPinViewController } @Override - void resetState() { - super.resetState(); - mMessageAreaController.setMessage(""); - } - - @Override public boolean startDisappearAnimation(Runnable finishRunnable) { return mView.startDisappearAnimation( mKeyguardUpdateMonitor.needsSlowUnlockTransition(), finishRunnable); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java index a5fe0efc8887..af3da9f940bd 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java @@ -20,7 +20,6 @@ import android.graphics.Rect; import android.util.Slog; import com.android.keyguard.KeyguardClockSwitch.ClockSize; -import com.android.systemui.communal.CommunalStateController; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; import com.android.systemui.statusbar.notification.AnimatableProperty; import com.android.systemui.statusbar.notification.PropertyAnimator; @@ -63,7 +62,6 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV KeyguardClockSwitchController keyguardClockSwitchController, KeyguardStateController keyguardStateController, KeyguardUpdateMonitor keyguardUpdateMonitor, - CommunalStateController communalStateController, ConfigurationController configurationController, DozeParameters dozeParameters, KeyguardUnlockAnimationController keyguardUnlockAnimationController, @@ -75,9 +73,8 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV mConfigurationController = configurationController; mDozeParameters = dozeParameters; mKeyguardStateController = keyguardStateController; - mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, communalStateController, - keyguardStateController, dozeParameters, screenOffAnimationController, - /* animateYPos= */ true, /* visibleOnCommunal= */ false); + mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, keyguardStateController, + dozeParameters, screenOffAnimationController, /* animateYPos= */ true); mKeyguardUnlockAnimationController = keyguardUnlockAnimationController; } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java b/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java index bb608c79a50e..498304b3fc55 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java @@ -22,7 +22,6 @@ import android.view.View; import android.view.ViewPropertyAnimator; import com.android.systemui.animation.Interpolators; -import com.android.systemui.communal.CommunalStateController; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.notification.AnimatableProperty; import com.android.systemui.statusbar.notification.PropertyAnimator; @@ -39,30 +38,24 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; public class KeyguardVisibilityHelper { private View mView; - private final CommunalStateController mCommunalStateController; private final KeyguardStateController mKeyguardStateController; private final DozeParameters mDozeParameters; private final ScreenOffAnimationController mScreenOffAnimationController; - private final boolean mVisibleOnCommunal; private boolean mAnimateYPos; private boolean mKeyguardViewVisibilityAnimating; private boolean mLastOccludedState = false; private final AnimationProperties mAnimationProperties = new AnimationProperties(); public KeyguardVisibilityHelper(View view, - CommunalStateController communalStateController, KeyguardStateController keyguardStateController, DozeParameters dozeParameters, ScreenOffAnimationController screenOffAnimationController, - boolean animateYPos, - boolean visibleOnCommunal) { + boolean animateYPos) { mView = view; - mCommunalStateController = communalStateController; mKeyguardStateController = keyguardStateController; mDozeParameters = dozeParameters; mScreenOffAnimationController = screenOffAnimationController; mAnimateYPos = animateYPos; - mVisibleOnCommunal = visibleOnCommunal; } public boolean isVisibilityAnimating() { @@ -81,13 +74,6 @@ public class KeyguardVisibilityHelper { boolean isOccluded = mKeyguardStateController.isOccluded(); mKeyguardViewVisibilityAnimating = false; - // If the communal view is showing, hide immediately - if (!mVisibleOnCommunal && mCommunalStateController.getCommunalViewShowing()) { - mView.setVisibility(View.GONE); - mView.setAlpha(1f); - return; - } - if ((!keyguardFadingAway && oldStatusBarState == KEYGUARD && statusBarState != KEYGUARD) || goingToFullShade) { mKeyguardViewVisibilityAnimating = true; diff --git a/packages/SystemUI/src/com/android/systemui/Prefs.java b/packages/SystemUI/src/com/android/systemui/Prefs.java index 6a60afa8eadf..ff5715c606b6 100644 --- a/packages/SystemUI/src/com/android/systemui/Prefs.java +++ b/packages/SystemUI/src/com/android/systemui/Prefs.java @@ -71,7 +71,9 @@ public final class Prefs { Key.HAS_SEEN_REVERSE_BOTTOM_SHEET, Key.CONTROLS_STRUCTURE_SWIPE_TOOLTIP_COUNT, Key.HAS_SEEN_ACCESSIBILITY_FLOATING_MENU_DOCK_TOOLTIP, - Key.ACCESSIBILITY_FLOATING_MENU_POSITION + Key.ACCESSIBILITY_FLOATING_MENU_POSITION, + Key.HAS_CLICKED_NUDGE_TO_SETUP_DREAM, + Key.HAS_DISMISSED_NUDGE_TO_SETUP_DREAM }) // TODO: annotate these with their types so {@link PrefsCommandLine} can know how to set them public @interface Key { @@ -115,6 +117,8 @@ public final class Prefs { String HAS_SEEN_ACCESSIBILITY_FLOATING_MENU_DOCK_TOOLTIP = "HasSeenAccessibilityFloatingMenuDockTooltip"; String ACCESSIBILITY_FLOATING_MENU_POSITION = "AccessibilityFloatingMenuPosition"; + String HAS_CLICKED_NUDGE_TO_SETUP_DREAM = "HasClickedNudgeToSetupDream"; + String HAS_DISMISSED_NUDGE_TO_SETUP_DREAM = "HasDismissedNudgeToSetupDream"; } public static boolean getBoolean(Context context, @Key String key, boolean defaultValue) { diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java index 50ca447090b5..7e1a02626dc9 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java @@ -1072,6 +1072,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold pw.println("WindowMagnificationController (displayId=" + mDisplayId + "):"); pw.println(" mOverlapWithGestureInsets:" + mOverlapWithGestureInsets); pw.println(" mScale:" + mScale); + pw.println(" mWindowBounds:" + mWindowBounds); pw.println(" mMirrorViewBounds:" + (isWindowVisible() ? mMirrorViewBounds : "empty")); pw.println(" mMagnificationFrameBoundary:" + (isWindowVisible() ? mMagnificationFrameBoundary : "empty")); diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/DraggableConstraintLayout.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/DraggableConstraintLayout.java index a327809640db..57dc1620a410 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/DraggableConstraintLayout.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/DraggableConstraintLayout.java @@ -19,10 +19,12 @@ package com.android.systemui.clipboardoverlay; import android.animation.Animator; import android.content.Context; import android.graphics.Rect; +import android.graphics.Region; import android.util.AttributeSet; import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; +import android.view.ViewTreeObserver; import androidx.constraintlayout.widget.ConstraintLayout; @@ -34,7 +36,8 @@ import java.util.function.Consumer; /** * ConstraintLayout that is draggable when touched in a specific region */ -public class DraggableConstraintLayout extends ConstraintLayout { +public class DraggableConstraintLayout extends ConstraintLayout + implements ViewTreeObserver.OnComputeInternalInsetsListener { private final SwipeDismissHandler mSwipeDismissHandler; private final GestureDetector mSwipeDetector; private Consumer<Animator> mOnDismissInitiated; @@ -95,11 +98,6 @@ public class DraggableConstraintLayout extends ConstraintLayout { mSwipeDetector.setIsLongpressEnabled(false); } - @Override // View - protected void onFinishInflate() { - - } - @Override public boolean onInterceptTouchEvent(MotionEvent ev) { if (ev.getActionMasked() == MotionEvent.ACTION_DOWN) { @@ -137,4 +135,29 @@ public class DraggableConstraintLayout extends ConstraintLayout { public void setOnInteractionCallback(Runnable callback) { mOnInteraction = callback; } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + getViewTreeObserver().addOnComputeInternalInsetsListener(this); + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + getViewTreeObserver().removeOnComputeInternalInsetsListener(this); + } + + @Override + public void onComputeInternalInsets(ViewTreeObserver.InternalInsetsInfo inoutInfo) { + // Only child views are touchable. + Region r = new Region(); + Rect rect = new Rect(); + for (int i = 0; i < getChildCount(); i++) { + getChildAt(i).getGlobalVisibleRect(rect); + r.op(rect, Region.Op.UNION); + } + inoutInfo.setTouchableInsets(ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION); + inoutInfo.touchableRegion.set(r); + } } diff --git a/packages/SystemUI/src/com/android/systemui/communal/CommunalHostView.java b/packages/SystemUI/src/com/android/systemui/communal/CommunalHostView.java deleted file mode 100644 index 6e2fcd11f643..000000000000 --- a/packages/SystemUI/src/com/android/systemui/communal/CommunalHostView.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import android.content.Context; -import android.util.AttributeSet; -import android.widget.FrameLayout; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -/** - * Container for communal presentation. Containing communal-related view to this parent view allows - * for aggregate measurement/layout adjustments and capturing said values before the communal views - * might be available. - */ -public class CommunalHostView extends FrameLayout { - public CommunalHostView(@NonNull Context context) { - this(context, null, 0); - } - - public CommunalHostView(@NonNull Context context, - @Nullable AttributeSet attrs) { - this(context, attrs, 0); - } - - public CommunalHostView(@NonNull Context context, @Nullable AttributeSet attrs, - int defStyleAttr) { - super(context, attrs, defStyleAttr); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/communal/CommunalHostViewController.java b/packages/SystemUI/src/com/android/systemui/communal/CommunalHostViewController.java deleted file mode 100644 index b42838099986..000000000000 --- a/packages/SystemUI/src/com/android/systemui/communal/CommunalHostViewController.java +++ /dev/null @@ -1,396 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import android.annotation.IntDef; -import android.content.Context; -import android.util.Log; -import android.view.View; -import android.view.ViewGroup; - -import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.keyguard.KeyguardUpdateMonitorCallback; -import com.android.keyguard.KeyguardVisibilityHelper; -import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.statusbar.StatusBarState; -import com.android.systemui.statusbar.notification.AnimatableProperty; -import com.android.systemui.statusbar.notification.PropertyAnimator; -import com.android.systemui.statusbar.notification.stack.AnimationProperties; -import com.android.systemui.statusbar.notification.stack.StackStateAnimator; -import com.android.systemui.statusbar.phone.DozeParameters; -import com.android.systemui.statusbar.phone.ScreenOffAnimationController; -import com.android.systemui.statusbar.policy.KeyguardStateController; -import com.android.systemui.util.ViewController; - -import com.google.common.util.concurrent.ListenableFuture; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.ref.WeakReference; -import java.util.Objects; -import java.util.Optional; -import java.util.concurrent.Executor; - -import javax.inject.Inject; - -/** - * Injectable controller for {@link CommunalHostView}. - */ -public class CommunalHostViewController extends ViewController<CommunalHostView> { - private static final String TAG = "CommunalController"; - private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); - private static final String STATE_LIST_FORMAT = "[%s]"; - private static final AnimationProperties COMMUNAL_ANIMATION_PROPERTIES = - new AnimationProperties().setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD); - - private final Executor mMainExecutor; - private final CommunalStateController mCommunalStateController; - private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; - private final KeyguardStateController mKeyguardStateController; - private final StatusBarStateController mStatusBarStateController; - private WeakReference<CommunalSource> mCurrentSource; - private Optional<ShowRequest> mLastRequest = Optional.empty(); - private int mState; - private float mQsExpansion; - private float mShadeExpansion; - - @Retention(RetentionPolicy.RUNTIME) - @IntDef({STATE_KEYGUARD_SHOWING, STATE_DOZING, STATE_BOUNCER_SHOWING, STATE_KEYGUARD_OCCLUDED}) - public @interface State {} - - private static final int STATE_KEYGUARD_SHOWING = 1 << 0; - private static final int STATE_DOZING = 1 << 1; - private static final int STATE_BOUNCER_SHOWING = 1 << 2; - private static final int STATE_KEYGUARD_OCCLUDED = 1 << 3; - - // Only show communal view when keyguard is showing and not dozing. - private static final int SHOW_COMMUNAL_VIEW_REQUIRED_STATES = STATE_KEYGUARD_SHOWING; - private static final int SHOW_COMMUNAL_VIEW_INVALID_STATES = - STATE_DOZING | STATE_KEYGUARD_OCCLUDED; - - private final KeyguardVisibilityHelper mKeyguardVisibilityHelper; - - private ViewController<? extends View> mCommunalViewController; - - private static class ShowRequest { - private boolean mShouldShow; - private WeakReference<CommunalSource> mSource; - - ShowRequest(boolean shouldShow, WeakReference<CommunalSource> source) { - mShouldShow = shouldShow; - mSource = source; - } - - CommunalSource getSource() { - return mSource != null ? mSource.get() : null; - } - - boolean shouldShow() { - return mShouldShow; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof ShowRequest)) return false; - ShowRequest that = (ShowRequest) o; - return mShouldShow == that.mShouldShow && Objects.equals(getSource(), that.getSource()); - } - - @Override - public int hashCode() { - return Objects.hash(mShouldShow, mSource); - } - } - - private KeyguardUpdateMonitorCallback mKeyguardUpdateCallback = - new KeyguardUpdateMonitorCallback() { - @Override - public void onKeyguardBouncerChanged(boolean bouncer) { - if (DEBUG) { - Log.d(TAG, "onKeyguardBouncerChanged:" + bouncer); - } - - setState(STATE_BOUNCER_SHOWING, bouncer); - } - - @Override - public void onKeyguardOccludedChanged(boolean occluded) { - if (DEBUG) { - Log.d(TAG, "onKeyguardOccludedChanged" + occluded); - } - - setState(STATE_KEYGUARD_OCCLUDED, occluded); - } - }; - - private KeyguardStateController.Callback mKeyguardCallback = - new KeyguardStateController.Callback() { - @Override - public void onKeyguardShowingChanged() { - final boolean isShowing = mKeyguardStateController.isShowing(); - if (DEBUG) { - Log.d(TAG, "setKeyguardShowing:" + isShowing); - } - - setState(STATE_KEYGUARD_SHOWING, isShowing); - } - }; - - private StatusBarStateController.StateListener mDozeCallback = - new StatusBarStateController.StateListener() { - @Override - public void onDozingChanged(boolean isDozing) { - if (DEBUG) { - Log.d(TAG, "setDozing:" + isDozing); - } - - setState(STATE_DOZING, isDozing); - } - - @Override - public void onStateChanged(int newState) { - updateCommunalViewOccluded(); - } - }; - - @Inject - protected CommunalHostViewController(@Main Executor mainExecutor, - CommunalStateController communalStateController, - KeyguardUpdateMonitor keyguardUpdateMonitor, - KeyguardStateController keyguardStateController, - DozeParameters dozeParameters, - ScreenOffAnimationController screenOffAnimationController, - StatusBarStateController statusBarStateController, CommunalHostView view) { - super(view); - mCommunalStateController = communalStateController; - mKeyguardUpdateMonitor = keyguardUpdateMonitor; - mMainExecutor = mainExecutor; - mKeyguardStateController = keyguardStateController; - mStatusBarStateController = statusBarStateController; - mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, communalStateController, - keyguardStateController, dozeParameters, screenOffAnimationController, - /* animateYPos= */ false, /* visibleOnCommunal= */ true); - } - - /** - * Set the visibility of the keyguard status view based on some new state. - */ - public void setKeyguardStatusViewVisibility( - int statusBarState, - boolean keyguardFadingAway, - boolean goingToFullShade, - int oldStatusBarState) { - mKeyguardVisibilityHelper.setViewVisibility( - statusBarState, keyguardFadingAway, goingToFullShade, oldStatusBarState); - } - - /** - * Set keyguard status view alpha. - */ - public void setAlpha(float alpha) { - if (!mKeyguardVisibilityHelper.isVisibilityAnimating()) { - mView.setAlpha(alpha); - - // Some communal view implementations, such as SurfaceViews, do not behave correctly - // inheriting the alpha of their parent. Directly set child alpha here to work around - // this. - for (int i = mView.getChildCount() - 1; i >= 0; --i) { - mView.getChildAt(i).setAlpha(alpha); - } - } - } - @Override - public void onInit() { - setState(STATE_KEYGUARD_SHOWING, mKeyguardStateController.isShowing()); - setState(STATE_DOZING, mStatusBarStateController.isDozing()); - } - - @Override - protected void onViewAttached() { - mKeyguardStateController.addCallback(mKeyguardCallback); - mStatusBarStateController.addCallback(mDozeCallback); - mKeyguardUpdateMonitor.registerCallback(mKeyguardUpdateCallback); - } - - @Override - protected void onViewDetached() { - mKeyguardStateController.removeCallback(mKeyguardCallback); - mStatusBarStateController.removeCallback(mDozeCallback); - mKeyguardUpdateMonitor.removeCallback(mKeyguardUpdateCallback); - } - - private void setState(@State int stateFlag, boolean enabled) { - final int existingState = mState; - if (DEBUG) { - Log.d(TAG, "setState flag:" + describeState(stateFlag) + " enabled:" + enabled); - } - - if (enabled) { - mState |= stateFlag; - } else { - mState &= ~stateFlag; - } - - if (DEBUG) { - Log.d(TAG, "updated state:" + describeState()); - } - - if (existingState != mState) { - showSource(); - } - - updateCommunalViewOccluded(); - } - - private String describeState(@State int stateFlag) { - switch(stateFlag) { - case STATE_DOZING: - return "dozing"; - case STATE_BOUNCER_SHOWING: - return "bouncer_showing"; - case STATE_KEYGUARD_SHOWING: - return "keyguard_showing"; - default: - return "UNDEFINED_STATE"; - } - } - - private String describeState() { - StringBuilder stringBuilder = new StringBuilder(); - - if ((mState & STATE_KEYGUARD_SHOWING) == STATE_KEYGUARD_SHOWING) { - stringBuilder.append(String.format(STATE_LIST_FORMAT, - describeState(STATE_KEYGUARD_SHOWING))); - } - if ((mState & STATE_DOZING) == STATE_DOZING) { - stringBuilder.append(String.format(STATE_LIST_FORMAT, - describeState(STATE_DOZING))); - } - if ((mState & STATE_BOUNCER_SHOWING) == STATE_BOUNCER_SHOWING) { - stringBuilder.append(String.format(STATE_LIST_FORMAT, - describeState(STATE_BOUNCER_SHOWING))); - } - - return stringBuilder.toString(); - } - - private void showSource() { - final ShowRequest request = new ShowRequest( - (mState & SHOW_COMMUNAL_VIEW_REQUIRED_STATES) == SHOW_COMMUNAL_VIEW_REQUIRED_STATES - && (mState & SHOW_COMMUNAL_VIEW_INVALID_STATES) == 0 - && mCurrentSource != null, - mCurrentSource); - - if (mLastRequest.isPresent() && Objects.equals(mLastRequest.get(), request)) { - return; - } - - mLastRequest = Optional.of(request); - - // Make sure all necessary states are present for showing communal and all invalid states - // are absent - mMainExecutor.execute(() -> { - if (DEBUG) { - Log.d(TAG, "showSource. currentSource:" + request.getSource()); - } - - if (request.shouldShow()) { - mView.removeAllViews(); - - // Make view visible. - mView.setVisibility(View.VISIBLE); - - final Context context = mView.getContext(); - - final ListenableFuture<CommunalSource.CommunalViewResult> listenableFuture = - request.getSource().requestCommunalView(context); - - if (listenableFuture == null) { - Log.e(TAG, "could not request communal view"); - return; - } - - listenableFuture.addListener(() -> { - try { - final CommunalSource.CommunalViewResult result = listenableFuture.get(); - result.view.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT)); - mView.addView(result.view); - - mCommunalViewController = result.viewController; - mCommunalViewController.init(); - } catch (Exception e) { - Log.e(TAG, "could not obtain communal view through callback:" + e); - } - }, mMainExecutor); - } else { - mView.removeAllViews(); - mView.setVisibility(View.INVISIBLE); - mCommunalStateController.setCommunalViewShowing(false); - } - }); - } - - /** - * Instructs {@link CommunalHostViewController} to display provided source. - * - * @param source The new {@link CommunalSource}, {@code null} if not set. - */ - public void show(WeakReference<CommunalSource> source) { - mCurrentSource = source; - showSource(); - } - - /** - * Update position of the view with an optional animation - */ - public void updatePosition(int y, boolean animate) { - PropertyAnimator.setProperty(mView, AnimatableProperty.Y, y, COMMUNAL_ANIMATION_PROPERTIES, - animate); - } - - /** - * Invoked when the quick settings is expanded. - * @param expansionFraction the percentage the QS shade has been expanded. - */ - public void updateQsExpansion(float expansionFraction) { - mQsExpansion = expansionFraction; - updateCommunalViewOccluded(); - } - - /** - * Invoked when the main shade is expanded. - * @param shadeExpansion the percentage the main shade has expanded. - */ - public void updateShadeExpansion(float shadeExpansion) { - mShadeExpansion = shadeExpansion; - updateCommunalViewOccluded(); - } - - private void updateCommunalViewOccluded() { - final boolean bouncerShowing = (mState & STATE_BOUNCER_SHOWING) == STATE_BOUNCER_SHOWING; - final int statusBarState = mStatusBarStateController.getState(); - final boolean shadeExpanded = statusBarState == StatusBarState.SHADE - || statusBarState == StatusBarState.SHADE_LOCKED; - - mCommunalStateController.setCommunalViewOccluded( - bouncerShowing || shadeExpanded || mQsExpansion > 0.0f || mShadeExpansion > 0.0f); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/communal/CommunalHostViewPositionAlgorithm.java b/packages/SystemUI/src/com/android/systemui/communal/CommunalHostViewPositionAlgorithm.java deleted file mode 100644 index 424da0b111c5..000000000000 --- a/packages/SystemUI/src/com/android/systemui/communal/CommunalHostViewPositionAlgorithm.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import android.util.Log; - -import com.android.systemui.statusbar.phone.NotificationPanelViewController; - -/** - * {@link CommunalHostViewPositionAlgorithm} calculates the position of the communal view given - * input such as the notification panel position. - */ -public class CommunalHostViewPositionAlgorithm { - private static final String TAG = "CommunalPositionAlg"; - private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); - - /** - * @see NotificationPanelViewController#getExpandedFraction() - */ - private float mPanelExpansion; - - /** - * Height of {@link CommunalHostView}. - */ - private int mCommunalHeight; - - /** - * A data container for the result of the position algorithm. - */ - public static class Result { - /** - * The y translation of the clock. - */ - public int communalY; - } - - /** - * Sets the conditions under which the result should be calculated from. - * @param panelExpansion The percentage the keyguard panel has been moved upwards. - * @param communalHeight The height of the communal panel. - */ - public void setup(float panelExpansion, int communalHeight) { - if (DEBUG) { - Log.d(TAG, "setup. panelExpansion:" + panelExpansion); - } - mPanelExpansion = panelExpansion; - mCommunalHeight = communalHeight; - } - - /** - * Calculates the position based on factors input through {link {@link #setup(float, int)}}. - * @param result The resulting calculations. - */ - public void run(Result result) { - // The panel expansion relates to the keyguard expansion. At full expansion, the communal - // view should be aligned at the top (0). Otherwise, it should be shifted offscreen by the - // unexpanded amount. - result.communalY = (int) ((1 - mPanelExpansion) * -mCommunalHeight); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/communal/CommunalSource.java b/packages/SystemUI/src/com/android/systemui/communal/CommunalSource.java deleted file mode 100644 index 42ecd5c835bb..000000000000 --- a/packages/SystemUI/src/com/android/systemui/communal/CommunalSource.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import android.content.Context; -import android.view.View; - -import com.android.systemui.util.ViewController; - -import com.google.common.util.concurrent.ListenableFuture; - -import java.util.Optional; - -/** - * {@link CommunalSource} defines an interface for working with a source for communal data. Clients - * may request a communal surface that can be shown within a {@link android.view.SurfaceView}. - * Callbacks may also be registered to listen to state changes. - */ -public interface CommunalSource { - /** - * {@link Connector} defines an interface for {@link CommunalSource} instances to be generated. - */ - interface Connector { - Connection connect(Connection.Callback callback); - } - - /** - * {@link Connection} defines an interface for an entity which holds the necessary components - * for establishing and maintaining a connection to the communal source. - */ - interface Connection { - /** - * {@link Callback} defines an interface for clients to be notified when a source is ready - */ - interface Callback { - void onSourceEstablished(Optional<CommunalSource> source); - void onDisconnected(); - } - - void disconnect(); - } - - /** - * The {@link Observer} interface specifies an entity which {@link CommunalSource} listeners - * can be informed of changes to the source, which will require updating. Note that this deals - * with changes to the source itself, not content which will be updated through the - * {@link CommunalSource} interface. - */ - interface Observer { - interface Callback { - void onSourceChanged(); - } - - void addCallback(Callback callback); - void removeCallback(Callback callback); - } - - /** - * {@link CommunalViewResult} is handed back from {@link #requestCommunalView(Context)} and - * contains the view to be displayed and its associated controller. - */ - class CommunalViewResult { - /** - * The resulting communal view. - */ - public final View view; - /** - * The controller for the communal view. - */ - public final ViewController<? extends View> viewController; - - /** - * The default constructor for {@link CommunalViewResult}. - * @param view The communal view. - * @param viewController The communal view's controller. - */ - public CommunalViewResult(View view, ViewController<? extends View> viewController) { - this.view = view; - this.viewController = viewController; - } - } - - /** - * Requests a communal surface that can be displayed inside {@link CommunalHostView}. - * - * @param context The {@link View} {@link Context} to build the resulting view from - * @return A future that can be listened upon for the resulting {@link CommunalViewResult}. The - * value will be {@code null} in case of a failure. - */ - ListenableFuture<CommunalViewResult> requestCommunalView(Context context); -} diff --git a/packages/SystemUI/src/com/android/systemui/communal/CommunalSourceMonitor.java b/packages/SystemUI/src/com/android/systemui/communal/CommunalSourceMonitor.java deleted file mode 100644 index 58cf35f2917c..000000000000 --- a/packages/SystemUI/src/com/android/systemui/communal/CommunalSourceMonitor.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import static com.android.systemui.communal.dagger.CommunalModule.COMMUNAL_CONDITIONS; - -import android.util.Log; - -import com.android.internal.annotations.VisibleForTesting; -import com.android.systemui.dagger.SysUISingleton; -import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.util.condition.Monitor; - -import com.google.android.collect.Lists; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.concurrent.Executor; - -import javax.inject.Inject; -import javax.inject.Named; - -/** - * A Monitor for reporting a {@link CommunalSource} presence. - */ -@SysUISingleton -public class CommunalSourceMonitor { - private static final String TAG = "CommunalSourceMonitor"; - private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); - - // A list of {@link Callback} that have registered to receive updates. - private final ArrayList<WeakReference<Callback>> mCallbacks = Lists.newArrayList(); - private final Monitor mConditionsMonitor; - private final Executor mExecutor; - - private CommunalSource mCurrentSource; - - // Whether all conditions for communal mode to show have been met. - private boolean mAllCommunalConditionsMet = false; - - // Whether the class is currently listening for condition changes. - private boolean mListeningForConditions = false; - - private final Monitor.Callback mConditionsCallback = - allConditionsMet -> { - if (mAllCommunalConditionsMet != allConditionsMet) { - if (DEBUG) Log.d(TAG, "communal conditions changed: " + allConditionsMet); - - mAllCommunalConditionsMet = allConditionsMet; - executeOnSourceAvailableCallbacks(); - } - }; - - @VisibleForTesting - @Inject - public CommunalSourceMonitor(@Main Executor executor, - @Named(COMMUNAL_CONDITIONS) Monitor communalConditionsMonitor) { - mExecutor = executor; - mConditionsMonitor = communalConditionsMonitor; - } - - /** - * Sets the current {@link CommunalSource}, informing any callbacks. Any existing - * {@link CommunalSource} will be disconnected. - * - * @param source The new {@link CommunalSource}. - */ - public void setSource(CommunalSource source) { - mCurrentSource = source; - - if (mAllCommunalConditionsMet) { - executeOnSourceAvailableCallbacks(); - } - } - - private void executeOnSourceAvailableCallbacks() { - mExecutor.execute(() -> { - // If the new source is valid, inform registered Callbacks of its presence. - Iterator<WeakReference<Callback>> itr = mCallbacks.iterator(); - while (itr.hasNext()) { - Callback cb = itr.next().get(); - if (cb == null) { - itr.remove(); - } else { - cb.onSourceAvailable( - (mAllCommunalConditionsMet && mCurrentSource != null) - ? new WeakReference<>(mCurrentSource) : null); - } - } - }); - } - - /** - * Adds a {@link Callback} to receive {@link CommunalSource} updates. - * - * @param callback The {@link Callback} to add. - */ - public void addCallback(Callback callback) { - mExecutor.execute(() -> { - mCallbacks.add(new WeakReference<>(callback)); - - // Inform the callback of any already present CommunalSource. - if (mAllCommunalConditionsMet && mCurrentSource != null) { - callback.onSourceAvailable(new WeakReference<>(mCurrentSource)); - } - - if (!mListeningForConditions) { - mConditionsMonitor.addCallback(mConditionsCallback); - mListeningForConditions = true; - } - }); - } - - /** - * Removes the specified {@link Callback} from receive future updates if present. - * - * @param callback The {@link Callback} to add. - */ - public void removeCallback(Callback callback) { - mExecutor.execute(() -> { - mCallbacks.removeIf(el -> el.get() == callback); - - if (mCallbacks.isEmpty() && mListeningForConditions) { - mConditionsMonitor.removeCallback(mConditionsCallback); - mListeningForConditions = false; - } - }); - } - - /** - * Interface implemented to be notified when new {@link CommunalSource} become available. - */ - public interface Callback { - /** - * Called when a new {@link CommunalSource} has been registered. This will also be invoked - * when a {@link Callback} is first registered and a {@link CommunalSource} is already - * registered. - * - * @param source The new {@link CommunalSource}. - */ - void onSourceAvailable(WeakReference<CommunalSource> source); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/communal/CommunalSourcePrimer.java b/packages/SystemUI/src/com/android/systemui/communal/CommunalSourcePrimer.java deleted file mode 100644 index f965431a8001..000000000000 --- a/packages/SystemUI/src/com/android/systemui/communal/CommunalSourcePrimer.java +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import android.content.Context; -import android.content.res.Resources; -import android.util.Log; - -import com.android.systemui.CoreStartable; -import com.android.systemui.R; -import com.android.systemui.dagger.SysUISingleton; -import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.util.concurrency.DelayableExecutor; -import com.android.systemui.util.time.SystemClock; - -import java.util.Optional; - -import javax.inject.Inject; - -/** - * The {@link CommunalSourcePrimer} is responsible for priming SystemUI with a pre-configured - * Communal source. The SystemUI service binds to the component to retrieve the - * {@link CommunalSource}. {@link CommunalSourcePrimer} has no effect - * if there is no pre-defined value. - */ -@SysUISingleton -public class CommunalSourcePrimer extends CoreStartable { - private static final String TAG = "CommunalSourcePrimer"; - private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); - - private final SystemClock mSystemClock; - private final DelayableExecutor mMainExecutor; - private final CommunalSourceMonitor mMonitor; - private final int mBaseReconnectDelayMs; - private final int mMaxReconnectAttempts; - private final int mMinConnectionDuration; - - private int mReconnectAttempts = 0; - private Runnable mCurrentReconnectCancelable; - - private final Optional<CommunalSource.Observer> mObserver; - private final Optional<CommunalSource.Connector> mConnector; - - private CommunalSource.Connection mCurrentConnection; - - private final Runnable mConnectRunnable = new Runnable() { - @Override - public void run() { - mCurrentReconnectCancelable = null; - connect(); - } - }; - - private final CommunalSource.Observer.Callback mObserverCallback = () -> { - initiateConnectionAttempt(); - }; - - @Inject - public CommunalSourcePrimer(Context context, @Main Resources resources, - SystemClock clock, - DelayableExecutor mainExecutor, - CommunalSourceMonitor monitor, - Optional<CommunalSource.Connector> connector, - Optional<CommunalSource.Observer> observer) { - super(context); - mSystemClock = clock; - mMainExecutor = mainExecutor; - mMonitor = monitor; - mConnector = connector; - mObserver = observer; - - mMaxReconnectAttempts = resources.getInteger( - R.integer.config_communalSourceMaxReconnectAttempts); - mBaseReconnectDelayMs = resources.getInteger( - R.integer.config_communalSourceReconnectBaseDelay); - mMinConnectionDuration = resources.getInteger( - R.integer.config_connectionMinDuration); - } - - @Override - public void start() { - } - - private void initiateConnectionAttempt() { - // Reset attempts - mReconnectAttempts = 0; - mMonitor.setSource(null); - - // The first attempt is always a direct invocation rather than delayed. - connect(); - } - - private void scheduleConnectionAttempt() { - // always clear cancelable if present. - if (mCurrentReconnectCancelable != null) { - mCurrentReconnectCancelable.run(); - mCurrentReconnectCancelable = null; - } - - if (mReconnectAttempts >= mMaxReconnectAttempts) { - if (DEBUG) { - Log.d(TAG, "exceeded max connection attempts."); - } - return; - } - - final long reconnectDelayMs = - (long) Math.scalb(mBaseReconnectDelayMs, mReconnectAttempts); - - if (DEBUG) { - Log.d(TAG, - "scheduling connection attempt in " + reconnectDelayMs + "milliseconds"); - } - - mCurrentReconnectCancelable = mMainExecutor.executeDelayed(mConnectRunnable, - reconnectDelayMs); - - mReconnectAttempts++; - } - - @Override - protected void onBootCompleted() { - if (mObserver.isPresent()) { - mObserver.get().addCallback(mObserverCallback); - } - initiateConnectionAttempt(); - } - - private void connect() { - if (DEBUG) { - Log.d(TAG, "attempting to connect to communal source"); - } - - if (mCurrentConnection != null) { - if (DEBUG) { - Log.d(TAG, "canceling in-flight connection"); - } - mCurrentConnection.disconnect(); - } - - mCurrentConnection = mConnector.get().connect(new CommunalSource.Connection.Callback() { - private long mStartTime; - - @Override - public void onSourceEstablished(Optional<CommunalSource> optionalSource) { - mStartTime = mSystemClock.currentTimeMillis(); - - if (optionalSource.isPresent()) { - final CommunalSource source = optionalSource.get(); - mMonitor.setSource(source); - } else { - scheduleConnectionAttempt(); - } - } - - @Override - public void onDisconnected() { - if (mSystemClock.currentTimeMillis() - mStartTime > mMinConnectionDuration) { - initiateConnectionAttempt(); - } else { - scheduleConnectionAttempt(); - } - } - }); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/communal/CommunalStateController.java b/packages/SystemUI/src/com/android/systemui/communal/CommunalStateController.java deleted file mode 100644 index c72f5422b1f5..000000000000 --- a/packages/SystemUI/src/com/android/systemui/communal/CommunalStateController.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import android.annotation.NonNull; - -import com.android.internal.annotations.VisibleForTesting; -import com.android.systemui.dagger.SysUISingleton; -import com.android.systemui.statusbar.policy.CallbackController; - -import java.util.ArrayList; -import java.util.Objects; - -import javax.inject.Inject; - -/** - * CommunalStateController enables publishing and listening to communal-related state changes. - */ -@SysUISingleton -public class CommunalStateController implements - CallbackController<CommunalStateController.Callback> { - private final ArrayList<Callback> mCallbacks = new ArrayList<>(); - private boolean mCommunalViewOccluded; - private boolean mCommunalViewShowing; - - /** - * Callback for communal events. - */ - public interface Callback { - /** - * Called when the visibility of the communal view changes. - */ - default void onCommunalViewShowingChanged() { - } - - /** - * Called when the occlusion of the communal view changes. - */ - default void onCommunalViewOccludedChanged() { - } - } - - @VisibleForTesting - @Inject - public CommunalStateController() { - } - - /** - * Sets whether the communal view is showing. - * @param communalViewShowing {@code true} if the view is showing, {@code false} otherwise. - */ - public void setCommunalViewShowing(boolean communalViewShowing) { - if (mCommunalViewShowing == communalViewShowing) { - return; - } - - mCommunalViewShowing = communalViewShowing; - - final ArrayList<Callback> callbacks = new ArrayList<>(mCallbacks); - for (Callback callback : callbacks) { - callback.onCommunalViewShowingChanged(); - } - } - - /** - * Sets whether the communal view is occluded (but otherwise still showing). - * @param communalViewOccluded {@code true} if the view is occluded, {@code false} otherwise. - */ - public void setCommunalViewOccluded(boolean communalViewOccluded) { - if (mCommunalViewOccluded == communalViewOccluded) { - return; - } - - mCommunalViewOccluded = communalViewOccluded; - - ArrayList<Callback> callbacks = new ArrayList<>(mCallbacks); - for (int i = 0; i < callbacks.size(); i++) { - callbacks.get(i).onCommunalViewOccludedChanged(); - } - } - - /** - * Returns whether the communal view is showing. - * @return {@code true} if the view is showing, {@code false} otherwise. - */ - public boolean getCommunalViewShowing() { - return mCommunalViewShowing; - } - - /** - * Returns whether the communal view is occluded. - * @return {@code true} if the view is occluded, {@code false} otherwise. - */ - public boolean getCommunalViewOccluded() { - return mCommunalViewOccluded; - } - - @Override - public void addCallback(@NonNull Callback callback) { - Objects.requireNonNull(callback, "Callback must not be null. b/128895449"); - if (!mCallbacks.contains(callback)) { - mCallbacks.add(callback); - } - } - - @Override - public void removeCallback(@NonNull Callback callback) { - Objects.requireNonNull(callback, "Callback must not be null. b/128895449"); - mCallbacks.remove(callback); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/communal/PackageObserver.java b/packages/SystemUI/src/com/android/systemui/communal/PackageObserver.java deleted file mode 100644 index 3d25d126a291..000000000000 --- a/packages/SystemUI/src/com/android/systemui/communal/PackageObserver.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.os.PatternMatcher; -import android.util.Log; - -import com.google.android.collect.Lists; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.Iterator; - -/** - * {@link PackageObserver} allows for monitoring the system for changes relating to a particular - * package. This can be used by {@link CommunalSource} clients to detect when a related package - * has changed and reloading is necessary. - */ -public class PackageObserver implements CommunalSource.Observer { - private static final String TAG = "PackageObserver"; - private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); - - private final ArrayList<WeakReference<Callback>> mCallbacks = Lists.newArrayList(); - - private final BroadcastReceiver mReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if (DEBUG) { - Log.d(TAG, "package added receiver - onReceive"); - } - - final Iterator<WeakReference<Callback>> iter = mCallbacks.iterator(); - while (iter.hasNext()) { - final Callback callback = iter.next().get(); - if (callback != null) { - callback.onSourceChanged(); - } else { - iter.remove(); - } - } - } - }; - - private final String mPackageName; - private final Context mContext; - - public PackageObserver(Context context, String packageName) { - mContext = context; - mPackageName = packageName; - } - - @Override - public void addCallback(Callback callback) { - if (DEBUG) { - Log.d(TAG, "addCallback:" + callback); - } - mCallbacks.add(new WeakReference<>(callback)); - - // Only register for listening to package additions on first callback. - if (mCallbacks.size() > 1) { - return; - } - - final IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED); - filter.addDataScheme("package"); - filter.addDataSchemeSpecificPart(mPackageName, PatternMatcher.PATTERN_LITERAL); - // Note that we directly register the receiver here as data schemes are not supported by - // BroadcastDispatcher. - mContext.registerReceiver(mReceiver, filter, Context.RECEIVER_EXPORTED); - } - - @Override - public void removeCallback(Callback callback) { - if (DEBUG) { - Log.d(TAG, "removeCallback:" + callback); - } - final boolean removed = mCallbacks.removeIf(el -> el.get() == callback); - - if (removed && mCallbacks.isEmpty()) { - mContext.unregisterReceiver(mReceiver); - } - } -} diff --git a/packages/SystemUI/src/com/android/systemui/communal/conditions/CommunalSettingCondition.java b/packages/SystemUI/src/com/android/systemui/communal/conditions/CommunalSettingCondition.java deleted file mode 100644 index 25519d0f96c7..000000000000 --- a/packages/SystemUI/src/com/android/systemui/communal/conditions/CommunalSettingCondition.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal.conditions; - -import android.database.ContentObserver; -import android.os.Handler; -import android.os.UserHandle; -import android.provider.Settings; - -import androidx.annotation.MainThread; - -import com.android.systemui.util.condition.Condition; -import com.android.systemui.util.settings.SecureSettings; - -import javax.inject.Inject; - -/** - * Monitors the communal setting, and informs any listeners with updates. - */ -public class CommunalSettingCondition extends Condition { - private final SecureSettings mSecureSettings; - private final ContentObserver mCommunalSettingContentObserver; - - @Inject - public CommunalSettingCondition(@MainThread Handler mainHandler, - SecureSettings secureSettings) { - mSecureSettings = secureSettings; - - mCommunalSettingContentObserver = new ContentObserver(mainHandler) { - @Override - public void onChange(boolean selfChange) { - final boolean communalSettingEnabled = mSecureSettings.getIntForUser( - Settings.Secure.COMMUNAL_MODE_ENABLED, 0, UserHandle.USER_SYSTEM) == 1; - updateCondition(communalSettingEnabled); - } - }; - } - - @Override - protected void start() { - mSecureSettings.registerContentObserverForUser(Settings.Secure.COMMUNAL_MODE_ENABLED, - false /*notifyForDescendants*/, mCommunalSettingContentObserver, - UserHandle.USER_SYSTEM); - - // Fetches setting immediately. - mCommunalSettingContentObserver.onChange(false); - } - - @Override - protected void stop() { - mSecureSettings.unregisterContentObserver(mCommunalSettingContentObserver); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalModule.java b/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalModule.java deleted file mode 100644 index 814b251d08ab..000000000000 --- a/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalModule.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal.dagger; - -import android.content.ComponentName; -import android.content.Context; -import android.content.res.Resources; -import android.text.TextUtils; - -import androidx.annotation.Nullable; - -import com.android.systemui.R; -import com.android.systemui.communal.CommunalSource; -import com.android.systemui.communal.PackageObserver; -import com.android.systemui.communal.conditions.CommunalSettingCondition; -import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.util.condition.Condition; -import com.android.systemui.util.condition.Monitor; -import com.android.systemui.util.condition.dagger.MonitorComponent; - -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Optional; -import java.util.Set; - -import javax.inject.Named; -import javax.inject.Provider; - -import dagger.Module; -import dagger.Provides; -import dagger.multibindings.ElementsIntoSet; -import dagger.multibindings.IntoMap; -import dagger.multibindings.StringKey; - -/** - * Dagger Module providing Communal-related functionality. - */ -@Module(subcomponents = { - CommunalViewComponent.class, -}) -public interface CommunalModule { - String COMMUNAL_CONDITIONS = "communal_conditions"; - - /** */ - @Provides - static Optional<CommunalSource.Observer> provideCommunalSourcePackageObserver( - Context context, @Main Resources resources) { - final String componentName = resources.getString(R.string.config_communalSourceComponent); - - if (TextUtils.isEmpty(componentName)) { - return Optional.empty(); - } - - return Optional.of(new PackageObserver(context, - ComponentName.unflattenFromString(componentName).getPackageName())); - } - - /** - * Provides a set of conditions that need to be fulfilled in order for Communal Mode to display. - */ - @Provides - @ElementsIntoSet - @Named(COMMUNAL_CONDITIONS) - static Set<Condition> provideCommunalConditions( - CommunalSettingCondition communalSettingCondition) { - return new HashSet<>(Collections.singletonList(communalSettingCondition)); - } - - /** - * TODO(b/205638389): Remove when there is a base implementation of - * {@link CommunalSource.Connector}. Currently a place holder to allow a map to be present. - */ - @Provides - @IntoMap - @Nullable - @StringKey("empty") - static CommunalSource.Connector provideEmptyCommunalSourceConnector() { - return null; - } - - /** */ - @Provides - static Optional<CommunalSource.Connector> provideCommunalSourceConnector( - @Main Resources resources, - Map<Class<?>, Provider<CommunalSource.Connector>> connectorCreators) { - final String className = resources.getString(R.string.config_communalSourceConnector); - - if (TextUtils.isEmpty(className)) { - return Optional.empty(); - } - - try { - Class<?> clazz = Class.forName(className); - Provider<CommunalSource.Connector> provider = connectorCreators.get(clazz); - return provider != null ? Optional.of(provider.get()) : Optional.empty(); - } catch (ClassNotFoundException e) { - return Optional.empty(); - } - } - - /** */ - @Provides - @Named(COMMUNAL_CONDITIONS) - static Monitor provideCommunalSourceMonitor( - @Named(COMMUNAL_CONDITIONS) Set<Condition> communalConditions, - MonitorComponent.Factory factory) { - final MonitorComponent component = factory.create(communalConditions, new HashSet<>()); - return component.getMonitor(); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalViewComponent.java b/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalViewComponent.java deleted file mode 100644 index 3a80a03aecb2..000000000000 --- a/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalViewComponent.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal.dagger; - -import com.android.systemui.communal.CommunalHostView; -import com.android.systemui.communal.CommunalHostViewController; - -import dagger.BindsInstance; -import dagger.Subcomponent; - -/** - * Subcomponent for working with {@link CommunalHostView}. - */ -@Subcomponent -public interface CommunalViewComponent { - /** Simple factory for {@link CommunalViewComponent}. */ - @Subcomponent.Factory - interface Factory { - CommunalViewComponent build(@BindsInstance CommunalHostView view); - } - - /** Builds a {@link CommunalHostViewController}. */ - CommunalHostViewController getCommunalHostViewController(); -} diff --git a/packages/SystemUI/src/com/android/systemui/dagger/GlobalModule.java b/packages/SystemUI/src/com/android/systemui/dagger/GlobalModule.java index 18f85196aa0b..620feec8fbb8 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/GlobalModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/GlobalModule.java @@ -23,10 +23,14 @@ import android.util.DisplayMetrics; import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.UiEventLoggerImpl; import com.android.systemui.dagger.qualifiers.TestHarness; +import com.android.systemui.dagger.qualifiers.UiBackground; import com.android.systemui.plugins.PluginsModule; import com.android.systemui.unfold.UnfoldTransitionModule; import com.android.systemui.util.concurrency.GlobalConcurrencyModule; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; + import javax.inject.Singleton; import dagger.Module; @@ -75,4 +79,16 @@ public class GlobalModule { static boolean provideIsTestHarness() { return ActivityManager.isRunningInUserTestHarness(); } + + /** + * Provide an Executor specifically for running UI operations on a separate thread. + * + * Keep submitted runnables short and to the point, just as with any other UI code. + */ + @Provides + @Singleton + @UiBackground + public static Executor provideUiBackgroundExecutor() { + return Executors.newSingleThreadExecutor(); + } } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/GlobalRootComponent.java b/packages/SystemUI/src/com/android/systemui/dagger/GlobalRootComponent.java index a3a45fe7ae40..4f55ba496b6b 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/GlobalRootComponent.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/GlobalRootComponent.java @@ -27,10 +27,7 @@ import dagger.Component; * Root component for Dagger injection. */ @Singleton -@Component(modules = { - GlobalModule.class, - SysUISubcomponentModule.class, - WMModule.class}) +@Component(modules = {GlobalModule.class}) public interface GlobalRootComponent { /** @@ -45,12 +42,12 @@ public interface GlobalRootComponent { } /** - * Builder for a WMComponent. + * Builder for a {@link WMComponent}, which makes it a subcomponent of this class. */ WMComponent.Builder getWMComponentBuilder(); /** - * Builder for a SysUIComponent. + * Builder for a {@link SysUIComponent}, which makes it a subcomponent of this class. */ SysUIComponent.Builder getSysUIComponent(); } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java index 27993010c917..166c2654cbaa 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java @@ -32,7 +32,6 @@ import com.android.systemui.assist.AssistModule; import com.android.systemui.biometrics.UdfpsHbmProvider; import com.android.systemui.biometrics.dagger.BiometricsModule; import com.android.systemui.classifier.FalsingModule; -import com.android.systemui.communal.dagger.CommunalModule; import com.android.systemui.controls.dagger.ControlsModule; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.demomode.dagger.DemoModeModule; @@ -49,6 +48,7 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.recents.Recents; import com.android.systemui.screenshot.dagger.ScreenshotModule; import com.android.systemui.settings.dagger.SettingsModule; +import com.android.systemui.smartspace.dagger.SmartspaceModule; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationShadeWindowController; @@ -66,8 +66,8 @@ import com.android.systemui.statusbar.notification.people.PeopleHubModule; import com.android.systemui.statusbar.notification.row.dagger.ExpandableNotificationRowComponent; import com.android.systemui.statusbar.notification.row.dagger.NotificationRowComponent; import com.android.systemui.statusbar.notification.row.dagger.NotificationShelfComponent; -import com.android.systemui.statusbar.phone.ShadeController; import com.android.systemui.statusbar.phone.CentralSurfaces; +import com.android.systemui.statusbar.phone.ShadeController; import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.HeadsUpManager; @@ -106,7 +106,6 @@ import dagger.Provides; AssistModule.class, BiometricsModule.class, ClockModule.class, - CommunalModule.class, DreamModule.class, ControlsModule.class, DemoModeModule.class, @@ -121,6 +120,7 @@ import dagger.Provides; SettingsModule.class, SettingsUtilModule.class, SmartRepliesInflationModule.class, + SmartspaceModule.class, StatusBarPolicyModule.class, StatusBarWindowModule.class, SysUIConcurrencyModule.class, diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java index ebc766635733..dfbb0c7c1624 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java @@ -65,6 +65,9 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ // A reference to the {@link Window} used to hold the dream overlay. private Window mWindow; + // True if the service has been destroyed. + private boolean mDestroyed; + private final Complication.Host mHost = new Complication.Host() { @Override public void requestExitDream() { @@ -134,6 +137,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ mPreviewComplication.setDreamLabel(null); mStateController.removeComplication(mPreviewComplication); mStateController.setPreviewMode(false); + mDestroyed = true; super.onDestroy(); } @@ -141,6 +145,11 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ public void onStartDream(@NonNull WindowManager.LayoutParams layoutParams) { setCurrentState(Lifecycle.State.STARTED); mExecutor.execute(() -> { + if (mDestroyed) { + // The task could still be executed after the service has been destroyed. Bail if + // that is the case. + return; + } mStateController.setShouldShowComplications(shouldShowComplications()); mStateController.setPreviewMode(isPreviewMode()); if (isPreviewMode()) { diff --git a/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java b/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java index a5dcd39264df..a83e006dfa2f 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java @@ -17,6 +17,7 @@ package com.android.systemui.dreams; import android.content.Context; +import android.os.Parcelable; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; @@ -25,7 +26,10 @@ import com.android.systemui.CoreStartable; import com.android.systemui.dreams.complication.Complication; import com.android.systemui.dreams.complication.ComplicationLayoutParams; import com.android.systemui.dreams.complication.ComplicationViewModel; -import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController; +import com.android.systemui.dreams.smartspace.DreamsSmartspaceController; +import com.android.systemui.plugins.BcSmartspaceDataPlugin; + +import java.util.List; import javax.inject.Inject; @@ -39,10 +43,22 @@ public class SmartSpaceComplication implements Complication { * SystemUI. */ public static class Registrant extends CoreStartable { - private final LockscreenSmartspaceController mSmartSpaceController; + private final DreamsSmartspaceController mSmartSpaceController; private final DreamOverlayStateController mDreamOverlayStateController; private final SmartSpaceComplication mComplication; + private final BcSmartspaceDataPlugin.SmartspaceTargetListener mSmartspaceListener = + new BcSmartspaceDataPlugin.SmartspaceTargetListener() { + @Override + public void onSmartspaceTargetsUpdated(List<? extends Parcelable> targets) { + if (!targets.isEmpty()) { + mDreamOverlayStateController.addComplication(mComplication); + } else { + mDreamOverlayStateController.removeComplication(mComplication); + } + } + }; + /** * Default constructor for {@link SmartSpaceComplication}. */ @@ -50,7 +66,7 @@ public class SmartSpaceComplication implements Complication { public Registrant(Context context, DreamOverlayStateController dreamOverlayStateController, SmartSpaceComplication smartSpaceComplication, - LockscreenSmartspaceController smartSpaceController) { + DreamsSmartspaceController smartSpaceController) { super(context); mDreamOverlayStateController = dreamOverlayStateController; mComplication = smartSpaceComplication; @@ -59,32 +75,27 @@ public class SmartSpaceComplication implements Complication { @Override public void start() { - addOrRemoveOverlay(); mDreamOverlayStateController.addCallback(new DreamOverlayStateController.Callback() { @Override public void onStateChanged() { - addOrRemoveOverlay(); + if (mDreamOverlayStateController.isOverlayActive()) { + mSmartSpaceController.addListener(mSmartspaceListener); + } else { + mSmartSpaceController.removeListener(mSmartspaceListener); + } } }); } - - private void addOrRemoveOverlay() { - if (mDreamOverlayStateController.isPreviewMode()) { - mDreamOverlayStateController.removeComplication(mComplication); - } else if (mSmartSpaceController.isEnabled()) { - mDreamOverlayStateController.addComplication(mComplication); - } - } } private static class SmartSpaceComplicationViewHolder implements ViewHolder { private static final int SMARTSPACE_COMPLICATION_WEIGHT = 10; - private final LockscreenSmartspaceController mSmartSpaceController; + private final DreamsSmartspaceController mSmartSpaceController; private final Context mContext; protected SmartSpaceComplicationViewHolder( Context context, - LockscreenSmartspaceController smartSpaceController) { + DreamsSmartspaceController smartSpaceController) { mSmartSpaceController = smartSpaceController; mContext = context; } @@ -109,12 +120,12 @@ public class SmartSpaceComplication implements Complication { } } - private final LockscreenSmartspaceController mSmartSpaceController; + private final DreamsSmartspaceController mSmartSpaceController; private final Context mContext; @Inject public SmartSpaceComplication(Context context, - LockscreenSmartspaceController smartSpaceController) { + DreamsSmartspaceController smartSpaceController) { mContext = context; mSmartSpaceController = smartSpaceController; } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationHostViewController.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationHostViewController.java index 62b319bd9e97..4e528bbe9386 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationHostViewController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationHostViewController.java @@ -21,6 +21,7 @@ import static com.android.systemui.dreams.complication.dagger.ComplicationModule import android.graphics.Rect; import android.graphics.Region; +import android.util.Log; import android.view.View; import androidx.constraintlayout.widget.ConstraintLayout; @@ -42,6 +43,8 @@ import javax.inject.Named; * a {@link ComplicationLayoutEngine}. */ public class ComplicationHostViewController extends ViewController<ConstraintLayout> { + public static final String TAG = "ComplicationHostViewController"; + private final ComplicationLayoutEngine mLayoutEngine; private final LifecycleOwner mLifecycleOwner; private final ComplicationCollectionViewModel mComplicationCollectionViewModel; @@ -113,6 +116,12 @@ public class ComplicationHostViewController extends ViewController<ConstraintLay final Complication.ViewHolder viewHolder = complication.getComplication() .createView(complication); mComplications.put(id, viewHolder); + if (viewHolder.getView().getParent() != null) { + Log.e(TAG, "View for complication " + + complication.getComplication().getClass() + + " already has a parent. Make sure not to reuse complication " + + "views!"); + } mLayoutEngine.addComplication(id, viewHolder.getView(), viewHolder.getLayoutParams(), viewHolder.getCategory()); }); diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java index de5b4bb9e520..c7b02cd00e96 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java @@ -26,7 +26,7 @@ import dagger.Module; import dagger.Provides; /** - * Dagger Module providing Communal-related functionality. + * Dagger Module providing Dream-related functionality. */ @Module(includes = { RegisteredComplicationsModule.class, diff --git a/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt b/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt new file mode 100644 index 000000000000..4e228a14fc88 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt @@ -0,0 +1,219 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.dreams.smartspace + +import android.app.smartspace.SmartspaceConfig +import android.app.smartspace.SmartspaceManager +import android.app.smartspace.SmartspaceSession +import android.content.Context +import android.graphics.Color +import android.util.Log +import android.view.View +import android.view.ViewGroup +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.plugins.BcSmartspaceDataPlugin +import com.android.systemui.plugins.BcSmartspaceDataPlugin.SmartspaceTargetListener +import com.android.systemui.plugins.BcSmartspaceDataPlugin.SmartspaceView +import com.android.systemui.smartspace.SmartspacePrecondition +import com.android.systemui.smartspace.SmartspaceTargetFilter +import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.DREAM_SMARTSPACE_DATA_PLUGIN +import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.DREAM_SMARTSPACE_PRECONDITION +import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.DREAM_SMARTSPACE_TARGET_FILTER +import com.android.systemui.smartspace.dagger.SmartspaceViewComponent +import com.android.systemui.util.concurrency.Execution +import java.lang.RuntimeException +import java.util.Optional +import java.util.concurrent.Executor +import javax.inject.Inject +import javax.inject.Named + +/** + * Controller for managing the smartspace view on the dream + */ +@SysUISingleton +class DreamsSmartspaceController @Inject constructor( + private val context: Context, + private val smartspaceManager: SmartspaceManager, + private val execution: Execution, + @Main private val uiExecutor: Executor, + private val smartspaceViewComponentFactory: SmartspaceViewComponent.Factory, + @Named(DREAM_SMARTSPACE_PRECONDITION) private val precondition: SmartspacePrecondition, + @Named(DREAM_SMARTSPACE_TARGET_FILTER) + private val optionalTargetFilter: Optional<SmartspaceTargetFilter>, + @Named(DREAM_SMARTSPACE_DATA_PLUGIN) optionalPlugin: Optional<BcSmartspaceDataPlugin> +) { + companion object { + private const val TAG = "DreamsSmartspaceCtrlr" + } + + private var session: SmartspaceSession? = null + private val plugin: BcSmartspaceDataPlugin? = optionalPlugin.orElse(null) + private var targetFilter: SmartspaceTargetFilter? = optionalTargetFilter.orElse(null) + + // A shadow copy of listeners is maintained to track whether the session should remain open. + private var listeners = mutableSetOf<BcSmartspaceDataPlugin.SmartspaceTargetListener>() + + // Smartspace can be used on multiple displays, such as when the user casts their screen + private var smartspaceViews = mutableSetOf<SmartspaceView>() + + var preconditionListener = object : SmartspacePrecondition.Listener { + override fun onCriteriaChanged() { + reloadSmartspace() + } + } + + init { + precondition.addListener(preconditionListener) + } + + var filterListener = object : SmartspaceTargetFilter.Listener { + override fun onCriteriaChanged() { + reloadSmartspace() + } + } + + init { + targetFilter?.addListener(filterListener) + } + + var stateChangeListener = object : View.OnAttachStateChangeListener { + override fun onViewAttachedToWindow(v: View) { + val view = v as SmartspaceView + // Until there is dream color matching + view.setPrimaryTextColor(Color.WHITE) + smartspaceViews.add(view) + connectSession() + } + + override fun onViewDetachedFromWindow(v: View) { + smartspaceViews.remove(v as SmartspaceView) + + if (smartspaceViews.isEmpty()) { + disconnect() + } + } + } + + private val sessionListener = SmartspaceSession.OnTargetsAvailableListener { targets -> + execution.assertIsMainThread() + + val filteredTargets = targets.filter { targetFilter?.filterSmartspaceTarget(it) ?: true } + plugin?.onTargetsAvailable(filteredTargets) + } + + /** + * Constructs the smartspace view and connects it to the smartspace service. + */ + fun buildAndConnectView(parent: ViewGroup): View? { + execution.assertIsMainThread() + + if (!precondition.conditionsMet()) { + throw RuntimeException("Cannot build view when not enabled") + } + + val view = buildView(parent) + connectSession() + + return view + } + + private fun buildView(parent: ViewGroup): View? { + return if (plugin != null) { + var view = smartspaceViewComponentFactory.create(parent, plugin, stateChangeListener) + .getView() + + if (view is View) { + return view + } + + return null + } else { + null + } + } + + private fun hasActiveSessionListeners(): Boolean { + return smartspaceViews.isNotEmpty() || listeners.isNotEmpty() + } + + private fun connectSession() { + if (plugin == null || session != null || !hasActiveSessionListeners()) { + return + } + + if (!precondition.conditionsMet()) { + return + } + + // TODO(b/217559844): Replace with "dream" session when available. + val newSession = smartspaceManager.createSmartspaceSession( + SmartspaceConfig.Builder(context, "lockscreen").build()) + Log.d(TAG, "Starting smartspace session for dream") + newSession.addOnTargetsAvailableListener(uiExecutor, sessionListener) + this.session = newSession + + plugin.registerSmartspaceEventNotifier { + e -> session?.notifySmartspaceEvent(e) + } + + reloadSmartspace() + } + + /** + * Disconnects the smartspace view from the smartspace service and cleans up any resources. + */ + private fun disconnect() { + if (hasActiveSessionListeners()) return + + execution.assertIsMainThread() + + if (session == null) { + return + } + + session?.let { + it.removeOnTargetsAvailableListener(sessionListener) + it.close() + } + + session = null + + plugin?.registerSmartspaceEventNotifier(null) + plugin?.onTargetsAvailable(emptyList()) + Log.d(TAG, "Ending smartspace session for dream") + } + + fun addListener(listener: SmartspaceTargetListener) { + execution.assertIsMainThread() + plugin?.registerListener(listener) + listeners.add(listener) + + connectSession() + } + + fun removeListener(listener: SmartspaceTargetListener) { + execution.assertIsMainThread() + plugin?.unregisterListener(listener) + listeners.remove(listener) + disconnect() + } + + private fun reloadSmartspace() { + session?.requestSmartspaceUpdate() + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java index 04a324b87382..355c69f9a48d 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java @@ -211,10 +211,8 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements ColorFilter buttonColorFilter = new PorterDuffColorFilter( mAdapter.getController().getColorButtonBackground(), PorterDuff.Mode.SRC_IN); - ColorFilter onlineButtonColorFilter = new PorterDuffColorFilter( - mAdapter.getController().getColorInactiveItem(), PorterDuff.Mode.SRC_IN); mDoneButton.getBackground().setColorFilter(buttonColorFilter); - mStopButton.getBackground().setColorFilter(onlineButtonColorFilter); + mStopButton.getBackground().setColorFilter(buttonColorFilter); } mHeaderIcon.setVisibility(View.VISIBLE); mHeaderIcon.setImageIcon(icon); diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java index f16ca7dd7361..0c202e09b62e 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java @@ -30,12 +30,16 @@ import android.graphics.PorterDuffColorFilter; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; +import android.media.INearbyMediaDevicesUpdateCallback; import android.media.MediaMetadata; import android.media.MediaRoute2Info; +import android.media.NearbyDevice; import android.media.RoutingSessionInfo; import android.media.session.MediaController; import android.media.session.MediaSessionManager; import android.media.session.PlaybackState; +import android.os.IBinder; +import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; @@ -61,6 +65,7 @@ import com.android.settingslib.utils.ThreadUtils; import com.android.systemui.R; import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.media.nearby.NearbyMediaDevicesManager; import com.android.systemui.monet.ColorScheme; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.statusbar.notification.collection.NotificationEntry; @@ -70,6 +75,9 @@ import com.android.systemui.statusbar.phone.ShadeController; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import javax.inject.Inject; @@ -77,7 +85,8 @@ import javax.inject.Inject; /** * Controller for media output dialog */ -public class MediaOutputController implements LocalMediaManager.DeviceCallback { +public class MediaOutputController implements LocalMediaManager.DeviceCallback, + INearbyMediaDevicesUpdateCallback { private static final String TAG = "MediaOutputController"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); @@ -95,6 +104,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { private final CommonNotifCollection mNotifCollection; @VisibleForTesting final List<MediaDevice> mMediaDevices = new CopyOnWriteArrayList<>(); + private final NearbyMediaDevicesManager mNearbyMediaDevicesManager; + private final Map<String, Integer> mNearbyDeviceInfoMap = new ConcurrentHashMap<>(); private MediaController mMediaController; @VisibleForTesting @@ -116,7 +127,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { boolean aboveStatusbar, MediaSessionManager mediaSessionManager, LocalBluetoothManager lbm, ShadeController shadeController, ActivityStarter starter, CommonNotifCollection notifCollection, UiEventLogger uiEventLogger, - DialogLaunchAnimator dialogLaunchAnimator) { + DialogLaunchAnimator dialogLaunchAnimator, + Optional<NearbyMediaDevicesManager> nearbyMediaDevicesManagerOptional) { mContext = context; mPackageName = packageName; mMediaSessionManager = mediaSessionManager; @@ -130,6 +142,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { mMetricLogger = new MediaOutputMetricLogger(mContext, mPackageName); mUiEventLogger = uiEventLogger; mDialogLaunchAnimator = dialogLaunchAnimator; + mNearbyMediaDevicesManager = nearbyMediaDevicesManagerOptional.orElse(null); mColorActiveItem = Utils.getColorStateListDefaultColor(mContext, R.color.media_dialog_active_item_main_content); mColorInactiveItem = Utils.getColorStateListDefaultColor(mContext, @@ -144,6 +157,10 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { void start(@NonNull Callback cb) { mMediaDevices.clear(); + mNearbyDeviceInfoMap.clear(); + if (mNearbyMediaDevicesManager != null) { + mNearbyMediaDevicesManager.registerNearbyDevicesCallback(this); + } if (!TextUtils.isEmpty(mPackageName)) { for (MediaController controller : mMediaSessionManager.getActiveSessions(null)) { if (TextUtils.equals(controller.getPackageName(), mPackageName)) { @@ -187,6 +204,10 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { mLocalMediaManager.stopScan(); } mMediaDevices.clear(); + if (mNearbyMediaDevicesManager != null) { + mNearbyMediaDevicesManager.unregisterNearbyDevicesCallback(this); + } + mNearbyDeviceInfoMap.clear(); } @Override @@ -417,6 +438,15 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { } mMediaDevices.clear(); mMediaDevices.addAll(targetMediaDevices); + attachRangeInfo(); + } + + private void attachRangeInfo() { + for (MediaDevice mediaDevice : mMediaDevices) { + if (mNearbyDeviceInfoMap.containsKey(mediaDevice.getId())) { + mediaDevice.setRangeZone(mNearbyDeviceInfoMap.get(mediaDevice.getId())); + } + } } List<MediaDevice> getGroupMediaDevices() { @@ -604,7 +634,9 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { // We show the output group dialog from the output dialog. MediaOutputController controller = new MediaOutputController(mContext, mPackageName, mAboveStatusbar, mMediaSessionManager, mLocalBluetoothManager, mShadeController, - mActivityStarter, mNotifCollection, mUiEventLogger, mDialogLaunchAnimator); + mActivityStarter, mNotifCollection, mUiEventLogger, mDialogLaunchAnimator, + Optional.of(mNearbyMediaDevicesManager)); + MediaOutputGroupDialog dialog = new MediaOutputGroupDialog(mContext, mAboveStatusbar, controller); mDialogLaunchAnimator.showFromView(dialog, mediaOutputDialog); @@ -629,6 +661,20 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { || mLocalMediaManager.isMediaSessionAvailableForVolumeControl(); } + @Override + public void onDevicesUpdated(List<NearbyDevice> nearbyDevices) throws RemoteException { + mNearbyDeviceInfoMap.clear(); + for (NearbyDevice nearbyDevice : nearbyDevices) { + mNearbyDeviceInfoMap.put(nearbyDevice.getMediaRoute2Id(), nearbyDevice.getRangeZone()); + } + mNearbyMediaDevicesManager.unregisterNearbyDevicesCallback(this); + } + + @Override + public IBinder asBinder() { + return null; + } + private final MediaController.Callback mCb = new MediaController.Callback() { @Override public void onMetadataChanged(MediaMetadata metadata) { diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt index 9e252ea1eddc..a7e54801bf47 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt @@ -22,9 +22,11 @@ import android.view.View import com.android.internal.logging.UiEventLogger import com.android.settingslib.bluetooth.LocalBluetoothManager import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.media.nearby.NearbyMediaDevicesManager import com.android.systemui.plugins.ActivityStarter import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection import com.android.systemui.statusbar.phone.ShadeController +import java.util.Optional import javax.inject.Inject /** @@ -38,7 +40,8 @@ class MediaOutputDialogFactory @Inject constructor( private val starter: ActivityStarter, private val notifCollection: CommonNotifCollection, private val uiEventLogger: UiEventLogger, - private val dialogLaunchAnimator: DialogLaunchAnimator + private val dialogLaunchAnimator: DialogLaunchAnimator, + private val nearbyMediaDevicesManagerOptional: Optional<NearbyMediaDevicesManager> ) { companion object { var mediaOutputDialog: MediaOutputDialog? = null @@ -50,8 +53,8 @@ class MediaOutputDialogFactory @Inject constructor( mediaOutputDialog?.dismiss() val controller = MediaOutputController(context, packageName, aboveStatusBar, - mediaSessionManager, lbm, shadeController, starter, notifCollection, - uiEventLogger, dialogLaunchAnimator) + mediaSessionManager, lbm, shadeController, starter, notifCollection, + uiEventLogger, dialogLaunchAnimator, nearbyMediaDevicesManagerOptional) val dialog = MediaOutputDialog(context, aboveStatusBar, controller, uiEventLogger) mediaOutputDialog = dialog diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelper.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelper.kt index 9dd8222ff6a1..3961f079748b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelper.kt @@ -16,6 +16,7 @@ package com.android.systemui.media.taptotransfer +import android.annotation.SuppressLint import android.app.StatusBarManager import android.content.Context import android.media.MediaRoute2Info @@ -23,16 +24,12 @@ import android.util.Log import androidx.annotation.VisibleForTesting import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.media.taptotransfer.sender.AlmostCloseToEndCast -import com.android.systemui.media.taptotransfer.sender.AlmostCloseToStartCast -import com.android.systemui.media.taptotransfer.sender.TransferFailed -import com.android.systemui.media.taptotransfer.sender.TransferToReceiverTriggered -import com.android.systemui.media.taptotransfer.sender.TransferToThisDeviceSucceeded -import com.android.systemui.media.taptotransfer.sender.TransferToThisDeviceTriggered -import com.android.systemui.media.taptotransfer.sender.TransferToReceiverSucceeded +import com.android.systemui.media.taptotransfer.receiver.ChipStateReceiver +import com.android.systemui.media.taptotransfer.sender.ChipStateSender import com.android.systemui.statusbar.commandline.Command import com.android.systemui.statusbar.commandline.CommandRegistry import java.io.PrintWriter +import java.lang.IllegalArgumentException import java.util.concurrent.Executor import javax.inject.Inject @@ -46,28 +43,6 @@ class MediaTttCommandLineHelper @Inject constructor( private val context: Context, @Main private val mainExecutor: Executor ) { - /** - * A map from a display state string typed in the command line to the display int it represents. - */ - private val stateStringToStateInt: Map<String, Int> = mapOf( - AlmostCloseToStartCast::class.simpleName!! - to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST, - AlmostCloseToEndCast::class.simpleName!! - to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST, - TransferToReceiverTriggered::class.simpleName!! - to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED, - TransferToThisDeviceTriggered::class.simpleName!! - to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED, - TransferToReceiverSucceeded::class.simpleName!! - to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, - TransferToThisDeviceSucceeded::class.simpleName!! - to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, - TransferFailed::class.simpleName!! - to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED, - FAR_FROM_RECEIVER_STATE - to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER - ) - init { commandRegistry.registerCommand(SENDER_COMMAND) { SenderCommand() } commandRegistry.registerCommand(RECEIVER_COMMAND) { ReceiverCommand() } @@ -76,21 +51,23 @@ class MediaTttCommandLineHelper @Inject constructor( /** All commands for the sender device. */ inner class SenderCommand : Command { override fun execute(pw: PrintWriter, args: List<String>) { - val routeInfo = MediaRoute2Info.Builder("id", args[0]) - .addFeature("feature") - .setPackageName(TEST_PACKAGE_NAME) - .build() - val commandName = args[1] @StatusBarManager.MediaTransferSenderState - val displayState = stateStringToStateInt[commandName] - if (displayState == null) { + val displayState: Int? + try { + displayState = ChipStateSender.getSenderStateIdFromName(commandName) + } catch (ex: IllegalArgumentException) { pw.println("Invalid command name $commandName") return } + @SuppressLint("WrongConstant") // sysui allowed to call STATUS_BAR_SERVICE val statusBarManager = context.getSystemService(Context.STATUS_BAR_SERVICE) as StatusBarManager + val routeInfo = MediaRoute2Info.Builder("id", args[0]) + .addFeature("feature") + .setPackageName(TEST_PACKAGE_NAME) + .build() statusBarManager.updateMediaTapToTransferSenderDisplay( displayState, routeInfo, @@ -136,6 +113,17 @@ class MediaTttCommandLineHelper @Inject constructor( /** All commands for the receiver device. */ inner class ReceiverCommand : Command { override fun execute(pw: PrintWriter, args: List<String>) { + val commandName = args[0] + @StatusBarManager.MediaTransferReceiverState + val displayState: Int? + try { + displayState = ChipStateReceiver.getReceiverStateIdFromName(commandName) + } catch (ex: IllegalArgumentException) { + pw.println("Invalid command name $commandName") + return + } + + @SuppressLint("WrongConstant") // sysui is allowed to call STATUS_BAR_SERVICE val statusBarManager = context.getSystemService(Context.STATUS_BAR_SERVICE) as StatusBarManager val routeInfo = MediaRoute2Info.Builder("id", "Test Name") @@ -143,24 +131,12 @@ class MediaTttCommandLineHelper @Inject constructor( .setPackageName(TEST_PACKAGE_NAME) .build() - when(val commandName = args[0]) { - CLOSE_TO_SENDER_STATE -> - statusBarManager.updateMediaTapToTransferReceiverDisplay( - StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER, - routeInfo, - null, - null - ) - FAR_FROM_SENDER_STATE -> - statusBarManager.updateMediaTapToTransferReceiverDisplay( - StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER, - routeInfo, - null, - null - ) - else -> - pw.println("Invalid command name $commandName") - } + statusBarManager.updateMediaTapToTransferReceiverDisplay( + displayState, + routeInfo, + null, + null + ) } override fun help(pw: PrintWriter) { @@ -173,11 +149,5 @@ class MediaTttCommandLineHelper @Inject constructor( const val SENDER_COMMAND = "media-ttt-chip-sender" @VisibleForTesting const val RECEIVER_COMMAND = "media-ttt-chip-receiver" -@VisibleForTesting -const val FAR_FROM_RECEIVER_STATE = "FarFromReceiver" -@VisibleForTesting -const val CLOSE_TO_SENDER_STATE = "CloseToSender" -@VisibleForTesting -const val FAR_FROM_SENDER_STATE = "FarFromSender" private const val CLI_TAG = "MediaTransferCli" private const val TEST_PACKAGE_NAME = "com.android.systemui" diff --git a/packages/SystemUI/src/com/android/systemui/tv/TvSysUIComponentModule.java b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/ChipInfoCommon.kt index 9621e5f5f1a0..3cc99a8ef77e 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/TvSysUIComponentModule.java +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/ChipInfoCommon.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2021 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,17 @@ * limitations under the License. */ -package com.android.systemui.tv; - -import dagger.Module; +package com.android.systemui.media.taptotransfer.common /** - * Dagger module for including the SysUIComponent. + * A superclass chip state that will be subclassed by the sender chip and receiver chip. */ -@Module(subcomponents = {TvSysUIComponent.class}) -public abstract class TvSysUIComponentModule { +interface ChipInfoCommon { + /** + * Returns the amount of time the given chip state should display on the screen before it times + * out and disappears. + */ + fun getTimeoutMs(): Long } + +const val DEFAULT_TIMEOUT_MILLIS = 3000L diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommon.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommon.kt index 9c4b39d9cb77..71cacac7f4df 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommon.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommon.kt @@ -19,14 +19,18 @@ package com.android.systemui.media.taptotransfer.common import android.annotation.LayoutRes import android.annotation.SuppressLint import android.content.Context +import android.content.pm.PackageManager import android.graphics.PixelFormat +import android.graphics.drawable.Drawable +import android.os.PowerManager +import android.os.SystemClock +import android.util.Log import android.view.Gravity import android.view.LayoutInflater import android.view.MotionEvent import android.view.View import android.view.ViewGroup import android.view.WindowManager -import androidx.annotation.VisibleForTesting import com.android.internal.widget.CachingIconView import com.android.systemui.R import com.android.systemui.dagger.qualifiers.Main @@ -40,14 +44,18 @@ import com.android.systemui.util.view.ViewUtil * * Subclasses need to override and implement [updateChipView], which is where they can control what * gets displayed to the user. + * + * The generic type T is expected to contain all the information necessary for the subclasses to + * display the chip in a certain state, since they receive <T> in [updateChipView]. */ -abstract class MediaTttChipControllerCommon<T : MediaTttChipState>( +abstract class MediaTttChipControllerCommon<T : ChipInfoCommon>( internal val context: Context, internal val logger: MediaTttLogger, private val windowManager: WindowManager, private val viewUtil: ViewUtil, @Main private val mainExecutor: DelayableExecutor, private val tapGestureDetector: TapGestureDetector, + private val powerManager: PowerManager, @LayoutRes private val chipLayoutRes: Int ) { /** The window layout parameters we'll use when attaching the view to a window. */ @@ -64,10 +72,10 @@ abstract class MediaTttChipControllerCommon<T : MediaTttChipState>( } /** The chip view currently being displayed. Null if the chip is not being displayed. */ - var chipView: ViewGroup? = null + private var chipView: ViewGroup? = null /** A [Runnable] that, when run, will cancel the pending timeout of the chip. */ - var cancelChipViewTimeout: Runnable? = null + private var cancelChipViewTimeout: Runnable? = null /** * Displays the chip with the current state. @@ -75,7 +83,7 @@ abstract class MediaTttChipControllerCommon<T : MediaTttChipState>( * This method handles inflating and attaching the view, then delegates to [updateChipView] to * display the correct information in the chip. */ - fun displayChip(chipState: T) { + fun displayChip(chipInfo: T) { val oldChipView = chipView if (chipView == null) { chipView = LayoutInflater @@ -84,19 +92,25 @@ abstract class MediaTttChipControllerCommon<T : MediaTttChipState>( } val currentChipView = chipView!! - updateChipView(chipState, currentChipView) + updateChipView(chipInfo, currentChipView) // Add view if necessary if (oldChipView == null) { tapGestureDetector.addOnGestureDetectedCallback(TAG, this::onScreenTapped) windowManager.addView(chipView, windowLayoutParams) + // Wake the screen so the user will see the chip + powerManager.wakeUp( + SystemClock.uptimeMillis(), + PowerManager.WAKE_REASON_APPLICATION, + "com.android.systemui:media_tap_to_transfer_activated" + ) } // Cancel and re-set the chip timeout each time we get a new state. cancelChipViewTimeout?.run() cancelChipViewTimeout = mainExecutor.executeDelayed( { removeChip(MediaTttRemovalReason.REASON_TIMEOUT) }, - chipState.getTimeoutMs() + chipInfo.getTimeoutMs() ) } @@ -117,20 +131,28 @@ abstract class MediaTttChipControllerCommon<T : MediaTttChipState>( } /** - * A method implemented by subclasses to update [currentChipView] based on [chipState]. + * A method implemented by subclasses to update [currentChipView] based on [chipInfo]. */ - abstract fun updateChipView(chipState: T, currentChipView: ViewGroup) + abstract fun updateChipView(chipInfo: T, currentChipView: ViewGroup) /** * An internal method to set the icon on the view. * * This is in the common superclass since both the sender and the receiver show an icon. + * + * @param appPackageName the package name of the app playing the media. Will be used to fetch + * the app icon and app name if overrides aren't provided. */ - internal fun setIcon(chipState: T, currentChipView: ViewGroup) { + internal fun setIcon( + currentChipView: ViewGroup, + appPackageName: String?, + appIconDrawableOverride: Drawable? = null, + appNameOverride: CharSequence? = null, + ) { val appIconView = currentChipView.requireViewById<CachingIconView>(R.id.app_icon) - appIconView.contentDescription = chipState.getAppName(context) + appIconView.contentDescription = appNameOverride ?: getAppName(appPackageName) - val appIcon = chipState.getAppIcon(context) + val appIcon = appIconDrawableOverride ?: getAppIcon(appPackageName) val visibility = if (appIcon != null) { View.VISIBLE } else { @@ -140,6 +162,30 @@ abstract class MediaTttChipControllerCommon<T : MediaTttChipState>( appIconView.visibility = visibility } + /** Returns the icon of the app playing the media or null if we can't find it. */ + private fun getAppIcon(appPackageName: String?): Drawable? { + appPackageName ?: return null + return try { + context.packageManager.getApplicationIcon(appPackageName) + } catch (e: PackageManager.NameNotFoundException) { + Log.w(TAG, "Cannot find icon for package $appPackageName", e) + null + } + } + + /** Returns the name of the app playing the media or null if we can't find it. */ + private fun getAppName(appPackageName: String?): String? { + appPackageName ?: return null + return try { + context.packageManager.getApplicationInfo( + appPackageName, PackageManager.ApplicationInfoFlags.of(0) + ).loadLabel(context.packageManager).toString() + } catch (e: PackageManager.NameNotFoundException) { + Log.w(TAG, "Cannot find name for package $appPackageName", e) + null + } + } + private fun onScreenTapped(e: MotionEvent) { val view = chipView ?: return // If the tap is within the chip bounds, we shouldn't hide the chip (in case users think the @@ -159,4 +205,3 @@ object MediaTttRemovalReason { const val REASON_TIMEOUT = "TIMEOUT" const val REASON_SCREEN_TAP = "SCREEN_TAP" } - diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttChipState.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttChipState.kt deleted file mode 100644 index 6f6018170f98..000000000000 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttChipState.kt +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.media.taptotransfer.common - -import android.content.Context -import android.content.pm.PackageManager -import android.graphics.drawable.Drawable -import android.util.Log - -/** - * A superclass chip state that will be subclassed by the sender chip and receiver chip. - * - * @property appPackageName the package name of the app playing the media. Will be used to fetch the - * app icon and app name. - */ -open class MediaTttChipState( - internal val appPackageName: String?, -) { - open fun getAppIcon(context: Context): Drawable? { - appPackageName ?: return null - return try { - context.packageManager.getApplicationIcon(appPackageName) - } catch (e: PackageManager.NameNotFoundException) { - Log.w(TAG, "Cannot find icon for package $appPackageName", e) - null - } - } - - /** Returns the name of the app playing the media or null if we can't find it. */ - open fun getAppName(context: Context): String? { - appPackageName ?: return null - return try { - context.packageManager.getApplicationInfo( - appPackageName, PackageManager.ApplicationInfoFlags.of(0) - ).loadLabel(context.packageManager).toString() - } catch (e: PackageManager.NameNotFoundException) { - Log.w(TAG, "Cannot find name for package $appPackageName", e) - null - } - } - - /** - * Returns the amount of time this chip should display on the screen before it times out and - * disappears. [MediaTttChipControllerCommon] will ensure that the timeout resets each time we - * receive a new state. - */ - open fun getTimeoutMs(): Long = DEFAULT_TIMEOUT_MILLIS -} - -private const val DEFAULT_TIMEOUT_MILLIS = 3000L -private val TAG = MediaTttChipState::class.simpleName!! diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ChipStateReceiver.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ChipStateReceiver.kt index 6a4b62a8c1ae..a0e803f6bb8d 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ChipStateReceiver.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ChipStateReceiver.kt @@ -16,35 +16,43 @@ package com.android.systemui.media.taptotransfer.receiver -import android.content.Context -import android.graphics.drawable.Drawable -import com.android.systemui.media.taptotransfer.common.MediaTttChipState +import android.app.StatusBarManager +import com.android.internal.logging.UiEventLogger /** * A class that stores all the information necessary to display the media tap-to-transfer chip on * the receiver device. - * - * @property appIconDrawable a drawable representing the icon of the app playing the media. If - * present, this will be used in [this.getAppIcon] instead of [appPackageName]. - * @property appName a name for the app playing the media. If present, this will be used in - * [this.getAppName] instead of [appPackageName]. */ -class ChipStateReceiver( - appPackageName: String?, - private val appIconDrawable: Drawable?, - private val appName: CharSequence? -) : MediaTttChipState(appPackageName) { - override fun getAppIcon(context: Context): Drawable? { - if (appIconDrawable != null) { - return appIconDrawable - } - return super.getAppIcon(context) - } +enum class ChipStateReceiver( + @StatusBarManager.MediaTransferSenderState val stateInt: Int, + val uiEvent: UiEventLogger.UiEventEnum, +) { + CLOSE_TO_SENDER( + StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER, + MediaTttReceiverUiEvents.MEDIA_TTT_RECEIVER_CLOSE_TO_SENDER, + ), + FAR_FROM_SENDER( + StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER, + MediaTttReceiverUiEvents.MEDIA_TTT_RECEIVER_FAR_FROM_SENDER, + ); + + companion object { + /** + * Returns the receiver state enum associated with the given [displayState] from + * [StatusBarManager]. + */ + fun getReceiverStateFromId( + @StatusBarManager.MediaTransferReceiverState displayState: Int + ) : ChipStateReceiver = values().first { it.stateInt == displayState } + - override fun getAppName(context: Context): String? { - if (appName != null) { - return appName.toString() - } - return super.getAppName(context) + /** + * Returns the state int from [StatusBarManager] associated with the given sender state + * name. + * + * @param name the name of one of the [ChipStateReceiver] enums. + */ + @StatusBarManager.MediaTransferReceiverState + fun getReceiverStateIdFromName(name: String): Int = valueOf(name).stateInt } } 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 1a96ddf69b28..44965d705802 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 @@ -18,15 +18,19 @@ package com.android.systemui.media.taptotransfer.receiver import android.app.StatusBarManager import android.content.Context +import android.graphics.drawable.Drawable import android.graphics.drawable.Icon import android.media.MediaRoute2Info import android.os.Handler +import android.os.PowerManager import android.util.Log import android.view.ViewGroup import android.view.WindowManager import com.android.systemui.R import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.media.taptotransfer.common.ChipInfoCommon +import com.android.systemui.media.taptotransfer.common.DEFAULT_TIMEOUT_MILLIS import com.android.systemui.media.taptotransfer.common.MediaTttChipControllerCommon import com.android.systemui.media.taptotransfer.common.MediaTttLogger import com.android.systemui.statusbar.CommandQueue @@ -49,14 +53,17 @@ class MediaTttChipControllerReceiver @Inject constructor( viewUtil: ViewUtil, mainExecutor: DelayableExecutor, tapGestureDetector: TapGestureDetector, + powerManager: PowerManager, @Main private val mainHandler: Handler, -) : MediaTttChipControllerCommon<ChipStateReceiver>( + private val uiEventLogger: MediaTttReceiverUiEventLogger, +) : MediaTttChipControllerCommon<ChipReceiverInfo>( context, logger, windowManager, viewUtil, mainExecutor, tapGestureDetector, + powerManager, R.layout.media_ttt_chip_receiver ) { private val commandQueueCallbacks = object : CommandQueue.Callbacks { @@ -82,45 +89,52 @@ class MediaTttChipControllerReceiver @Inject constructor( appIcon: Icon?, appName: CharSequence? ) { - logger.logStateChange(stateIntToString(displayState), routeInfo.id) - when(displayState) { - StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER -> { - val packageName = routeInfo.packageName - if (appIcon == null) { - displayChip(ChipStateReceiver(packageName, null, appName)) - } else { - appIcon.loadDrawableAsync( - context, - Icon.OnDrawableLoadedListener { drawable -> - displayChip( - ChipStateReceiver(packageName, drawable, appName) - )}, - // Notify the listener on the main handler since the listener will update - // the UI. - mainHandler - ) - } - } - StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER -> - removeChip(removalReason = FAR_FROM_SENDER) - else -> - Log.e(RECEIVER_TAG, "Unhandled MediaTransferReceiverState $displayState") + val chipState: ChipStateReceiver? = ChipStateReceiver.getReceiverStateFromId(displayState) + val stateName = chipState?.name ?: "Invalid" + logger.logStateChange(stateName, routeInfo.id) + + if (chipState == null) { + Log.e(RECEIVER_TAG, "Unhandled MediaTransferReceiverState $displayState") + return + } + uiEventLogger.logReceiverStateChange(chipState) + + if (chipState == ChipStateReceiver.FAR_FROM_SENDER) { + removeChip(removalReason = ChipStateReceiver.FAR_FROM_SENDER::class.simpleName!!) + return + } + if (appIcon == null) { + displayChip(ChipReceiverInfo(routeInfo, appIconDrawableOverride = null, appName)) + return } - } - override fun updateChipView(chipState: ChipStateReceiver, currentChipView: ViewGroup) { - setIcon(chipState, currentChipView) + appIcon.loadDrawableAsync( + context, + Icon.OnDrawableLoadedListener { drawable -> + displayChip(ChipReceiverInfo(routeInfo, drawable, appName)) + }, + // Notify the listener on the main handler since the listener will update + // the UI. + mainHandler + ) } - private fun stateIntToString(@StatusBarManager.MediaTransferReceiverState state: Int): String { - return when (state) { - StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER -> CLOSE_TO_SENDER - StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER -> FAR_FROM_SENDER - else -> "INVALID: $state" - } + override fun updateChipView(chipInfo: ChipReceiverInfo, currentChipView: ViewGroup) { + setIcon( + currentChipView, + chipInfo.routeInfo.packageName, + chipInfo.appIconDrawableOverride, + chipInfo.appNameOverride + ) } } +data class ChipReceiverInfo( + val routeInfo: MediaRoute2Info, + val appIconDrawableOverride: Drawable?, + val appNameOverride: CharSequence? +) : ChipInfoCommon { + override fun getTimeoutMs() = DEFAULT_TIMEOUT_MILLIS +} + private const val RECEIVER_TAG = "MediaTapToTransferRcvr" -private const val CLOSE_TO_SENDER = "CLOSE_TO_SENDER" -private const val FAR_FROM_SENDER = "FAR_FROM_SENDER" diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverUiEventLogger.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverUiEventLogger.kt new file mode 100644 index 000000000000..39a276329a9b --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverUiEventLogger.kt @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.media.taptotransfer.receiver + +import com.android.internal.logging.UiEvent +import com.android.internal.logging.UiEventLogger +import com.android.systemui.dagger.SysUISingleton +import javax.inject.Inject + +/** A class for analytics logging for the media tap-to-transfer chip on the receiver device. */ +@SysUISingleton +class MediaTttReceiverUiEventLogger @Inject constructor(private val logger: UiEventLogger) { + /** Logs that the receiver chip has changed states. */ + fun logReceiverStateChange(chipState: ChipStateReceiver) { + logger.log(chipState.uiEvent) + } +} + +enum class MediaTttReceiverUiEvents(val metricId: Int) : UiEventLogger.UiEventEnum { + @UiEvent(doc = "See android.app.StatusBarManager.MEDIA_TRANSFER_RECEIVER_* docs") + MEDIA_TTT_RECEIVER_CLOSE_TO_SENDER(982), + @UiEvent(doc = "See android.app.StatusBarManager.MEDIA_TRANSFER_RECEIVER_* docs") + MEDIA_TTT_RECEIVER_FAR_FROM_SENDER(983); + + override fun getId() = metricId +} diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt index 22424a4e9c74..3c6805b4e881 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt @@ -16,188 +16,225 @@ package com.android.systemui.media.taptotransfer.sender +import android.app.StatusBarManager import android.content.Context +import android.media.MediaRoute2Info import android.view.View +import androidx.annotation.StringRes +import com.android.internal.logging.UiEventLogger import com.android.internal.statusbar.IUndoMediaTransferCallback import com.android.systemui.R -import com.android.systemui.media.taptotransfer.common.MediaTttChipState +import com.android.systemui.media.taptotransfer.common.DEFAULT_TIMEOUT_MILLIS /** - * A class that stores all the information necessary to display the media tap-to-transfer chip on - * the sender device. + * A class enumerating all the possible states of the media tap-to-transfer chip on the sender + * device. * - * This is a sealed class where each subclass represents a specific chip state. Each subclass can - * contain additional information that is necessary for only that state. + * @property stateInt the integer from [StatusBarManager] corresponding with this state. + * @property stringResId the res ID of the string that should be displayed in the chip. Null if the + * state should not have the chip be displayed. + * @property isMidTransfer true if the state represents that a transfer is currently ongoing. + * @property isTransferFailure true if the state represents that the transfer has failed. + * @property timeout the amount of time this chip should display on the screen before it times out + * and disappears. */ -sealed class ChipStateSender( - appPackageName: String? -) : MediaTttChipState(appPackageName) { - /** Returns a fully-formed string with the text that the chip should display. */ - abstract fun getChipTextString(context: Context): String - - /** Returns true if the loading icon should be displayed and false otherwise. */ - open fun showLoading(): Boolean = false - +enum class ChipStateSender( + @StatusBarManager.MediaTransferSenderState val stateInt: Int, + val uiEvent: UiEventLogger.UiEventEnum, + @StringRes val stringResId: Int?, + val isMidTransfer: Boolean = false, + val isTransferFailure: Boolean = false, + val timeout: Long = DEFAULT_TIMEOUT_MILLIS +) { /** - * Returns a click listener for the undo button on the chip. Returns null if this chip state - * doesn't have an undo button. - * - * @param controllerSender passed as a parameter in case we want to display a new chip state - * when undo is clicked. + * A state representing that the two devices are close but not close enough to *start* a cast to + * the receiver device. The chip will instruct the user to move closer in order to initiate the + * transfer to the receiver. */ - open fun undoClickListener( - controllerSender: MediaTttChipControllerSender - ): View.OnClickListener? = null -} - -/** - * A state representing that the two devices are close but not close enough to *start* a cast to - * the receiver device. The chip will instruct the user to move closer in order to initiate the - * transfer to the receiver. - * - * @property otherDeviceName the name of the other device involved in the transfer. - */ -class AlmostCloseToStartCast( - appPackageName: String?, - private val otherDeviceName: String, -) : ChipStateSender(appPackageName) { - override fun getChipTextString(context: Context): String { - return context.getString(R.string.media_move_closer_to_start_cast, otherDeviceName) - } -} - -/** - * A state representing that the two devices are close but not close enough to *end* a cast that's - * currently occurring the receiver device. The chip will instruct the user to move closer in order - * to initiate the transfer from the receiver and back onto this device (the original sender). - * - * @property otherDeviceName the name of the other device involved in the transfer. - */ -class AlmostCloseToEndCast( - appPackageName: String?, - private val otherDeviceName: String, -) : ChipStateSender(appPackageName) { - override fun getChipTextString(context: Context): String { - return context.getString(R.string.media_move_closer_to_end_cast, otherDeviceName) - } -} - -/** - * A state representing that a transfer to the receiver device has been initiated (but not - * completed). - * - * @property otherDeviceName the name of the other device involved in the transfer. - */ -class TransferToReceiverTriggered( - appPackageName: String?, - private val otherDeviceName: String -) : ChipStateSender(appPackageName) { - override fun getChipTextString(context: Context): String { - return context.getString(R.string.media_transfer_playing_different_device, otherDeviceName) - } - - override fun showLoading() = true - override fun getTimeoutMs() = TRANSFER_TRIGGERED_TIMEOUT_MILLIS -} + ALMOST_CLOSE_TO_START_CAST( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST, + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_ALMOST_CLOSE_TO_START_CAST, + R.string.media_move_closer_to_start_cast, + ), -/** - * A state representing that a transfer from the receiver device and back to this device (the - * sender) has been initiated (but not completed). - */ -class TransferToThisDeviceTriggered( - appPackageName: String?, -) : ChipStateSender(appPackageName) { - override fun getChipTextString(context: Context): String { - return context.getString(R.string.media_transfer_playing_this_device) - } + /** + * A state representing that the two devices are close but not close enough to *end* a cast + * that's currently occurring the receiver device. The chip will instruct the user to move + * closer in order to initiate the transfer from the receiver and back onto this device (the + * original sender). + */ + ALMOST_CLOSE_TO_END_CAST( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST, + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_ALMOST_CLOSE_TO_END_CAST, + R.string.media_move_closer_to_end_cast, + ), - override fun showLoading() = true - override fun getTimeoutMs() = TRANSFER_TRIGGERED_TIMEOUT_MILLIS -} + /** + * A state representing that a transfer to the receiver device has been initiated (but not + * completed). + */ + TRANSFER_TO_RECEIVER_TRIGGERED( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED, + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_RECEIVER_TRIGGERED, + R.string.media_transfer_playing_different_device, + isMidTransfer = true, + timeout = TRANSFER_TRIGGERED_TIMEOUT_MILLIS + ), -/** - * A state representing that a transfer to the receiver device has been successfully completed. - * - * @property otherDeviceName the name of the other device involved in the transfer. - * @property undoCallback if present, the callback that should be called when the user clicks the - * undo button. The undo button will only be shown if this is non-null. - */ -class TransferToReceiverSucceeded( - appPackageName: String?, - private val otherDeviceName: String, - val undoCallback: IUndoMediaTransferCallback? = null -) : ChipStateSender(appPackageName) { - override fun getChipTextString(context: Context): String { - return context.getString(R.string.media_transfer_playing_different_device, otherDeviceName) - } + /** + * A state representing that a transfer from the receiver device and back to this device (the + * sender) has been initiated (but not completed). + */ + TRANSFER_TO_THIS_DEVICE_TRIGGERED( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED, + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_THIS_DEVICE_TRIGGERED, + R.string.media_transfer_playing_this_device, + isMidTransfer = true, + timeout = TRANSFER_TRIGGERED_TIMEOUT_MILLIS + ), - override fun undoClickListener( - controllerSender: MediaTttChipControllerSender - ): View.OnClickListener? { - if (undoCallback == null) { - return null + /** + * A state representing that a transfer to the receiver device has been successfully completed. + */ + TRANSFER_TO_RECEIVER_SUCCEEDED( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_RECEIVER_SUCCEEDED, + R.string.media_transfer_playing_different_device + ) { + override fun undoClickListener( + controllerSender: MediaTttChipControllerSender, + routeInfo: MediaRoute2Info, + undoCallback: IUndoMediaTransferCallback?, + uiEventLogger: MediaTttSenderUiEventLogger + ): View.OnClickListener? { + if (undoCallback == null) { + return null + } + return View.OnClickListener { + uiEventLogger.logUndoClicked( + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_UNDO_TRANSFER_TO_RECEIVER_CLICKED + ) + undoCallback.onUndoTriggered() + // The external service should eventually send us a TransferToThisDeviceTriggered + // state, but that may take too long to go through the binder and the user may be + // confused ast o why the UI hasn't changed yet. So, we immediately change the UI + // here. + controllerSender.displayChip( + ChipSenderInfo( + TRANSFER_TO_THIS_DEVICE_TRIGGERED, routeInfo, undoCallback + ) + ) + } } + }, - return View.OnClickListener { - this.undoCallback.onUndoTriggered() - // The external service should eventually send us a TransferToThisDeviceTriggered state, - // but that may take too long to go through the binder and the user may be confused as - // to why the UI hasn't changed yet. So, we immediately change the UI here. - controllerSender.displayChip( - TransferToThisDeviceTriggered(this.appPackageName) - ) + /** + * A state representing that a transfer back to this device has been successfully completed. + */ + TRANSFER_TO_THIS_DEVICE_SUCCEEDED( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, + R.string.media_transfer_playing_this_device + ) { + override fun undoClickListener( + controllerSender: MediaTttChipControllerSender, + routeInfo: MediaRoute2Info, + undoCallback: IUndoMediaTransferCallback?, + uiEventLogger: MediaTttSenderUiEventLogger + ): View.OnClickListener? { + if (undoCallback == null) { + return null + } + return View.OnClickListener { + uiEventLogger.logUndoClicked( + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_UNDO_TRANSFER_TO_THIS_DEVICE_CLICKED + ) + undoCallback.onUndoTriggered() + // The external service should eventually send us a TransferToReceiverTriggered + // state, but that may take too long to go through the binder and the user may be + // confused as to why the UI hasn't changed yet. So, we immediately change the UI + // here. + controllerSender.displayChip( + ChipSenderInfo( + TRANSFER_TO_RECEIVER_TRIGGERED, routeInfo, undoCallback + ) + ) + } } - } -} - -/** - * A state representing that a transfer back to this device has been successfully completed. - * - * @property otherDeviceName the name of the other device involved in the transfer. - * @property undoCallback if present, the callback that should be called when the user clicks the - * undo button. The undo button will only be shown if this is non-null. - */ -class TransferToThisDeviceSucceeded( - appPackageName: String?, - private val otherDeviceName: String, - val undoCallback: IUndoMediaTransferCallback? = null -) : ChipStateSender(appPackageName) { - override fun getChipTextString(context: Context): String { - return context.getString(R.string.media_transfer_playing_this_device) - } + }, + + /** A state representing that a transfer to the receiver device has failed. */ + TRANSFER_TO_RECEIVER_FAILED( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED, + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_RECEIVER_FAILED, + R.string.media_transfer_failed, + isTransferFailure = true + ), + + /** A state representing that a transfer back to this device has failed. */ + TRANSFER_TO_THIS_DEVICE_FAILED( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_FAILED, + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_THIS_DEVICE_FAILED, + R.string.media_transfer_failed, + isTransferFailure = true + ), + + /** A state representing that this device is far away from any receiver device. */ + FAR_FROM_RECEIVER( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_FAR_FROM_RECEIVER, + stringResId = null + ); - override fun undoClickListener( - controllerSender: MediaTttChipControllerSender - ): View.OnClickListener? { - if (undoCallback == null) { + /** + * Returns a fully-formed string with the text that the chip should display. + * + * @param otherDeviceName the name of the other device involved in the transfer. + */ + fun getChipTextString(context: Context, otherDeviceName: String): String? { + if (stringResId == null) { return null } - - return View.OnClickListener { - this.undoCallback.onUndoTriggered() - // The external service should eventually send us a TransferToReceiverTriggered state, - // but that may take too long to go through the binder and the user may be confused as - // to why the UI hasn't changed yet. So, we immediately change the UI here. - controllerSender.displayChip( - TransferToReceiverTriggered( - this.appPackageName, - this.otherDeviceName - ) - ) - } + return context.getString(stringResId, otherDeviceName) } -} -/** A state representing that a transfer has failed. */ -class TransferFailed( - appPackageName: String?, -) : ChipStateSender(appPackageName) { - override fun getChipTextString(context: Context): String { - return context.getString(R.string.media_transfer_failed) + /** + * Returns a click listener for the undo button on the chip. Returns null if this chip state + * doesn't have an undo button. + * + * @param controllerSender passed as a parameter in case we want to display a new chip state + * when undo is clicked. + * @param undoCallback if present, the callback that should be called when the user clicks the + * undo button. The undo button will only be shown if this is non-null. + */ + open fun undoClickListener( + controllerSender: MediaTttChipControllerSender, + routeInfo: MediaRoute2Info, + undoCallback: IUndoMediaTransferCallback?, + uiEventLogger: MediaTttSenderUiEventLogger + ): View.OnClickListener? = null + + companion object { + /** + * Returns the sender state enum associated with the given [displayState] from + * [StatusBarManager]. + */ + fun getSenderStateFromId( + @StatusBarManager.MediaTransferSenderState displayState: Int, + ): ChipStateSender = values().first { it.stateInt == displayState } + + /** + * Returns the state int from [StatusBarManager] associated with the given sender state + * name. + * + * @param name the name of one of the [ChipStateSender] enums. + */ + @StatusBarManager.MediaTransferSenderState + fun getSenderStateIdFromName(name: String): Int = valueOf(name).stateInt } } // Give the Transfer*Triggered states a longer timeout since those states represent an active // process and we should keep the user informed about it as long as possible (but don't allow it to // continue indefinitely). -private const val TRANSFER_TRIGGERED_TIMEOUT_MILLIS = 15000L
\ No newline at end of file +private const val TRANSFER_TRIGGERED_TIMEOUT_MILLIS = 15000L diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt index da2aac4d5ad7..9f5ec7e1a330 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt @@ -19,6 +19,7 @@ package com.android.systemui.media.taptotransfer.sender import android.app.StatusBarManager import android.content.Context import android.media.MediaRoute2Info +import android.os.PowerManager import android.util.Log import android.view.View import android.view.ViewGroup @@ -28,6 +29,7 @@ import com.android.internal.statusbar.IUndoMediaTransferCallback import com.android.systemui.R import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.media.taptotransfer.common.ChipInfoCommon import com.android.systemui.media.taptotransfer.common.MediaTttChipControllerCommon import com.android.systemui.media.taptotransfer.common.MediaTttLogger import com.android.systemui.media.taptotransfer.common.MediaTttRemovalReason @@ -50,13 +52,16 @@ class MediaTttChipControllerSender @Inject constructor( viewUtil: ViewUtil, @Main mainExecutor: DelayableExecutor, tapGestureDetector: TapGestureDetector, -) : MediaTttChipControllerCommon<ChipStateSender>( + powerManager: PowerManager, + private val uiEventLogger: MediaTttSenderUiEventLogger +) : MediaTttChipControllerCommon<ChipSenderInfo>( context, logger, windowManager, viewUtil, mainExecutor, tapGestureDetector, + powerManager, R.layout.media_ttt_chip ) { private var currentlyDisplayedChipState: ChipStateSender? = null @@ -82,104 +87,83 @@ class MediaTttChipControllerSender @Inject constructor( routeInfo: MediaRoute2Info, undoCallback: IUndoMediaTransferCallback? ) { - logger.logStateChange(stateIntToString(displayState), routeInfo.id) - val appPackageName = routeInfo.packageName - val otherDeviceName = routeInfo.name.toString() - val chipState = when(displayState) { - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST -> - AlmostCloseToStartCast(appPackageName, otherDeviceName) - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST -> - AlmostCloseToEndCast(appPackageName, otherDeviceName) - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED -> - TransferToReceiverTriggered(appPackageName, otherDeviceName) - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED -> - TransferToThisDeviceTriggered(appPackageName) - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED -> - TransferToReceiverSucceeded(appPackageName, otherDeviceName, undoCallback) - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED -> - TransferToThisDeviceSucceeded(appPackageName, otherDeviceName, undoCallback) - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED, - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_FAILED -> - TransferFailed(appPackageName) - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER -> { - removeChip(removalReason = FAR_FROM_RECEIVER) - null - } - else -> { - Log.e(SENDER_TAG, "Unhandled MediaTransferSenderState $displayState") - null - } + val chipState: ChipStateSender? = ChipStateSender.getSenderStateFromId(displayState) + val stateName = chipState?.name ?: "Invalid" + logger.logStateChange(stateName, routeInfo.id) + + if (chipState == null) { + Log.e(SENDER_TAG, "Unhandled MediaTransferSenderState $displayState") + return } + uiEventLogger.logSenderStateChange(chipState) - chipState?.let { - displayChip(it) + if (chipState == ChipStateSender.FAR_FROM_RECEIVER) { + removeChip(removalReason = ChipStateSender.FAR_FROM_RECEIVER::class.simpleName!!) + } else { + displayChip(ChipSenderInfo(chipState, routeInfo, undoCallback)) } } /** Displays the chip view for the given state. */ - override fun updateChipView(chipState: ChipStateSender, currentChipView: ViewGroup) { + override fun updateChipView( + chipInfo: ChipSenderInfo, + currentChipView: ViewGroup) { + val chipState = chipInfo.state currentlyDisplayedChipState = chipState // App icon - setIcon(chipState, currentChipView) + setIcon(currentChipView, chipInfo.routeInfo.packageName) // Text + val otherDeviceName = chipInfo.routeInfo.name.toString() currentChipView.requireViewById<TextView>(R.id.text).apply { - text = chipState.getChipTextString(context) + text = chipState.getChipTextString(context, otherDeviceName) } // Loading currentChipView.requireViewById<View>(R.id.loading).visibility = - if (chipState.showLoading()) { View.VISIBLE } else { View.GONE } + chipState.isMidTransfer.visibleIfTrue() + // Undo val undoView = currentChipView.requireViewById<View>(R.id.undo) - val undoClickListener = chipState.undoClickListener(this) + val undoClickListener = chipState.undoClickListener( + this, chipInfo.routeInfo, chipInfo.undoCallback, uiEventLogger + ) undoView.setOnClickListener(undoClickListener) - undoView.visibility = if (undoClickListener != null) { View.VISIBLE } else { View.GONE } + undoView.visibility = (undoClickListener != null).visibleIfTrue() // Failure - val showFailure = chipState is TransferFailed currentChipView.requireViewById<View>(R.id.failure_icon).visibility = - if (showFailure) { View.VISIBLE } else { View.GONE } + chipState.isTransferFailure.visibleIfTrue() } override fun removeChip(removalReason: String) { // Don't remove the chip if we're mid-transfer since the user should still be able to // see the status of the transfer. (But do remove it if it's finally timed out.) - if ((currentlyDisplayedChipState is TransferToReceiverTriggered || - currentlyDisplayedChipState is TransferToThisDeviceTriggered) - && removalReason != MediaTttRemovalReason.REASON_TIMEOUT) { + if (currentlyDisplayedChipState?.isMidTransfer == true + && removalReason != MediaTttRemovalReason.REASON_TIMEOUT) { return } super.removeChip(removalReason) currentlyDisplayedChipState = null } - private fun stateIntToString(@StatusBarManager.MediaTransferSenderState state: Int): String { - return when(state) { - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST -> - "ALMOST_CLOSE_TO_START_CAST" - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST -> - "ALMOST_CLOSE_TO_END_CAST" - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED -> - "TRANSFER_TO_RECEIVER_TRIGGERED" - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED -> - "TRANSFER_TO_THIS_DEVICE_TRIGGERED" - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED -> - "TRANSFER_TO_RECEIVER_SUCCEEDED" - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED -> - "TRANSFER_TO_THIS_DEVICE_SUCCEEDED" - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED -> - "TRANSFER_TO_RECEIVER_FAILED" - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_FAILED -> - "TRANSFER_TO_THIS_DEVICE_FAILED" - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER -> - FAR_FROM_RECEIVER - else -> "INVALID: $state" + private fun Boolean.visibleIfTrue(): Int { + return if (this) { + View.VISIBLE + } else { + View.GONE } } } +data class ChipSenderInfo( + val state: ChipStateSender, + val routeInfo: MediaRoute2Info, + val undoCallback: IUndoMediaTransferCallback? = null +) : ChipInfoCommon { + override fun getTimeoutMs() = state.timeout +} + const val SENDER_TAG = "MediaTapToTransferSender" -private const val FAR_FROM_RECEIVER = "FAR_FROM_RECEIVER" diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderUiEventLogger.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderUiEventLogger.kt new file mode 100644 index 000000000000..af3c1b60bacf --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderUiEventLogger.kt @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.media.taptotransfer.sender + +import android.util.Log +import com.android.internal.logging.UiEvent +import com.android.internal.logging.UiEventLogger +import com.android.systemui.dagger.SysUISingleton +import javax.inject.Inject + +/** A class for analytics logging for the media tap-to-transfer chip on the sender device. */ +@SysUISingleton +class MediaTttSenderUiEventLogger @Inject constructor(private val logger: UiEventLogger) { + /** Logs that the sender chip has changed states. */ + fun logSenderStateChange(chipState: ChipStateSender) { + logger.log(chipState.uiEvent) + } + + /** + * Logs that the undo button was clicked. + * + * @param undoUiEvent the uiEvent specific to which undo button was clicked. + */ + fun logUndoClicked(undoUiEvent: UiEventLogger.UiEventEnum) { + val isUndoEvent = + undoUiEvent == MediaTttSenderUiEvents.MEDIA_TTT_SENDER_UNDO_TRANSFER_TO_RECEIVER_CLICKED + || undoUiEvent == + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_UNDO_TRANSFER_TO_THIS_DEVICE_CLICKED + if (!isUndoEvent) { + Log.w( + MediaTttSenderUiEventLogger::class.simpleName!!, + "Must pass an undo-specific UiEvent." + ) + return + } + logger.log(undoUiEvent) + } +} + +enum class MediaTttSenderUiEvents(val metricId: Int) : UiEventLogger.UiEventEnum { + @UiEvent(doc = "The undo button on the media ttt chip on the sender device was clicked " + + "to undo the transfer to the receiver device") + MEDIA_TTT_SENDER_UNDO_TRANSFER_TO_RECEIVER_CLICKED(971), + @UiEvent(doc = "The undo button on the media ttt chip on the sender device was clicked " + + "to undo the transfer back to this device") + MEDIA_TTT_SENDER_UNDO_TRANSFER_TO_THIS_DEVICE_CLICKED(972), + + @UiEvent(doc = "See android.app.StatusBarManager.MEDIA_TRANSFER_SENDER_* docs") + MEDIA_TTT_SENDER_ALMOST_CLOSE_TO_START_CAST(973), + @UiEvent(doc = "See android.app.StatusBarManager.MEDIA_TRANSFER_SENDER_* docs") + MEDIA_TTT_SENDER_ALMOST_CLOSE_TO_END_CAST(974), + @UiEvent(doc = "See android.app.StatusBarManager.MEDIA_TRANSFER_SENDER_* docs") + MEDIA_TTT_SENDER_TRANSFER_TO_RECEIVER_TRIGGERED(975), + @UiEvent(doc = "See android.app.StatusBarManager.MEDIA_TRANSFER_SENDER_* docs") + MEDIA_TTT_SENDER_TRANSFER_TO_THIS_DEVICE_TRIGGERED(976), + @UiEvent(doc = "See android.app.StatusBarManager.MEDIA_TRANSFER_SENDER_* docs") + MEDIA_TTT_SENDER_TRANSFER_TO_RECEIVER_SUCCEEDED(977), + @UiEvent(doc = "See android.app.StatusBarManager.MEDIA_TRANSFER_SENDER_* docs") + MEDIA_TTT_SENDER_TRANSFER_TO_THIS_DEVICE_SUCCEEDED(978), + @UiEvent(doc = "See android.app.StatusBarManager.MEDIA_TRANSFER_SENDER_* docs") + MEDIA_TTT_SENDER_TRANSFER_TO_RECEIVER_FAILED(979), + @UiEvent(doc = "See android.app.StatusBarManager.MEDIA_TRANSFER_SENDER_* docs") + MEDIA_TTT_SENDER_TRANSFER_TO_THIS_DEVICE_FAILED(980), + @UiEvent(doc = "See android.app.StatusBarManager.MEDIA_TRANSFER_SENDER_* docs") + MEDIA_TTT_SENDER_FAR_FROM_RECEIVER(981); + + override fun getId() = metricId +} diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java index 039c33315741..b4e20fd7f32b 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java @@ -97,7 +97,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { "SHOWING_AUTO_SAVER_SUGGESTION", }; - private static final String ACTION_SHOW_BATTERY_SETTINGS = "PNW.batterySettings"; + private static final String ACTION_SHOW_BATTERY_SAVER_SETTINGS = "PNW.batterySaverSettings"; private static final String ACTION_START_SAVER = "PNW.startSaver"; private static final String ACTION_DISMISSED_WARNING = "PNW.dismissedWarning"; private static final String ACTION_CLICKED_TEMP_WARNING = "PNW.clickedTempWarning"; @@ -120,8 +120,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private static final String ACTION_ENABLE_SEVERE_BATTERY_DIALOG = "PNW.enableSevereDialog"; - private static final String SETTINGS_ACTION_OPEN_BATTERY_SAVER_SETTING = - "android.settings.BATTERY_SAVER_SETTINGS"; public static final String BATTERY_SAVER_SCHEDULE_SCREEN_INTENT_ACTION = "com.android.settings.BATTERY_SAVER_SCHEDULE_SETTINGS"; @@ -140,6 +138,9 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private final Handler mHandler = new Handler(Looper.getMainLooper()); private final Receiver mReceiver = new Receiver(); private final Intent mOpenBatterySettings = settings(Intent.ACTION_POWER_USAGE_SUMMARY); + private final Intent mOpenBatterySaverSettings = + settings(Settings.ACTION_BATTERY_SAVER_SETTINGS); + private final boolean mUseSevereDialog; private int mBatteryLevel; private int mBucket; @@ -170,6 +171,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { mKeyguard = mContext.getSystemService(KeyguardManager.class); mReceiver.init(); mActivityStarter = activityStarter; + mUseSevereDialog = mContext.getResources().getBoolean(R.bool.config_severe_battery_dialog); } @Override @@ -283,11 +285,11 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { .setContentText(contentText) .setContentTitle(title) .setOnlyAlertOnce(true) - .setDeleteIntent(pendingBroadcast(ACTION_DISMISSED_WARNING)) + .setOngoing(true) .setStyle(new Notification.BigTextStyle().bigText(contentText)) .setVisibility(Notification.VISIBILITY_PUBLIC); if (hasBatterySettings()) { - nb.setContentIntent(pendingBroadcast(ACTION_SHOW_BATTERY_SETTINGS)); + nb.setContentIntent(pendingBroadcast(ACTION_SHOW_BATTERY_SAVER_SETTINGS)); } // Make the notification red if the percentage goes below a certain amount or the time // remaining estimate is disabled @@ -298,6 +300,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { } if (!mPowerMan.isPowerSaveMode()) { + nb.addAction(0, mContext.getString(R.string.battery_saver_dismiss_action), + pendingBroadcast(ACTION_DISMISSED_WARNING)); nb.addAction(0, mContext.getString(R.string.battery_saver_start_action), pendingBroadcast(ACTION_START_SAVER)); @@ -312,9 +316,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private boolean showSevereLowBatteryDialog() { final boolean isSevereState = !mCurrentBatterySnapshot.isHybrid() || mBucket < -1; - final boolean useSevereDialog = mContext.getResources().getBoolean( - R.bool.config_severe_battery_dialog); - return isSevereState && useSevereDialog; + return isSevereState && mUseSevereDialog; } private void showAutoSaverSuggestionNotification() { @@ -748,7 +750,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { public void init() { IntentFilter filter = new IntentFilter(); - filter.addAction(ACTION_SHOW_BATTERY_SETTINGS); + filter.addAction(ACTION_SHOW_BATTERY_SAVER_SETTINGS); filter.addAction(ACTION_START_SAVER); filter.addAction(ACTION_DISMISSED_WARNING); filter.addAction(ACTION_CLICKED_TEMP_WARNING); @@ -768,9 +770,9 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { public void onReceive(Context context, Intent intent) { final String action = intent.getAction(); Slog.i(TAG, "Received " + action); - if (action.equals(ACTION_SHOW_BATTERY_SETTINGS)) { + if (action.equals(ACTION_SHOW_BATTERY_SAVER_SETTINGS)) { dismissLowBatteryNotification(); - mContext.startActivityAsUser(mOpenBatterySettings, UserHandle.CURRENT); + mContext.startActivityAsUser(mOpenBatterySaverSettings, UserHandle.CURRENT); } else if (action.equals(ACTION_START_SAVER)) { setSaverMode(true, true); dismissLowBatteryNotification(); diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java index 56528c9974ac..61b434d6a28f 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java @@ -51,7 +51,6 @@ import com.android.systemui.statusbar.phone.CentralSurfaces; import java.io.FileDescriptor; import java.io.PrintWriter; -import java.time.Duration; import java.util.Arrays; import java.util.Optional; import java.util.concurrent.Future; @@ -70,7 +69,6 @@ public class PowerUI extends CoreStartable implements CommandQueue.Callbacks { private static final int MAX_RECENT_TEMPS = 125; // TEMPERATURE_LOGGING_INTERVAL plus a buffer static final long THREE_HOURS_IN_MILLIS = DateUtils.HOUR_IN_MILLIS * 3; private static final int CHARGE_CYCLE_PERCENT_RESET = 30; - private static final long SIX_HOURS_MILLIS = Duration.ofHours(6).toMillis(); public static final int NO_ESTIMATE_AVAILABLE = -1; private static final String BOOT_COUNT_KEY = "boot_count"; private static final String PREFS = "powerui_prefs"; diff --git a/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt b/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt index 5d9361d201c1..e0d158cd7db6 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt @@ -18,7 +18,10 @@ package com.android.systemui.qs import android.app.IActivityManager import android.app.IForegroundServiceObserver +import android.content.BroadcastReceiver import android.content.Context +import android.content.Intent +import android.content.IntentFilter import android.content.pm.PackageManager import android.graphics.drawable.Drawable import android.os.IBinder @@ -42,6 +45,7 @@ import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_ import com.android.systemui.Dumpable import com.android.systemui.R import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main @@ -67,6 +71,7 @@ class FgsManagerController @Inject constructor( private val packageManager: PackageManager, private val deviceConfigProxy: DeviceConfigProxy, private val dialogLaunchAnimator: DialogLaunchAnimator, + private val broadcastDispatcher: BroadcastDispatcher, private val dumpManager: DumpManager ) : IForegroundServiceObserver.Stub(), Dumpable { @@ -125,6 +130,18 @@ class FgsManagerController @Inject constructor( dumpManager.registerDumpable(this) + broadcastDispatcher.registerReceiver( + object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + if (intent.action == Intent.ACTION_SHOW_FOREGROUND_SERVICE_MANAGER) { + showDialog(null) + } + } + }, + IntentFilter(Intent.ACTION_SHOW_FOREGROUND_SERVICE_MANAGER), + executor = mainExecutor, + flags = Context.RECEIVER_NOT_EXPORTED) + initialized = true } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java index 00142799c541..865f09337fa3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java @@ -199,9 +199,7 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { /** */ public void setListening(boolean listening, boolean expanded) { - // TODO(218268829): checking for split shade is workaround but when proper fix lands - // "|| mShouldUseSplitNotificationShade" should be removed - setListening(listening && (expanded || mShouldUseSplitNotificationShade)); + setListening(listening && expanded); if (mView.isListening()) { refreshAllTiles(); } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java index 1241e1de0ca4..6d729b92e7b8 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java @@ -403,12 +403,20 @@ public class ScreenshotView extends FrameLayout implements } @Override - public void onSwipeDismissInitiated(Animator animator) { + public void onSwipeDismissInitiated(Animator anim) { if (DEBUG_DISMISS) { Log.d(ScreenshotView.TAG, "dismiss triggered via swipe gesture"); } mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_SWIPE_DISMISSED, 0, mPackageName); + anim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + super.onAnimationStart(animation); + mBackgroundProtection.animate() + .alpha(0).setDuration(anim.getDuration()).start(); + } + }); } @Override @@ -999,6 +1007,7 @@ public class ScreenshotView extends FrameLayout implements mSmartChips.clear(); mQuickShareChip = null; setAlpha(1); + mScreenshotStatic.setAlpha(1); mScreenshotSelectorView.stop(); } diff --git a/packages/SystemUI/src/com/android/systemui/smartspace/SmartspacePrecondition.kt b/packages/SystemUI/src/com/android/systemui/smartspace/SmartspacePrecondition.kt new file mode 100644 index 000000000000..aa2bcecbd224 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/smartspace/SmartspacePrecondition.kt @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.smartspace + +/** + * A {@link SmartspacePrecondition} captures the conditions that must be met for Smartspace to be + * used in a particular setting. + */ +interface SmartspacePrecondition { + /** + * A callback for receiving updates when conditions have changed. + */ + interface Listener { + fun onCriteriaChanged() + } + + /** + * Adds a listener to receive future updates. {@link Listener#onCriteriaChanged} will be called + * immediately upon adding. + */ + fun addListener(listener: Listener) + + /** + * Removes a listener from receiving future updates. + */ + fun removeListener(listener: Listener) + + /** + * Returns whether all conditions have been met. + */ + fun conditionsMet(): Boolean +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/smartspace/SmartspaceTargetFilter.kt b/packages/SystemUI/src/com/android/systemui/smartspace/SmartspaceTargetFilter.kt new file mode 100644 index 000000000000..7228550e4e41 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/smartspace/SmartspaceTargetFilter.kt @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.smartspace + +import android.app.smartspace.SmartspaceTarget + +/** + * {@link SmartspaceTargetFilter} defines a way to locally filter targets from inclusion. This + * should be used for filtering that isn't available further upstream. + */ +interface SmartspaceTargetFilter { + /** + * An interface implemented by clients to receive updates when the filtering criteria changes. + * When this happens, the client should refresh their target set. + */ + interface Listener { + fun onCriteriaChanged() + } + + /** + * Adds a listener to receive future updates. {@link Listener#onCriteriaChanged} will be + * invoked immediately after. + */ + fun addListener(listener: Listener) + + /** + * Removes listener from receiving future updates. + */ + fun removeListener(listener: Listener) + + /** + * Returns {@code true} if the {@link SmartspaceTarget} should be included in the current + * target set, {@code false} otherwise. + */ + fun filterSmartspaceTarget(t: SmartspaceTarget): Boolean +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt b/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt new file mode 100644 index 000000000000..1b74ac36ebf0 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.smartspace.dagger + +import com.android.systemui.plugins.BcSmartspaceDataPlugin +import com.android.systemui.smartspace.SmartspacePrecondition +import com.android.systemui.smartspace.SmartspaceTargetFilter +import com.android.systemui.smartspace.filters.LockscreenTargetFilter +import com.android.systemui.smartspace.preconditions.LockscreenPrecondition +import dagger.Binds +import dagger.BindsOptionalOf +import dagger.Module +import javax.inject.Named + +@Module(subcomponents = [SmartspaceViewComponent::class]) +abstract class SmartspaceModule { + @Module + companion object { + /** + * The BcSmartspaceDataProvider for dreams. + */ + const val DREAM_SMARTSPACE_DATA_PLUGIN = "dreams_smartspace_data_plugin" + + /** + * The lockscreen smartspace target filter. + */ + const val LOCKSCREEN_SMARTSPACE_TARGET_FILTER = "lockscreen_smartspace_target_filter" + + /** + * The dream smartspace target filter. + */ + const val DREAM_SMARTSPACE_TARGET_FILTER = "dream_smartspace_target_filter" + + /** + * The precondition for dream smartspace + */ + const val DREAM_SMARTSPACE_PRECONDITION = "dream_smartspace_precondition" + } + + @BindsOptionalOf + @Named(DREAM_SMARTSPACE_TARGET_FILTER) + abstract fun optionalDreamSmartspaceTargetFilter(): SmartspaceTargetFilter? + + @BindsOptionalOf + @Named(DREAM_SMARTSPACE_DATA_PLUGIN) + abstract fun optionalDreamsBcSmartspaceDataPlugin(): BcSmartspaceDataPlugin? + + @Binds + @Named(LOCKSCREEN_SMARTSPACE_TARGET_FILTER) + abstract fun provideLockscreenSmartspaceTargetFilter( + filter: LockscreenTargetFilter? + ): SmartspaceTargetFilter? + + @Binds + @Named(DREAM_SMARTSPACE_PRECONDITION) + abstract fun bindSmartspacePrecondition( + lockscreenPrecondition: LockscreenPrecondition? + ): SmartspacePrecondition? +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt b/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt new file mode 100644 index 000000000000..d3ae198e8e35 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.smartspace.dagger + +import android.app.PendingIntent +import android.content.Intent +import android.view.View +import android.view.ViewGroup +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.plugins.BcSmartspaceDataPlugin +import com.android.systemui.plugins.FalsingManager +import com.android.systemui.smartspace.dagger.SmartspaceViewComponent.SmartspaceViewModule.PLUGIN +import dagger.BindsInstance +import dagger.Module +import dagger.Provides +import dagger.Subcomponent +import javax.inject.Named + +@Subcomponent(modules = [SmartspaceViewComponent.SmartspaceViewModule::class]) +interface SmartspaceViewComponent { + @Subcomponent.Factory + interface Factory { + fun create( + @BindsInstance parent: ViewGroup, + @BindsInstance @Named(PLUGIN) plugin: BcSmartspaceDataPlugin, + @BindsInstance onAttachListener: View.OnAttachStateChangeListener + ): SmartspaceViewComponent + } + + fun getView(): BcSmartspaceDataPlugin.SmartspaceView + + @Module + object SmartspaceViewModule { + const val PLUGIN = "plugin" + + @Provides + fun providesSmartspaceView( + activityStarter: ActivityStarter, + falsingManager: FalsingManager, + parent: ViewGroup, + @Named(PLUGIN) plugin: BcSmartspaceDataPlugin, + onAttachListener: View.OnAttachStateChangeListener + ): + BcSmartspaceDataPlugin.SmartspaceView { + val ssView = plugin.getView(parent) + ssView.registerDataProvider(plugin) + + ssView.setIntentStarter(object : BcSmartspaceDataPlugin.IntentStarter { + override fun startIntent(view: View, intent: Intent, showOnLockscreen: Boolean) { + activityStarter.startActivity( + intent, + true, /* dismissShade */ + null, /* launch animator */ + showOnLockscreen + ) + } + + override fun startPendingIntent(pi: PendingIntent, showOnLockscreen: Boolean) { + if (showOnLockscreen) { + pi.send() + } else { + activityStarter.startPendingIntentDismissingKeyguard(pi) + } + } + }) + (ssView as View).addOnAttachStateChangeListener(onAttachListener) + ssView.setFalsingManager(falsingManager) + return ssView + } + } +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/smartspace/filters/LockscreenTargetFilter.kt b/packages/SystemUI/src/com/android/systemui/smartspace/filters/LockscreenTargetFilter.kt new file mode 100644 index 000000000000..6ad490169c17 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/smartspace/filters/LockscreenTargetFilter.kt @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.smartspace.filters + +import android.app.smartspace.SmartspaceTarget +import android.content.ContentResolver +import android.content.Context +import android.database.ContentObserver +import android.net.Uri +import android.os.Handler +import android.os.UserHandle +import android.provider.Settings +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.settings.UserTracker +import com.android.systemui.smartspace.SmartspaceTargetFilter +import com.android.systemui.util.concurrency.Execution +import com.android.systemui.util.settings.SecureSettings +import java.util.concurrent.Executor +import javax.inject.Inject + +/** + * {@link SmartspaceTargetFilter} for smartspace targets that show above the lockscreen. + */ +class LockscreenTargetFilter @Inject constructor( + private val secureSettings: SecureSettings, + private val userTracker: UserTracker, + private val execution: Execution, + @Main private val handler: Handler, + private val contentResolver: ContentResolver, + @Main private val uiExecutor: Executor +) : SmartspaceTargetFilter { + private var listeners: MutableSet<SmartspaceTargetFilter.Listener> = mutableSetOf() + private var showSensitiveContentForCurrentUser = false + set(value) { + val existing = field + field = value + if (existing != field) { + listeners.forEach { it.onCriteriaChanged() } + } + } + private var showSensitiveContentForManagedUser = false + set(value) { + val existing = field + field = value + if (existing != field) { + listeners.forEach { it.onCriteriaChanged() } + } + } + + private val settingsObserver = object : ContentObserver(handler) { + override fun onChange(selfChange: Boolean, uri: Uri?) { + execution.assertIsMainThread() + updateUserContentSettings() + } + } + + private var managedUserHandle: UserHandle? = null + + override fun addListener(listener: SmartspaceTargetFilter.Listener) { + listeners.add(listener) + + if (listeners.size != 1) { + return + } + + userTracker.addCallback(userTrackerCallback, uiExecutor) + + contentResolver.registerContentObserver( + secureSettings.getUriFor(Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS), + true, + settingsObserver, + UserHandle.USER_ALL + ) + + updateUserContentSettings() + } + + override fun removeListener(listener: SmartspaceTargetFilter.Listener) { + listeners.remove(listener) + + if (listeners.isNotEmpty()) { + return + } + + userTracker.removeCallback(userTrackerCallback) + contentResolver.unregisterContentObserver(settingsObserver) + } + + override fun filterSmartspaceTarget(t: SmartspaceTarget): Boolean { + return when (t.userHandle) { + userTracker.userHandle -> { + !t.isSensitive || showSensitiveContentForCurrentUser + } + managedUserHandle -> { + // Really, this should be "if this managed profile is associated with the current + // active user", but we don't have a good way to check that, so instead we cheat: + // Only the primary user can have an associated managed profile, so only show + // content for the managed profile if the primary user is active + userTracker.userHandle.identifier == UserHandle.USER_SYSTEM && + (!t.isSensitive || showSensitiveContentForManagedUser) + } + else -> { + false + } + } + } + + private val userTrackerCallback = object : UserTracker.Callback { + override fun onUserChanged(newUser: Int, userContext: Context) { + execution.assertIsMainThread() + updateUserContentSettings() + } + } + + private fun getWorkProfileUser(): UserHandle? { + for (userInfo in userTracker.userProfiles) { + if (userInfo.isManagedProfile) { + return userInfo.userHandle + } + } + return null + } + + private fun updateUserContentSettings() { + val setting = Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS + + showSensitiveContentForCurrentUser = + secureSettings.getIntForUser(setting, 0, userTracker.userId) == 1 + + managedUserHandle = getWorkProfileUser() + val managedId = managedUserHandle?.identifier + if (managedId != null) { + showSensitiveContentForManagedUser = + secureSettings.getIntForUser(setting, 0, managedId) == 1 + } + + listeners.forEach { it.onCriteriaChanged() } + } +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/smartspace/preconditions/LockscreenPrecondition.kt b/packages/SystemUI/src/com/android/systemui/smartspace/preconditions/LockscreenPrecondition.kt new file mode 100644 index 000000000000..1302ec9dbc55 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/smartspace/preconditions/LockscreenPrecondition.kt @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.smartspace.preconditions + +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags +import com.android.systemui.smartspace.SmartspacePrecondition +import com.android.systemui.statusbar.policy.DeviceProvisionedController +import com.android.systemui.util.concurrency.Execution +import javax.inject.Inject + +/** + * {@link LockscreenPrecondition} covers the conditions that must be met before Smartspace can be + * used over lockscreen. These conditions include the device being provisioned with a setup user + * and the Smartspace feature flag enabled. + */ +class LockscreenPrecondition @Inject constructor( + private val featureFlags: FeatureFlags, + private val deviceProvisionedController: DeviceProvisionedController, + private val execution: Execution +) : SmartspacePrecondition { + private var listeners = mutableSetOf<SmartspacePrecondition.Listener>() + + private val deviceProvisionedListener = + object : DeviceProvisionedController.DeviceProvisionedListener { + override fun onDeviceProvisionedChanged() { + updateDeviceReadiness() + } + + override fun onUserSetupChanged() { + updateDeviceReadiness() + } + } + + init { + deviceProvisionedController.addCallback(deviceProvisionedListener) + } + + var deviceReady: Boolean = false + private set + + init { + updateDeviceReadiness() + } + + private fun updateDeviceReadiness() { + if (deviceReady) { + return + } + + deviceReady = deviceProvisionedController.isDeviceProvisioned && + deviceProvisionedController.isCurrentUserSetup + + if (!deviceReady) { + return + } + + deviceProvisionedController.removeCallback(deviceProvisionedListener) + synchronized(listeners) { + listeners.forEach { it.onCriteriaChanged() } + } + } + + override fun addListener(listener: SmartspacePrecondition.Listener) { + synchronized(listeners) { + listeners += listener + } + // Always trigger a targeted callback upon addition of listener. + listener.onCriteriaChanged() + } + + override fun removeListener(listener: SmartspacePrecondition.Listener) { + synchronized(listeners) { + listeners -= listener + } + } + + override fun conditionsMet(): Boolean { + execution.assertIsMainThread() + return featureFlags.isEnabled(Flags.SMARTSPACE) && deviceReady + } +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt index 17f42b1a3a43..5adb9e55a9df 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt @@ -99,15 +99,57 @@ class LockscreenShadeTransitionController @Inject constructor( internal var pulseHeightAnimator: ValueAnimator? = null /** - * Distance that the full shade transition takes in order for scrim to fully transition to - * the shade (in alpha) + * Distance that the full shade transition takes in order to complete. + */ + private var fullTransitionDistance = 0 + + /** + * Distance that the full transition takes in order for us to fully transition to the shade by + * tapping on a button, such as "expand". + */ + private var fullTransitionDistanceByTap = 0 + + /** + * Distance that the full shade transition takes in order for scrim to fully transition to the + * shade (in alpha) */ private var scrimTransitionDistance = 0 /** - * Distance that the full transition takes in order for us to fully transition to the shade + * Distance that the full shade transition takes in order for the notification shelf to fully + * expand. */ - private var fullTransitionDistance = 0 + private var notificationShelfTransitionDistance = 0 + + /** + * Distance that the full shade transition takes in order for the Quick Settings to fully fade + * and expand. + */ + private var qsTransitionDistance = 0 + + /** + * Distance that the full shade transition takes in order for the keyguard content on + * NotificationPanelViewController to fully fade (e.g. Clock & Smartspace). + */ + private var npvcKeyguardContentAlphaTransitionDistance = 0 + + /** + * Distance that the full shade transition takes in order for depth of the wallpaper to fully + * change. + */ + private var depthControllerTransitionDistance = 0 + + /** + * Distance that the full shade transition takes in order for the UDFPS Keyguard View to fully + * fade. + */ + private var udfpsTransitionDistance = 0 + + /** + * Used for StatusBar to know that a transition is in progress. At the moment it only checks + * whether the progress is > 0, therefore this value is not very important. + */ + private var statusBarTransitionDistance = 0 /** * Flag to make sure that the dragDownAmount is applied to the listeners even when in the @@ -130,7 +172,7 @@ class LockscreenShadeTransitionController @Inject constructor( * The distance until we're showing the notifications when pulsing */ val distanceUntilShowingPulsingNotifications - get() = scrimTransitionDistance + get() = fullTransitionDistance /** * The udfpsKeyguardViewController if it exists. @@ -177,10 +219,24 @@ class LockscreenShadeTransitionController @Inject constructor( } private fun updateResources() { + fullTransitionDistance = context.resources.getDimensionPixelSize( + R.dimen.lockscreen_shade_full_transition_distance) + fullTransitionDistanceByTap = context.resources.getDimensionPixelSize( + R.dimen.lockscreen_shade_transition_by_tap_distance) scrimTransitionDistance = context.resources.getDimensionPixelSize( R.dimen.lockscreen_shade_scrim_transition_distance) - fullTransitionDistance = context.resources.getDimensionPixelSize( + notificationShelfTransitionDistance = context.resources.getDimensionPixelSize( + R.dimen.lockscreen_shade_notif_shelf_transition_distance) + qsTransitionDistance = context.resources.getDimensionPixelSize( R.dimen.lockscreen_shade_qs_transition_distance) + npvcKeyguardContentAlphaTransitionDistance = context.resources.getDimensionPixelSize( + R.dimen.lockscreen_shade_npvc_keyguard_content_alpha_transition_distance) + depthControllerTransitionDistance = context.resources.getDimensionPixelSize( + R.dimen.lockscreen_shade_depth_controller_transition_distance) + udfpsTransitionDistance = context.resources.getDimensionPixelSize( + R.dimen.lockscreen_shade_udfps_keyguard_transition_distance) + statusBarTransitionDistance = context.resources.getDimensionPixelSize( + R.dimen.lockscreen_shade_status_bar_transition_distance) useSplitShade = Utils.shouldUseSplitNotificationShade(context.resources) } @@ -337,11 +393,16 @@ class LockscreenShadeTransitionController @Inject constructor( if (field != value || forceApplyAmount) { field = value if (!nsslController.isInLockedDownShade() || field == 0f || forceApplyAmount) { - qSDragProgress = MathUtils.saturate(dragDownAmount / scrimTransitionDistance) - nsslController.setTransitionToFullShadeAmount(field, qSDragProgress) + val notificationShelfProgress = + MathUtils.saturate(dragDownAmount / notificationShelfTransitionDistance) + nsslController.setTransitionToFullShadeAmount(field, notificationShelfProgress) + + qSDragProgress = MathUtils.saturate(dragDownAmount / qsTransitionDistance) qS.setTransitionToFullShadeAmount(field, qSDragProgress) + notificationPanelController.setTransitionToFullShadeAmount(field, false /* animate */, 0 /* delay */) + mediaHierarchyManager.setTransitionToFullShadeAmount(field) transitionToShadeAmountCommon(field) } @@ -357,11 +418,23 @@ class LockscreenShadeTransitionController @Inject constructor( private fun transitionToShadeAmountCommon(dragDownAmount: Float) { val scrimProgress = MathUtils.saturate(dragDownAmount / scrimTransitionDistance) scrimController.setTransitionToFullShadeProgress(scrimProgress) + // Fade out all content only visible on the lockscreen - notificationPanelController.setKeyguardOnlyContentAlpha(1.0f - scrimProgress) - depthController.transitionToFullShadeProgress = scrimProgress - udfpsKeyguardViewController?.setTransitionToFullShadeProgress(scrimProgress) - centralSurfaces.setTransitionToFullShadeProgress(scrimProgress) + val npvcProgress = + MathUtils.saturate(dragDownAmount / npvcKeyguardContentAlphaTransitionDistance) + notificationPanelController.setKeyguardOnlyContentAlpha(1.0f - npvcProgress) + + if (depthControllerTransitionDistance > 0) { + val depthProgress = + MathUtils.saturate(dragDownAmount / depthControllerTransitionDistance) + depthController.transitionToFullShadeProgress = depthProgress + } + + val udfpsProgress = MathUtils.saturate(dragDownAmount / udfpsTransitionDistance) + udfpsKeyguardViewController?.setTransitionToFullShadeProgress(udfpsProgress) + + val statusBarProgress = MathUtils.saturate(dragDownAmount / statusBarTransitionDistance) + centralSurfaces.setTransitionToFullShadeProgress(statusBarProgress) } private fun setDragDownAmountAnimated( @@ -404,7 +477,7 @@ class LockscreenShadeTransitionController @Inject constructor( // be a couple of frames later. if we're setting it to 0, it will use the // default inset and therefore flicker dragDownAmount = 1f - setDragDownAmountAnimated(fullTransitionDistance.toFloat(), delay = delay) { + setDragDownAmountAnimated(fullTransitionDistanceByTap.toFloat(), delay = delay) { // End listener: // Reset dragDownAmount = 0f diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ActivityLaunchAnimCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ActivityLaunchAnimCoordinator.kt new file mode 100644 index 000000000000..b54163d29e80 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ActivityLaunchAnimCoordinator.kt @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.notification.collection.coordinator + +import com.android.systemui.statusbar.notification.collection.NotifPipeline +import com.android.systemui.statusbar.notification.collection.NotificationEntry +import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope +import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender +import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender.OnEndLifetimeExtensionCallback +import com.android.systemui.statusbar.phone.NotifActivityLaunchEvents +import dagger.Binds +import dagger.Module +import javax.inject.Inject + +/** Extends the lifetime of notifications while their activity launch animation is playing. */ +interface ActivityLaunchAnimCoordinator : Coordinator + +/** Provides an [ActivityLaunchAnimCoordinator] to [CoordinatorScope]. */ +@Module(includes = [PrivateActivityStarterCoordinatorModule::class]) +object ActivityLaunchAnimCoordinatorModule + +@Module +private interface PrivateActivityStarterCoordinatorModule { + @Binds + fun bindCoordinator(impl: ActivityLaunchAnimCoordinatorImpl): ActivityLaunchAnimCoordinator +} + +/** + * Listens for [NotifActivityLaunchEvents], and then extends the lifetimes of any notifs while their + * launch animation is playing. + */ +@CoordinatorScope +private class ActivityLaunchAnimCoordinatorImpl @Inject constructor( + private val activityLaunchEvents: NotifActivityLaunchEvents +) : ActivityLaunchAnimCoordinator { + // Tracks notification launches, and whether or not their lifetimes are extended. + private val notifsLaunchingActivities = mutableMapOf<String, Boolean>() + + private var onEndLifetimeExtensionCallback: OnEndLifetimeExtensionCallback? = null + + override fun attach(pipeline: NotifPipeline) { + activityLaunchEvents.registerListener(activityStartEventListener) + pipeline.addNotificationLifetimeExtender(extender) + } + + private val activityStartEventListener = object : NotifActivityLaunchEvents.Listener { + override fun onStartLaunchNotifActivity(entry: NotificationEntry) { + notifsLaunchingActivities[entry.key] = false + } + + override fun onFinishLaunchNotifActivity(entry: NotificationEntry) { + if (notifsLaunchingActivities.remove(entry.key) == true) { + // If we were extending the lifetime of this notification, stop. + onEndLifetimeExtensionCallback?.onEndLifetimeExtension(extender, entry) + } + } + } + + private val extender = object : NotifLifetimeExtender { + override fun getName(): String = "ActivityStarterCoordinator" + + override fun setCallback(callback: OnEndLifetimeExtensionCallback) { + onEndLifetimeExtensionCallback = callback + } + + override fun maybeExtendLifetime(entry: NotificationEntry, reason: Int): Boolean { + if (entry.key in notifsLaunchingActivities) { + // Track that we're now extending this notif + notifsLaunchingActivities[entry.key] = true + return true + } + return false + } + + override fun cancelLifetimeExtension(entry: NotificationEntry) { + if (entry.key in notifsLaunchingActivities) { + notifsLaunchingActivities[entry.key] = false + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/CommunalCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/CommunalCoordinator.java deleted file mode 100644 index 5396b8638225..000000000000 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/CommunalCoordinator.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.statusbar.notification.collection.coordinator; - -import androidx.annotation.NonNull; - -import com.android.systemui.communal.CommunalStateController; -import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.statusbar.NotificationLockscreenUserManager; -import com.android.systemui.statusbar.notification.NotificationEntryManager; -import com.android.systemui.statusbar.notification.collection.NotifPipeline; -import com.android.systemui.statusbar.notification.collection.NotificationEntry; -import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope; -import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter; - -import java.util.concurrent.Executor; - -import javax.inject.Inject; - -/** - * {@link CommunalCoordinator} prevents notifications from showing on the keyguard when the communal - * view is present. - */ -@CoordinatorScope -public class CommunalCoordinator implements Coordinator { - final Executor mExecutor; - final CommunalStateController mCommunalStateController; - final NotificationEntryManager mNotificationEntryManager; - final NotificationLockscreenUserManager mNotificationLockscreenUserManager; - - @Inject - public CommunalCoordinator(@Main Executor executor, - NotificationEntryManager notificationEntryManager, - NotificationLockscreenUserManager notificationLockscreenUserManager, - CommunalStateController communalStateController) { - mExecutor = executor; - mNotificationEntryManager = notificationEntryManager; - mNotificationLockscreenUserManager = notificationLockscreenUserManager; - mCommunalStateController = communalStateController; - } - - final NotifFilter mFilter = new NotifFilter("CommunalCoordinator") { - @Override - public boolean shouldFilterOut(@NonNull NotificationEntry entry, long now) { - return mCommunalStateController.getCommunalViewShowing(); - } - }; - - final CommunalStateController.Callback mStateCallback = new CommunalStateController.Callback() { - @Override - public void onCommunalViewShowingChanged() { - mExecutor.execute(() -> { - mFilter.invalidateList(); - mNotificationEntryManager.updateNotifications("Communal mode state changed"); - }); - } - }; - - @Override - public void attach(@NonNull NotifPipeline pipeline) { - pipeline.addPreGroupFilter(mFilter); - mCommunalStateController.addCallback(mStateCallback); - if (!pipeline.isNewPipelineEnabled()) { - mNotificationLockscreenUserManager.addKeyguardNotificationSuppressor( - entry -> mCommunalStateController.getCommunalViewShowing()); - } - } -} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt index 41b070635d4f..0df2162d3338 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt @@ -72,9 +72,9 @@ class HeadsUpCoordinator @Inject constructor( private var mEndLifetimeExtension: OnEndLifetimeExtensionCallback? = null private lateinit var mNotifPipeline: NotifPipeline private var mNow: Long = -1 - // notifs we've extended the lifetime for private val mNotifsExtendingLifetime = ArraySet<NotificationEntry>() + private val mPostedEntries = LinkedHashMap<String, PostedEntry>() override fun attach(pipeline: NotifPipeline) { mNotifPipeline = pipeline @@ -101,10 +101,12 @@ class HeadsUpCoordinator @Inject constructor( return } // Process all non-group adds/updates - mPostedEntries.values.toList().forEach { posted -> - if (!posted.entry.sbn.isGroup) { - handlePostedEntry(posted, "non-group") - mPostedEntries.remove(posted.key) + mHeadsUpManager.modifyHuns { hunMutator -> + mPostedEntries.values.toList().forEach { posted -> + if (!posted.entry.sbn.isGroup) { + handlePostedEntry(posted, hunMutator, "non-group") + mPostedEntries.remove(posted.key) + } } } } @@ -114,10 +116,10 @@ class HeadsUpCoordinator @Inject constructor( * we know that stability and [NotifPromoter]s have been applied, so we can use the location of * notifications in this list to determine what kind of group alert behavior should happen. */ - fun onBeforeFinalizeFilter(list: List<ListEntry>) { + fun onBeforeFinalizeFilter(list: List<ListEntry>) = mHeadsUpManager.modifyHuns { hunMutator -> // Nothing to do if there are no other adds/updates if (mPostedEntries.isEmpty()) { - return + return@modifyHuns } // Calculate a bunch of information about the logical group and the locations of group // entries in the nearly-finalized shade list. These may be used in the per-group loop. @@ -138,13 +140,17 @@ class HeadsUpCoordinator @Inject constructor( // If there is no logical summary, then there is no alert to transfer if (logicalSummary == null) { - postedEntries.forEach { handlePostedEntry(it, "logical-summary-missing") } + postedEntries.forEach { + handlePostedEntry(it, hunMutator, scenario = "logical-summary-missing") + } return@forEach } // If summary isn't wanted to be heads up, then there is no alert to transfer if (!isGoingToShowHunStrict(logicalSummary)) { - postedEntries.forEach { handlePostedEntry(it, "logical-summary-not-alerting") } + postedEntries.forEach { + handlePostedEntry(it, hunMutator, scenario = "logical-summary-not-alerting") + } return@forEach } @@ -177,7 +183,9 @@ class HeadsUpCoordinator @Inject constructor( // If there is no child to receive the parent alert, then just handle the posted entries // and return. if (childToReceiveParentAlert == null) { - postedEntries.forEach { handlePostedEntry(it, "no-transfer-target") } + postedEntries.forEach { + handlePostedEntry(it, hunMutator, scenario = "no-transfer-target") + } return@forEach } @@ -189,51 +197,66 @@ class HeadsUpCoordinator @Inject constructor( if (!isSummaryAttached) { val summaryUpdateForRemoval = summaryUpdate?.also { it.shouldHeadsUpEver = false - } ?: PostedEntry(logicalSummary, - wasAdded = false, - wasUpdated = false, - shouldHeadsUpEver = false, - shouldHeadsUpAgain = false, - isAlerting = mHeadsUpManager.isAlerting(logicalSummary.key), - isBinding = isEntryBinding(logicalSummary), + } ?: PostedEntry( + logicalSummary, + wasAdded = false, + wasUpdated = false, + shouldHeadsUpEver = false, + shouldHeadsUpAgain = false, + isAlerting = mHeadsUpManager.isAlerting(logicalSummary.key), + isBinding = isEntryBinding(logicalSummary), ) // If we transfer the alert and the summary isn't even attached, that means we // should ensure the summary is no longer alerting, so we remove it here. - handlePostedEntry(summaryUpdateForRemoval, "detached-summary-remove-alert") - } else if (summaryUpdate!=null) { - mLogger.logPostedEntryWillNotEvaluate(summaryUpdate, "attached-summary-transferred") + handlePostedEntry( + summaryUpdateForRemoval, + hunMutator, + scenario = "detached-summary-remove-alert") + } else if (summaryUpdate != null) { + mLogger.logPostedEntryWillNotEvaluate( + summaryUpdate, + reason = "attached-summary-transferred") } // Handle all posted entries -- if the child receiving the parent's alert is in the // list, then set its flags to ensure it alerts. var didAlertChildToReceiveParentAlert = false postedEntries.asSequence() - .filter { it.key != logicalSummary.key } - .forEach { postedEntry -> - if (childToReceiveParentAlert.key == postedEntry.key) { - // Update the child's posted update so that it - postedEntry.shouldHeadsUpEver = true - postedEntry.shouldHeadsUpAgain = true - handlePostedEntry(postedEntry, "child-alert-transfer-target-$targetType") - didAlertChildToReceiveParentAlert = true - } else { - handlePostedEntry(postedEntry, "child-alert-non-target") + .filter { it.key != logicalSummary.key } + .forEach { postedEntry -> + if (childToReceiveParentAlert.key == postedEntry.key) { + // Update the child's posted update so that it + postedEntry.shouldHeadsUpEver = true + postedEntry.shouldHeadsUpAgain = true + handlePostedEntry( + postedEntry, + hunMutator, + scenario = "child-alert-transfer-target-$targetType") + didAlertChildToReceiveParentAlert = true + } else { + handlePostedEntry( + postedEntry, + hunMutator, + scenario = "child-alert-non-target") + } } - } // If the child receiving the alert was not updated on this tick (which can happen in a // standard alert transfer scenario), then construct an update so that we can apply it. if (!didAlertChildToReceiveParentAlert) { val posted = PostedEntry( - childToReceiveParentAlert, - wasAdded = false, - wasUpdated = false, - shouldHeadsUpEver = true, - shouldHeadsUpAgain = true, - isAlerting = mHeadsUpManager.isAlerting(childToReceiveParentAlert.key), - isBinding = isEntryBinding(childToReceiveParentAlert), + childToReceiveParentAlert, + wasAdded = false, + wasUpdated = false, + shouldHeadsUpEver = true, + shouldHeadsUpAgain = true, + isAlerting = mHeadsUpManager.isAlerting(childToReceiveParentAlert.key), + isBinding = isEntryBinding(childToReceiveParentAlert), ) - handlePostedEntry(posted, "non-posted-child-alert-transfer-target-$targetType") + handlePostedEntry( + posted, + hunMutator, + scenario = "non-posted-child-alert-transfer-target-$targetType") } } // After this method runs, all posted entries should have been handled (or skipped). @@ -292,9 +315,7 @@ class HeadsUpCoordinator @Inject constructor( } } - private val mPostedEntries = LinkedHashMap<String, PostedEntry>() - - fun handlePostedEntry(posted: PostedEntry, scenario: String) { + private fun handlePostedEntry(posted: PostedEntry, hunMutator: HunMutator, scenario: String) { mLogger.logPostedEntryWillEvaluate(posted, scenario) if (posted.wasAdded) { if (posted.shouldHeadsUpEver) { @@ -308,12 +329,12 @@ class HeadsUpCoordinator @Inject constructor( // If alerting, we need to post an update. Otherwise we're still binding, // and we can just let that finish. if (posted.isAlerting) { - mHeadsUpManager.updateNotification(posted.key, posted.shouldHeadsUpAgain) + hunMutator.updateNotification(posted.key, posted.shouldHeadsUpAgain) } } else { if (posted.isAlerting) { // We don't want this to be interrupting anymore, let's remove it - mHeadsUpManager.removeNotification(posted.key, false /*removeImmediately*/) + hunMutator.removeNotification(posted.key, false /*removeImmediately*/) } else { // Don't let the bind finish cancelHeadsUpBind(posted.entry) @@ -366,7 +387,7 @@ class HeadsUpCoordinator @Inject constructor( val shouldHeadsUpAgain = shouldHunAgain(entry) val isAlerting = mHeadsUpManager.isAlerting(entry.key) val isBinding = isEntryBinding(entry) - mPostedEntries.compute(entry.key) { _, value -> + val posted = mPostedEntries.compute(entry.key) { _, value -> value?.also { update -> update.wasUpdated = true update.shouldHeadsUpEver = update.shouldHeadsUpEver || shouldHeadsUpEver @@ -383,6 +404,18 @@ class HeadsUpCoordinator @Inject constructor( isBinding = isBinding, ) } + // Handle cancelling alerts here, rather than in the OnBeforeFinalizeFilter, so that + // work can be done before the ShadeListBuilder is run. This prevents re-entrant + // behavior between this Coordinator, HeadsUpManager, and VisualStabilityManager. + if (posted?.shouldHeadsUpEver == false) { + if (posted.isAlerting) { + // We don't want this to be interrupting anymore, let's remove it + mHeadsUpManager.removeNotification(posted.key, false /*removeImmediately*/) + } else if (posted.isBinding) { + // Don't let the bind finish + cancelHeadsUpBind(posted.entry) + } + } } /** @@ -543,3 +576,43 @@ private enum class GroupLocation { Detached, Isolated, Summary, Child } private fun Map<String, GroupLocation>.getLocation(key: String): GroupLocation = getOrDefault(key, GroupLocation.Detached) + +/** + * Invokes the given block with a [HunMutator] that defers all HUN removals. This ensures that the + * HeadsUpManager is notified of additions before removals, which prevents a glitch where the + * HeadsUpManager temporarily believes that nothing is alerting, causing bad re-entrant behavior. + */ +private fun <R> HeadsUpManager.modifyHuns(block: (HunMutator) -> R): R { + val mutator = HunMutatorImpl(this) + return block(mutator).also { mutator.commitModifications() } +} + +/** Mutates the HeadsUp state of notifications. */ +private interface HunMutator { + fun updateNotification(key: String, alert: Boolean) + fun removeNotification(key: String, releaseImmediately: Boolean) +} + +/** + * [HunMutator] implementation that defers removing notifications from the HeadsUpManager until + * after additions/updates. + */ +private class HunMutatorImpl(private val headsUpManager: HeadsUpManager) : HunMutator { + private val deferred = mutableListOf<Pair<String, Boolean>>() + + override fun updateNotification(key: String, alert: Boolean) { + headsUpManager.updateNotification(key, alert) + } + + override fun removeNotification(key: String, releaseImmediately: Boolean) { + val args = Pair(key, releaseImmediately) + deferred.add(args) + } + + fun commitModifications() { + deferred.forEach { (key, releaseImmediately) -> + headsUpManager.removeNotification(key, releaseImmediately) + } + deferred.clear() + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt index 757fb5a2fe9a..985914acb2a2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt @@ -45,7 +45,6 @@ class NotifCoordinatorsImpl @Inject constructor( bubbleCoordinator: BubbleCoordinator, headsUpCoordinator: HeadsUpCoordinator, gutsCoordinator: GutsCoordinator, - communalCoordinator: CommunalCoordinator, conversationCoordinator: ConversationCoordinator, debugModeCoordinator: DebugModeCoordinator, groupCountCoordinator: GroupCountCoordinator, @@ -58,7 +57,8 @@ class NotifCoordinatorsImpl @Inject constructor( smartspaceDedupingCoordinator: SmartspaceDedupingCoordinator, viewConfigCoordinator: ViewConfigCoordinator, visualStabilityCoordinator: VisualStabilityCoordinator, - sensitiveContentCoordinator: SensitiveContentCoordinator + sensitiveContentCoordinator: SensitiveContentCoordinator, + activityLaunchAnimCoordinator: ActivityLaunchAnimCoordinator ) : NotifCoordinators { private val mCoordinators: MutableList<Coordinator> = ArrayList() @@ -86,7 +86,6 @@ class NotifCoordinatorsImpl @Inject constructor( mCoordinators.add(appOpsCoordinator) mCoordinators.add(deviceProvisionedCoordinator) mCoordinators.add(bubbleCoordinator) - mCoordinators.add(communalCoordinator) mCoordinators.add(debugModeCoordinator) mCoordinators.add(conversationCoordinator) mCoordinators.add(groupCountCoordinator) @@ -97,6 +96,7 @@ class NotifCoordinatorsImpl @Inject constructor( mCoordinators.add(viewConfigCoordinator) mCoordinators.add(visualStabilityCoordinator) mCoordinators.add(sensitiveContentCoordinator) + mCoordinators.add(activityLaunchAnimCoordinator) if (notifPipelineFlags.isSmartspaceDedupingEnabled()) { mCoordinators.add(smartspaceDedupingCoordinator) } @@ -144,4 +144,4 @@ class NotifCoordinatorsImpl @Inject constructor( companion object { private const val TAG = "NotifCoordinators" } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt index 72d091883ce6..3f8a39f62dfb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt @@ -34,11 +34,11 @@ import dagger.Binds import dagger.Module import javax.inject.Inject -@Module(includes = [PrivateModule::class]) +@Module(includes = [PrivateSensitiveContentCoordinatorModule::class]) interface SensitiveContentCoordinatorModule @Module -private interface PrivateModule { +private interface PrivateSensitiveContentCoordinatorModule { @Binds fun bindCoordinator(impl: SensitiveContentCoordinatorImpl): SensitiveContentCoordinator } @@ -121,4 +121,4 @@ private fun extractAllRepresentativeEntries(listEntry: ListEntry): Sequence<Noti if (listEntry is GroupEntry) { yieldAll(extractAllRepresentativeEntries(listEntry.children)) } - }
\ No newline at end of file + } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinator.java index 3aa3549a7c27..699c4e77321e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinator.java @@ -32,7 +32,7 @@ import com.android.systemui.statusbar.notification.collection.NotifPipeline; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifStabilityManager; import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider; -import com.android.systemui.statusbar.notification.collection.render.NotifPanelEventSource; +import com.android.systemui.statusbar.phone.NotifPanelEvents; import com.android.systemui.statusbar.policy.HeadsUpManager; import com.android.systemui.util.concurrency.DelayableExecutor; @@ -53,10 +53,10 @@ import javax.inject.Inject; // TODO(b/204468557): Move to @CoordinatorScope @SysUISingleton public class VisualStabilityCoordinator implements Coordinator, Dumpable, - NotifPanelEventSource.Callbacks { + NotifPanelEvents.Listener { private final DelayableExecutor mDelayableExecutor; private final HeadsUpManager mHeadsUpManager; - private final NotifPanelEventSource mNotifPanelEventSource; + private final NotifPanelEvents mNotifPanelEvents; private final StatusBarStateController mStatusBarStateController; private final VisualStabilityProvider mVisualStabilityProvider; private final WakefulnessLifecycle mWakefulnessLifecycle; @@ -87,7 +87,7 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable, DelayableExecutor delayableExecutor, DumpManager dumpManager, HeadsUpManager headsUpManager, - NotifPanelEventSource notifPanelEventSource, + NotifPanelEvents notifPanelEvents, StatusBarStateController statusBarStateController, VisualStabilityProvider visualStabilityProvider, WakefulnessLifecycle wakefulnessLifecycle) { @@ -96,7 +96,7 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable, mWakefulnessLifecycle = wakefulnessLifecycle; mStatusBarStateController = statusBarStateController; mDelayableExecutor = delayableExecutor; - mNotifPanelEventSource = notifPanelEventSource; + mNotifPanelEvents = notifPanelEvents; dumpManager.registerDumpable(this); } @@ -109,7 +109,7 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable, mStatusBarStateController.addCallback(mStatusBarStateControllerListener); mPulsing = mStatusBarStateController.isPulsing(); - mNotifPanelEventSource.registerCallbacks(this); + mNotifPanelEvents.registerListener(this); pipeline.setVisualStabilityManager(mNotifStabilityManager); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/dagger/CoordinatorsModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/dagger/CoordinatorsModule.kt index a26d50d2a059..274affd9da43 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/dagger/CoordinatorsModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/dagger/CoordinatorsModule.kt @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.notification.collection.coordinator.dagger import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.statusbar.notification.collection.coordinator.ActivityLaunchAnimCoordinatorModule import com.android.systemui.statusbar.notification.collection.coordinator.NotifCoordinators import com.android.systemui.statusbar.notification.collection.coordinator.NotifCoordinatorsImpl import com.android.systemui.statusbar.notification.collection.coordinator.SensitiveContentCoordinatorModule @@ -47,7 +48,10 @@ interface CoordinatorsSubcomponent { } } -@Module(includes = [SensitiveContentCoordinatorModule::class]) +@Module(includes = [ + ActivityLaunchAnimCoordinatorModule::class, + SensitiveContentCoordinatorModule::class, +]) private abstract class InternalCoordinatorsModule { @Binds @Internal @@ -62,4 +66,4 @@ private annotation class Internal @Scope @MustBeDocumented @Retention(AnnotationRetention.RUNTIME) -annotation class CoordinatorScope
\ No newline at end of file +annotation class CoordinatorScope diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NotifPanelEventSource.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NotifPanelEventSource.kt deleted file mode 100644 index 470737e3b772..000000000000 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NotifPanelEventSource.kt +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.systemui.statusbar.notification.collection.render - -import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.statusbar.phone.NotificationPanelViewController -import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent -import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent.CentralSurfacesScope -import com.android.systemui.util.ListenerSet -import dagger.Binds -import dagger.Module -import dagger.Provides -import dagger.multibindings.IntoSet - -/** Provides certain notification panel events. */ -interface NotifPanelEventSource { - - /** Registers callbacks to be invoked when notification panel events occur. */ - fun registerCallbacks(callbacks: Callbacks) - - /** Unregisters callbacks previously registered via [.registerCallbacks] */ - fun unregisterCallbacks(callbacks: Callbacks) - - /** Callbacks for certain notification panel events. */ - interface Callbacks { - - /** Invoked when the notification panel starts or stops collapsing. */ - fun onPanelCollapsingChanged(isCollapsing: Boolean) - - /** - * Invoked when the notification panel starts or stops launching an [android.app.Activity]. - */ - fun onLaunchingActivityChanged(isLaunchingActivity: Boolean) - } -} - -@Module -abstract class NotifPanelEventSourceModule { - - @Binds - @SysUISingleton - abstract fun bindEventSource(manager: NotifPanelEventSourceManager): NotifPanelEventSource - - @Module - companion object { - @JvmStatic - @Provides - fun provideManager(): NotifPanelEventSourceManager = NotifPanelEventSourceManagerImpl() - } -} - -@Module -object StatusBarNotifPanelEventSourceModule { - @JvmStatic - @Provides - @IntoSet - @CentralSurfacesScope - fun bindStartable( - manager: NotifPanelEventSourceManager, - notifPanelController: NotificationPanelViewController - ): CentralSurfacesComponent.Startable = - EventSourceStatusBarStartableImpl(manager, notifPanelController) -} - -/** - * Management layer that bridges [SysUiSingleton] and [CentralSurfacesScope]. Necessary because code - * that wants to listen to [NotifPanelEventSource] lives in [SysUiSingleton], but the events - * themselves come from [NotificationPanelViewController] in [CentralSurfacesScope]. - */ -interface NotifPanelEventSourceManager : NotifPanelEventSource { - var eventSource: NotifPanelEventSource? -} - -private class NotifPanelEventSourceManagerImpl - : NotifPanelEventSourceManager, NotifPanelEventSource.Callbacks { - - private val callbackSet = ListenerSet<NotifPanelEventSource.Callbacks>() - - override var eventSource: NotifPanelEventSource? = null - set(value) { - field?.unregisterCallbacks(this) - value?.registerCallbacks(this) - field = value - } - - override fun registerCallbacks(callbacks: NotifPanelEventSource.Callbacks) { - callbackSet.addIfAbsent(callbacks) - } - - override fun unregisterCallbacks(callbacks: NotifPanelEventSource.Callbacks) { - callbackSet.remove(callbacks) - } - - override fun onPanelCollapsingChanged(isCollapsing: Boolean) { - callbackSet.forEach { it.onPanelCollapsingChanged(isCollapsing) } - } - - override fun onLaunchingActivityChanged(isLaunchingActivity: Boolean) { - callbackSet.forEach { it.onLaunchingActivityChanged(isLaunchingActivity) } - } -} - -private class EventSourceStatusBarStartableImpl( - private val manager: NotifPanelEventSourceManager, - private val notifPanelController: NotificationPanelViewController -) : CentralSurfacesComponent.Startable { - - override fun start() { - manager.eventSource = notifPanelController - } - - override fun stop() { - manager.eventSource = null - } -} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java index 51bbf1c80478..efe88e6d4f0a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java @@ -68,7 +68,6 @@ import com.android.systemui.statusbar.notification.collection.render.GroupExpans import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager; import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManagerImpl; import com.android.systemui.statusbar.notification.collection.render.NotifGutsViewManager; -import com.android.systemui.statusbar.notification.collection.render.NotifPanelEventSourceModule; import com.android.systemui.statusbar.notification.collection.render.NotifShadeEventSource; import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider; import com.android.systemui.statusbar.notification.init.NotificationsController; @@ -84,9 +83,11 @@ import com.android.systemui.statusbar.notification.row.NotificationGutsManager; import com.android.systemui.statusbar.notification.row.OnUserInteractionCallback; import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager; import com.android.systemui.statusbar.notification.stack.StackScrollAlgorithm; +import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.KeyguardBypassController; +import com.android.systemui.statusbar.phone.NotifActivityLaunchEventsModule; +import com.android.systemui.statusbar.phone.NotifPanelEventsModule; import com.android.systemui.statusbar.phone.ShadeController; -import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.policy.HeadsUpManager; import com.android.systemui.util.leak.LeakDetector; import com.android.systemui.wmshell.BubblesManager; @@ -106,8 +107,9 @@ import dagger.Provides; */ @Module(includes = { CoordinatorsModule.class, + NotifActivityLaunchEventsModule.class, NotifPipelineChoreographerModule.class, - NotifPanelEventSourceModule.class, + NotifPanelEventsModule.class, NotificationSectionHeadersModule.class, }) public interface NotificationsModule { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java index f40a3c7186e6..3b22f2a86bfc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java @@ -102,6 +102,16 @@ public class AmbientState { /** Whether we are swiping up. */ private boolean mIsSwipingUp; + /** Whether we are flinging the shade open or closed. */ + private boolean mIsFlinging; + + /** + * Whether we need to do a fling down after swiping up on lockscreen. + * True right after we swipe up on lockscreen and have not finished the fling down that follows. + * False when we stop flinging or leave lockscreen. + */ + private boolean mNeedFlingAfterLockscreenSwipeUp = false; + /** * @return Height of the notifications panel without top padding when expansion completes. */ @@ -142,6 +152,10 @@ public class AmbientState { * @param isSwipingUp Whether we are swiping up. */ public void setSwipingUp(boolean isSwipingUp) { + if (!isSwipingUp && mIsSwipingUp) { + // Just stopped swiping up. + mNeedFlingAfterLockscreenSwipeUp = true; + } mIsSwipingUp = isSwipingUp; } @@ -153,6 +167,17 @@ public class AmbientState { } /** + * @param isFlinging Whether we are flinging the shade open or closed. + */ + public void setIsFlinging(boolean isFlinging) { + if (isOnKeyguard() && !isFlinging && mIsFlinging) { + // Just stopped flinging. + mNeedFlingAfterLockscreenSwipeUp = false; + } + mIsFlinging = isFlinging; + } + + /** * @return Fraction of shade expansion. */ public float getExpansionFraction() { @@ -459,6 +484,9 @@ public class AmbientState { } public void setStatusBarState(int statusBarState) { + if (mStatusBarState != StatusBarState.KEYGUARD) { + mNeedFlingAfterLockscreenSwipeUp = false; + } mStatusBarState = statusBarState; } @@ -522,6 +550,13 @@ public class AmbientState { } /** + * @return Whether we need to do a fling down after swiping up on lockscreen. + */ + public boolean isFlingingAfterSwipeUpOnLockscreen() { + return mIsFlinging && mNeedFlingAfterLockscreenSwipeUp; + } + + /** * @return whether a view is dozing and not pulsing right now */ public boolean isDozingAndNotPulsing(ExpandableView view) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index efe559a64cc4..5b9dbd0f3361 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -202,9 +202,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable private float mQsExpansionFraction; private final int mSplitShadeMinContentHeight; - /** Whether we are flinging the shade open or closed. */ - private boolean mIsFlinging; - /** * The algorithm which calculates the properties for our children */ @@ -407,7 +404,12 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable */ private float mBackgroundXFactor = 1f; - private boolean mQsExpanded; + /** + * Indicates QS are full screen and pushing notifications out of the screen. + * It's different from QS just being expanded as in split shade QS can be expanded and + * still don't take full screen nor influence notifications. + */ + private boolean mQsFullScreen; private boolean mForwardScrollable; private boolean mBackwardScrollable; private NotificationShelf mShelf; @@ -1133,7 +1135,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable @ShadeViewRefactor(RefactorComponent.LAYOUT_ALGORITHM) private void updateAlgorithmLayoutMinHeight() { - mAmbientState.setLayoutMinHeight(mQsExpanded || isHeadsUpTransition() + mAmbientState.setLayoutMinHeight(mQsFullScreen || isHeadsUpTransition() ? getLayoutMinHeight() : 0); } @@ -1263,13 +1265,16 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable } /** - * @return Whether we should skip stack height update for lockscreen swipe-up or unlock hint. + * @return Whether we should skip stack height updates. + * True when + * 1) Unlock hint is running + * 2) Swiping up on lockscreen or flinging down after swipe up */ private boolean shouldSkipHeightUpdate() { - // After the user swipes up on lockscreen and lets go, - // {@link PanelViewController) flings the shade back down. - return mAmbientState.isOnKeyguard() && ( - mAmbientState.isUnlockHintRunning() || mAmbientState.isSwipingUp() || mIsFlinging); + return mAmbientState.isOnKeyguard() + && (mAmbientState.isUnlockHintRunning() + || mAmbientState.isSwipingUp() + || mAmbientState.isFlingingAfterSwipeUpOnLockscreen()); } /** @@ -1361,7 +1366,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable translationY = 0; if (mShouldShowShelfOnly) { stackHeight = mTopPadding + mShelf.getIntrinsicHeight(); - } else if (mQsExpanded) { + } else if (mQsFullScreen) { int stackStartPosition = mContentHeight - mTopPadding + mIntrinsicPadding; int stackEndPosition = mMaxTopPadding + mShelf.getIntrinsicHeight(); if (stackStartPosition <= stackEndPosition) { @@ -2318,7 +2323,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable @ShadeViewRefactor(RefactorComponent.SHADE_VIEW) private void updateScrollability() { - boolean scrollable = !mQsExpanded && getScrollRange() > 0; + boolean scrollable = !mQsFullScreen && getScrollRange() > 0; if (scrollable != mScrollable) { mScrollable = scrollable; setFocusable(scrollable); @@ -4839,14 +4844,14 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable } @ShadeViewRefactor(RefactorComponent.SHADE_VIEW) - public void setQsExpanded(boolean qsExpanded) { - mQsExpanded = qsExpanded; + public void setQsFullScreen(boolean qsFullScreen) { + mQsFullScreen = qsFullScreen; updateAlgorithmLayoutMinHeight(); updateScrollability(); } - boolean isQsExpanded() { - return mQsExpanded; + boolean isQsFullScreen() { + return mQsFullScreen; } @ShadeViewRefactor(RefactorComponent.SHADE_VIEW) @@ -5009,13 +5014,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable mAmbientState.setUnlockHintRunning(running); } - /** - * @param isFlinging Whether we are flinging the shade open or closed. - */ - public void setIsFlinging(boolean isFlinging) { - mIsFlinging = isFlinging; - } - @ShadeViewRefactor(RefactorComponent.SHADE_VIEW) public void setHeadsUpGoingAwayAnimationsAllowed(boolean headsUpGoingAwayAnimationsAllowed) { mHeadsUpGoingAwayAnimationsAllowed = headsUpGoingAwayAnimationsAllowed; @@ -5814,10 +5812,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable mSwipeHelper.resetExposedMenuView(animate, force); } - boolean isUsingSplitNotificationShade() { - return mShouldUseSplitNotificationShade; - } - static boolean matchesSelection( ExpandableNotificationRow row, @SelectedRows int selection) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index df6b8f59fc36..7df8e7df486e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -111,13 +111,13 @@ import com.android.systemui.statusbar.notification.row.ExpandableView; import com.android.systemui.statusbar.notification.row.NotificationGuts; import com.android.systemui.statusbar.notification.row.NotificationGutsManager; import com.android.systemui.statusbar.notification.row.NotificationSnooze; +import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.HeadsUpAppearanceController; import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; import com.android.systemui.statusbar.phone.HeadsUpTouchHelper; import com.android.systemui.statusbar.phone.KeyguardBypassController; import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.phone.ShadeController; -import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener; @@ -1086,8 +1086,8 @@ public class NotificationStackScrollLayoutController { } } - public void setQsExpanded(boolean expanded) { - mView.setQsExpanded(expanded); + public void setQsFullScreen(boolean fullScreen) { + mView.setQsFullScreen(fullScreen); updateShowEmptyShadeView(); } @@ -1181,13 +1181,6 @@ public class NotificationStackScrollLayoutController { mView.setUnlockHintRunning(running); } - /** - * @param isFlinging Whether we are flinging the shade open or close. - */ - public void setIsFlinging(boolean isFlinging) { - mView.setIsFlinging(isFlinging); - } - public boolean isFooterViewNotGone() { return mView.isFooterViewNotGone(); } @@ -1211,7 +1204,7 @@ public class NotificationStackScrollLayoutController { public void updateShowEmptyShadeView() { Trace.beginSection("NSSLC.updateShowEmptyShadeView"); mShowEmptyShadeView = mBarState != KEYGUARD - && (!mView.isQsExpanded() || mView.isUsingSplitNotificationShade()) + && !mView.isQsFullScreen() && getVisibleNotificationCount() == 0; mView.updateEmptyShadeView( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java index 95a465989299..84adc5679a81 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java @@ -663,6 +663,7 @@ public class CentralSurfaces extends CoreStartable implements protected final BatteryController mBatteryController; protected boolean mPanelExpanded; private UiModeManager mUiModeManager; + protected boolean mIsKeyguard; private LogMaker mStatusBarStateLog; protected final NotificationIconAreaController mNotificationIconAreaController; @Nullable private View mAmbientIndicationContainer; @@ -1141,7 +1142,7 @@ public class CentralSurfaces extends CoreStartable implements } if (leaveOpen) { mStatusBarStateController.setLeaveOpenOnKeyguardHide(true); - if (mKeyguardStateController.isShowing()) { + if (mIsKeyguard) { // When device state changes on keyguard we don't want to keep the state of // the shade and instead we open clean state of keyguard with shade closed. // Normally some parts of QS state (like expanded/collapsed) are persisted and @@ -2889,8 +2890,7 @@ public class CentralSurfaces extends CoreStartable implements // late in the transition, so we also allow the device to start dozing once the screen has // turned off fully. boolean keyguardForDozing = mDozeServiceHost.getDozingRequested() - && (!mDeviceInteractive || (isGoingToSleep() - && (isScreenFullyOff() || mKeyguardStateController.isShowing()))); + && (!mDeviceInteractive || isGoingToSleep() && (isScreenFullyOff() || mIsKeyguard)); boolean isWakingAndOccluded = isOccluded() && isWaking(); boolean shouldBeKeyguard = (mStatusBarStateController.isKeyguardRequested() || keyguardForDozing) && !wakeAndUnlocking && !isWakingAndOccluded; @@ -2923,6 +2923,7 @@ public class CentralSurfaces extends CoreStartable implements public void showKeyguardImpl() { Trace.beginSection("CentralSurfaces#showKeyguard"); + mIsKeyguard = true; // In case we're locking while a smartspace transition is in progress, reset it. mKeyguardUnlockAnimationController.resetSmartspaceTransition(); if (mKeyguardStateController.isLaunchTransitionFadingAway()) { @@ -3043,6 +3044,7 @@ public class CentralSurfaces extends CoreStartable implements * @return true if we would like to stay in the shade, false if it should go away entirely */ public boolean hideKeyguardImpl(boolean forceStateChange) { + mIsKeyguard = false; Trace.beginSection("CentralSurfaces#hideKeyguard"); boolean staying = mStatusBarStateController.leaveOpenOnKeyguardHide(); int previousState = mStatusBarStateController.getState(); @@ -3769,7 +3771,7 @@ public class CentralSurfaces extends CoreStartable implements }); } else if (mDozing && !unlocking) { mScrimController.transitionTo(ScrimState.AOD); - } else if (mKeyguardStateController.isShowing() && !unlocking) { + } else if (mIsKeyguard && !unlocking) { mScrimController.transitionTo(ScrimState.KEYGUARD); } else { mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index 541aeab22a80..dc1af362ec23 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -32,7 +32,6 @@ import android.app.ActivityManager; import android.app.ActivityOptions; import android.app.ActivityTaskManager; import android.app.admin.DevicePolicyManager; -import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -1109,8 +1108,13 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL Intent intent = mQRCodeScannerController.getIntent(); if (intent != null) { try { - mContext.startActivity(intent); - } catch (ActivityNotFoundException e) { + ActivityTaskManager.getService().startActivityAsUser( + null, getContext().getBasePackageName(), + getContext().getAttributionTag(), intent, + intent.resolveTypeIfNeeded(getContext().getContentResolver()), + null, null, 0, Intent.FLAG_ACTIVITY_NEW_TASK, null, null, + UserHandle.CURRENT.getIdentifier()); + } catch (RemoteException e) { // This is unexpected. Nonetheless, just log the error and prevent the UI from // crashing Log.e(TAG, "Unexpected intent: " + intent diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotifActivityLaunchEvents.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotifActivityLaunchEvents.kt new file mode 100644 index 000000000000..f46d07338206 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotifActivityLaunchEvents.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.phone + +import com.android.systemui.statusbar.notification.collection.NotificationEntry + +/** Provides events about [android.app.Activity] launches from Notifications. */ +interface NotifActivityLaunchEvents { + + /** Registers a [Listener] to be invoked when notification activity launch events occur. */ + fun registerListener(listener: Listener) + + /** Unregisters a [Listener] previously registered via [registerListener] */ + fun unregisterListener(listener: Listener) + + /** Listener for events about [android.app.Activity] launches from Notifications. */ + interface Listener { + + /** Invoked when an activity has started launching from a notification. */ + fun onStartLaunchNotifActivity(entry: NotificationEntry) + + /** Invoked when an activity has finished launching. */ + fun onFinishLaunchNotifActivity(entry: NotificationEntry) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotifActivityLaunchEventsModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotifActivityLaunchEventsModule.java new file mode 100644 index 000000000000..84ff538677b0 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotifActivityLaunchEventsModule.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.phone; + +import com.android.systemui.dagger.SysUISingleton; + +import dagger.Binds; +import dagger.Module; + +/** Provides a {@link NotifActivityLaunchEvents} in {@link SysUISingleton} scope. */ +@Module +public abstract class NotifActivityLaunchEventsModule { + @Binds + abstract NotifActivityLaunchEvents bindLaunchEvents( + StatusBarNotificationActivityStarter.LaunchEventsEmitter impl); +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotifPanelEvents.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotifPanelEvents.kt new file mode 100644 index 000000000000..a385e22c1aff --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotifPanelEvents.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.phone + +/** Provides certain notification panel events. */ +interface NotifPanelEvents { + + /** Registers callbacks to be invoked when notification panel events occur. */ + fun registerListener(listener: Listener) + + /** Unregisters callbacks previously registered via [registerListener] */ + fun unregisterListener(listener: Listener) + + /** Callbacks for certain notification panel events. */ + interface Listener { + + /** Invoked when the notification panel starts or stops collapsing. */ + fun onPanelCollapsingChanged(isCollapsing: Boolean) + + /** + * Invoked when the notification panel starts or stops launching an [android.app.Activity]. + */ + fun onLaunchingActivityChanged(isLaunchingActivity: Boolean) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SysUISubcomponentModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotifPanelEventsModule.java index aacc6939cf74..2aaf6a5f4391 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SysUISubcomponentModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotifPanelEventsModule.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2022 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,17 @@ * limitations under the License. */ -package com.android.systemui.dagger; +package com.android.systemui.statusbar.phone; +import com.android.systemui.dagger.SysUISingleton; + +import dagger.Binds; import dagger.Module; -/** - * Dagger module for including the WMComponent. - */ -@Module(subcomponents = {SysUIComponent.class}) -public abstract class SysUISubcomponentModule { +/** Provides a {@link NotifPanelEvents} in {@link SysUISingleton} scope. */ +@Module +public abstract class NotifPanelEventsModule { + @Binds + abstract NotifPanelEvents bindPanelEvents( + NotificationPanelViewController.PanelEventsEmitter impl); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index 01860a822503..cc8a70388ed0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -120,14 +120,8 @@ import com.android.systemui.animation.LaunchAnimator; import com.android.systemui.biometrics.AuthController; import com.android.systemui.classifier.Classifier; import com.android.systemui.classifier.FalsingCollector; -import com.android.systemui.communal.CommunalHostView; -import com.android.systemui.communal.CommunalHostViewController; -import com.android.systemui.communal.CommunalHostViewPositionAlgorithm; -import com.android.systemui.communal.CommunalSource; -import com.android.systemui.communal.CommunalSourceMonitor; -import com.android.systemui.communal.CommunalStateController; -import com.android.systemui.communal.dagger.CommunalViewComponent; import com.android.systemui.controls.dagger.ControlsComponent; +import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.DisplayId; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.doze.DozeLog; @@ -176,7 +170,6 @@ import com.android.systemui.statusbar.notification.ViewGroupFadeHelper; import com.android.systemui.statusbar.notification.collection.ListEntry; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy; -import com.android.systemui.statusbar.notification.collection.render.NotifPanelEventSource; import com.android.systemui.statusbar.notification.collection.render.ShadeViewManager; import com.android.systemui.statusbar.notification.row.ActivatableNotificationView; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; @@ -209,7 +202,6 @@ import com.android.wm.shell.animation.FlingAnimationUtils; import java.io.FileDescriptor; import java.io.PrintWriter; -import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -223,8 +215,7 @@ import javax.inject.Inject; import javax.inject.Provider; @CentralSurfacesComponent.CentralSurfacesScope -public class NotificationPanelViewController extends PanelViewController - implements NotifPanelEventSource { +public class NotificationPanelViewController extends PanelViewController { private static final boolean DEBUG = false; @@ -309,13 +300,10 @@ public class NotificationPanelViewController extends PanelViewController private final PulseExpansionHandler mPulseExpansionHandler; private final KeyguardBypassController mKeyguardBypassController; private final KeyguardUpdateMonitor mUpdateMonitor; - private final CommunalSourceMonitor mCommunalSourceMonitor; - private final CommunalStateController mCommunalStateController; private final ConversationNotificationManager mConversationNotificationManager; private final AuthController mAuthController; private final MediaHierarchyManager mMediaHierarchyManager; private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; - private final CommunalViewComponent.Factory mCommunalViewComponentFactory; private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory; private final KeyguardQsUserSwitchComponent.Factory mKeyguardQsUserSwitchComponentFactory; private final KeyguardUserSwitcherComponent.Factory mKeyguardUserSwitcherComponentFactory; @@ -335,6 +323,7 @@ public class NotificationPanelViewController extends PanelViewController private final TapAgainViewController mTapAgainViewController; private final SplitShadeHeaderController mSplitShadeHeaderController; private final RecordingController mRecordingController; + private final PanelEventsEmitter mPanelEventsEmitter; private boolean mShouldUseSplitNotificationShade; // The bottom padding reserved for elements of the keyguard measuring notifications private float mKeyguardNotificationBottomPadding; @@ -350,8 +339,6 @@ public class NotificationPanelViewController extends PanelViewController @VisibleForTesting QS mQs; private FrameLayout mQsFrame; private QsFrameTranslateController mQsFrameTranslateController; - @Nullable - private CommunalHostViewController mCommunalViewController; private KeyguardStatusViewController mKeyguardStatusViewController; private LockIconViewController mLockIconViewController; private NotificationsQuickSettingsContainer mNotificationContainerParent; @@ -364,8 +351,6 @@ public class NotificationPanelViewController extends PanelViewController private VelocityTracker mQsVelocityTracker; private boolean mQsTracking; - private CommunalHostView mCommunalView; - /** * If set, the ongoing touch gesture might both trigger the expansion in {@link PanelView} and * the expansion for quick settings. @@ -373,6 +358,12 @@ public class NotificationPanelViewController extends PanelViewController private boolean mConflictingQsExpansionGesture; private boolean mPanelExpanded; + + /** + * Indicates that QS is in expanded state which can happen by: + * - single pane shade: expanding shade and then expanding QS + * - split shade: just expanding shade (QS are expanded automatically) + */ private boolean mQsExpanded; private boolean mQsExpandedWhenExpandingStarted; private boolean mQsFullyExpanded; @@ -413,16 +404,14 @@ public class NotificationPanelViewController extends PanelViewController private final KeyguardClockPositionAlgorithm.Result mClockPositionResult = new KeyguardClockPositionAlgorithm.Result(); - private final CommunalHostViewPositionAlgorithm - mCommunalPositionAlgorithm = - new CommunalHostViewPositionAlgorithm(); - private final CommunalHostViewPositionAlgorithm.Result - mCommunalPositionResult = - new CommunalHostViewPositionAlgorithm.Result(); private boolean mIsExpanding; private boolean mBlockTouches; - // Used for two finger gesture as well as accessibility shortcut to QS. + + /** + * Determines if QS should be already expanded when expanding shade. + * Used for split shade, two finger gesture as well as accessibility shortcut to QS. + */ private boolean mQsExpandImmediate; private boolean mTwoFingerQsExpandPossible; private String mHeaderDebugInfo; @@ -523,10 +512,6 @@ public class NotificationPanelViewController extends PanelViewController mPanelAlphaAnimator.getProperty(), Interpolators.ALPHA_IN); private final NotificationEntryManager mEntryManager; - private final CommunalSourceMonitor.Callback mCommunalSourceMonitorCallback; - - private WeakReference<CommunalSource> mCommunalSource; - private final CommandQueue mCommandQueue; private final NotificationLockscreenUserManager mLockscreenUserManager; private final UserManager mUserManager; @@ -664,8 +649,6 @@ public class NotificationPanelViewController extends PanelViewController private Optional<NotificationPanelUnfoldAnimationController> mNotificationPanelUnfoldAnimationController; - private final ListenerSet<Callbacks> mNotifEventSourceCallbacks = new ListenerSet<>(); - private final NotificationListContainer mNotificationListContainer; private View.AccessibilityDelegate mAccessibilityDelegate = new View.AccessibilityDelegate() { @@ -688,32 +671,6 @@ public class NotificationPanelViewController extends PanelViewController } }; - private final CommunalStateController.Callback mCommunalStateCallback = - new CommunalStateController.Callback() { - @Override - public void onCommunalViewShowingChanged() { - mKeyguardStatusViewController.setKeyguardStatusViewVisibility( - mBarState, - mKeyguardStateController.isKeyguardFadingAway(), - mStatusBarStateController.goingToFullShade(), - mBarState); - if (mKeyguardUserSwitcherController != null) { - mKeyguardUserSwitcherController.setKeyguardUserSwitcherVisibility( - mBarState, - mKeyguardStateController.isKeyguardFadingAway(), - mStatusBarStateController.goingToFullShade(), - mBarState); - } - if (mKeyguardQsUserSwitchController != null) { - mKeyguardQsUserSwitchController.setKeyguardQsUserSwitchVisibility( - mBarState, - mKeyguardStateController.isKeyguardFadingAway(), - mStatusBarStateController.goingToFullShade(), - mBarState); - } - } - }; - private final FalsingTapListener mFalsingTapListener = new FalsingTapListener() { @Override public void onDoubleTapRequired() { @@ -739,7 +696,6 @@ public class NotificationPanelViewController extends PanelViewController FalsingCollector falsingCollector, NotificationLockscreenUserManager notificationLockscreenUserManager, NotificationEntryManager notificationEntryManager, - CommunalStateController communalStateController, KeyguardStateController keyguardStateController, StatusBarStateController statusBarStateController, StatusBarWindowStateController statusBarWindowStateController, @@ -749,7 +705,7 @@ public class NotificationPanelViewController extends PanelViewController LatencyTracker latencyTracker, PowerManager powerManager, AccessibilityManager accessibilityManager, @DisplayId int displayId, KeyguardUpdateMonitor keyguardUpdateMonitor, - CommunalSourceMonitor communalSourceMonitor, MetricsLogger metricsLogger, + MetricsLogger metricsLogger, ActivityManager activityManager, ConfigurationController configurationController, Provider<FlingAnimationUtils.Builder> flingAnimationUtilsBuilder, @@ -763,7 +719,6 @@ public class NotificationPanelViewController extends PanelViewController KeyguardQsUserSwitchComponent.Factory keyguardQsUserSwitchComponentFactory, KeyguardUserSwitcherComponent.Factory keyguardUserSwitcherComponentFactory, KeyguardStatusBarViewComponent.Factory keyguardStatusBarViewComponentFactory, - CommunalViewComponent.Factory communalViewComponentFactory, LockscreenShadeTransitionController lockscreenShadeTransitionController, NotificationGroupManagerLegacy groupManager, NotificationIconAreaController notificationIconAreaController, @@ -796,7 +751,8 @@ public class NotificationPanelViewController extends PanelViewController QsFrameTranslateController qsFrameTranslateController, SysUiState sysUiState, KeyguardUnlockAnimationController keyguardUnlockAnimationController, - NotificationListContainer notificationListContainer) { + NotificationListContainer notificationListContainer, + PanelEventsEmitter panelEventsEmitter) { super(view, falsingManager, dozeLog, @@ -832,8 +788,6 @@ public class NotificationPanelViewController extends PanelViewController mNotificationStackScrollLayoutController = notificationStackScrollLayoutController; mGroupManager = groupManager; mNotificationIconAreaController = notificationIconAreaController; - mCommunalStateController = communalStateController; - mCommunalViewComponentFactory = communalViewComponentFactory; mKeyguardStatusViewComponentFactory = keyguardStatusViewComponentFactory; mKeyguardStatusBarViewComponentFactory = keyguardStatusBarViewComponentFactory; mDepthController = notificationShadeDepthController; @@ -868,6 +822,7 @@ public class NotificationPanelViewController extends PanelViewController mSecureSettings = secureSettings; mInteractionJankMonitor = interactionJankMonitor; mSysUiState = sysUiState; + mPanelEventsEmitter = panelEventsEmitter; pulseExpansionHandler.setPulseExpandAbortListener(() -> { if (mQs != null) { mQs.animateHeaderSlidingOut(); @@ -877,7 +832,6 @@ public class NotificationPanelViewController extends PanelViewController mThemeResId = mView.getContext().getThemeResId(); mKeyguardBypassController = bypassController; mUpdateMonitor = keyguardUpdateMonitor; - mCommunalSourceMonitor = communalSourceMonitor; mLockscreenShadeTransitionController = lockscreenShadeTransitionController; lockscreenShadeTransitionController.setNotificationPanelController(this); DynamicPrivacyControlListener @@ -924,9 +878,6 @@ public class NotificationPanelViewController extends PanelViewController mNotificationPanelUnfoldAnimationController = unfoldComponent.map( SysUIUnfoldComponent::getNotificationPanelUnfoldAnimationController); - mCommunalSourceMonitorCallback = (source) -> { - mUiExecutor.execute(() -> setCommunalSource(source)); - }; mQsFrameTranslateController = qsFrameTranslateController; updateUserSwitcherFlags(); onFinishInflate(); @@ -962,7 +913,6 @@ public class NotificationPanelViewController extends PanelViewController private void onFinishInflate() { loadDimens(); mKeyguardStatusBar = mView.findViewById(R.id.keyguard_header); - mCommunalView = mView.findViewById(R.id.communal_host); FrameLayout userAvatarContainer = null; KeyguardUserSwitcherView keyguardUserSwitcherView = null; @@ -984,20 +934,11 @@ public class NotificationPanelViewController extends PanelViewController .getKeyguardStatusBarViewController(); mKeyguardStatusBarViewController.init(); - if (mCommunalView != null) { - CommunalViewComponent communalViewComponent = - mCommunalViewComponentFactory.build(mCommunalView); - mCommunalViewController = - communalViewComponent.getCommunalHostViewController(); - mCommunalViewController.init(); - } - mNotificationContainerParent = mView.findViewById(R.id.notification_container_parent); updateViewControllers( mView.findViewById(R.id.keyguard_status_view), userAvatarContainer, - keyguardUserSwitcherView, - mCommunalView); + keyguardUserSwitcherView); NotificationStackScrollLayout stackScrollLayout = mView.findViewById( R.id.notification_stack_scroller); @@ -1088,8 +1029,7 @@ public class NotificationPanelViewController extends PanelViewController private void updateViewControllers(KeyguardStatusView keyguardStatusView, FrameLayout userAvatarView, - KeyguardUserSwitcherView keyguardUserSwitcherView, - CommunalHostView communalView) { + KeyguardUserSwitcherView keyguardUserSwitcherView) { // Re-associate the KeyguardStatusViewController KeyguardStatusViewComponent statusViewComponent = mKeyguardStatusViewComponentFactory.build(keyguardStatusView); @@ -1282,7 +1222,7 @@ public class NotificationPanelViewController extends PanelViewController showKeyguardUserSwitcher /* enabled */); updateViewControllers(mView.findViewById(R.id.keyguard_status_view), userAvatarView, - keyguardUserSwitcherView, mCommunalView); + keyguardUserSwitcherView); // Update keyguard bottom area int index = mView.indexOfChild(mKeyguardBottomArea); @@ -1428,10 +1368,6 @@ public class NotificationPanelViewController extends PanelViewController int stackScrollerPadding; boolean onKeyguard = isOnKeyguard(); - if (onKeyguard) { - updateCommunalViewAppearance(); - } - if (onKeyguard || forceClockUpdate) { updateClockAppearance(); } @@ -1457,22 +1393,6 @@ public class NotificationPanelViewController extends PanelViewController mAnimateNextPositionUpdate = false; } - private void updateCommunalViewAppearance() { - if (mCommunalViewController == null) { - return; - } - - float expandedFraction = - mScreenOffAnimationController.shouldExpandNotifications() - ? 1.0f : getExpandedFraction(); - mCommunalPositionAlgorithm.setup(expandedFraction, mCommunalView.getHeight()); - mCommunalPositionAlgorithm.run(mCommunalPositionResult); - boolean animate = - mNotificationStackScrollLayoutController.isAddOrRemoveAnimationPending() - || mAnimateNextPositionUpdate; - mCommunalViewController.updatePosition(mCommunalPositionResult.communalY, animate); - } - private void updateClockAppearance() { int userSwitcherPreferredY = mStatusBarHeaderHeightKeyguard; boolean bypassEnabled = mKeyguardBypassController.getBypassEnabled(); @@ -1547,9 +1467,8 @@ public class NotificationPanelViewController extends PanelViewController private void updateKeyguardStatusViewAlignment(boolean animate) { boolean hasVisibleNotifications = mNotificationStackScrollLayoutController .getVisibleNotificationCount() != 0 || mMediaDataManager.hasActiveMedia(); - boolean hasCommunalSurface = mCommunalSource != null && mCommunalSource.get() != null; - boolean shouldBeCentered = !mShouldUseSplitNotificationShade - || (!hasVisibleNotifications && !hasCommunalSurface) || mDozing; + boolean shouldBeCentered = !mShouldUseSplitNotificationShade || !hasVisibleNotifications + || mDozing; if (mStatusViewCentered != shouldBeCentered) { mStatusViewCentered = shouldBeCentered; ConstraintSet constraintSet = new ConstraintSet(); @@ -1558,6 +1477,11 @@ public class NotificationPanelViewController extends PanelViewController constraintSet.connect(R.id.keyguard_status_view, END, statusConstraint, END); if (animate) { ChangeBounds transition = new ChangeBounds(); + if (mShouldUseSplitNotificationShade) { + // Excluding media from the transition on split-shade, as it doesn't transition + // horizontally properly. + transition.excludeTarget(R.id.status_view_media_container, true); + } transition.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); transition.setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD); TransitionManager.beginDelayedTransition(mNotificationContainerParent, transition); @@ -1579,11 +1503,6 @@ public class NotificationPanelViewController extends PanelViewController * @return the maximum keyguard notifications that can fit on the screen */ private int computeMaxKeyguardNotifications() { - // Do not show any notifications on the keyguard if a communal source is set. - if (mCommunalSource != null && mCommunalSource.get() != null) { - return 0; - } - float minPadding = mClockPositionAlgorithm.getMinStackScrollerPadding(); int notificationPadding = Math.max( 1, mResources.getDimensionPixelSize(R.dimen.notification_divider_height)); @@ -1707,12 +1626,6 @@ public class NotificationPanelViewController extends PanelViewController return true; } - private void updateCommunal() { - if (mCommunalViewController != null) { - mCommunalViewController.setAlpha(mKeyguardOnlyContentAlpha); - } - } - private void updateClock() { float alpha = mClockPositionResult.clockAlpha * mKeyguardOnlyContentAlpha; mKeyguardStatusViewController.setAlpha(alpha); @@ -1786,11 +1699,16 @@ public class NotificationPanelViewController extends PanelViewController if (mQsExpanded) { mQsExpandImmediate = true; - mNotificationStackScrollLayoutController.setShouldShowShelfOnly(true); + setShowShelfOnly(true); } super.collapse(delayed, speedUpFactor); } + private void setShowShelfOnly(boolean shelfOnly) { + mNotificationStackScrollLayoutController.setShouldShowShelfOnly( + shelfOnly && !mShouldUseSplitNotificationShade); + } + public void closeQs() { cancelQsAnimation(); setQsExpansion(mQsMinExpansionHeight); @@ -1827,7 +1745,7 @@ public class NotificationPanelViewController extends PanelViewController public void expandWithQs() { if (isQsExpansionEnabled()) { mQsExpandImmediate = true; - mNotificationStackScrollLayoutController.setShouldShowShelfOnly(true); + setShowShelfOnly(true); } if (isFullyCollapsed()) { expand(true /* animate */); @@ -1860,14 +1778,14 @@ public class NotificationPanelViewController extends PanelViewController mHeadsUpTouchHelper.notifyFling(!expand); mKeyguardStateController.notifyPanelFlingStart(!expand /* flingingToDismiss */); setClosingWithAlphaFadeout(!expand && !isOnKeyguard() && getFadeoutAlpha() == 1.0f); - mNotificationStackScrollLayoutController.setIsFlinging(true); + mAmbientState.setIsFlinging(true); super.flingToHeight(vel, expand, target, collapseSpeedUpFactor, expandBecauseOfFalsing); } @Override protected void onFlingEnd(boolean cancelled) { super.onFlingEnd(cancelled); - mNotificationStackScrollLayoutController.setIsFlinging(false); + mAmbientState.setIsFlinging(false); } private boolean onQsIntercept(MotionEvent event) { @@ -2026,7 +1944,15 @@ public class NotificationPanelViewController extends PanelViewController mFalsingManager.isFalseTouch(QS_COLLAPSE); } - flingSettings(vel, expandsQs && !isCancelMotionEvent ? FLING_EXPAND : FLING_COLLAPSE); + int flingType; + if (expandsQs && !isCancelMotionEvent) { + flingType = FLING_EXPAND; + } else if (mShouldUseSplitNotificationShade) { + flingType = FLING_HIDE; + } else { + flingType = FLING_COLLAPSE; + } + flingSettings(vel, flingType); } private void logQsSwipeDown(float y) { @@ -2091,8 +2017,10 @@ public class NotificationPanelViewController extends PanelViewController return false; } final int action = event.getActionMasked(); - if (action == MotionEvent.ACTION_DOWN && getExpandedFraction() == 1f - && mBarState != KEYGUARD && !mQsExpanded && isQsExpansionEnabled()) { + boolean collapsedQs = !mQsExpanded && !mShouldUseSplitNotificationShade; + boolean expandedShadeCollapsedQs = getExpandedFraction() == 1f && mBarState != KEYGUARD + && collapsedQs && isQsExpansionEnabled(); + if (action == MotionEvent.ACTION_DOWN && expandedShadeCollapsedQs) { // Down in the empty area while fully expanded - go to QS. mQsTracking = true; traceQsJank(true /* startTracing */, false /* wasCancelled */); @@ -2107,7 +2035,7 @@ public class NotificationPanelViewController extends PanelViewController } if (!mQsExpandImmediate && mQsTracking) { onQsTouch(event); - if (!mConflictingQsExpansionGesture) { + if (!mConflictingQsExpansionGesture && !mShouldUseSplitNotificationShade) { return true; } } @@ -2121,7 +2049,7 @@ public class NotificationPanelViewController extends PanelViewController < mStatusBarMinHeight) { mMetricsLogger.count(COUNTER_PANEL_OPEN_QS, 1); mQsExpandImmediate = true; - mNotificationStackScrollLayoutController.setShouldShowShelfOnly(true); + setShowShelfOnly(true); requestPanelHeightUpdate(); // Normally, we start listening when the panel is expanded, but here we need to start @@ -2192,6 +2120,9 @@ public class NotificationPanelViewController extends PanelViewController if (!isFullyCollapsed()) { return; } + if (mShouldUseSplitNotificationShade) { + mQsExpandImmediate = true; + } mExpectingSynthesizedDown = true; onTrackingStarted(); updatePanelExpanded(); @@ -2398,12 +2329,10 @@ public class NotificationPanelViewController extends PanelViewController } private void updateQsState() { - mNotificationStackScrollLayoutController.setQsExpanded(mQsExpanded); + boolean qsFullScreen = mQsExpanded && !mShouldUseSplitNotificationShade; + mNotificationStackScrollLayoutController.setQsFullScreen(qsFullScreen); mNotificationStackScrollLayoutController.setScrollingEnabled( - mBarState != KEYGUARD - && (!mQsExpanded - || mQsExpansionFromOverscroll - || mShouldUseSplitNotificationShade)); + mBarState != KEYGUARD && (!qsFullScreen || mQsExpansionFromOverscroll)); if (mKeyguardUserSwitcherController != null && mQsExpanded && !mStackScrollerOverscrolling) { @@ -2448,7 +2377,7 @@ public class NotificationPanelViewController extends PanelViewController private void updateQsExpansion() { if (mQs == null) return; final float squishiness; - if (mQsExpandImmediate || mQsExpanded) { + if ((mQsExpandImmediate || mQsExpanded) && !mShouldUseSplitNotificationShade) { squishiness = 1; } else if (mLockscreenShadeTransitionController.getQSDragProgress() > 0) { squishiness = mLockscreenShadeTransitionController.getQSDragProgress(); @@ -2483,10 +2412,6 @@ public class NotificationPanelViewController extends PanelViewController mSplitShadeHeaderController.setShadeExpandedFraction(shadeExpandedFraction); mSplitShadeHeaderController.setQsExpandedFraction(qsExpansionFraction); mSplitShadeHeaderController.setShadeExpanded(mQsVisible); - - if (mCommunalViewController != null) { - mCommunalViewController.updateQsExpansion(qsExpansionFraction); - } } private void onStackYChanged(boolean shouldAnimate) { @@ -2849,10 +2774,6 @@ public class NotificationPanelViewController extends PanelViewController } mTransitionToFullShadeQSPosition = position; updateQsExpansion(); - - if (mCommunalViewController != null) { - mCommunalViewController.updateShadeExpansion(mTransitioningToFullShadeProgress); - } } /** @@ -2876,7 +2797,6 @@ public class NotificationPanelViewController extends PanelViewController updateKeyguardBottomAreaAlpha(); } updateClock(); - updateCommunal(); } private void trackMovement(MotionEvent event) { @@ -3305,7 +3225,7 @@ public class NotificationPanelViewController extends PanelViewController setListening(true); } mQsExpandImmediate = false; - mNotificationStackScrollLayoutController.setShouldShowShelfOnly(false); + setShowShelfOnly(false); mTwoFingerQsExpandPossible = false; updateTrackingHeadsUp(null); mExpandingFromHeadsUp = false; @@ -3361,9 +3281,7 @@ public class NotificationPanelViewController extends PanelViewController mScrimController.onTrackingStarted(); if (mQsFullyExpanded) { mQsExpandImmediate = true; - if (!mShouldUseSplitNotificationShade) { - mNotificationStackScrollLayoutController.setShouldShowShelfOnly(true); - } + setShowShelfOnly(true); } if (mBarState == KEYGUARD || mBarState == StatusBarState.SHADE_LOCKED) { mAffordanceHelper.animateHideLeftRightIcon(); @@ -3466,9 +3384,7 @@ public class NotificationPanelViewController extends PanelViewController boolean wasRunning = isLaunchTransitionRunning(); super.setIsLaunchAnimationRunning(running); if (wasRunning != isLaunchTransitionRunning()) { - for (Callbacks cb : mNotifEventSourceCallbacks) { - cb.onLaunchingActivityChanged(running); - } + mPanelEventsEmitter.notifyLaunchingActivityChanged(running); } } @@ -3477,9 +3393,7 @@ public class NotificationPanelViewController extends PanelViewController boolean wasClosing = isClosing(); super.setIsClosing(isClosing); if (wasClosing != isClosing) { - for (Callbacks cb : mNotifEventSourceCallbacks) { - cb.onPanelCollapsingChanged(isClosing); - } + mPanelEventsEmitter.notifyPanelCollapsingChanged(isClosing); } } @@ -4072,10 +3986,6 @@ public class NotificationPanelViewController extends PanelViewController mNotificationStackScrollLayoutController.runAfterAnimationFinished(r); } - public void setScrollingEnabled(boolean b) { - mNotificationStackScrollLayoutController.setScrollingEnabled(b); - } - private Runnable mHideExpandedRunnable; private final Runnable mMaybeHideExpandedRunnable = new Runnable() { @Override @@ -4381,16 +4291,6 @@ public class NotificationPanelViewController extends PanelViewController .commitUpdate(mDisplayId); } - @Override - public void registerCallbacks(Callbacks callbacks) { - mNotifEventSourceCallbacks.addIfAbsent(callbacks); - } - - @Override - public void unregisterCallbacks(Callbacks callbacks) { - mNotifEventSourceCallbacks.remove(callbacks); - } - private class OnHeightChangedListener implements ExpandableView.OnHeightChangedListener { @Override public void onHeightChanged(ExpandableView view, boolean needsAnimation) { @@ -4770,14 +4670,6 @@ public class NotificationPanelViewController extends PanelViewController goingToFullShade, mBarState); - if (mCommunalViewController != null) { - mCommunalViewController.setKeyguardStatusViewVisibility( - statusBarState, - keyguardFadingAway, - goingToFullShade, - mBarState); - } - setKeyguardBottomAreaVisibility(statusBarState, goingToFullShade); mBarState = statusBarState; @@ -4905,25 +4797,6 @@ public class NotificationPanelViewController extends PanelViewController setExpandedFraction(1f); } - private void setCommunalSource(WeakReference<CommunalSource> source) { - CommunalSource existingSource = mCommunalSource != null ? mCommunalSource.get() : null; - - if (existingSource != null) { - mCommunalViewController.show(null /*source*/); - } - - mCommunalSource = source; - - CommunalSource currentSource = mCommunalSource != null ? mCommunalSource.get() : null; - // Set source and register callback - if (currentSource != null && mCommunalViewController != null) { - mCommunalViewController.show(source); - } - - updateKeyguardStatusViewAlignment(true /*animate*/); - updateMaxDisplayedNotifications(true /*recompute*/); - } - /** * Sets the overstretch amount in raw pixels when dragging down. */ @@ -4941,7 +4814,6 @@ public class NotificationPanelViewController extends PanelViewController .addTagListener(QS.TAG, mFragmentListener); mStatusBarStateController.addCallback(mStatusBarStateListener); mConfigurationController.addCallback(mConfigurationListener); - mCommunalSourceMonitor.addCallback(mCommunalSourceMonitorCallback); // Theme might have changed between inflating this view and attaching it to the // window, so // force a call to onThemeChanged @@ -4949,7 +4821,6 @@ public class NotificationPanelViewController extends PanelViewController mFalsingManager.addTapListener(mFalsingTapListener); mKeyguardIndicationController.init(); registerSettingsChangeListener(); - mCommunalStateController.addCallback(mCommunalStateCallback); } @Override @@ -4959,9 +4830,7 @@ public class NotificationPanelViewController extends PanelViewController .removeTagListener(QS.TAG, mFragmentListener); mStatusBarStateController.removeCallback(mStatusBarStateListener); mConfigurationController.removeCallback(mConfigurationListener); - mCommunalSourceMonitor.removeCallback(mCommunalSourceMonitorCallback); mFalsingManager.removeTapListener(mFalsingTapListener); - mCommunalStateController.removeCallback(mCommunalStateCallback); } } @@ -5027,7 +4896,11 @@ public class NotificationPanelViewController extends PanelViewController private void updateQSMinHeight() { float previousMin = mQsMinExpansionHeight; - mQsMinExpansionHeight = mKeyguardShowing ? 0 : mQs.getQsMinExpansionHeight(); + if (mKeyguardShowing || mShouldUseSplitNotificationShade) { + mQsMinExpansionHeight = 0; + } else { + mQsMinExpansionHeight = mQs.getQsMinExpansionHeight(); + } if (mQsExpansionHeight == previousMin) { mQsExpansionHeight = mQsMinExpansionHeight; } @@ -5164,4 +5037,35 @@ public class NotificationPanelViewController extends PanelViewController 1.0f /* speedUpFactor */); } } + + @SysUISingleton + static class PanelEventsEmitter implements NotifPanelEvents { + + private final ListenerSet<Listener> mListeners = new ListenerSet<>(); + + @Inject + PanelEventsEmitter() {} + + @Override + public void registerListener(@NonNull Listener listener) { + mListeners.addIfAbsent(listener); + } + + @Override + public void unregisterListener(@NonNull Listener listener) { + mListeners.remove(listener); + } + + private void notifyLaunchingActivityChanged(boolean isLaunchingActivity) { + for (Listener cb : mListeners) { + cb.onLaunchingActivityChanged(isLaunchingActivity); + } + } + + private void notifyPanelCollapsingChanged(boolean isCollapsing) { + for (NotifPanelEvents.Listener cb : mListeners) { + cb.onPanelCollapsingChanged(isCollapsing); + } + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQSContainerController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQSContainerController.kt index 7c9e597e74a1..ebb09b1af5e9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQSContainerController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQSContainerController.kt @@ -1,6 +1,7 @@ package com.android.systemui.statusbar.phone import android.view.WindowInsets +import com.android.systemui.R import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.navigationbar.NavigationModeController @@ -41,6 +42,7 @@ class NotificationsQSContainerController @Inject constructor( private var isQSCustomizerAnimating = false private var notificationsBottomMargin = 0 + private var scrimShadeBottomMargin = 0 private var bottomStableInsets = 0 private var bottomCutoutInsets = 0 @@ -67,17 +69,36 @@ class NotificationsQSContainerController @Inject constructor( public override fun onViewAttached() { updateMargins() + updateResources() overviewProxyService.addCallback(taskbarVisibilityListener) mView.setInsetsChangedListener(windowInsetsListener) mView.setQSFragmentAttachedListener { qs: QS -> qs.setContainerController(this) } + mView.setConfigurationChangedListener { updateResources() } } override fun onViewDetached() { overviewProxyService.removeCallback(taskbarVisibilityListener) mView.removeOnInsetsChangedListener() mView.removeQSFragmentAttachedListener() + mView.setConfigurationChangedListener(null) } + private fun updateResources() { + val previousScrimShadeBottomMargin = scrimShadeBottomMargin + scrimShadeBottomMargin = resources.getDimensionPixelSize( + R.dimen.split_shade_notifications_scrim_margin_bottom + ) + + if (previousScrimShadeBottomMargin != scrimShadeBottomMargin) { + updateBottomSpacing() + } + } + + /** + * Update the notification bottom margin. + * + * Will not call updateBottomSpacing + */ fun updateMargins() { notificationsBottomMargin = mView.defaultNotificationsMarginBottom } @@ -111,7 +132,11 @@ class NotificationsQSContainerController @Inject constructor( qsScrollPaddingBottom = bottomStableInsets } else if (newFooter && !(isQSCustomizing || isQSDetailShowing)) { // With the new footer, we also want this padding in the bottom in these cases - qsScrollPaddingBottom = bottomStableInsets + qsScrollPaddingBottom = if (splitShadeEnabled) { + notificationsMargin - scrimShadeBottomMargin + } else { + bottomStableInsets + } } mView.setPadding(0, 0, 0, containerPadding) mView.setNotificationsMarginBottom(notificationsMargin) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java index 95e3b70b4c5e..c2b5f5657fb0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java @@ -18,11 +18,13 @@ package com.android.systemui.statusbar.phone; import android.app.Fragment; import android.content.Context; +import android.content.res.Configuration; import android.graphics.Canvas; import android.util.AttributeSet; import android.view.View; import android.view.WindowInsets; +import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; import com.android.systemui.R; @@ -54,6 +56,9 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout private View mQSScrollView; private View mQSContainer; + @Nullable + private Consumer<Configuration> mConfigurationChangedListener; + public NotificationsQuickSettingsContainer(Context context, AttributeSet attrs) { super(context, attrs); } @@ -79,6 +84,18 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout invalidate(); } + @Override + protected void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + if (mConfigurationChangedListener != null) { + mConfigurationChangedListener.accept(newConfig); + } + } + + public void setConfigurationChangedListener(Consumer<Configuration> listener) { + mConfigurationChangedListener = listener; + } + public void setNotificationsMarginBottom(int margin) { LayoutParams params = (LayoutParams) mStackScroller.getLayoutParams(); params.bottomMargin = margin; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java index 7c1775ed2a5e..1d560c4592a6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java @@ -397,6 +397,7 @@ public abstract class PanelViewController { private void endMotionEvent(MotionEvent event, float x, float y, boolean forceCancel) { mTrackingPointer = -1; + mAmbientState.setSwipingUp(false); if ((mTracking && mTouchSlopExceeded) || Math.abs(x - mInitialTouchX) > mTouchSlop || Math.abs(y - mInitialTouchY) > mTouchSlop || event.getActionMasked() == MotionEvent.ACTION_CANCEL || forceCancel) { @@ -460,7 +461,6 @@ public abstract class PanelViewController { boolean expands = onEmptySpaceClick(mInitialTouchX); onTrackingStopped(expands); } - mAmbientState.setSwipingUp(false); mVelocityTracker.clear(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java index edbddbb3c3e7..108d98a129b2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java @@ -41,6 +41,7 @@ import android.text.TextUtils; import android.util.EventLog; import android.view.View; +import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import com.android.internal.jank.InteractionJankMonitor; @@ -51,6 +52,7 @@ import com.android.systemui.ActivityIntentHelper; import com.android.systemui.EventLogTags; import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.assist.AssistManager; +import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.statusbar.CommandQueue; @@ -75,6 +77,7 @@ import com.android.systemui.statusbar.notification.row.OnUserInteractionCallback import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent; import com.android.systemui.statusbar.policy.HeadsUpUtil; import com.android.systemui.statusbar.policy.KeyguardStateController; +import com.android.systemui.util.ListenerSet; import com.android.systemui.wmshell.BubblesManager; import java.util.Optional; @@ -128,6 +131,7 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte private final ActivityLaunchAnimator mActivityLaunchAnimator; private final NotificationLaunchAnimatorControllerProvider mNotificationAnimationProvider; private final OnUserInteractionCallback mOnUserInteractionCallback; + private final LaunchEventsEmitter mLaunchEventsEmitter; private boolean mIsCollapsingToShowActivityOverLockscreen; @@ -166,7 +170,8 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte NotificationPresenter presenter, NotificationPanelViewController panel, ActivityLaunchAnimator activityLaunchAnimator, - NotificationLaunchAnimatorControllerProvider notificationAnimationProvider) { + NotificationLaunchAnimatorControllerProvider notificationAnimationProvider, + LaunchEventsEmitter launchEventsEmitter) { mContext = context; mCommandQueue = commandQueue; mMainThreadHandler = mainThreadHandler; @@ -192,18 +197,17 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte mLockPatternUtils = lockPatternUtils; mStatusBarRemoteInputCallback = remoteInputCallback; mActivityIntentHelper = activityIntentHelper; - mNotifPipelineFlags = notifPipelineFlags; mMetricsLogger = metricsLogger; mLogger = logger; mOnUserInteractionCallback = onUserInteractionCallback; - // TODO: use KeyguardStateController#isOccluded to remove this dependency mCentralSurfaces = centralSurfaces; mPresenter = presenter; mNotificationPanel = panel; mActivityLaunchAnimator = activityLaunchAnimator; mNotificationAnimationProvider = notificationAnimationProvider; + mLaunchEventsEmitter = launchEventsEmitter; if (!mNotifPipelineFlags.isNewPipelineEnabled()) { mEntryManager.addNotificationEntryListener(new NotificationEntryListener() { @@ -254,6 +258,8 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte return; } + mLaunchEventsEmitter.notifyStartLaunchNotifActivity(entry); + boolean isActivityIntent = intent != null && intent.isActivity() && !isBubble; final boolean willLaunchResolverActivity = isActivityIntent && mActivityIntentHelper.wouldLaunchResolverActivity(intent.getIntent(), @@ -280,7 +286,9 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte postKeyguardAction.onDismiss(); } else { mActivityStarter.dismissKeyguardThenExecute( - postKeyguardAction, null /* cancel */, willLaunchResolverActivity); + postKeyguardAction, + () -> mLaunchEventsEmitter.notifyFinishLaunchNotifActivity(entry), + willLaunchResolverActivity); } } @@ -380,24 +388,26 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte // inform NMS that the notification was clicked mClickNotifier.onNotificationClick(notificationKey, nv); - if (!canBubble) { - if (shouldAutoCancel || mRemoteInputManager.isNotificationKeptForRemoteInputHistory( - notificationKey)) { - // Immediately remove notification from visually showing. - // We have to post the removal to the UI thread for synchronization. - mMainThreadHandler.post(() -> { - final Runnable removeNotification = () -> - mOnUserInteractionCallback.onDismiss( - entry, REASON_CLICK, summaryToRemove); - if (mPresenter.isCollapsing()) { - // To avoid lags we're only performing the remove - // after the shade is collapsed - mShadeController.addPostCollapseAction(removeNotification); - } else { - removeNotification.run(); - } - }); - } + if (!canBubble && (shouldAutoCancel + || mRemoteInputManager.isNotificationKeptForRemoteInputHistory(notificationKey))) { + // Immediately remove notification from visually showing. + // We have to post the removal to the UI thread for synchronization. + mMainThreadHandler.post(() -> { + final Runnable removeNotification = () -> { + mOnUserInteractionCallback.onDismiss(entry, REASON_CLICK, summaryToRemove); + mLaunchEventsEmitter.notifyFinishLaunchNotifActivity(entry); + }; + if (mPresenter.isCollapsing()) { + // To avoid lags we're only performing the remove + // after the shade is collapsed + mShadeController.addPostCollapseAction(removeNotification); + } else { + removeNotification.run(); + } + }); + } else { + mMainThreadHandler.post( + () -> mLaunchEventsEmitter.notifyFinishLaunchNotifActivity(entry)); } mIsCollapsingToShowActivityOverLockscreen = false; @@ -659,4 +669,35 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte return entry.shouldSuppressFullScreenIntent(); } + + @SysUISingleton + static class LaunchEventsEmitter implements NotifActivityLaunchEvents { + + private final ListenerSet<Listener> mListeners = new ListenerSet<>(); + + @Inject + LaunchEventsEmitter() {} + + @Override + public void registerListener(@NonNull Listener listener) { + mListeners.addIfAbsent(listener); + } + + @Override + public void unregisterListener(@NonNull Listener listener) { + mListeners.remove(listener); + } + + private void notifyStartLaunchNotifActivity(NotificationEntry entry) { + for (Listener listener : mListeners) { + listener.onStartLaunchNotifActivity(entry); + } + } + + private void notifyFinishLaunchNotifActivity(NotificationEntry entry) { + for (Listener listener : mListeners) { + listener.onFinishLaunchNotifActivity(entry); + } + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesComponent.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesComponent.java index 59c9d0baea3f..a86ad6bc7012 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesComponent.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesComponent.java @@ -27,7 +27,6 @@ import com.android.systemui.statusbar.NotificationShelfController; import com.android.systemui.statusbar.core.StatusBarInitializer; import com.android.systemui.statusbar.notification.NotificationActivityStarter; import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl; -import com.android.systemui.statusbar.notification.collection.render.StatusBarNotifPanelEventSourceModule; import com.android.systemui.statusbar.notification.stack.NotificationListContainer; import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController; import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutListContainerModule; @@ -60,8 +59,8 @@ import dagger.Subcomponent; * outside the component. Should more items be moved *into* this component to avoid so many getters? */ @Subcomponent(modules = { + CentralSurfacesStartableModule.class, NotificationStackScrollLayoutListContainerModule.class, - StatusBarNotifPanelEventSourceModule.class, StatusBarViewModule.class, StatusBarNotificationActivityStarterModule.class, StatusBarNotificationPresenterModule.class, diff --git a/packages/SystemUI/src/com/android/systemui/dagger/WMModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesStartableModule.java index 2894780e04b8..21e5ad5778b1 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/WMModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesStartableModule.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2022 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,15 @@ * limitations under the License. */ -package com.android.systemui.dagger; +package com.android.systemui.statusbar.phone.dagger; + +import java.util.Set; import dagger.Module; +import dagger.multibindings.Multibinds; -/** - * Dagger module for including the WMComponent. - */ -@Module(subcomponents = {WMComponent.class}) -public abstract class WMModule { +@Module +interface CentralSurfacesStartableModule { + @Multibinds + Set<CentralSurfacesComponent.Startable> multibindStartables(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardQsUserSwitchController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardQsUserSwitchController.java index 7e2488f1dfab..2cdbabde8115 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardQsUserSwitchController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardQsUserSwitchController.java @@ -35,7 +35,6 @@ import com.android.keyguard.KeyguardVisibilityHelper; import com.android.keyguard.dagger.KeyguardUserSwitcherScope; import com.android.settingslib.drawable.CircleFramedDrawable; import com.android.systemui.R; -import com.android.systemui.communal.CommunalStateController; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.plugins.FalsingManager; @@ -119,7 +118,6 @@ public class KeyguardQsUserSwitchController extends ViewController<FrameLayout> @Main Resources resources, ScreenLifecycle screenLifecycle, UserSwitcherController userSwitcherController, - CommunalStateController communalStateController, KeyguardStateController keyguardStateController, FalsingManager falsingManager, ConfigurationController configurationController, @@ -138,10 +136,9 @@ public class KeyguardQsUserSwitchController extends ViewController<FrameLayout> mFalsingManager = falsingManager; mConfigurationController = configurationController; mStatusBarStateController = statusBarStateController; - mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, communalStateController, + mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, keyguardStateController, dozeParameters, - screenOffAnimationController, /* animateYPos= */ false, - /* visibleOnCommunal= */ false); + screenOffAnimationController, /* animateYPos= */ false); mUserSwitchDialogController = userSwitchDialogController; mUiEventLogger = uiEventLogger; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcherController.java index 04a6a114a07d..e6306e5cdd3f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcherController.java @@ -42,7 +42,6 @@ import com.android.keyguard.dagger.KeyguardUserSwitcherScope; import com.android.settingslib.drawable.CircleFramedDrawable; import com.android.systemui.R; import com.android.systemui.animation.Interpolators; -import com.android.systemui.communal.CommunalStateController; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.plugins.statusbar.StatusBarStateController; @@ -158,7 +157,6 @@ public class KeyguardUserSwitcherController extends ViewController<KeyguardUserS LayoutInflater layoutInflater, ScreenLifecycle screenLifecycle, UserSwitcherController userSwitcherController, - CommunalStateController communalStateController, KeyguardStateController keyguardStateController, SysuiStatusBarStateController statusBarStateController, KeyguardUpdateMonitor keyguardUpdateMonitor, @@ -174,10 +172,9 @@ public class KeyguardUserSwitcherController extends ViewController<KeyguardUserS mKeyguardUpdateMonitor = keyguardUpdateMonitor; mAdapter = new KeyguardUserAdapter(mContext, resources, layoutInflater, mUserSwitcherController, this); - mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, communalStateController, + mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, keyguardStateController, dozeParameters, - screenOffAnimationController, /* animateYPos= */ false, - /* visibleOnCommunal= */ false); + screenOffAnimationController, /* animateYPos= */ false); mBackground = new KeyguardUserSwitcherScrim(context); } diff --git a/packages/SystemUI/src/com/android/systemui/tv/TvGlobalRootComponent.java b/packages/SystemUI/src/com/android/systemui/tv/TvGlobalRootComponent.java index 89ab23b50cd8..117cba7401e9 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/TvGlobalRootComponent.java +++ b/packages/SystemUI/src/com/android/systemui/tv/TvGlobalRootComponent.java @@ -18,7 +18,6 @@ package com.android.systemui.tv; import com.android.systemui.dagger.GlobalModule; import com.android.systemui.dagger.GlobalRootComponent; -import com.android.systemui.dagger.WMModule; import javax.inject.Singleton; @@ -28,11 +27,7 @@ import dagger.Component; * Root component for Dagger injection. */ @Singleton -@Component(modules = { - GlobalModule.class, - TvSysUIComponentModule.class, - WMModule.class -}) +@Component(modules = {GlobalModule.class}) public interface TvGlobalRootComponent extends GlobalRootComponent { /** * Component Builder interface. This allows to bind Context instance in the component @@ -42,9 +37,6 @@ public interface TvGlobalRootComponent extends GlobalRootComponent { TvGlobalRootComponent build(); } - /** - * Builder for a WMComponent. - */ @Override TvWMComponent.Builder getWMComponentBuilder(); diff --git a/packages/SystemUI/src/com/android/systemui/util/Utils.java b/packages/SystemUI/src/com/android/systemui/util/Utils.java index 71d8e3344937..7e3bce589f7e 100644 --- a/packages/SystemUI/src/com/android/systemui/util/Utils.java +++ b/packages/SystemUI/src/com/android/systemui/util/Utils.java @@ -199,10 +199,13 @@ public class Utils { /** * Gets the {@link R.dimen#split_shade_header_height}. * - * Currently, it's the same as {@link com.android.internal.R.dimen#quick_qs_offset_height}. + * It should be fine to not ignore cutouts as split shade might not want to react to them: + * for split shade header, which is only on bigger screens, either cutout won't be a problem + * (it's usually centered and in split shade that's likely empty area) or we probably want to + * handle it differently. */ public static int getSplitShadeStatusBarHeight(Context context) { - return SystemBarUtils.getQuickQsOffsetHeight(context); + return context.getResources().getDimensionPixelSize(R.dimen.split_shade_header_height); } /** diff --git a/packages/SystemUI/src/com/android/systemui/util/concurrency/SysUIConcurrencyModule.java b/packages/SystemUI/src/com/android/systemui/util/concurrency/SysUIConcurrencyModule.java index e8a9bc702352..8f61abcca4dc 100644 --- a/packages/SystemUI/src/com/android/systemui/util/concurrency/SysUIConcurrencyModule.java +++ b/packages/SystemUI/src/com/android/systemui/util/concurrency/SysUIConcurrencyModule.java @@ -25,10 +25,8 @@ import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.LongRunning; import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.dagger.qualifiers.UiBackground; import java.util.concurrent.Executor; -import java.util.concurrent.Executors; import dagger.Module; import dagger.Provides; @@ -149,18 +147,6 @@ public abstract class SysUIConcurrencyModule { return new RepeatableExecutorImpl(exec); } - /** - * Provide an Executor specifically for running UI operations on a separate thread. - * - * Keep submitted runnables short and to the point, just as with any other UI code. - */ - @Provides - @SysUISingleton - @UiBackground - public static Executor provideUiBackgroundExecutor() { - return Executors.newSingleThreadExecutor(); - } - /** */ @Provides @Main diff --git a/packages/SystemUI/src/com/android/systemui/util/service/PackageObserver.java b/packages/SystemUI/src/com/android/systemui/util/service/PackageObserver.java index 2ee7b20c1f93..0d47d73153c1 100644 --- a/packages/SystemUI/src/com/android/systemui/util/service/PackageObserver.java +++ b/packages/SystemUI/src/com/android/systemui/util/service/PackageObserver.java @@ -24,8 +24,6 @@ import android.content.IntentFilter; import android.os.PatternMatcher; import android.util.Log; -import com.android.systemui.communal.CommunalSource; - import com.google.android.collect.Lists; import java.lang.ref.WeakReference; @@ -36,8 +34,8 @@ import javax.inject.Inject; /** * {@link PackageObserver} allows for monitoring the system for changes relating to a particular - * package. This can be used by {@link CommunalSource} clients to detect when a related package - * has changed and reloading is necessary. + * package. This can be used by clients to detect when a related package has changed and reloading + * is necessary. */ public class PackageObserver implements Observer { private static final String TAG = "PackageObserver"; diff --git a/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java b/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java index 69ebfe8012d1..8a961942123b 100644 --- a/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java +++ b/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java @@ -749,6 +749,8 @@ public class BubblesManager implements Dumpable { return; } + entry.setFlagBubble(shouldBubble); + // Update the state in NotificationManagerService try { int flags = Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION; diff --git a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java index c3c3f90539fd..60567c49bfdf 100644 --- a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java +++ b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java @@ -51,6 +51,7 @@ import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.shared.tracing.ProtoTraceable; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.policy.ConfigurationController; +import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.UserInfoController; import com.android.systemui.tracing.ProtoTracer; import com.android.systemui.tracing.nano.SystemUiTraceProto; @@ -116,6 +117,7 @@ public final class WMShell extends CoreStartable private final CommandQueue mCommandQueue; private final ConfigurationController mConfigurationController; + private final KeyguardStateController mKeyguardStateController; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; private final NavigationModeController mNavigationModeController; private final ScreenLifecycle mScreenLifecycle; @@ -129,7 +131,7 @@ public final class WMShell extends CoreStartable private KeyguardUpdateMonitorCallback mSplitScreenKeyguardCallback; private KeyguardUpdateMonitorCallback mPipKeyguardCallback; private KeyguardUpdateMonitorCallback mOneHandedKeyguardCallback; - private KeyguardUpdateMonitorCallback mCompatUIKeyguardCallback; + private KeyguardStateController.Callback mCompatUIKeyguardCallback; private WakefulnessLifecycle.Observer mWakefulnessObserver; @Inject @@ -143,6 +145,7 @@ public final class WMShell extends CoreStartable Optional<DragAndDrop> dragAndDropOptional, CommandQueue commandQueue, ConfigurationController configurationController, + KeyguardStateController keyguardStateController, KeyguardUpdateMonitor keyguardUpdateMonitor, NavigationModeController navigationModeController, ScreenLifecycle screenLifecycle, @@ -154,6 +157,7 @@ public final class WMShell extends CoreStartable super(context); mCommandQueue = commandQueue; mConfigurationController = configurationController; + mKeyguardStateController = keyguardStateController; mKeyguardUpdateMonitor = keyguardUpdateMonitor; mNavigationModeController = navigationModeController; mScreenLifecycle = screenLifecycle; @@ -362,13 +366,13 @@ public final class WMShell extends CoreStartable @VisibleForTesting void initCompatUi(CompatUI sizeCompatUI) { - mCompatUIKeyguardCallback = new KeyguardUpdateMonitorCallback() { + mCompatUIKeyguardCallback = new KeyguardStateController.Callback() { @Override - public void onKeyguardOccludedChanged(boolean occluded) { - sizeCompatUI.onKeyguardOccludedChanged(occluded); + public void onKeyguardShowingChanged() { + sizeCompatUI.onKeyguardShowingChanged(mKeyguardStateController.isShowing()); } }; - mKeyguardUpdateMonitor.registerCallback(mCompatUIKeyguardCallback); + mKeyguardStateController.addCallback(mCompatUIKeyguardCallback); } void initDragAndDrop(DragAndDrop dragAndDrop) { diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt index 8e1e42a9c9a2..e980eb783d79 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt @@ -88,6 +88,6 @@ class KeyguardPatternViewControllerTest : SysuiTestCase() { fun onPause_clearsTextField() { mKeyguardPatternViewController.init() mKeyguardPatternViewController.onPause() - verify(mKeyguardMessageAreaController).setMessage("") + verify(mKeyguardMessageAreaController).setMessage(R.string.keyguard_enter_your_pattern) } } diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java index 217092e6e4e5..2fc912288623 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java @@ -22,7 +22,6 @@ import android.test.suitebuilder.annotation.SmallTest; import android.testing.AndroidTestingRunner; import com.android.systemui.SysuiTestCase; -import com.android.systemui.communal.CommunalStateController; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; import com.android.systemui.statusbar.phone.DozeParameters; import com.android.systemui.statusbar.phone.ScreenOffAnimationController; @@ -50,8 +49,6 @@ public class KeyguardStatusViewControllerTest extends SysuiTestCase { @Mock private KeyguardStateController mKeyguardStateController; @Mock - private CommunalStateController mCommunalStateController; - @Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor; @Mock ConfigurationController mConfigurationController; @@ -76,7 +73,6 @@ public class KeyguardStatusViewControllerTest extends SysuiTestCase { mKeyguardClockSwitchController, mKeyguardStateController, mKeyguardUpdateMonitor, - mCommunalStateController, mConfigurationController, mDozeParameters, mKeyguardUnlockAnimationController, diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardVisibilityHelperTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardVisibilityHelperTest.java deleted file mode 100644 index a93a15df5986..000000000000 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardVisibilityHelperTest.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.keyguard; - -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.test.suitebuilder.annotation.SmallTest; -import android.view.View; -import android.view.ViewPropertyAnimator; - -import com.android.systemui.SysuiTestCase; -import com.android.systemui.communal.CommunalStateController; -import com.android.systemui.statusbar.StatusBarState; -import com.android.systemui.statusbar.phone.ScreenOffAnimationController; -import com.android.systemui.statusbar.policy.KeyguardStateController; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -@SmallTest -public class KeyguardVisibilityHelperTest extends SysuiTestCase { - @Mock - private CommunalStateController mCommunalStateController; - @Mock - private KeyguardStateController mKeyguardStateController; - @Mock - com.android.systemui.statusbar.phone.DozeParameters mDozeParameters; - @Mock - ScreenOffAnimationController mScreenOffAnimationController; - @Mock - ViewPropertyAnimator mViewPropertyAnimator; - @Mock - View mTargetView; - - private KeyguardVisibilityHelper mKeyguardVisibilityHelper; - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - when(mTargetView.animate()).thenReturn(mViewPropertyAnimator); - mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mTargetView, - mCommunalStateController, mKeyguardStateController, mDozeParameters, - mScreenOffAnimationController, false, false); - } - - @Test - public void testHideOnCommunal() { - // Verify view is hidden when communal is visible. - when(mCommunalStateController.getCommunalViewShowing()).thenReturn(true); - mKeyguardVisibilityHelper.setViewVisibility(StatusBarState.KEYGUARD, false, - false, StatusBarState.KEYGUARD); - verify(mTargetView).setVisibility(View.GONE); - verify(mTargetView).setAlpha(1.0f); - - // Verify view is shown when communal is not visible. - when(mCommunalStateController.getCommunalViewShowing()).thenReturn(false); - mKeyguardVisibilityHelper.setViewVisibility(StatusBarState.KEYGUARD, false, - false, StatusBarState.KEYGUARD); - verify(mTargetView).setVisibility(View.VISIBLE); - } - - @Test - public void testVisibleOnCommunal() { - when(mCommunalStateController.getCommunalViewShowing()).thenReturn(true); - when(mKeyguardStateController.isOccluded()).thenReturn(false); - - // Verify that helpers constructed with visibility on communal are not hidden when communal - // is present. - mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mTargetView, - mCommunalStateController, mKeyguardStateController, mDozeParameters, - mScreenOffAnimationController, false, true); - mKeyguardVisibilityHelper.setViewVisibility(StatusBarState.KEYGUARD, false, - false, StatusBarState.KEYGUARD); - verify(mTargetView).setVisibility(View.VISIBLE); - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalHostViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalHostViewControllerTest.java deleted file mode 100644 index 8bd5e793dcdd..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalHostViewControllerTest.java +++ /dev/null @@ -1,242 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.clearInvocations; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.testing.AndroidTestingRunner; -import android.view.View; - -import androidx.test.filters.SmallTest; - -import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.keyguard.KeyguardUpdateMonitorCallback; -import com.android.systemui.SysuiTestCase; -import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.statusbar.StatusBarState; -import com.android.systemui.statusbar.phone.DozeParameters; -import com.android.systemui.statusbar.phone.ScreenOffAnimationController; -import com.android.systemui.statusbar.policy.KeyguardStateController; -import com.android.systemui.util.concurrency.FakeExecutor; -import com.android.systemui.util.time.FakeSystemClock; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; - -import java.lang.ref.WeakReference; - -@SmallTest -@RunWith(AndroidTestingRunner.class) -public class CommunalHostViewControllerTest extends SysuiTestCase { - @Mock - private CommunalStateController mCommunalStateController; - - @Mock - private KeyguardUpdateMonitor mKeyguardUpdateMonitor; - - @Mock - private KeyguardStateController mKeyguardStateController; - - @Mock - private StatusBarStateController mStatusBarStateController; - - @Mock - private CommunalHostView mCommunalView; - - @Mock - private DozeParameters mDozeParameters; - - @Mock - private ScreenOffAnimationController mScreenOffAnimationController; - - private FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock()); - - private CommunalHostViewController mController; - - @Mock - private CommunalSource mCommunalSource; - - @Mock - private View mChildView; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - - when(mKeyguardStateController.isShowing()).thenReturn(true); - when(mCommunalView.isAttachedToWindow()).thenReturn(true); - when(mStatusBarStateController.getState()).thenReturn(StatusBarState.KEYGUARD); - - mController = new CommunalHostViewController(mFakeExecutor, mCommunalStateController, - mKeyguardUpdateMonitor, mKeyguardStateController, mDozeParameters, - mScreenOffAnimationController, mStatusBarStateController, mCommunalView); - mController.init(); - mFakeExecutor.runAllReady(); - - Mockito.clearInvocations(mCommunalView); - } - - @Test - public void testShow() { - ArgumentCaptor<KeyguardStateController.Callback> callbackCapture = - ArgumentCaptor.forClass(KeyguardStateController.Callback.class); - - // Capture callback value for later use. - verify(mKeyguardStateController).addCallback(callbackCapture.capture()); - - // Verify the communal view is shown when the controller is initialized with keyguard - // showing (see setup). - mController.show(new WeakReference<>(mCommunalSource)); - mFakeExecutor.runAllReady(); - verify(mCommunalView).setVisibility(View.VISIBLE); - - // Trigger keyguard off to ensure visibility of communal view is changed accordingly. - when(mKeyguardStateController.isShowing()).thenReturn(false); - callbackCapture.getValue().onKeyguardShowingChanged(); - mFakeExecutor.runAllReady(); - verify(mCommunalView).setVisibility(View.INVISIBLE); - } - - @Test - public void testHideOnOcclude() { - ArgumentCaptor<KeyguardUpdateMonitorCallback> callbackCapture = - ArgumentCaptor.forClass(KeyguardUpdateMonitorCallback.class); - - // Capture callback value for later use. - verify(mKeyguardUpdateMonitor).registerCallback(callbackCapture.capture()); - - // Establish a visible communal view. - mController.show(new WeakReference<>(mCommunalSource)); - mFakeExecutor.runAllReady(); - verify(mCommunalView).setVisibility(View.VISIBLE); - Mockito.clearInvocations(mCommunalView); - - // Occlude. - Mockito.clearInvocations(mCommunalView); - callbackCapture.getValue().onKeyguardOccludedChanged(true); - mFakeExecutor.runAllReady(); - verify(mCommunalView).setVisibility(View.INVISIBLE); - - // Unocclude. - Mockito.clearInvocations(mCommunalView); - callbackCapture.getValue().onKeyguardOccludedChanged(false); - mFakeExecutor.runAllReady(); - verify(mCommunalView).setVisibility(View.VISIBLE); - } - - @Test - public void testReportOcclusion() { - // Ensure CommunalHostViewController reports view occluded when either the QS or Shade is - // expanded. - clearInvocations(mCommunalStateController); - mController.updateShadeExpansion(0); - verify(mCommunalStateController).setCommunalViewOccluded(false); - clearInvocations(mCommunalStateController); - mController.updateQsExpansion(.5f); - verify(mCommunalStateController).setCommunalViewOccluded(true); - clearInvocations(mCommunalStateController); - mController.updateShadeExpansion(.7f); - verify(mCommunalStateController).setCommunalViewOccluded(true); - clearInvocations(mCommunalStateController); - mController.updateShadeExpansion(0); - verify(mCommunalStateController).setCommunalViewOccluded(true); - clearInvocations(mCommunalStateController); - mController.updateQsExpansion(0f); - verify(mCommunalStateController).setCommunalViewOccluded(false); - clearInvocations(mCommunalStateController); - } - - @Test - public void testCommunalStateControllerHideNotified() { - ArgumentCaptor<KeyguardUpdateMonitorCallback> callbackCapture = - ArgumentCaptor.forClass(KeyguardUpdateMonitorCallback.class); - - // Capture callback value for later use. - verify(mKeyguardUpdateMonitor).registerCallback(callbackCapture.capture()); - - // Establish a visible communal view. - mController.show(new WeakReference<>(mCommunalSource)); - mFakeExecutor.runAllReady(); - - // Occlude - clearInvocations(mCommunalStateController); - callbackCapture.getValue().onKeyguardOccludedChanged(true); - mFakeExecutor.runAllReady(); - - // Verify state controller is notified communal view is hidden. - verify(mCommunalStateController).setCommunalViewShowing(false); - } - - @Test - public void testAlphaPropagation() { - final float alpha = 0.8f; - - // Ensure alpha setting is propagated to children. - when(mCommunalView.getChildCount()).thenReturn(1); - when(mCommunalView.getChildAt(0)).thenReturn(mChildView); - mController.setAlpha(alpha); - verify(mChildView).setAlpha(alpha); - verify(mCommunalView).setAlpha(alpha); - } - - @Test - public void testMultipleShowRequestSuppression() { - // Ensure first request invokes source. - mController.show(new WeakReference<>(mCommunalSource)); - mFakeExecutor.runAllReady(); - verify(mCommunalSource).requestCommunalView(any()); - clearInvocations(mCommunalSource); - - // Ensure subsequent identical request is suppressed - mController.show(new WeakReference<>(mCommunalSource)); - mFakeExecutor.runAllReady(); - verify(mCommunalSource, never()).requestCommunalView(any()); - } - - @Test - public void testNoShowInvocationOnBouncer() { - ArgumentCaptor<KeyguardUpdateMonitorCallback> callbackCapture = - ArgumentCaptor.forClass(KeyguardUpdateMonitorCallback.class); - - // Capture callback value for later use. - verify(mKeyguardUpdateMonitor).registerCallback(callbackCapture.capture()); - - // Set source so it will be cleared if in invalid state. - mController.show(new WeakReference<>(mCommunalSource)); - mFakeExecutor.runAllReady(); - clearInvocations(mCommunalStateController, mCommunalView); - - // Change bouncer to showing. - callbackCapture.getValue().onKeyguardBouncerChanged(true); - mFakeExecutor.runAllReady(); - - // Verify that there were no requests to remove all child views or set the communal - // state to not showing. - verify(mCommunalStateController, never()).setCommunalViewShowing(eq(false)); - verify(mCommunalView, never()).removeAllViews(); - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalHostViewPositionAlgorithmTest.java b/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalHostViewPositionAlgorithmTest.java deleted file mode 100644 index 0a0266bc1955..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalHostViewPositionAlgorithmTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import static com.google.common.truth.Truth.assertThat; - -import android.test.suitebuilder.annotation.SmallTest; - -import com.android.systemui.SysuiTestCase; -import com.android.systemui.communal.CommunalHostViewPositionAlgorithm.Result; - -import org.junit.Test; - - -@SmallTest -public class CommunalHostViewPositionAlgorithmTest extends SysuiTestCase { - @Test - public void testOutput() { - final float expansion = 0.25f; - final int height = 120; - - final CommunalHostViewPositionAlgorithm algorithm = new CommunalHostViewPositionAlgorithm(); - algorithm.setup(expansion, height); - final Result result = new Result(); - algorithm.run(result); - - // Verify the communal view is shifted offscreen vertically by the correct amount. - assertThat((1 - expansion) * -height).isEqualTo(result.communalY); - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSettingConditionTest.java b/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSettingConditionTest.java deleted file mode 100644 index c5b1a1d8bac5..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSettingConditionTest.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.clearInvocations; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; - -import android.os.Looper; -import android.os.UserHandle; -import android.provider.Settings; -import android.testing.AndroidTestingRunner; - -import androidx.test.filters.SmallTest; - -import com.android.systemui.SysuiTestCase; -import com.android.systemui.communal.conditions.CommunalSettingCondition; -import com.android.systemui.util.condition.Condition; -import com.android.systemui.util.settings.FakeSettings; -import com.android.systemui.utils.os.FakeHandler; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -@SmallTest -@RunWith(AndroidTestingRunner.class) -public class CommunalSettingConditionTest extends SysuiTestCase { - private FakeSettings mSecureSettings; - private CommunalSettingCondition mCondition; - - @Before - public void setup() { - final FakeHandler handler = new FakeHandler(Looper.getMainLooper()); - mSecureSettings = new FakeSettings(); - mCondition = new CommunalSettingCondition(handler, mSecureSettings); - } - - @Test - public void addCallback_communalSettingEnabled_immediatelyReportsTrue() { - updateCommunalSetting(true); - - final Condition.Callback callback = mock(Condition.Callback.class); - mCondition.addCallback(callback); - verify(callback).onConditionChanged(mCondition); - assertThat(mCondition.isConditionMet()).isTrue(); - } - - @Test - public void addCallback_communalSettingDisabled_noReport() { - updateCommunalSetting(false); - - final Condition.Callback callback = mock(Condition.Callback.class); - mCondition.addCallback(callback); - verify(callback, never()).onConditionChanged(eq(mCondition)); - } - - @Test - public void updateCallback_communalSettingEnabled_reportsTrue() { - updateCommunalSetting(false); - - final Condition.Callback callback = mock(Condition.Callback.class); - mCondition.addCallback(callback); - clearInvocations(callback); - - updateCommunalSetting(true); - verify(callback).onConditionChanged(mCondition); - assertThat(mCondition.isConditionMet()).isTrue(); - } - - @Test - public void updateCallback_communalSettingDisabled_reportsFalse() { - updateCommunalSetting(true); - - final Condition.Callback callback = mock(Condition.Callback.class); - mCondition.addCallback(callback); - clearInvocations(callback); - - updateCommunalSetting(false); - verify(callback).onConditionChanged(mCondition); - assertThat(mCondition.isConditionMet()).isFalse(); - } - - @Test - public void updateCallback_communalSettingDidNotChange_neverReportDup() { - updateCommunalSetting(true); - - final Condition.Callback callback = mock(Condition.Callback.class); - mCondition.addCallback(callback); - clearInvocations(callback); - - updateCommunalSetting(true); - verify(callback, never()).onConditionChanged(mCondition); - assertThat(mCondition.isConditionMet()).isTrue(); - } - - private void updateCommunalSetting(boolean value) { - mSecureSettings.putIntForUser(Settings.Secure.COMMUNAL_MODE_ENABLED, value ? 1 : 0, - UserHandle.USER_SYSTEM); - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSourceMonitorTest.java b/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSourceMonitorTest.java deleted file mode 100644 index df1cc766d162..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSourceMonitorTest.java +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.clearInvocations; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; - -import android.testing.AndroidTestingRunner; -import android.testing.TestableLooper; - -import androidx.test.filters.SmallTest; - -import com.android.systemui.SysuiTestCase; -import com.android.systemui.util.concurrency.FakeExecutor; -import com.android.systemui.util.condition.Monitor; -import com.android.systemui.util.time.FakeSystemClock; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -import java.lang.ref.WeakReference; - -@SmallTest -@RunWith(AndroidTestingRunner.class) -@TestableLooper.RunWithLooper -public class CommunalSourceMonitorTest extends SysuiTestCase { - @Mock private Monitor mCommunalConditionsMonitor; - - @Captor private ArgumentCaptor<Monitor.Callback> mConditionsCallbackCaptor; - - private CommunalSourceMonitor mCommunalSourceMonitor; - private FakeExecutor mExecutor = new FakeExecutor(new FakeSystemClock()); - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - mCommunalSourceMonitor = new CommunalSourceMonitor(mExecutor, mCommunalConditionsMonitor); - } - - @Test - public void testSourceAddedBeforeCallbackAdded() { - final CommunalSourceMonitor.Callback callback = mock(CommunalSourceMonitor.Callback.class); - final CommunalSource source = mock(CommunalSource.class); - - setSource(source); - mCommunalSourceMonitor.addCallback(callback); - setConditionsMet(true); - - verifyOnSourceAvailableCalledWith(callback, source); - } - - @Test - public void testRemoveCallback() { - final CommunalSourceMonitor.Callback callback = mock(CommunalSourceMonitor.Callback.class); - final CommunalSource source = mock(CommunalSource.class); - - mCommunalSourceMonitor.addCallback(callback); - mCommunalSourceMonitor.removeCallback(callback); - setSource(source); - - verify(callback, never()).onSourceAvailable(any()); - } - - @Test - public void testAddCallbackWithConditionsMet() { - final CommunalSourceMonitor.Callback callback = mock(CommunalSourceMonitor.Callback.class); - final CommunalSource source = mock(CommunalSource.class); - - mCommunalSourceMonitor.addCallback(callback); - setConditionsMet(true); - clearInvocations(callback); - setSource(source); - - verifyOnSourceAvailableCalledWith(callback, source); - } - - @Test - public void testAddCallbackWithConditionsNotMet() { - final CommunalSourceMonitor.Callback callback = mock(CommunalSourceMonitor.Callback.class); - final CommunalSource source = mock(CommunalSource.class); - - mCommunalSourceMonitor.addCallback(callback); - setConditionsMet(false); - setSource(source); - - verify(callback, never()).onSourceAvailable(any()); - } - - @Test - public void testConditionsAreMetAfterCallbackAdded() { - final CommunalSourceMonitor.Callback callback = mock(CommunalSourceMonitor.Callback.class); - final CommunalSource source = mock(CommunalSource.class); - - mCommunalSourceMonitor.addCallback(callback); - setSource(source); - - // The callback should not have executed since communal is disabled. - verify(callback, never()).onSourceAvailable(any()); - - // The callback should execute when all conditions are met. - setConditionsMet(true); - verifyOnSourceAvailableCalledWith(callback, source); - } - - @Test - public void testConditionsNoLongerMetAfterCallbackAdded() { - final CommunalSourceMonitor.Callback callback = mock(CommunalSourceMonitor.Callback.class); - final CommunalSource source = mock(CommunalSource.class); - - mCommunalSourceMonitor.addCallback(callback); - setSource(source); - setConditionsMet(true); - verifyOnSourceAvailableCalledWith(callback, source); - - // The callback should execute again when conditions are no longer met, with a value of - // null. - setConditionsMet(false); - verify(callback).onSourceAvailable(null); - } - - private void verifyOnSourceAvailableCalledWith(CommunalSourceMonitor.Callback callback, - CommunalSource source) { - final ArgumentCaptor<WeakReference<CommunalSource>> sourceCapture = - ArgumentCaptor.forClass(WeakReference.class); - verify(callback).onSourceAvailable(sourceCapture.capture()); - assertThat(sourceCapture.getValue().get()).isEqualTo(source); - } - - // Pushes an update on whether the communal conditions are met, assuming that a callback has - // been registered with the communal conditions monitor. - private void setConditionsMet(boolean value) { - mExecutor.runAllReady(); - verify(mCommunalConditionsMonitor).addCallback(mConditionsCallbackCaptor.capture()); - final Monitor.Callback conditionsCallback = - mConditionsCallbackCaptor.getValue(); - conditionsCallback.onConditionsChanged(value); - mExecutor.runAllReady(); - } - - private void setSource(CommunalSource source) { - mCommunalSourceMonitor.setSource(source); - mExecutor.runAllReady(); - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSourcePrimerTest.java b/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSourcePrimerTest.java deleted file mode 100644 index 1d9a0594d7e2..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSourcePrimerTest.java +++ /dev/null @@ -1,205 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.clearInvocations; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.content.Context; -import android.content.res.Resources; -import android.testing.AndroidTestingRunner; - -import androidx.test.filters.SmallTest; - -import com.android.systemui.R; -import com.android.systemui.SysuiTestCase; -import com.android.systemui.util.concurrency.FakeExecutor;; -import com.android.systemui.util.ref.GcWeakReference; -import com.android.systemui.util.time.FakeSystemClock; - -import com.google.common.util.concurrent.ListenableFuture; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; - -import java.util.Optional; - -@SmallTest -@RunWith(AndroidTestingRunner.class) -public class CommunalSourcePrimerTest extends SysuiTestCase { - private static final String TEST_COMPONENT_NAME = "com.google.tests/.CommunalService"; - private static final int MAX_RETRIES = 5; - private static final int RETRY_DELAY_MS = 1000; - private static final int CONNECTION_MIN_DURATION_MS = 5000; - - // A simple implementation of {@link CommunalSource.Observer} to capture a callback value. - // Used to ensure the references to a {@link CommunalSource.Observer.Callback} can be fully - // removed. - private static class FakeObserver implements CommunalSource.Observer { - public GcWeakReference<Callback> mLastCallback; - - @Override - public void addCallback(Callback callback) { - mLastCallback = new GcWeakReference<>(callback); - } - - @Override - public void removeCallback(Callback callback) { - if (mLastCallback.get() == callback) { - mLastCallback = null; - } - } - } - - // A simple implementation of {@link CommunalSource} to capture callback values. This - // implementation better emulates the {@link WeakReference} wrapping behavior of - // {@link CommunalSource} implementations than a mock. - private static class FakeSource implements CommunalSource { - @Override - public ListenableFuture<CommunalViewResult> requestCommunalView(Context context) { - return null; - } - } - - @Mock - private Context mContext; - - @Mock - private Resources mResources; - - private FakeSystemClock mFakeClock = new FakeSystemClock(); - private FakeExecutor mFakeExecutor = new FakeExecutor(mFakeClock); - - private FakeSource mSource = new FakeSource(); - - @Mock - private CommunalSourceMonitor mCommunalSourceMonitor; - - @Mock - private CommunalSource.Connector mConnector; - - @Mock - private CommunalSource.Connection mConnection; - - private FakeObserver mObserver = new FakeObserver(); - - private CommunalSourcePrimer mPrimer; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - when(mResources.getInteger(R.integer.config_communalSourceMaxReconnectAttempts)) - .thenReturn(MAX_RETRIES); - when(mResources.getInteger(R.integer.config_communalSourceReconnectBaseDelay)) - .thenReturn(RETRY_DELAY_MS); - when(mResources.getInteger(R.integer.config_communalSourceReconnectBaseDelay)) - .thenReturn(RETRY_DELAY_MS); - when(mResources.getString(R.string.config_communalSourceComponent)) - .thenReturn(TEST_COMPONENT_NAME); - when(mResources.getInteger(R.integer.config_connectionMinDuration)) - .thenReturn(CONNECTION_MIN_DURATION_MS); - - mPrimer = new CommunalSourcePrimer(mContext, mResources, mFakeClock, mFakeExecutor, - mCommunalSourceMonitor, Optional.of(mConnector), Optional.of(mObserver)); - } - - private CommunalSource.Connection.Callback captureCallbackAndSend( - CommunalSource.Connector connector, Optional<CommunalSource> source) { - ArgumentCaptor<CommunalSource.Connection.Callback> connectionCallback = - ArgumentCaptor.forClass(CommunalSource.Connection.Callback.class); - - verify(connector).connect(connectionCallback.capture()); - Mockito.clearInvocations(connector); - - final CommunalSource.Connection.Callback callback = connectionCallback.getValue(); - callback.onSourceEstablished(source); - - return callback; - } - - @Test - public void testConnect() { - mPrimer.onBootCompleted(); - captureCallbackAndSend(mConnector, Optional.of(mSource)); - verify(mCommunalSourceMonitor).setSource(mSource); - } - - @Test - public void testRetryOnBindFailure() throws Exception { - mPrimer.onBootCompleted(); - - // Verify attempts happen. Note that we account for the retries plus initial attempt, which - // is not scheduled. - for (int attemptCount = 0; attemptCount < MAX_RETRIES + 1; attemptCount++) { - captureCallbackAndSend(mConnector, Optional.empty()); - mFakeExecutor.advanceClockToNext(); - mFakeExecutor.runAllReady(); - } - - verify(mCommunalSourceMonitor, never()).setSource(Mockito.notNull()); - } - - @Test - public void testRetryOnDisconnectFailure() throws Exception { - mPrimer.onBootCompleted(); - // Verify attempts happen. Note that we account for the retries plus initial attempt, which - // is not scheduled. - for (int attemptCount = 0; attemptCount < MAX_RETRIES + 1; attemptCount++) { - final CommunalSource.Connection.Callback callback = - captureCallbackAndSend(mConnector, Optional.of(mSource)); - verify(mCommunalSourceMonitor).setSource(Mockito.notNull()); - clearInvocations(mCommunalSourceMonitor); - callback.onDisconnected(); - mFakeExecutor.advanceClockToNext(); - mFakeExecutor.runAllReady(); - } - - verify(mConnector, never()).connect(any()); - } - - @Test - public void testAttemptOnPackageChange() { - mPrimer.onBootCompleted(); - captureCallbackAndSend(mConnector, Optional.empty()); - - mObserver.mLastCallback.get().onSourceChanged(); - - verify(mConnector, times(1)).connect(any()); - } - - @Test - public void testDisconnect() { - mPrimer.onBootCompleted(); - final CommunalSource.Connection.Callback callback = - captureCallbackAndSend(mConnector, Optional.of(mSource)); - verify(mCommunalSourceMonitor).setSource(mSource); - - mFakeClock.advanceTime(CONNECTION_MIN_DURATION_MS + 1); - callback.onDisconnected(); - - verify(mConnector).connect(any()); - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalStateControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalStateControllerTest.java deleted file mode 100644 index 7f85c35af742..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalStateControllerTest.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.clearInvocations; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; - -import android.testing.AndroidTestingRunner; - -import androidx.test.filters.SmallTest; - -import com.android.systemui.SysuiTestCase; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -@SmallTest -@RunWith(AndroidTestingRunner.class) -public class CommunalStateControllerTest extends SysuiTestCase { - @Mock - private CommunalStateController.Callback mCallback; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - } - - @Test - public void testDefaultCommunalViewShowingState() { - // The state controller should report the communal view as not showing by default. - final CommunalStateController stateController = new CommunalStateController(); - assertThat(stateController.getCommunalViewShowing()).isFalse(); - } - - @Test - public void testNotifyCommunalSurfaceShow() { - final CommunalStateController stateController = new CommunalStateController(); - stateController.addCallback(mCallback); - - // Verify setting communal view to showing propagates to callback. - stateController.setCommunalViewShowing(true); - verify(mCallback).onCommunalViewShowingChanged(); - assertThat(stateController.getCommunalViewShowing()).isTrue(); - - clearInvocations(mCallback); - - // Verify setting communal view to not showing propagates to callback. - stateController.setCommunalViewShowing(false); - verify(mCallback).onCommunalViewShowingChanged(); - assertThat(stateController.getCommunalViewShowing()).isFalse(); - } - - @Test - public void testCallbackRegistration() { - final CommunalStateController stateController = new CommunalStateController(); - stateController.addCallback(mCallback); - - // Verify setting communal view to showing propagates to callback. - stateController.setCommunalViewShowing(true); - verify(mCallback).onCommunalViewShowingChanged(); - - clearInvocations(mCallback); - - stateController.removeCallback(mCallback); - clearInvocations(mCallback); - - // Verify callback not invoked after removing from state controller. - stateController.setCommunalViewShowing(false); - verify(mCallback, never()).onCommunalViewShowingChanged(); - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/PackageObserverTest.java b/packages/SystemUI/tests/src/com/android/systemui/communal/PackageObserverTest.java deleted file mode 100644 index 1cd60698353b..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/PackageObserverTest.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.communal; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.verify; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.testing.AndroidTestingRunner; - -import androidx.test.filters.SmallTest; - -import com.android.systemui.SysuiTestCase; - -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; - -@SmallTest -@RunWith(AndroidTestingRunner.class) -public class PackageObserverTest extends SysuiTestCase { - private static final String PACKAGE_NAME = "com.foo.bar"; - - @Mock - Context mContext; - - @Mock - CommunalSource.Observer.Callback mCallback; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - } - - @Test - public void testChange() { - final PackageObserver observer = new PackageObserver(mContext, PACKAGE_NAME); - final ArgumentCaptor<BroadcastReceiver> receiverCapture = - ArgumentCaptor.forClass(BroadcastReceiver.class); - - observer.addCallback(mCallback); - - // Verify broadcast receiver registered. - verify(mContext).registerReceiver(receiverCapture.capture(), any(), anyInt()); - - // Simulate package change. - receiverCapture.getValue().onReceive(mContext, new Intent()); - - // Check that callback was informed. - verify(mCallback).onSourceChanged(); - - observer.removeCallback(mCallback); - - // Make sure receiver is unregistered on last callback removal - verify(mContext).unregisterReceiver(receiverCapture.getValue()); - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java index b3d54590dc99..7d7ccb462b3e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java @@ -19,6 +19,7 @@ package com.android.systemui.dreams; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -173,19 +174,19 @@ public class DreamOverlayServiceTest extends SysuiTestCase { } @Test - public void testShouldShowComplicationsFalseByDefault() { + public void testShouldShowComplicationsTrueByDefault() { mService.onBind(new Intent()); - assertThat(mService.shouldShowComplications()).isFalse(); + assertThat(mService.shouldShowComplications()).isTrue(); } @Test public void testShouldShowComplicationsSetByIntentExtra() { final Intent intent = new Intent(); - intent.putExtra(DreamService.EXTRA_SHOW_COMPLICATIONS, true); + intent.putExtra(DreamService.EXTRA_SHOW_COMPLICATIONS, false); mService.onBind(intent); - assertThat(mService.shouldShowComplications()).isTrue(); + assertThat(mService.shouldShowComplications()).isFalse(); } @Test @@ -222,4 +223,25 @@ public class DreamOverlayServiceTest extends SysuiTestCase { verify(mLifecycleRegistry).setCurrentState(Lifecycle.State.DESTROYED); verify(mStateController).setOverlayActive(false); } + + @Test + public void testDecorViewNotAddedToWindowAfterDestroy() throws Exception { + when(mDreamOverlayContainerView.getParent()) + .thenReturn(mDreamOverlayContainerViewParent) + .thenReturn(null); + + final IBinder proxy = mService.onBind(new Intent()); + final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + + // Inform the overlay service of dream starting. + overlay.startDream(mWindowParams, mDreamOverlayCallback); + + // Destroy the service. + mService.onDestroy(); + + // Run executor tasks. + mMainExecutor.runAllReady(); + + verify(mWindowManager, never()).addView(any(), any()); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java index 3ce9889571f1..49da4bd5a825 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java @@ -158,7 +158,6 @@ public class DreamOverlayStateControllerTest extends SysuiTestCase { public void testComplicationFilteringWhenShouldShowComplications() { final DreamOverlayStateController stateController = new DreamOverlayStateController(mExecutor); - stateController.setShouldShowComplications(true); final Complication alwaysAvailableComplication = Mockito.mock(Complication.class); final Complication weatherComplication = Mockito.mock(Complication.class); diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/SmartSpaceComplicationTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/SmartSpaceComplicationTest.java index 3b17a8071cb2..ed1cf69ad8c0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/SmartSpaceComplicationTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/SmartSpaceComplicationTest.java @@ -15,26 +15,31 @@ */ package com.android.systemui.dreams; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.app.smartspace.SmartspaceTarget; import android.content.Context; import android.testing.AndroidTestingRunner; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; -import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController; +import com.android.systemui.dreams.smartspace.DreamsSmartspaceController; +import com.android.systemui.plugins.BcSmartspaceDataPlugin; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import java.util.Arrays; + @SmallTest @RunWith(AndroidTestingRunner.class) public class SmartSpaceComplicationTest extends SysuiTestCase { @@ -42,7 +47,7 @@ public class SmartSpaceComplicationTest extends SysuiTestCase { private Context mContext; @Mock - private LockscreenSmartspaceController mSmartspaceController; + private DreamsSmartspaceController mSmartspaceController; @Mock private DreamOverlayStateController mDreamOverlayStateController; @@ -60,7 +65,6 @@ public class SmartSpaceComplicationTest extends SysuiTestCase { */ @Test public void testAvailability() { - when(mSmartspaceController.isEnabled()).thenReturn(false); final SmartSpaceComplication.Registrant registrant = new SmartSpaceComplication.Registrant( mContext, @@ -68,10 +72,22 @@ public class SmartSpaceComplicationTest extends SysuiTestCase { mComplication, mSmartspaceController); registrant.start(); - verify(mDreamOverlayStateController, never()).addComplication(any()); + verify(mDreamOverlayStateController, never()).addComplication(eq(mComplication)); - when(mSmartspaceController.isEnabled()).thenReturn(true); - registrant.start(); + + final ArgumentCaptor<DreamOverlayStateController.Callback> dreamCallbackCaptor = + ArgumentCaptor.forClass(DreamOverlayStateController.Callback.class); + verify(mDreamOverlayStateController).addCallback(dreamCallbackCaptor.capture()); + + when(mDreamOverlayStateController.isOverlayActive()).thenReturn(true); + dreamCallbackCaptor.getValue().onStateChanged(); + + final ArgumentCaptor<BcSmartspaceDataPlugin.SmartspaceTargetListener> listenerCaptor = + ArgumentCaptor.forClass(BcSmartspaceDataPlugin.SmartspaceTargetListener.class); + verify(mSmartspaceController).addListener(listenerCaptor.capture()); + + final SmartspaceTarget target = Mockito.mock(SmartspaceTarget.class); + listenerCaptor.getValue().onSmartspaceTargetsUpdated(Arrays.asList(target)); verify(mDreamOverlayStateController).addComplication(eq(mComplication)); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBaseDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBaseDialogTest.java index 2be30b39763e..13e582196ffb 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBaseDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBaseDialogTest.java @@ -42,6 +42,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.media.nearby.NearbyMediaDevicesManager; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.phone.ShadeController; @@ -50,6 +51,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.Optional; + @SmallTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper(setAsMainLooper = true) @@ -66,6 +69,8 @@ public class MediaOutputBaseDialogTest extends SysuiTestCase { private NotificationEntryManager mNotificationEntryManager = mock(NotificationEntryManager.class); private final UiEventLogger mUiEventLogger = mock(UiEventLogger.class); + private NearbyMediaDevicesManager mNearbyMediaDevicesManager = mock( + NearbyMediaDevicesManager.class); private final DialogLaunchAnimator mDialogLaunchAnimator = mock(DialogLaunchAnimator.class); private MediaOutputBaseDialogImpl mMediaOutputBaseDialogImpl; @@ -80,7 +85,8 @@ public class MediaOutputBaseDialogTest extends SysuiTestCase { public void setUp() { mMediaOutputController = new MediaOutputController(mContext, TEST_PACKAGE, false, mMediaSessionManager, mLocalBluetoothManager, mShadeController, mStarter, - mNotificationEntryManager, mUiEventLogger, mDialogLaunchAnimator); + mNotificationEntryManager, mUiEventLogger, mDialogLaunchAnimator, + Optional.of(mNearbyMediaDevicesManager)); mMediaOutputBaseDialogImpl = new MediaOutputBaseDialogImpl(mContext, mMediaOutputController); mMediaOutputBaseDialogImpl.onCreate(new Bundle()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputControllerTest.java index 789822e262d5..6230700a6a2e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputControllerTest.java @@ -33,9 +33,11 @@ import android.content.Context; import android.graphics.drawable.Icon; import android.media.MediaDescription; import android.media.MediaMetadata; +import android.media.NearbyDevice; import android.media.RoutingSessionInfo; import android.media.session.MediaController; import android.media.session.MediaSessionManager; +import android.os.RemoteException; import android.service.notification.StatusBarNotification; import android.testing.AndroidTestingRunner; import android.text.TextUtils; @@ -51,17 +53,21 @@ import com.android.settingslib.media.MediaDevice; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.media.nearby.NearbyMediaDevicesManager; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection; import com.android.systemui.statusbar.phone.ShadeController; +import com.google.common.collect.ImmutableList; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.List; +import java.util.Optional; @SmallTest @RunWith(AndroidTestingRunner.class) @@ -86,6 +92,8 @@ public class MediaOutputControllerTest extends SysuiTestCase { private MediaOutputController.Callback mCb = mock(MediaOutputController.Callback.class); private MediaDevice mMediaDevice1 = mock(MediaDevice.class); private MediaDevice mMediaDevice2 = mock(MediaDevice.class); + private NearbyDevice mNearbyDevice1 = mock(NearbyDevice.class); + private NearbyDevice mNearbyDevice2 = mock(NearbyDevice.class); private MediaMetadata mMediaMetadata = mock(MediaMetadata.class); private RoutingSessionInfo mRemoteSessionInfo = mock(RoutingSessionInfo.class); private ShadeController mShadeController = mock(ShadeController.class); @@ -93,12 +101,15 @@ public class MediaOutputControllerTest extends SysuiTestCase { private CommonNotifCollection mNotifCollection = mock(CommonNotifCollection.class); private final UiEventLogger mUiEventLogger = mock(UiEventLogger.class); private final DialogLaunchAnimator mDialogLaunchAnimator = mock(DialogLaunchAnimator.class); + private final NearbyMediaDevicesManager mNearbyMediaDevicesManager = mock( + NearbyMediaDevicesManager.class); private Context mSpyContext; private MediaOutputController mMediaOutputController; private LocalMediaManager mLocalMediaManager; private List<MediaController> mMediaControllers = new ArrayList<>(); private List<MediaDevice> mMediaDevices = new ArrayList<>(); + private List<NearbyDevice> mNearbyDevices = new ArrayList<>(); private MediaDescription mMediaDescription; private List<RoutingSessionInfo> mRoutingSessionInfos = new ArrayList<>(); @@ -115,7 +126,8 @@ public class MediaOutputControllerTest extends SysuiTestCase { mMediaOutputController = new MediaOutputController(mSpyContext, TEST_PACKAGE_NAME, false, mMediaSessionManager, mLocalBluetoothManager, mShadeController, mStarter, - mNotifCollection, mUiEventLogger, mDialogLaunchAnimator); + mNotifCollection, mUiEventLogger, mDialogLaunchAnimator, + Optional.of(mNearbyMediaDevicesManager)); mLocalMediaManager = spy(mMediaOutputController.mLocalMediaManager); mMediaOutputController.mLocalMediaManager = mLocalMediaManager; MediaDescription.Builder builder = new MediaDescription.Builder(); @@ -127,6 +139,13 @@ public class MediaOutputControllerTest extends SysuiTestCase { when(mMediaDevice2.getId()).thenReturn(TEST_DEVICE_2_ID); mMediaDevices.add(mMediaDevice1); mMediaDevices.add(mMediaDevice2); + + when(mNearbyDevice1.getMediaRoute2Id()).thenReturn(TEST_DEVICE_1_ID); + when(mNearbyDevice1.getRangeZone()).thenReturn(NearbyDevice.RANGE_CLOSE); + when(mNearbyDevice2.getMediaRoute2Id()).thenReturn(TEST_DEVICE_2_ID); + when(mNearbyDevice2.getRangeZone()).thenReturn(NearbyDevice.RANGE_FAR); + mNearbyDevices.add(mNearbyDevice1); + mNearbyDevices.add(mNearbyDevice2); } @Test @@ -159,7 +178,8 @@ public class MediaOutputControllerTest extends SysuiTestCase { public void start_withoutPackageName_verifyMediaControllerInit() { mMediaOutputController = new MediaOutputController(mSpyContext, null, false, mMediaSessionManager, mLocalBluetoothManager, mShadeController, mStarter, - mNotifCollection, mUiEventLogger, mDialogLaunchAnimator); + mNotifCollection, mUiEventLogger, mDialogLaunchAnimator, + Optional.of(mNearbyMediaDevicesManager)); mMediaOutputController.start(mCb); @@ -167,6 +187,13 @@ public class MediaOutputControllerTest extends SysuiTestCase { } @Test + public void start_nearbyMediaDevicesManagerNotNull_registersNearbyDevicesCallback() { + mMediaOutputController.start(mCb); + + verify(mNearbyMediaDevicesManager).registerNearbyDevicesCallback(any()); + } + + @Test public void stop_withPackageName_verifyMediaControllerDeinit() { mMediaOutputController.start(mCb); reset(mMediaController); @@ -180,7 +207,8 @@ public class MediaOutputControllerTest extends SysuiTestCase { public void stop_withoutPackageName_verifyMediaControllerDeinit() { mMediaOutputController = new MediaOutputController(mSpyContext, null, false, mMediaSessionManager, mLocalBluetoothManager, mShadeController, mStarter, - mNotifCollection, mUiEventLogger, mDialogLaunchAnimator); + mNotifCollection, mUiEventLogger, mDialogLaunchAnimator, + Optional.of(mNearbyMediaDevicesManager)); mMediaOutputController.start(mCb); @@ -189,6 +217,39 @@ public class MediaOutputControllerTest extends SysuiTestCase { verify(mMediaController, never()).unregisterCallback(any()); } + + @Test + public void stop_nearbyMediaDevicesManagerNotNull_unregistersNearbyDevicesCallback() { + mMediaOutputController.start(mCb); + reset(mMediaController); + + mMediaOutputController.stop(); + + verify(mNearbyMediaDevicesManager).unregisterNearbyDevicesCallback(any()); + } + + @Test + public void onDevicesUpdated_unregistersNearbyDevicesCallback() throws RemoteException { + mMediaOutputController.start(mCb); + + mMediaOutputController.onDevicesUpdated(ImmutableList.of()); + + verify(mNearbyMediaDevicesManager).unregisterNearbyDevicesCallback(any()); + } + + @Test + public void onDeviceListUpdate_withNearbyDevices_updatesRangeInformation() + throws RemoteException { + mMediaOutputController.start(mCb); + reset(mCb); + + mMediaOutputController.onDevicesUpdated(mNearbyDevices); + mMediaOutputController.onDeviceListUpdate(mMediaDevices); + + verify(mMediaDevice1).setRangeZone(NearbyDevice.RANGE_CLOSE); + verify(mMediaDevice2).setRangeZone(NearbyDevice.RANGE_FAR); + } + @Test public void onDeviceListUpdate_verifyDeviceListCallback() { mMediaOutputController.start(mCb); @@ -451,7 +512,8 @@ public class MediaOutputControllerTest extends SysuiTestCase { public void getNotificationLargeIcon_withoutPackageName_returnsNull() { mMediaOutputController = new MediaOutputController(mSpyContext, null, false, mMediaSessionManager, mLocalBluetoothManager, mShadeController, mStarter, - mNotifCollection, mUiEventLogger, mDialogLaunchAnimator); + mNotifCollection, mUiEventLogger, mDialogLaunchAnimator, + Optional.of(mNearbyMediaDevicesManager)); assertThat(mMediaOutputController.getNotificationIcon()).isNull(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java index 8a3ea562269d..cb52e7c20464 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java @@ -37,6 +37,7 @@ import com.android.settingslib.media.LocalMediaManager; import com.android.settingslib.media.MediaDevice; import com.android.systemui.SysuiTestCase; import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.media.nearby.NearbyMediaDevicesManager; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.phone.ShadeController; @@ -48,6 +49,7 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.List; +import java.util.Optional; @SmallTest @RunWith(AndroidTestingRunner.class) @@ -67,6 +69,8 @@ public class MediaOutputDialogTest extends SysuiTestCase { mock(NotificationEntryManager.class); private final UiEventLogger mUiEventLogger = mock(UiEventLogger.class); private final DialogLaunchAnimator mDialogLaunchAnimator = mock(DialogLaunchAnimator.class); + private final NearbyMediaDevicesManager mNearbyMediaDevicesManager = mock( + NearbyMediaDevicesManager.class); private MediaOutputDialog mMediaOutputDialog; private MediaOutputController mMediaOutputController; @@ -76,7 +80,8 @@ public class MediaOutputDialogTest extends SysuiTestCase { public void setUp() { mMediaOutputController = new MediaOutputController(mContext, TEST_PACKAGE, false, mMediaSessionManager, mLocalBluetoothManager, mShadeController, mStarter, - mNotificationEntryManager, mUiEventLogger, mDialogLaunchAnimator); + mNotificationEntryManager, mUiEventLogger, mDialogLaunchAnimator, + Optional.of(mNearbyMediaDevicesManager)); mMediaOutputController.mLocalMediaManager = mLocalMediaManager; mMediaOutputDialog = new MediaOutputDialog(mContext, false, mMediaOutputController, mUiEventLogger); diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputGroupDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputGroupDialogTest.java index e8cd6c88956d..f186f57fd0e5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputGroupDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputGroupDialogTest.java @@ -35,6 +35,7 @@ import com.android.settingslib.media.MediaDevice; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.media.nearby.NearbyMediaDevicesManager; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.phone.ShadeController; @@ -46,6 +47,7 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.List; +import java.util.Optional; @SmallTest @RunWith(AndroidTestingRunner.class) @@ -66,6 +68,8 @@ public class MediaOutputGroupDialogTest extends SysuiTestCase { mock(NotificationEntryManager.class); private final UiEventLogger mUiEventLogger = mock(UiEventLogger.class); private final DialogLaunchAnimator mDialogLaunchAnimator = mock(DialogLaunchAnimator.class); + private NearbyMediaDevicesManager mNearbyMediaDevicesManager = mock( + NearbyMediaDevicesManager.class); private MediaOutputGroupDialog mMediaOutputGroupDialog; private MediaOutputController mMediaOutputController; @@ -75,7 +79,8 @@ public class MediaOutputGroupDialogTest extends SysuiTestCase { public void setUp() { mMediaOutputController = new MediaOutputController(mContext, TEST_PACKAGE, false, mMediaSessionManager, mLocalBluetoothManager, mShadeController, mStarter, - mNotificationEntryManager, mUiEventLogger, mDialogLaunchAnimator); + mNotificationEntryManager, mUiEventLogger, mDialogLaunchAnimator, + Optional.of(mNearbyMediaDevicesManager)); mMediaOutputController.mLocalMediaManager = mLocalMediaManager; mMediaOutputGroupDialog = new MediaOutputGroupDialog(mContext, false, mMediaOutputController); diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelperTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelperTest.kt index 794bc09715af..2a130535c657 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelperTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelperTest.kt @@ -21,13 +21,8 @@ import android.content.Context import android.media.MediaRoute2Info import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.media.taptotransfer.sender.AlmostCloseToEndCast -import com.android.systemui.media.taptotransfer.sender.AlmostCloseToStartCast -import com.android.systemui.media.taptotransfer.sender.TransferFailed -import com.android.systemui.media.taptotransfer.sender.TransferToReceiverTriggered -import com.android.systemui.media.taptotransfer.sender.TransferToThisDeviceSucceeded -import com.android.systemui.media.taptotransfer.sender.TransferToThisDeviceTriggered -import com.android.systemui.media.taptotransfer.sender.TransferToReceiverSucceeded +import com.android.systemui.media.taptotransfer.receiver.ChipStateReceiver +import com.android.systemui.media.taptotransfer.sender.ChipStateSender import com.android.systemui.statusbar.commandline.Command import com.android.systemui.statusbar.commandline.CommandRegistry import com.android.systemui.util.concurrency.FakeExecutor @@ -88,7 +83,7 @@ class MediaTttCommandLineHelperTest : SysuiTestCase() { @Test fun sender_almostCloseToStartCast_serviceCallbackCalled() { commandRegistry.onShellCommand( - pw, getSenderCommand(AlmostCloseToStartCast::class.simpleName!!) + pw, getSenderCommand(ChipStateSender.ALMOST_CLOSE_TO_START_CAST.name) ) val routeInfoCaptor = argumentCaptor<MediaRoute2Info>() @@ -103,7 +98,7 @@ class MediaTttCommandLineHelperTest : SysuiTestCase() { @Test fun sender_almostCloseToEndCast_serviceCallbackCalled() { commandRegistry.onShellCommand( - pw, getSenderCommand(AlmostCloseToEndCast::class.simpleName!!) + pw, getSenderCommand(ChipStateSender.ALMOST_CLOSE_TO_END_CAST.name) ) val routeInfoCaptor = argumentCaptor<MediaRoute2Info>() @@ -118,7 +113,7 @@ class MediaTttCommandLineHelperTest : SysuiTestCase() { @Test fun sender_transferToReceiverTriggered_chipDisplayWithCorrectState() { commandRegistry.onShellCommand( - pw, getSenderCommand(TransferToReceiverTriggered::class.simpleName!!) + pw, getSenderCommand(ChipStateSender.TRANSFER_TO_RECEIVER_TRIGGERED.name) ) val routeInfoCaptor = argumentCaptor<MediaRoute2Info>() @@ -133,7 +128,7 @@ class MediaTttCommandLineHelperTest : SysuiTestCase() { @Test fun sender_transferToThisDeviceTriggered_chipDisplayWithCorrectState() { commandRegistry.onShellCommand( - pw, getSenderCommand(TransferToThisDeviceTriggered::class.simpleName!!) + pw, getSenderCommand(ChipStateSender.TRANSFER_TO_THIS_DEVICE_TRIGGERED.name) ) verify(statusBarManager).updateMediaTapToTransferSenderDisplay( @@ -146,7 +141,7 @@ class MediaTttCommandLineHelperTest : SysuiTestCase() { @Test fun sender_transferToReceiverSucceeded_chipDisplayWithCorrectState() { commandRegistry.onShellCommand( - pw, getSenderCommand(TransferToReceiverSucceeded::class.simpleName!!) + pw, getSenderCommand(ChipStateSender.TRANSFER_TO_RECEIVER_SUCCEEDED.name) ) val routeInfoCaptor = argumentCaptor<MediaRoute2Info>() @@ -161,7 +156,7 @@ class MediaTttCommandLineHelperTest : SysuiTestCase() { @Test fun sender_transferToThisDeviceSucceeded_chipDisplayWithCorrectState() { commandRegistry.onShellCommand( - pw, getSenderCommand(TransferToThisDeviceSucceeded::class.simpleName!!) + pw, getSenderCommand(ChipStateSender.TRANSFER_TO_THIS_DEVICE_SUCCEEDED.name) ) val routeInfoCaptor = argumentCaptor<MediaRoute2Info>() @@ -174,8 +169,10 @@ class MediaTttCommandLineHelperTest : SysuiTestCase() { } @Test - fun sender_transferFailed_serviceCallbackCalled() { - commandRegistry.onShellCommand(pw, getSenderCommand(TransferFailed::class.simpleName!!)) + fun sender_transferToReceiverFailed_serviceCallbackCalled() { + commandRegistry.onShellCommand( + pw, getSenderCommand(ChipStateSender.TRANSFER_TO_RECEIVER_FAILED.name) + ) verify(statusBarManager).updateMediaTapToTransferSenderDisplay( eq(StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED), @@ -185,8 +182,23 @@ class MediaTttCommandLineHelperTest : SysuiTestCase() { } @Test + fun sender_transferToThisDeviceFailed_serviceCallbackCalled() { + commandRegistry.onShellCommand( + pw, getSenderCommand(ChipStateSender.TRANSFER_TO_THIS_DEVICE_FAILED.name) + ) + + verify(statusBarManager).updateMediaTapToTransferSenderDisplay( + eq(StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_FAILED), + any(), + nullable(), + nullable()) + } + + @Test fun sender_farFromReceiver_serviceCallbackCalled() { - commandRegistry.onShellCommand(pw, getSenderCommand(FAR_FROM_RECEIVER_STATE)) + commandRegistry.onShellCommand( + pw, getSenderCommand(ChipStateSender.FAR_FROM_RECEIVER.name) + ) verify(statusBarManager).updateMediaTapToTransferSenderDisplay( eq(StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER), @@ -197,7 +209,9 @@ class MediaTttCommandLineHelperTest : SysuiTestCase() { @Test fun receiver_closeToSender_serviceCallbackCalled() { - commandRegistry.onShellCommand(pw, getReceiverCommand(CLOSE_TO_SENDER_STATE)) + commandRegistry.onShellCommand( + pw, getReceiverCommand(ChipStateReceiver.CLOSE_TO_SENDER.name) + ) verify(statusBarManager).updateMediaTapToTransferReceiverDisplay( eq(StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER), @@ -209,7 +223,9 @@ class MediaTttCommandLineHelperTest : SysuiTestCase() { @Test fun receiver_farFromSender_serviceCallbackCalled() { - commandRegistry.onShellCommand(pw, getReceiverCommand(FAR_FROM_SENDER_STATE)) + commandRegistry.onShellCommand( + pw, getReceiverCommand(ChipStateReceiver.FAR_FROM_SENDER.name) + ) verify(statusBarManager).updateMediaTapToTransferReceiverDisplay( eq(StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER), diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommonTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommonTest.kt index adb59eca1e08..ccce5778c150 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommonTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommonTest.kt @@ -17,7 +17,10 @@ package com.android.systemui.media.taptotransfer.common import android.content.Context +import android.content.pm.ApplicationInfo +import android.content.pm.PackageManager import android.graphics.drawable.Drawable +import android.os.PowerManager import android.view.MotionEvent import android.view.View import android.view.ViewGroup @@ -40,6 +43,7 @@ import org.junit.Before import org.junit.Test import org.mockito.ArgumentCaptor import org.mockito.Mock +import org.mockito.Mockito.eq import org.mockito.Mockito.never import org.mockito.Mockito.reset import org.mockito.Mockito.verify @@ -48,12 +52,16 @@ import org.mockito.MockitoAnnotations @SmallTest class MediaTttChipControllerCommonTest : SysuiTestCase() { - private lateinit var controllerCommon: MediaTttChipControllerCommon<MediaTttChipState> + private lateinit var controllerCommon: MediaTttChipControllerCommon<ChipInfo> private lateinit var fakeClock: FakeSystemClock private lateinit var fakeExecutor: FakeExecutor - private lateinit var appIconDrawable: Drawable + private lateinit var appIconFromPackageName: Drawable + @Mock + private lateinit var packageManager: PackageManager + @Mock + private lateinit var applicationInfo: ApplicationInfo @Mock private lateinit var logger: MediaTttLogger @Mock @@ -62,25 +70,36 @@ class MediaTttChipControllerCommonTest : SysuiTestCase() { private lateinit var viewUtil: ViewUtil @Mock private lateinit var tapGestureDetector: TapGestureDetector + @Mock + private lateinit var powerManager: PowerManager @Before fun setUp() { MockitoAnnotations.initMocks(this) - appIconDrawable = context.getDrawable(R.drawable.ic_cake)!! + + appIconFromPackageName = context.getDrawable(R.drawable.ic_cake)!! + whenever(packageManager.getApplicationIcon(PACKAGE_NAME)).thenReturn(appIconFromPackageName) + whenever(applicationInfo.loadLabel(packageManager)).thenReturn(APP_NAME) + whenever(packageManager.getApplicationInfo( + eq(PACKAGE_NAME), any<PackageManager.ApplicationInfoFlags>() + )).thenReturn(applicationInfo) + context.setMockPackageManager(packageManager) + fakeClock = FakeSystemClock() fakeExecutor = FakeExecutor(fakeClock) controllerCommon = TestControllerCommon( - context, logger, windowManager, viewUtil, fakeExecutor, tapGestureDetector + context, logger, windowManager, viewUtil, fakeExecutor, tapGestureDetector, powerManager ) } @Test - fun displayChip_chipAddedAndGestureDetectionStarted() { + fun displayChip_chipAddedAndGestureDetectionStartedAndScreenOn() { controllerCommon.displayChip(getState()) verify(windowManager).addView(any(), any()) verify(tapGestureDetector).addOnGestureDetectedCallback(any(), any()) + verify(powerManager).wakeUp(any(), any(), any()) } @Test @@ -100,7 +119,7 @@ class MediaTttChipControllerCommonTest : SysuiTestCase() { controllerCommon.displayChip(state) reset(windowManager) - fakeClock.advanceTime(state.getTimeoutMs() - 1) + fakeClock.advanceTime(TIMEOUT_MS - 1) verify(windowManager, never()).removeView(any()) } @@ -111,7 +130,7 @@ class MediaTttChipControllerCommonTest : SysuiTestCase() { controllerCommon.displayChip(state) reset(windowManager) - fakeClock.advanceTime(state.getTimeoutMs() + 1) + fakeClock.advanceTime(TIMEOUT_MS + 1) verify(windowManager).removeView(any()) } @@ -128,7 +147,7 @@ class MediaTttChipControllerCommonTest : SysuiTestCase() { controllerCommon.displayChip(getState()) // Wait until the timeout for the first display would've happened - fakeClock.advanceTime(state.getTimeoutMs() - waitTime + 1) + fakeClock.advanceTime(TIMEOUT_MS - waitTime + 1) // Verify we didn't hide the chip verify(windowManager, never()).removeView(any()) @@ -145,7 +164,7 @@ class MediaTttChipControllerCommonTest : SysuiTestCase() { controllerCommon.displayChip(getState()) // Ensure we still hide the chip eventually - fakeClock.advanceTime(state.getTimeoutMs() + 1) + fakeClock.advanceTime(TIMEOUT_MS + 1) verify(windowManager).removeView(any()) } @@ -172,16 +191,45 @@ class MediaTttChipControllerCommonTest : SysuiTestCase() { } @Test - fun setIcon_viewHasIconAndContentDescription() { + fun setIcon_nullAppIconDrawable_iconIsFromPackageName() { + controllerCommon.displayChip(getState()) + val chipView = getChipView() + + controllerCommon.setIcon(chipView, PACKAGE_NAME, appIconDrawableOverride = null, null) + + assertThat(chipView.getAppIconView().drawable).isEqualTo(appIconFromPackageName) + } + + @Test + fun displayChip_hasAppIconDrawable_iconIsDrawable() { controllerCommon.displayChip(getState()) val chipView = getChipView() - val state = TestChipState(PACKAGE_NAME) - controllerCommon.setIcon(state, chipView) + val drawable = context.getDrawable(R.drawable.ic_alarm)!! + controllerCommon.setIcon(chipView, PACKAGE_NAME, drawable, null) - assertThat(chipView.getAppIconView().drawable).isEqualTo(appIconDrawable) - assertThat(chipView.getAppIconView().contentDescription) - .isEqualTo(state.getAppName(context)) + assertThat(chipView.getAppIconView().drawable).isEqualTo(drawable) + } + + @Test + fun displayChip_nullAppName_iconContentDescriptionIsFromPackageName() { + controllerCommon.displayChip(getState()) + val chipView = getChipView() + + controllerCommon.setIcon(chipView, PACKAGE_NAME, null, appNameOverride = null) + + assertThat(chipView.getAppIconView().contentDescription).isEqualTo(APP_NAME) + } + + @Test + fun displayChip_hasAppName_iconContentDescriptionIsAppNameOverride() { + controllerCommon.displayChip(getState()) + val chipView = getChipView() + + val appName = "Override App Name" + controllerCommon.setIcon(chipView, PACKAGE_NAME, null, appName) + + assertThat(chipView.getAppIconView().contentDescription).isEqualTo(appName) } @Test @@ -218,7 +266,7 @@ class MediaTttChipControllerCommonTest : SysuiTestCase() { verify(windowManager, never()).removeView(any()) } - private fun getState() = MediaTttChipState(PACKAGE_NAME) + private fun getState() = ChipInfo() private fun getChipView(): ViewGroup { val viewCaptor = ArgumentCaptor.forClass(View::class.java) @@ -235,22 +283,27 @@ class MediaTttChipControllerCommonTest : SysuiTestCase() { viewUtil: ViewUtil, @Main mainExecutor: DelayableExecutor, tapGestureDetector: TapGestureDetector, - ) : MediaTttChipControllerCommon<MediaTttChipState>( + powerManager: PowerManager + ) : MediaTttChipControllerCommon<ChipInfo>( context, logger, windowManager, viewUtil, mainExecutor, tapGestureDetector, + powerManager, R.layout.media_ttt_chip ) { - override fun updateChipView(chipState: MediaTttChipState, currentChipView: ViewGroup) { + override fun updateChipView(chipInfo: ChipInfo, currentChipView: ViewGroup) { + } } - inner class TestChipState(appPackageName: String?) : MediaTttChipState(appPackageName) { - override fun getAppIcon(context: Context) = appIconDrawable + inner class ChipInfo : ChipInfoCommon { + override fun getTimeoutMs() = TIMEOUT_MS } } private const val PACKAGE_NAME = "com.android.systemui" +private const val APP_NAME = "Fake App Name" +private const val TIMEOUT_MS = 10000L 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 56f45896436c..355d3fe4b8d1 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 @@ -22,6 +22,7 @@ import android.content.pm.PackageManager import android.graphics.drawable.Drawable import android.media.MediaRoute2Info import android.os.Handler +import android.os.PowerManager import android.testing.AndroidTestingRunner import android.testing.TestableLooper import android.view.View @@ -29,6 +30,7 @@ import android.view.ViewGroup import android.view.WindowManager import android.widget.ImageView import androidx.test.filters.SmallTest +import com.android.internal.logging.testing.UiEventLoggerFake import com.android.systemui.R import com.android.systemui.SysuiTestCase import com.android.systemui.media.taptotransfer.common.MediaTttLogger @@ -63,6 +65,8 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { @Mock private lateinit var logger: MediaTttLogger @Mock + private lateinit var powerManager: PowerManager + @Mock private lateinit var windowManager: WindowManager @Mock private lateinit var viewUtil: ViewUtil @@ -70,6 +74,8 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { private lateinit var commandQueue: CommandQueue private lateinit var commandQueueCallback: CommandQueue.Callbacks private lateinit var fakeAppIconDrawable: Drawable + private lateinit var uiEventLoggerFake: UiEventLoggerFake + private lateinit var receiverUiEventLogger: MediaTttReceiverUiEventLogger @Before fun setUp() { @@ -83,6 +89,9 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { )).thenReturn(applicationInfo) context.setMockPackageManager(packageManager) + uiEventLoggerFake = UiEventLoggerFake() + receiverUiEventLogger = MediaTttReceiverUiEventLogger(uiEventLoggerFake) + controllerReceiver = MediaTttChipControllerReceiver( commandQueue, context, @@ -91,7 +100,9 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { viewUtil, FakeExecutor(FakeSystemClock()), TapGestureDetector(context), + powerManager, Handler.getMain(), + receiverUiEventLogger, ) val callbackCaptor = ArgumentCaptor.forClass(CommandQueue.Callbacks::class.java) @@ -110,6 +121,9 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { ) assertThat(getChipView().getAppIconView().contentDescription).isEqualTo(appName) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + MediaTttReceiverUiEvents.MEDIA_TTT_RECEIVER_CLOSE_TO_SENDER.id + ) } @Test @@ -122,6 +136,9 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { ) verify(windowManager, never()).addView(any(), any()) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + MediaTttReceiverUiEvents.MEDIA_TTT_RECEIVER_FAR_FROM_SENDER.id + ) } @Test @@ -157,44 +174,6 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { verify(logger).logStateChange(any(), any()) } - @Test - fun displayChip_nullAppIconDrawable_iconIsFromPackageName() { - val state = ChipStateReceiver(PACKAGE_NAME, appIconDrawable = null, "appName") - - controllerReceiver.displayChip(state) - - assertThat(getChipView().getAppIconView().drawable).isEqualTo(fakeAppIconDrawable) - } - - @Test - fun displayChip_hasAppIconDrawable_iconIsDrawable() { - val drawable = context.getDrawable(R.drawable.ic_alarm)!! - val state = ChipStateReceiver(PACKAGE_NAME, drawable, "appName") - - controllerReceiver.displayChip(state) - - assertThat(getChipView().getAppIconView().drawable).isEqualTo(drawable) - } - - @Test - fun displayChip_nullAppName_iconContentDescriptionIsFromPackageName() { - val state = ChipStateReceiver(PACKAGE_NAME, appIconDrawable = null, appName = null) - - controllerReceiver.displayChip(state) - - assertThat(getChipView().getAppIconView().contentDescription).isEqualTo(APP_NAME) - } - - @Test - fun displayChip_hasAppName_iconContentDescriptionIsAppNameOverride() { - val appName = "Override App Name" - val state = ChipStateReceiver(PACKAGE_NAME, appIconDrawable = null, appName) - - controllerReceiver.displayChip(state) - - assertThat(getChipView().getAppIconView().contentDescription).isEqualTo(appName) - } - private fun getChipView(): ViewGroup { val viewCaptor = ArgumentCaptor.forClass(View::class.java) verify(windowManager).addView(viewCaptor.capture(), any()) diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverUiEventLoggerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverUiEventLoggerTest.kt new file mode 100644 index 000000000000..ee10ddc521f1 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverUiEventLoggerTest.kt @@ -0,0 +1,30 @@ +package com.android.systemui.media.taptotransfer.receiver + +import androidx.test.filters.SmallTest +import com.android.internal.logging.testing.UiEventLoggerFake +import com.android.systemui.SysuiTestCase +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test + +@SmallTest +class MediaTttReceiverUiEventLoggerTest : SysuiTestCase() { + private lateinit var uiEventLoggerFake: UiEventLoggerFake + private lateinit var logger: MediaTttReceiverUiEventLogger + + @Before + fun setUp() { + uiEventLoggerFake = UiEventLoggerFake() + logger = MediaTttReceiverUiEventLogger(uiEventLoggerFake) + } + + @Test + fun logReceiverStateChange_eventAssociatedWithStateIsLogged() { + val state = ChipStateReceiver.CLOSE_TO_SENDER + + logger.logReceiverStateChange(state) + + assertThat(uiEventLoggerFake.numLogs()).isEqualTo(1) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo(state.uiEvent.id) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSenderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSenderTest.kt index fd1d76a5d02d..ef5315428a60 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSenderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSenderTest.kt @@ -21,6 +21,7 @@ import android.content.pm.ApplicationInfo import android.content.pm.PackageManager import android.graphics.drawable.Drawable import android.media.MediaRoute2Info +import android.os.PowerManager import android.testing.AndroidTestingRunner import android.testing.TestableLooper import android.view.View @@ -29,6 +30,7 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import androidx.test.filters.SmallTest +import com.android.internal.logging.testing.UiEventLoggerFake import com.android.internal.statusbar.IUndoMediaTransferCallback import com.android.systemui.R import com.android.systemui.SysuiTestCase @@ -65,6 +67,8 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { @Mock private lateinit var logger: MediaTttLogger @Mock + private lateinit var powerManager: PowerManager + @Mock private lateinit var windowManager: WindowManager @Mock private lateinit var viewUtil: ViewUtil @@ -74,6 +78,8 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { private lateinit var fakeAppIconDrawable: Drawable private lateinit var fakeClock: FakeSystemClock private lateinit var fakeExecutor: FakeExecutor + private lateinit var uiEventLoggerFake: UiEventLoggerFake + private lateinit var senderUiEventLogger: MediaTttSenderUiEventLogger @Before fun setUp() { @@ -89,6 +95,8 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { fakeClock = FakeSystemClock() fakeExecutor = FakeExecutor(fakeClock) + uiEventLoggerFake = UiEventLoggerFake() + senderUiEventLogger = MediaTttSenderUiEventLogger(uiEventLoggerFake) controllerSender = MediaTttChipControllerSender( commandQueue, @@ -97,7 +105,9 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { windowManager, viewUtil, fakeExecutor, - TapGestureDetector(context) + TapGestureDetector(context), + powerManager, + senderUiEventLogger ) val callbackCaptor = ArgumentCaptor.forClass(CommandQueue.Callbacks::class.java) @@ -113,8 +123,12 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { null ) - assertThat(getChipView().getChipText()) - .isEqualTo(almostCloseToStartCast().getChipTextString(context)) + assertThat(getChipView().getChipText()).isEqualTo( + almostCloseToStartCast().state.getChipTextString(context, OTHER_DEVICE_NAME) + ) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_ALMOST_CLOSE_TO_START_CAST.id + ) } @Test @@ -125,8 +139,12 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { null ) - assertThat(getChipView().getChipText()) - .isEqualTo(almostCloseToEndCast().getChipTextString(context)) + assertThat(getChipView().getChipText()).isEqualTo( + almostCloseToEndCast().state.getChipTextString(context, OTHER_DEVICE_NAME) + ) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_ALMOST_CLOSE_TO_END_CAST.id + ) } @Test @@ -137,8 +155,12 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { null ) - assertThat(getChipView().getChipText()) - .isEqualTo(transferToReceiverTriggered().getChipTextString(context)) + assertThat(getChipView().getChipText()).isEqualTo( + transferToReceiverTriggered().state.getChipTextString(context, OTHER_DEVICE_NAME) + ) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_RECEIVER_TRIGGERED.id + ) } @Test @@ -149,8 +171,12 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { null ) - assertThat(getChipView().getChipText()) - .isEqualTo(transferToThisDeviceTriggered().getChipTextString(context)) + assertThat(getChipView().getChipText()).isEqualTo( + transferToThisDeviceTriggered().state.getChipTextString(context, OTHER_DEVICE_NAME) + ) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_THIS_DEVICE_TRIGGERED.id + ) } @Test @@ -161,8 +187,12 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { null ) - assertThat(getChipView().getChipText()) - .isEqualTo(transferToReceiverSucceeded().getChipTextString(context)) + assertThat(getChipView().getChipText()).isEqualTo( + transferToReceiverSucceeded().state.getChipTextString(context, OTHER_DEVICE_NAME) + ) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_RECEIVER_SUCCEEDED.id + ) } @Test @@ -173,8 +203,12 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { null ) - assertThat(getChipView().getChipText()) - .isEqualTo(transferToThisDeviceSucceeded().getChipTextString(context)) + assertThat(getChipView().getChipText()).isEqualTo( + transferToThisDeviceSucceeded().state.getChipTextString(context, OTHER_DEVICE_NAME) + ) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_THIS_DEVICE_SUCCEEDED.id + ) } @Test @@ -185,8 +219,12 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { null ) - assertThat(getChipView().getChipText()) - .isEqualTo(transferFailed().getChipTextString(context)) + assertThat(getChipView().getChipText()).isEqualTo( + transferToReceiverFailed().state.getChipTextString(context, OTHER_DEVICE_NAME) + ) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_RECEIVER_FAILED.id + ) } @Test @@ -197,8 +235,12 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { null ) - assertThat(getChipView().getChipText()) - .isEqualTo(transferFailed().getChipTextString(context)) + assertThat(getChipView().getChipText()).isEqualTo( + transferToThisDeviceFailed().state.getChipTextString(context, OTHER_DEVICE_NAME) + ) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_THIS_DEVICE_FAILED.id + ) } @Test @@ -210,6 +252,9 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { ) verify(windowManager, never()).addView(any(), any()) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_FAR_FROM_RECEIVER.id + ) } @Test @@ -250,7 +295,9 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { val chipView = getChipView() assertThat(chipView.getAppIconView().drawable).isEqualTo(fakeAppIconDrawable) assertThat(chipView.getAppIconView().contentDescription).isEqualTo(APP_NAME) - assertThat(chipView.getChipText()).isEqualTo(state.getChipTextString(context)) + assertThat(chipView.getChipText()).isEqualTo( + state.state.getChipTextString(context, OTHER_DEVICE_NAME) + ) assertThat(chipView.getLoadingIconVisibility()).isEqualTo(View.GONE) assertThat(chipView.getUndoButton().visibility).isEqualTo(View.GONE) assertThat(chipView.getFailureIcon().visibility).isEqualTo(View.GONE) @@ -264,7 +311,9 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { val chipView = getChipView() assertThat(chipView.getAppIconView().drawable).isEqualTo(fakeAppIconDrawable) assertThat(chipView.getAppIconView().contentDescription).isEqualTo(APP_NAME) - assertThat(chipView.getChipText()).isEqualTo(state.getChipTextString(context)) + assertThat(chipView.getChipText()).isEqualTo( + state.state.getChipTextString(context, OTHER_DEVICE_NAME) + ) assertThat(chipView.getLoadingIconVisibility()).isEqualTo(View.GONE) assertThat(chipView.getUndoButton().visibility).isEqualTo(View.GONE) assertThat(chipView.getFailureIcon().visibility).isEqualTo(View.GONE) @@ -278,7 +327,9 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { val chipView = getChipView() assertThat(chipView.getAppIconView().drawable).isEqualTo(fakeAppIconDrawable) assertThat(chipView.getAppIconView().contentDescription).isEqualTo(APP_NAME) - assertThat(chipView.getChipText()).isEqualTo(state.getChipTextString(context)) + assertThat(chipView.getChipText()).isEqualTo( + state.state.getChipTextString(context, OTHER_DEVICE_NAME) + ) assertThat(chipView.getLoadingIconVisibility()).isEqualTo(View.VISIBLE) assertThat(chipView.getUndoButton().visibility).isEqualTo(View.GONE) assertThat(chipView.getFailureIcon().visibility).isEqualTo(View.GONE) @@ -292,7 +343,9 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { val chipView = getChipView() assertThat(chipView.getAppIconView().drawable).isEqualTo(fakeAppIconDrawable) assertThat(chipView.getAppIconView().contentDescription).isEqualTo(APP_NAME) - assertThat(chipView.getChipText()).isEqualTo(state.getChipTextString(context)) + assertThat(chipView.getChipText()).isEqualTo( + state.state.getChipTextString(context, OTHER_DEVICE_NAME) + ) assertThat(chipView.getLoadingIconVisibility()).isEqualTo(View.VISIBLE) assertThat(chipView.getUndoButton().visibility).isEqualTo(View.GONE) assertThat(chipView.getFailureIcon().visibility).isEqualTo(View.GONE) @@ -306,7 +359,9 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { val chipView = getChipView() assertThat(chipView.getAppIconView().drawable).isEqualTo(fakeAppIconDrawable) assertThat(chipView.getAppIconView().contentDescription).isEqualTo(APP_NAME) - assertThat(chipView.getChipText()).isEqualTo(state.getChipTextString(context)) + assertThat(chipView.getChipText()).isEqualTo( + state.state.getChipTextString(context, OTHER_DEVICE_NAME) + ) assertThat(chipView.getLoadingIconVisibility()).isEqualTo(View.GONE) assertThat(chipView.getFailureIcon().visibility).isEqualTo(View.GONE) } @@ -355,8 +410,12 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { getChipView().getUndoButton().performClick() - assertThat(getChipView().getChipText()) - .isEqualTo(transferToThisDeviceTriggered().getChipTextString(context)) + assertThat(getChipView().getChipText()).isEqualTo( + transferToThisDeviceTriggered().state.getChipTextString(context, OTHER_DEVICE_NAME) + ) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_UNDO_TRANSFER_TO_RECEIVER_CLICKED.id + ) } @Test @@ -367,7 +426,9 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { val chipView = getChipView() assertThat(chipView.getAppIconView().drawable).isEqualTo(fakeAppIconDrawable) assertThat(chipView.getAppIconView().contentDescription).isEqualTo(APP_NAME) - assertThat(chipView.getChipText()).isEqualTo(state.getChipTextString(context)) + assertThat(chipView.getChipText()).isEqualTo( + state.state.getChipTextString(context, OTHER_DEVICE_NAME) + ) assertThat(chipView.getLoadingIconVisibility()).isEqualTo(View.GONE) assertThat(chipView.getFailureIcon().visibility).isEqualTo(View.GONE) } @@ -416,19 +477,41 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { getChipView().getUndoButton().performClick() - assertThat(getChipView().getChipText()) - .isEqualTo(transferToReceiverTriggered().getChipTextString(context)) + assertThat(getChipView().getChipText()).isEqualTo( + transferToReceiverTriggered().state.getChipTextString(context, OTHER_DEVICE_NAME) + ) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo( + MediaTttSenderUiEvents.MEDIA_TTT_SENDER_UNDO_TRANSFER_TO_THIS_DEVICE_CLICKED.id + ) + } + + @Test + fun transferToReceiverFailed_appIcon_noDeviceName_noLoadingIcon_noUndo_failureIcon() { + val state = transferToReceiverFailed() + controllerSender.displayChip(state) + + val chipView = getChipView() + assertThat(chipView.getAppIconView().drawable).isEqualTo(fakeAppIconDrawable) + assertThat(chipView.getAppIconView().contentDescription).isEqualTo(APP_NAME) + assertThat(getChipView().getChipText()).isEqualTo( + state.state.getChipTextString(context, OTHER_DEVICE_NAME) + ) + assertThat(chipView.getLoadingIconVisibility()).isEqualTo(View.GONE) + assertThat(chipView.getUndoButton().visibility).isEqualTo(View.GONE) + assertThat(chipView.getFailureIcon().visibility).isEqualTo(View.VISIBLE) } @Test - fun transferFailed_appIcon_noDeviceName_noLoadingIcon_noUndo_failureIcon() { - val state = transferFailed() + fun transferToThisDeviceFailed_appIcon_noDeviceName_noLoadingIcon_noUndo_failureIcon() { + val state = transferToThisDeviceFailed() controllerSender.displayChip(state) val chipView = getChipView() assertThat(chipView.getAppIconView().drawable).isEqualTo(fakeAppIconDrawable) assertThat(chipView.getAppIconView().contentDescription).isEqualTo(APP_NAME) - assertThat(chipView.getChipText()).isEqualTo(state.getChipTextString(context)) + assertThat(getChipView().getChipText()).isEqualTo( + state.state.getChipTextString(context, OTHER_DEVICE_NAME) + ) assertThat(chipView.getLoadingIconVisibility()).isEqualTo(View.GONE) assertThat(chipView.getUndoButton().visibility).isEqualTo(View.GONE) assertThat(chipView.getFailureIcon().visibility).isEqualTo(View.VISIBLE) @@ -475,7 +558,7 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { @Test fun changeFromTransferTriggeredToTransferFailed_failureIconAppears() { controllerSender.displayChip(transferToReceiverTriggered()) - controllerSender.displayChip(transferFailed()) + controllerSender.displayChip(transferToReceiverFailed()) assertThat(getChipView().getFailureIcon().visibility).isEqualTo(View.VISIBLE) } @@ -498,7 +581,7 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { fakeClock.advanceTime(1000L) controllerSender.removeChip("fakeRemovalReason") - fakeClock.advanceTime(state.getTimeoutMs() + 1) + fakeClock.advanceTime(state.state.timeout + 1) verify(windowManager).removeView(any()) } @@ -521,7 +604,7 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { fakeClock.advanceTime(1000L) controllerSender.removeChip("fakeRemovalReason") - fakeClock.advanceTime(state.getTimeoutMs() + 1) + fakeClock.advanceTime(state.state.timeout + 1) verify(windowManager).removeView(any()) } @@ -546,34 +629,35 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { /** Helper method providing default parameters to not clutter up the tests. */ private fun almostCloseToStartCast() = - AlmostCloseToStartCast(PACKAGE_NAME, OTHER_DEVICE_NAME) + ChipSenderInfo(ChipStateSender.ALMOST_CLOSE_TO_START_CAST, routeInfo) /** Helper method providing default parameters to not clutter up the tests. */ private fun almostCloseToEndCast() = - AlmostCloseToEndCast(PACKAGE_NAME, OTHER_DEVICE_NAME) + ChipSenderInfo(ChipStateSender.ALMOST_CLOSE_TO_END_CAST, routeInfo) /** Helper method providing default parameters to not clutter up the tests. */ private fun transferToReceiverTriggered() = - TransferToReceiverTriggered(PACKAGE_NAME, OTHER_DEVICE_NAME) + ChipSenderInfo(ChipStateSender.TRANSFER_TO_RECEIVER_TRIGGERED, routeInfo) /** Helper method providing default parameters to not clutter up the tests. */ private fun transferToThisDeviceTriggered() = - TransferToThisDeviceTriggered(PACKAGE_NAME) + ChipSenderInfo(ChipStateSender.TRANSFER_TO_THIS_DEVICE_TRIGGERED, routeInfo) /** Helper method providing default parameters to not clutter up the tests. */ private fun transferToReceiverSucceeded(undoCallback: IUndoMediaTransferCallback? = null) = - TransferToReceiverSucceeded( - PACKAGE_NAME, OTHER_DEVICE_NAME, undoCallback - ) + ChipSenderInfo(ChipStateSender.TRANSFER_TO_RECEIVER_SUCCEEDED, routeInfo, undoCallback) /** Helper method providing default parameters to not clutter up the tests. */ private fun transferToThisDeviceSucceeded(undoCallback: IUndoMediaTransferCallback? = null) = - TransferToThisDeviceSucceeded( - PACKAGE_NAME, OTHER_DEVICE_NAME, undoCallback - ) + ChipSenderInfo(ChipStateSender.TRANSFER_TO_THIS_DEVICE_SUCCEEDED, routeInfo, undoCallback) + + /** Helper method providing default parameters to not clutter up the tests. */ + private fun transferToReceiverFailed() = + ChipSenderInfo(ChipStateSender.TRANSFER_TO_RECEIVER_FAILED, routeInfo) /** Helper method providing default parameters to not clutter up the tests. */ - private fun transferFailed() = TransferFailed(PACKAGE_NAME) + private fun transferToThisDeviceFailed() = + ChipSenderInfo(ChipStateSender.TRANSFER_TO_RECEIVER_FAILED, routeInfo) } private const val APP_NAME = "Fake app name" diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderUiEventLoggerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderUiEventLoggerTest.kt new file mode 100644 index 000000000000..263637a6b6e5 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderUiEventLoggerTest.kt @@ -0,0 +1,46 @@ +package com.android.systemui.media.taptotransfer.sender + +import androidx.test.filters.SmallTest +import com.android.internal.logging.testing.UiEventLoggerFake +import com.android.systemui.SysuiTestCase +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test + +@SmallTest +class MediaTttSenderUiEventLoggerTest : SysuiTestCase() { + private lateinit var uiEventLoggerFake: UiEventLoggerFake + private lateinit var logger: MediaTttSenderUiEventLogger + + @Before + fun setUp () { + uiEventLoggerFake = UiEventLoggerFake() + logger = MediaTttSenderUiEventLogger(uiEventLoggerFake) + } + + @Test + fun logSenderStateChange_eventAssociatedWithStateIsLogged() { + val state = ChipStateSender.ALMOST_CLOSE_TO_END_CAST + logger.logSenderStateChange(state) + + assertThat(uiEventLoggerFake.numLogs()).isEqualTo(1) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo(state.uiEvent.id) + } + + @Test + fun logUndoClicked_undoEventLogged() { + val undoEvent = MediaTttSenderUiEvents.MEDIA_TTT_SENDER_UNDO_TRANSFER_TO_THIS_DEVICE_CLICKED + + logger.logUndoClicked(undoEvent) + + assertThat(uiEventLoggerFake.numLogs()).isEqualTo(1) + assertThat(uiEventLoggerFake.eventId(0)).isEqualTo(undoEvent.id) + } + + @Test + fun logUndoClicked_notUndoEvent_eventNotLogged() { + logger.logUndoClicked(MediaTttSenderUiEvents.MEDIA_TTT_SENDER_TRANSFER_TO_RECEIVER_FAILED) + + assertThat(uiEventLoggerFake.numLogs()).isEqualTo(0) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt new file mode 100644 index 000000000000..57803e874f93 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt @@ -0,0 +1,181 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.smartspace + +import android.app.smartspace.SmartspaceManager +import android.app.smartspace.SmartspaceSession +import android.app.smartspace.SmartspaceTarget +import android.content.Context +import android.graphics.drawable.Drawable +import android.testing.AndroidTestingRunner +import android.testing.TestableLooper +import android.view.View +import android.view.ViewGroup +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.dreams.smartspace.DreamsSmartspaceController +import com.android.systemui.plugins.BcSmartspaceDataPlugin +import com.android.systemui.plugins.FalsingManager +import com.android.systemui.smartspace.dagger.SmartspaceViewComponent +import com.android.systemui.util.concurrency.Execution +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.withArgCaptor +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito +import org.mockito.Mockito.`when` +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations +import java.util.Optional +import java.util.concurrent.Executor + +@SmallTest +@RunWith(AndroidTestingRunner::class) +@TestableLooper.RunWithLooper +class DreamSmartspaceControllerTest : SysuiTestCase() { + @Mock + private lateinit var smartspaceManager: SmartspaceManager + + @Mock + private lateinit var execution: Execution + + @Mock + private lateinit var uiExecutor: Executor + + @Mock + private lateinit var viewComponentFactory: SmartspaceViewComponent.Factory + + @Mock + private lateinit var viewComponent: SmartspaceViewComponent + + @Mock + private lateinit var targetFilter: SmartspaceTargetFilter + + @Mock + private lateinit var plugin: BcSmartspaceDataPlugin + + @Mock + private lateinit var precondition: SmartspacePrecondition + + @Mock + private lateinit var smartspaceView: BcSmartspaceDataPlugin.SmartspaceView + + @Mock + private lateinit var listener: BcSmartspaceDataPlugin.SmartspaceTargetListener + + @Mock + private lateinit var session: SmartspaceSession + + @Before + fun setup() { + MockitoAnnotations.initMocks(this) + `when`(viewComponentFactory.create(any(), eq(plugin), any())) + .thenReturn(viewComponent) + `when`(viewComponent.getView()).thenReturn(smartspaceView) + `when`(smartspaceManager.createSmartspaceSession(any())).thenReturn(session) + } + + /** + * Ensures smartspace session begins on a listener only flow. + */ + @Test + fun testConnectOnListen() { + val controller = DreamsSmartspaceController(context, + smartspaceManager, execution, uiExecutor, viewComponentFactory, precondition, + Optional.of(targetFilter), Optional.of(plugin)) + + `when`(precondition.conditionsMet()).thenReturn(true) + controller.addListener(listener) + + verify(smartspaceManager).createSmartspaceSession(any()) + + var targetListener = withArgCaptor<SmartspaceSession.OnTargetsAvailableListener> { + verify(session).addOnTargetsAvailableListener(any(), capture()) + } + + `when`(targetFilter.filterSmartspaceTarget(any())).thenReturn(true) + + var target = Mockito.mock(SmartspaceTarget::class.java) + targetListener.onTargetsAvailable(listOf(target)) + + var targets = withArgCaptor<List<SmartspaceTarget>> { + verify(plugin).onTargetsAvailable(capture()) + } + + assertThat(targets.contains(target)).isTrue() + + controller.removeListener(listener) + + verify(session).close() + } + + /** + * A class which implements SmartspaceView and extends View. This is mocked to provide the right + * object inheritance and interface implementation used in DreamSmartspaceController + */ + private class TestView(context: Context?) : View(context), + BcSmartspaceDataPlugin.SmartspaceView { + override fun registerDataProvider(plugin: BcSmartspaceDataPlugin?) {} + + override fun setPrimaryTextColor(color: Int) {} + + override fun setDozeAmount(amount: Float) {} + + override fun setIntentStarter(intentStarter: BcSmartspaceDataPlugin.IntentStarter?) {} + + override fun setFalsingManager(falsingManager: FalsingManager?) {} + + override fun setDnd(image: Drawable?, description: String?) {} + + override fun setNextAlarm(image: Drawable?, description: String?) {} + + override fun setMediaTarget(target: SmartspaceTarget?) {} + + override fun getSelectedPage(): Int { return 0; } + } + + /** + * Ensures session begins when a view is attached. + */ + @Test + fun testConnectOnViewCreate() { + val controller = DreamsSmartspaceController(context, + smartspaceManager, execution, uiExecutor, viewComponentFactory, precondition, + Optional.of(targetFilter), + Optional.of(plugin)) + + `when`(precondition.conditionsMet()).thenReturn(true) + controller.buildAndConnectView(Mockito.mock(ViewGroup::class.java)) + + var stateChangeListener = withArgCaptor<View.OnAttachStateChangeListener> { + verify(viewComponentFactory).create(any(), eq(plugin), capture()) + } + + var mockView = Mockito.mock(TestView::class.java) + `when`(precondition.conditionsMet()).thenReturn(true) + stateChangeListener.onViewAttachedToWindow(mockView) + + verify(smartspaceManager).createSmartspaceSession(any()) + + stateChangeListener.onViewDetachedFromWindow(mockView) + + verify(session).close() + } +}
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenPreconditionTest.kt b/packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenPreconditionTest.kt new file mode 100644 index 000000000000..d29e9a66a331 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenPreconditionTest.kt @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.smartspace + +import android.testing.AndroidTestingRunner +import android.testing.TestableLooper +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags +import com.android.systemui.smartspace.preconditions.LockscreenPrecondition +import com.android.systemui.statusbar.policy.DeviceProvisionedController +import com.android.systemui.util.concurrency.Execution +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentCaptor +import org.mockito.Mock +import org.mockito.Mockito +import org.mockito.Mockito.`when` +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations + +@SmallTest +@RunWith(AndroidTestingRunner::class) +@TestableLooper.RunWithLooper +class LockscreenPreconditionTest : SysuiTestCase() { + @Mock + private lateinit var featureFlags: FeatureFlags + + @Mock + private lateinit var deviceProvisionedController: DeviceProvisionedController + + @Mock + private lateinit var execution: Execution + + @Mock + private lateinit var listener: SmartspacePrecondition.Listener + + @Before + fun setup() { + MockitoAnnotations.initMocks(this) + } + + /** + * Ensures fully enabled state is published. + */ + @Test + fun testFullyEnabled() { + `when`(deviceProvisionedController.isCurrentUserSetup).thenReturn(true) + `when`(deviceProvisionedController.isDeviceProvisioned).thenReturn(true) + `when`(featureFlags.isEnabled(Mockito.eq(Flags.SMARTSPACE) ?: Flags.SMARTSPACE)) + .thenReturn(true) + val precondition = LockscreenPrecondition(featureFlags, deviceProvisionedController, + execution) + precondition.addListener(listener) + + `verify`(listener).onCriteriaChanged() + assertThat(precondition.conditionsMet()).isTrue() + } + + /** + * Ensures fully enabled state is published. + */ + @Test + fun testProvisioning() { + `when`(deviceProvisionedController.isCurrentUserSetup).thenReturn(true) + `when`(deviceProvisionedController.isDeviceProvisioned).thenReturn(false) + `when`(featureFlags.isEnabled(Mockito.eq(Flags.SMARTSPACE) ?: Flags.SMARTSPACE)) + .thenReturn(true) + val precondition = + LockscreenPrecondition(featureFlags, deviceProvisionedController, execution) + precondition.addListener(listener) + + verify(listener).onCriteriaChanged() + assertThat(precondition.conditionsMet()).isFalse() + + var argumentCaptor = ArgumentCaptor.forClass(DeviceProvisionedController + .DeviceProvisionedListener::class.java) + verify(deviceProvisionedController).addCallback(argumentCaptor.capture()) + + Mockito.clearInvocations(listener) + + `when`(deviceProvisionedController.isDeviceProvisioned).thenReturn(true) + argumentCaptor.value.onDeviceProvisionedChanged() + verify(listener).onCriteriaChanged() + assertThat(precondition.conditionsMet()).isTrue() + } + + /** + * Makes sure user setup changes are propagated. + */ + @Test + fun testUserSetup() { + `when`(deviceProvisionedController.isCurrentUserSetup).thenReturn(false) + `when`(deviceProvisionedController.isDeviceProvisioned).thenReturn(true) + `when`(featureFlags.isEnabled(Mockito.eq(Flags.SMARTSPACE) ?: Flags.SMARTSPACE)) + .thenReturn(true) + val precondition = + LockscreenPrecondition(featureFlags, deviceProvisionedController, execution) + precondition.addListener(listener) + + verify(listener).onCriteriaChanged() + assertThat(precondition.conditionsMet()).isFalse() + + var argumentCaptor = ArgumentCaptor.forClass(DeviceProvisionedController + .DeviceProvisionedListener::class.java) + verify(deviceProvisionedController).addCallback(argumentCaptor.capture()) + + Mockito.clearInvocations(listener) + + `when`(deviceProvisionedController.isCurrentUserSetup).thenReturn(true) + argumentCaptor.value.onUserSetupChanged() + verify(listener).onCriteriaChanged() + assertThat(precondition.conditionsMet()).isTrue() + } +}
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenTargetFilterTest.kt b/packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenTargetFilterTest.kt new file mode 100644 index 000000000000..185a8384dd75 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenTargetFilterTest.kt @@ -0,0 +1,149 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.smartspace + +import android.app.smartspace.SmartspaceTarget +import android.content.ContentResolver +import android.database.ContentObserver +import android.net.Uri +import android.os.Handler +import android.os.UserHandle +import android.provider.Settings +import android.testing.AndroidTestingRunner +import android.testing.TestableLooper +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.settings.UserTracker +import com.android.systemui.smartspace.filters.LockscreenTargetFilter +import com.android.systemui.util.concurrency.Execution +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.withArgCaptor +import com.android.systemui.util.settings.SecureSettings +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentCaptor +import org.mockito.ArgumentMatchers.anyBoolean +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.Mock +import org.mockito.Mockito.`when` +import org.mockito.Mockito.atLeast +import org.mockito.Mockito.clearInvocations +import org.mockito.Mockito.mock +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations +import java.util.concurrent.Executor + +@SmallTest +@TestableLooper.RunWithLooper +@RunWith(AndroidTestingRunner::class) +class LockscreenTargetFilterTest : SysuiTestCase() { + @Mock + private lateinit var secureSettings: SecureSettings + + @Mock + private lateinit var userTracker: UserTracker + + @Mock + private lateinit var execution: Execution + + @Mock + private lateinit var handler: Handler + + @Mock + private lateinit var contentResolver: ContentResolver + + @Mock + private lateinit var uiExecution: Executor + + @Mock + private lateinit var userHandle: UserHandle + + @Mock + private lateinit var listener: SmartspaceTargetFilter.Listener + + @Mock + private lateinit var lockScreenAllowPrivateNotificationsUri: Uri + + @Before + fun setup() { + MockitoAnnotations.initMocks(this) + `when`(userTracker.userHandle).thenReturn(userHandle) + `when`(secureSettings + .getUriFor(eq(Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS))) + .thenReturn(lockScreenAllowPrivateNotificationsUri) + } + + /** + * Ensures {@link Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS} is + * tracked. + */ + @Test + fun testLockscreenAllowPrivateNotifications() { + var setting = Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS + `when`(secureSettings + .getIntForUser(eq(setting) ?: setting, anyInt(), anyInt())) + .thenReturn(0) + var filter = LockscreenTargetFilter(secureSettings, userTracker, execution, handler, + contentResolver, uiExecution) + + filter.addListener(listener) + var smartspaceTarget = mock(SmartspaceTarget::class.java) + `when`(smartspaceTarget.userHandle).thenReturn(userHandle) + `when`(smartspaceTarget.isSensitive).thenReturn(true) + assertThat(filter.filterSmartspaceTarget(smartspaceTarget)).isFalse() + + var settingCaptor = ArgumentCaptor.forClass(ContentObserver::class.java) + + verify(contentResolver).registerContentObserver(eq(lockScreenAllowPrivateNotificationsUri), + anyBoolean(), settingCaptor.capture(), anyInt()) + + `when`(secureSettings + .getIntForUser(eq(setting) ?: setting, anyInt(), anyInt())) + .thenReturn(1) + + clearInvocations(listener) + settingCaptor.value.onChange(false, mock(Uri::class.java)) + verify(listener, atLeast(1)).onCriteriaChanged() + assertThat(filter.filterSmartspaceTarget(smartspaceTarget)).isTrue() + } + + /** + * Ensures user switches are tracked. + */ + @Test + fun testUserSwitchCallback() { + var setting = Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS + `when`(secureSettings + .getIntForUser(eq(setting) ?: setting, anyInt(), anyInt())) + .thenReturn(0) + var filter = LockscreenTargetFilter(secureSettings, userTracker, execution, handler, + contentResolver, uiExecution) + + filter.addListener(listener) + + var userTrackerCallback = withArgCaptor<UserTracker.Callback> { + verify(userTracker).addCallback(capture(), any()) + } + + clearInvocations(listener) + userTrackerCallback.onUserChanged(0, context) + + verify(listener).onCriteriaChanged() + } +}
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt index 25a5b900f15a..067caa98102b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt @@ -87,6 +87,8 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() { row = helper.createRow() context.getOrCreateTestableResources() .addOverride(R.bool.config_use_split_notification_shade, false) + context.getOrCreateTestableResources() + .addOverride(R.dimen.lockscreen_shade_depth_controller_transition_distance, 100) transitionController = LockscreenShadeTransitionController( statusBarStateController = statusbarStateController, logger = logger, @@ -247,6 +249,17 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() { } @Test + fun testDragDownAmount_depthDistanceIsZero_doesNotSetProgress() { + context.getOrCreateTestableResources() + .addOverride(R.dimen.lockscreen_shade_depth_controller_transition_distance, 0) + configurationController.notifyConfigurationChanged() + + transitionController.dragDownAmount = 10f + + verify(depthController, never()).transitionToFullShadeProgress + } + + @Test fun setDragDownAmount_setsValueOnMediaHierarchyManager() { transitionController.dragDownAmount = 10f diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ActivityLaunchAnimCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ActivityLaunchAnimCoordinatorTest.kt new file mode 100644 index 000000000000..c6c043aafb20 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ActivityLaunchAnimCoordinatorTest.kt @@ -0,0 +1,138 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.notification.collection.coordinator + +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.statusbar.notification.collection.NotifPipeline +import com.android.systemui.statusbar.notification.collection.NotificationEntry +import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope +import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender +import com.android.systemui.statusbar.phone.NotifActivityLaunchEvents +import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.withArgCaptor +import dagger.BindsInstance +import dagger.Component +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.mockito.Mockito.never +import org.mockito.Mockito.verify +import org.mockito.Mockito.`when` as whenever + +@SmallTest +class ActivityLaunchAnimCoordinatorTest : SysuiTestCase() { + + val activityLaunchEvents: NotifActivityLaunchEvents = mock() + val pipeline: NotifPipeline = mock() + + val coordinator: ActivityLaunchAnimCoordinator = + DaggerTestActivityStarterCoordinatorComponent + .factory() + .create(activityLaunchEvents) + .coordinator + + @Test + fun testNoLifetimeExtensionIfNoAssociatedActivityLaunch() { + coordinator.attach(pipeline) + val lifetimeExtender = withArgCaptor<NotifLifetimeExtender> { + verify(pipeline).addNotificationLifetimeExtender(capture()) + } + val fakeEntry = mock<NotificationEntry>().also { + whenever(it.key).thenReturn("0") + } + assertFalse(lifetimeExtender.maybeExtendLifetime(fakeEntry, 0)) + } + + @Test + fun testNoLifetimeExtensionIfAssociatedActivityLaunchAlreadyEnded() { + coordinator.attach(pipeline) + val lifetimeExtender = withArgCaptor<NotifLifetimeExtender> { + verify(pipeline).addNotificationLifetimeExtender(capture()) + } + val eventListener = withArgCaptor<NotifActivityLaunchEvents.Listener> { + verify(activityLaunchEvents).registerListener(capture()) + } + val fakeEntry = mock<NotificationEntry>().also { + whenever(it.key).thenReturn("0") + } + eventListener.onStartLaunchNotifActivity(fakeEntry) + eventListener.onFinishLaunchNotifActivity(fakeEntry) + assertFalse(lifetimeExtender.maybeExtendLifetime(fakeEntry, 0)) + } + + @Test + fun testLifetimeExtensionWhileActivityLaunchInProgress() { + coordinator.attach(pipeline) + val lifetimeExtender = withArgCaptor<NotifLifetimeExtender> { + verify(pipeline).addNotificationLifetimeExtender(capture()) + } + val eventListener = withArgCaptor<NotifActivityLaunchEvents.Listener> { + verify(activityLaunchEvents).registerListener(capture()) + } + val onEndLifetimeExtensionCallback = + mock<NotifLifetimeExtender.OnEndLifetimeExtensionCallback>() + lifetimeExtender.setCallback(onEndLifetimeExtensionCallback) + + val fakeEntry = mock<NotificationEntry>().also { + whenever(it.key).thenReturn("0") + } + eventListener.onStartLaunchNotifActivity(fakeEntry) + assertTrue(lifetimeExtender.maybeExtendLifetime(fakeEntry, 0)) + + eventListener.onFinishLaunchNotifActivity(fakeEntry) + verify(onEndLifetimeExtensionCallback).onEndLifetimeExtension(lifetimeExtender, fakeEntry) + } + + @Test + fun testCancelLifetimeExtensionDoesNotInvokeCallback() { + coordinator.attach(pipeline) + val lifetimeExtender = withArgCaptor<NotifLifetimeExtender> { + verify(pipeline).addNotificationLifetimeExtender(capture()) + } + val eventListener = withArgCaptor<NotifActivityLaunchEvents.Listener> { + verify(activityLaunchEvents).registerListener(capture()) + } + val onEndLifetimeExtensionCallback = + mock<NotifLifetimeExtender.OnEndLifetimeExtensionCallback>() + lifetimeExtender.setCallback(onEndLifetimeExtensionCallback) + + val fakeEntry = mock<NotificationEntry>().also { + whenever(it.key).thenReturn("0") + } + eventListener.onStartLaunchNotifActivity(fakeEntry) + assertTrue(lifetimeExtender.maybeExtendLifetime(fakeEntry, 0)) + + lifetimeExtender.cancelLifetimeExtension(fakeEntry) + eventListener.onFinishLaunchNotifActivity(fakeEntry) + verify(onEndLifetimeExtensionCallback, never()) + .onEndLifetimeExtension(lifetimeExtender, fakeEntry) + } +} + +@CoordinatorScope +@Component(modules = [ActivityLaunchAnimCoordinatorModule::class]) +interface TestActivityStarterCoordinatorComponent { + val coordinator: ActivityLaunchAnimCoordinator + + @Component.Factory + interface Factory { + fun create( + @BindsInstance activityLaunchEvents: NotifActivityLaunchEvents + ): TestActivityStarterCoordinatorComponent + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/CommunalCoordinatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/CommunalCoordinatorTest.java deleted file mode 100644 index 1f52b9cc4195..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/CommunalCoordinatorTest.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.statusbar.notification.collection.coordinator; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.test.suitebuilder.annotation.SmallTest; - -import com.android.systemui.SysuiTestCase; -import com.android.systemui.communal.CommunalStateController; -import com.android.systemui.statusbar.NotificationLockscreenUserManager; -import com.android.systemui.statusbar.notification.NotificationEntryManager; -import com.android.systemui.statusbar.notification.collection.NotifPipeline; -import com.android.systemui.statusbar.notification.collection.NotificationEntry; -import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter; -import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.Pluggable; -import com.android.systemui.util.concurrency.FakeExecutor; -import com.android.systemui.util.time.FakeSystemClock; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.ArgumentCaptor; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - - -@SmallTest -public class CommunalCoordinatorTest extends SysuiTestCase { - private final FakeExecutor mExecutor = new FakeExecutor(new FakeSystemClock()); - - @Mock - CommunalStateController mCommunalStateController; - @Mock - NotificationEntryManager mNotificationEntryManager; - @Mock - NotificationLockscreenUserManager mNotificationLockscreenUserManager; - @Mock - NotifPipeline mNotifPipeline; - @Mock - NotificationEntry mNotificationEntry; - @Mock - Pluggable.PluggableListener mFilterListener; - - CommunalCoordinator mCoordinator; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - mCoordinator = new CommunalCoordinator(mExecutor, mNotificationEntryManager, - mNotificationLockscreenUserManager, mCommunalStateController); - } - - @Test - public void testNotificationSuppressionInCommunal() { - mCoordinator.attach(mNotifPipeline); - final ArgumentCaptor<CommunalStateController.Callback> stateCallbackCaptor = - ArgumentCaptor.forClass(CommunalStateController.Callback.class); - verify(mCommunalStateController).addCallback(stateCallbackCaptor.capture()); - - final CommunalStateController.Callback stateCallback = stateCallbackCaptor.getValue(); - - final ArgumentCaptor<NotifFilter> filterCaptor = - ArgumentCaptor.forClass(NotifFilter.class); - verify(mNotifPipeline).addPreGroupFilter(filterCaptor.capture()); - - final NotifFilter filter = filterCaptor.getValue(); - - // Verify that notifications are not filtered out by default. - assertThat(filter.shouldFilterOut(mNotificationEntry, 0)).isFalse(); - - filter.setInvalidationListener(mFilterListener); - - // Verify that notifications are filtered out when communal is showing and that the filter - // pipeline is notified. - when(mCommunalStateController.getCommunalViewShowing()).thenReturn(true); - stateCallback.onCommunalViewShowingChanged(); - // Make sure callback depends on executor to run. - verify(mFilterListener, never()).onPluggableInvalidated(any()); - verify(mNotificationEntryManager, never()).updateNotifications(any()); - - mExecutor.runAllReady(); - - verify(mFilterListener).onPluggableInvalidated(any()); - verify(mNotificationEntryManager).updateNotifications(any()); - assertThat(filter.shouldFilterOut(mNotificationEntry, 0)).isTrue(); - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.java index ee111715e5ea..6f8e5d8e514e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.java @@ -41,7 +41,7 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntryB import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifStabilityManager; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.Pluggable; import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider; -import com.android.systemui.statusbar.notification.collection.render.NotifPanelEventSource; +import com.android.systemui.statusbar.phone.NotifPanelEvents; import com.android.systemui.statusbar.policy.HeadsUpManager; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.time.FakeSystemClock; @@ -67,12 +67,12 @@ public class VisualStabilityCoordinatorTest extends SysuiTestCase { @Mock private StatusBarStateController mStatusBarStateController; @Mock private Pluggable.PluggableListener<NotifStabilityManager> mInvalidateListener; @Mock private HeadsUpManager mHeadsUpManager; - @Mock private NotifPanelEventSource mNotifPanelEventSource; + @Mock private NotifPanelEvents mNotifPanelEvents; @Mock private VisualStabilityProvider mVisualStabilityProvider; @Captor private ArgumentCaptor<WakefulnessLifecycle.Observer> mWakefulnessObserverCaptor; @Captor private ArgumentCaptor<StatusBarStateController.StateListener> mSBStateListenerCaptor; - @Captor private ArgumentCaptor<NotifPanelEventSource.Callbacks> mNotifPanelEventsCallbackCaptor; + @Captor private ArgumentCaptor<NotifPanelEvents.Listener> mNotifPanelEventsCallbackCaptor; @Captor private ArgumentCaptor<NotifStabilityManager> mNotifStabilityManagerCaptor; private FakeSystemClock mFakeSystemClock = new FakeSystemClock(); @@ -80,7 +80,7 @@ public class VisualStabilityCoordinatorTest extends SysuiTestCase { private WakefulnessLifecycle.Observer mWakefulnessObserver; private StatusBarStateController.StateListener mStatusBarStateListener; - private NotifPanelEventSource.Callbacks mNotifPanelEventsCallback; + private NotifPanelEvents.Listener mNotifPanelEventsCallback; private NotifStabilityManager mNotifStabilityManager; private NotificationEntry mEntry; @@ -92,7 +92,7 @@ public class VisualStabilityCoordinatorTest extends SysuiTestCase { mFakeExecutor, mDumpManager, mHeadsUpManager, - mNotifPanelEventSource, + mNotifPanelEvents, mStatusBarStateController, mVisualStabilityProvider, mWakefulnessLifecycle); @@ -106,7 +106,7 @@ public class VisualStabilityCoordinatorTest extends SysuiTestCase { verify(mStatusBarStateController).addCallback(mSBStateListenerCaptor.capture()); mStatusBarStateListener = mSBStateListenerCaptor.getValue(); - verify(mNotifPanelEventSource).registerCallbacks(mNotifPanelEventsCallbackCaptor.capture()); + verify(mNotifPanelEvents).registerListener(mNotifPanelEventsCallbackCaptor.capture()); mNotifPanelEventsCallback = mNotifPanelEventsCallbackCaptor.getValue(); verify(mNotifPipeline).setVisualStabilityManager(mNotifStabilityManagerCaptor.capture()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java index 1561b5a5d22e..bf16e0ab39c6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java @@ -69,11 +69,11 @@ import com.android.systemui.statusbar.notification.collection.render.SectionHead import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.NotificationGutsManager; import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController.NotificationPanelEvent; +import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; import com.android.systemui.statusbar.phone.KeyguardBypassController; import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.phone.ShadeController; -import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.ZenModeController; @@ -278,18 +278,17 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { mStateListenerArgumentCaptor.capture(), anyInt()); StatusBarStateController.StateListener stateListener = mStateListenerArgumentCaptor.getValue(); - when(mNotificationStackScrollLayout.isUsingSplitNotificationShade()).thenReturn(true); stateListener.onStateChanged(SHADE); mController.getView().removeAllViews(); - mController.setQsExpanded(false); + mController.setQsFullScreen(false); reset(mNotificationStackScrollLayout); mController.updateShowEmptyShadeView(); verify(mNotificationStackScrollLayout).updateEmptyShadeView( /* visible= */ true, /* notifVisibleInShade= */ false); - mController.setQsExpanded(true); + mController.setQsFullScreen(true); reset(mNotificationStackScrollLayout); mController.updateShowEmptyShadeView(); verify(mNotificationStackScrollLayout).updateEmptyShadeView( @@ -411,11 +410,11 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { boolean toShow) { if (toShow) { statusBarStateListener.onStateChanged(SHADE); - mController.setQsExpanded(false); + mController.setQsFullScreen(false); mController.getView().removeAllViews(); } else { statusBarStateListener.onStateChanged(KEYGUARD); - mController.setQsExpanded(true); + mController.setQsFullScreen(true); mController.getView().addContainerView(mock(ExpandableNotificationRow.class)); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesTest.java index 3810783d4f76..953a330d2e65 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesTest.java @@ -846,7 +846,6 @@ public class CentralSurfacesTest extends SysuiTestCase { @Test public void testTransitionLaunch_noPreview_doesntGoUnlocked() { mCentralSurfaces.setBarStateForTest(StatusBarState.KEYGUARD); - when(mKeyguardStateController.isShowing()).thenReturn(true); mCentralSurfaces.showKeyguardImpl(); // Starting a pulse should change the scrim controller to the pulsing state @@ -869,7 +868,6 @@ public class CentralSurfacesTest extends SysuiTestCase { @Test public void testPulseWhileDozing_updatesScrimController() { mCentralSurfaces.setBarStateForTest(StatusBarState.KEYGUARD); - when(mKeyguardStateController.isShowing()).thenReturn(true); mCentralSurfaces.showKeyguardImpl(); // Starting a pulse should change the scrim controller to the pulsing state diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java index 1af7035a441b..6842295ec5d5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java @@ -28,7 +28,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeast; @@ -88,12 +87,6 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.biometrics.AuthController; import com.android.systemui.classifier.FalsingCollectorFake; import com.android.systemui.classifier.FalsingManagerFake; -import com.android.systemui.communal.CommunalHostView; -import com.android.systemui.communal.CommunalHostViewController; -import com.android.systemui.communal.CommunalSource; -import com.android.systemui.communal.CommunalSourceMonitor; -import com.android.systemui.communal.CommunalStateController; -import com.android.systemui.communal.dagger.CommunalViewComponent; import com.android.systemui.controls.dagger.ControlsComponent; import com.android.systemui.doze.DozeLog; import com.android.systemui.dump.DumpManager; @@ -157,7 +150,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.stubbing.Answer; -import java.lang.ref.WeakReference; import java.util.List; import java.util.Optional; @@ -271,21 +263,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { @Mock private KeyguardStatusBarViewComponent mKeyguardStatusBarViewComponent; @Mock - private CommunalViewComponent.Factory mCommunalViewComponentFactory; - @Mock - private CommunalViewComponent mCommunalViewComponent; - @Mock - private CommunalHostViewController mCommunalHostViewController; - @Mock - private CommunalSourceMonitor mCommunalSourceMonitor; - @Mock - private CommunalSource mCommunalSource; - @Mock - private CommunalHostView mCommunalHostView; - @Mock - private CommunalStateController mCommunalStateController; - private CommunalStateController.Callback mCommunalStateControllerCallback; - @Mock private KeyguardClockSwitchController mKeyguardClockSwitchController; @Mock private KeyguardStatusViewController mKeyguardStatusViewController; @@ -361,6 +338,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { private SysUiState mSysUiState; @Mock private NotificationListContainer mNotificationListContainer; + private NotificationPanelViewController.PanelEventsEmitter mPanelEventsEmitter; private Optional<SysUIUnfoldComponent> mSysUIUnfoldComponent = Optional.empty(); private SysuiStatusBarStateController mStatusBarStateController; private NotificationPanelViewController mNotificationPanelViewController; @@ -400,7 +378,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { when(mView.findViewById(R.id.keyguard_clock_container)).thenReturn(mKeyguardClockSwitch); when(mView.findViewById(R.id.notification_stack_scroller)) .thenReturn(mNotificationStackScrollLayout); - when(mView.findViewById(R.id.communal_host)).thenReturn(mCommunalHostView); when(mNotificationStackScrollLayoutController.getHeight()).thenReturn(1000); when(mNotificationStackScrollLayoutController.getHeadsUpCallback()) .thenReturn(mHeadsUpCallback); @@ -466,10 +443,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { .thenReturn(mKeyguardStatusBarViewComponent); when(mKeyguardStatusBarViewComponent.getKeyguardStatusBarViewController()) .thenReturn(mKeyguardStatusBarViewController); - when(mCommunalViewComponentFactory.build(any())) - .thenReturn(mCommunalViewComponent); - when(mCommunalViewComponent.getCommunalHostViewController()) - .thenReturn(mCommunalHostViewController); when(mLayoutInflater.inflate(eq(R.layout.keyguard_status_view), any(), anyBoolean())) .thenReturn(mKeyguardStatusView); when(mLayoutInflater.inflate(eq(R.layout.keyguard_user_switcher), any(), anyBoolean())) @@ -488,6 +461,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { }).when(mNotificationShadeWindowController).batchApplyWindowLayoutParams(any()); mMainHandler = new Handler(Looper.getMainLooper()); + mPanelEventsEmitter = new NotificationPanelViewController.PanelEventsEmitter(); mNotificationPanelViewController = new NotificationPanelViewController(mView, mResources, @@ -497,13 +471,13 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { coordinator, expansionHandler, mDynamicPrivacyController, mKeyguardBypassController, mFalsingManager, new FalsingCollectorFake(), mNotificationLockscreenUserManager, mNotificationEntryManager, - mCommunalStateController, mKeyguardStateController, + mKeyguardStateController, mStatusBarStateController, mStatusBarWindowStateController, mNotificationShadeWindowController, mDozeLog, mDozeParameters, mCommandQueue, mVibratorHelper, mLatencyTracker, mPowerManager, mAccessibilityManager, 0, mUpdateMonitor, - mCommunalSourceMonitor, mMetricsLogger, mActivityManager, mConfigurationController, + mMetricsLogger, mActivityManager, mConfigurationController, () -> flingAnimationUtilsBuilder, mStatusBarTouchableRegionManager, mConversationNotificationManager, mMediaHiearchyManager, mStatusBarKeyguardViewManager, @@ -513,7 +487,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { mKeyguardQsUserSwitchComponentFactory, mKeyguardUserSwitcherComponentFactory, mKeyguardStatusBarViewComponentFactory, - mCommunalViewComponentFactory, mLockscreenShadeTransitionController, mGroupManager, mNotificationAreaController, @@ -546,7 +519,8 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { mQsFrameTranslateController, mSysUiState, mKeyguardUnlockAnimationController, - mNotificationListContainer); + mNotificationListContainer, + mPanelEventsEmitter); mNotificationPanelViewController.initDependencies( mCentralSurfaces, () -> {}, @@ -1018,81 +992,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { verify(mKeyguardStatusViewController, never()).displayClock(LARGE, /* animate */ true); } - @Test - public void testCommunalhostViewControllerInit() { - verify(mCommunalHostViewController, times(1)).init(); - clearInvocations(mCommunalHostViewController); - givenViewAttached(); - verify(mCommunalHostViewController, never()).init(); - } - - @Test - public void testCommunalSourceListening() { - final ArgumentCaptor<CommunalSourceMonitor.Callback> monitorCallback = - ArgumentCaptor.forClass(CommunalSourceMonitor.Callback.class); - - givenViewAttached(); - verify(mCommunalSourceMonitor).addCallback(monitorCallback.capture()); - - final ArgumentCaptor<WeakReference<CommunalSource>> sourceCapture = - ArgumentCaptor.forClass(WeakReference.class); - - monitorCallback.getValue().onSourceAvailable(new WeakReference<>(mCommunalSource)); - mExecutor.runAllReady(); - verify(mCommunalHostViewController).show(sourceCapture.capture()); - assertThat(sourceCapture.getValue().get()).isEqualTo(mCommunalSource); - - clearInvocations(mCommunalHostViewController); - givenViewDetached(); - verify(mCommunalSourceMonitor).removeCallback(any()); - } - - @Test - public void testKeyguardStatusViewUpdatedWithCommunalPresence() { - givenViewAttached(); - - when(mResources.getBoolean( - com.android.internal.R.bool.config_keyguardUserSwitcher)).thenReturn(true); - updateMultiUserSetting(true); - - ArgumentCaptor<CommunalStateController.Callback> communalCallbackCapture = - ArgumentCaptor.forClass(CommunalStateController.Callback.class); - verify(mCommunalStateController).addCallback(communalCallbackCapture.capture()); - final CommunalStateController.Callback communalStateControllerCallback = - communalCallbackCapture.getValue(); - - clearInvocations(mKeyguardStatusViewController, mKeyguardUserSwitcherController); - // Ensure changes in communal visibility leads to setting the keyguard status view - // visibility. - communalStateControllerCallback.onCommunalViewShowingChanged(); - verify(mKeyguardStatusViewController).setKeyguardStatusViewVisibility(anyInt(), - anyBoolean(), anyBoolean(), anyInt()); - verify(mKeyguardUserSwitcherController).setKeyguardUserSwitcherVisibility(anyInt(), - anyBoolean(), anyBoolean(), anyInt()); - } - - @Test - public void testCommunalAlphaUpdate() { - // Verify keyguard content alpha changes are propagate. Note the actual value set is not - // checked since an interpolation is applied to the incoming value. - mNotificationPanelViewController.setKeyguardOnlyContentAlpha(0.8f); - verify(mCommunalHostViewController).setAlpha(anyFloat()); - } - - @Test - public void testCommunalPositionUpdate() { - // Verify that the communal position is updated on interaction with the - // NotificationPanelViewController. Note that there a number of paths where the position - // might be updated and therefore the check isn't strictly on a single invocation. - clearInvocations(mCommunalHostViewController); - final View.OnLayoutChangeListener layoutChangeListener = - mNotificationPanelViewController.createLayoutChangeListener(); - mNotificationPanelViewController.mStatusBarStateController.setState(KEYGUARD); - layoutChangeListener.onLayoutChange(mView, 0, 0, 200, 200, 0, 0, 200, 200); - verify(mCommunalHostViewController, atLeast(1)) - .updatePosition(anyInt(), anyBoolean()); - } - private void triggerPositionClockAndNotifications() { mNotificationPanelViewController.closeQs(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationQSContainerControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationQSContainerControllerTest.kt index 00af446ded3d..5fb4144bec3c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationQSContainerControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationQSContainerControllerTest.kt @@ -5,6 +5,7 @@ import android.testing.TestableLooper import android.view.WindowInsets import android.view.WindowManagerPolicyConstants import androidx.test.filters.SmallTest +import com.android.systemui.R import com.android.systemui.SysuiTestCase import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags @@ -40,6 +41,7 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { const val GESTURES_NAVIGATION = WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL const val BUTTONS_NAVIGATION = WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON const val NOTIFICATIONS_MARGIN = 50 + const val SCRIM_MARGIN = 10 } @Mock @@ -65,12 +67,18 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { @Before fun setup() { MockitoAnnotations.initMocks(this) + mContext.ensureTestableResources() + whenever(notificationsQSContainer.resources).thenReturn(mContext.resources) notificationsQSContainerController = NotificationsQSContainerController( notificationsQSContainer, navigationModeController, overviewProxyService, featureFlags ) + + mContext.orCreateTestableResources + .addOverride(R.dimen.split_shade_notifications_scrim_margin_bottom, SCRIM_MARGIN) + whenever(notificationsQSContainer.defaultNotificationsMarginBottom) .thenReturn(NOTIFICATIONS_MARGIN) whenever(navigationModeController.addListener(navigationModeCaptor.capture())) @@ -115,14 +123,14 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { insets = windowInsets().withStableBottom()) then(expectedContainerPadding = 0, // taskbar should disappear when shade is expanded expectedNotificationsMargin = NOTIFICATIONS_MARGIN, - expectedQsPadding = STABLE_INSET_BOTTOM) + expectedQsPadding = NOTIFICATIONS_MARGIN - SCRIM_MARGIN) given(taskbarVisible = true, navigationMode = BUTTONS_NAVIGATION, insets = windowInsets().withStableBottom()) then(expectedContainerPadding = STABLE_INSET_BOTTOM, expectedNotificationsMargin = NOTIFICATIONS_MARGIN, - expectedQsPadding = STABLE_INSET_BOTTOM) + expectedQsPadding = NOTIFICATIONS_MARGIN - SCRIM_MARGIN) } @Test @@ -153,14 +161,14 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { navigationMode = GESTURES_NAVIGATION, insets = windowInsets().withStableBottom()) then(expectedContainerPadding = 0, - expectedQsPadding = STABLE_INSET_BOTTOM) + expectedQsPadding = NOTIFICATIONS_MARGIN - SCRIM_MARGIN) given(taskbarVisible = false, navigationMode = BUTTONS_NAVIGATION, insets = windowInsets().withStableBottom()) then(expectedContainerPadding = 0, // qs goes full height as it's not obscuring nav buttons expectedNotificationsMargin = STABLE_INSET_BOTTOM + NOTIFICATIONS_MARGIN, - expectedQsPadding = STABLE_INSET_BOTTOM) + expectedQsPadding = STABLE_INSET_BOTTOM + NOTIFICATIONS_MARGIN - SCRIM_MARGIN) } @Test @@ -188,14 +196,15 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { given(taskbarVisible = false, navigationMode = GESTURES_NAVIGATION, insets = windowInsets().withCutout()) - then(expectedContainerPadding = CUTOUT_HEIGHT) + then(expectedContainerPadding = CUTOUT_HEIGHT, + expectedQsPadding = NOTIFICATIONS_MARGIN - SCRIM_MARGIN) given(taskbarVisible = false, navigationMode = BUTTONS_NAVIGATION, insets = windowInsets().withCutout().withStableBottom()) then(expectedContainerPadding = 0, expectedNotificationsMargin = STABLE_INSET_BOTTOM + NOTIFICATIONS_MARGIN, - expectedQsPadding = STABLE_INSET_BOTTOM) + expectedQsPadding = STABLE_INSET_BOTTOM + NOTIFICATIONS_MARGIN - SCRIM_MARGIN) } @Test @@ -392,6 +401,7 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { @Test fun testNotificationsMarginBottomIsUpdated() { + Mockito.clearInvocations(notificationsQSContainer) notificationsQSContainerController.splitShadeEnabled = true verify(notificationsQSContainer).setNotificationsMarginBottom(NOTIFICATIONS_MARGIN) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java index ace7415f2c17..27179fd7be92 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java @@ -57,6 +57,7 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.assist.AssistManager; import com.android.systemui.plugins.ActivityStarter; +import com.android.systemui.plugins.ActivityStarter.OnDismissAction; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationClickNotifier; @@ -130,7 +131,6 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { private NotifPipeline mNotifPipeline; @Mock private NotificationVisibilityProvider mVisibilityProvider; - @Mock private ActivityIntentHelper mActivityIntentHelper; @Mock @@ -145,14 +145,14 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { private ActivityLaunchAnimator mActivityLaunchAnimator; @Mock private InteractionJankMonitor mJankMonitor; + private StatusBarNotificationActivityStarter.LaunchEventsEmitter mLaunchEventsEmitter; private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock()); - private NotificationTestHelper mNotificationTestHelper; private ExpandableNotificationRow mNotificationRow; private ExpandableNotificationRow mBubbleNotificationRow; private final Answer<Void> mCallOnDismiss = answerVoid( - (ActivityStarter.OnDismissAction dismissAction, Runnable cancel, + (OnDismissAction dismissAction, Runnable cancel, Boolean afterKeyguardGone) -> dismissAction.onDismiss()); private ArrayList<NotificationEntry> mActiveNotifications; @@ -201,7 +201,7 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { NotificationListContainer.class), headsUpManager, mJankMonitor); - + mLaunchEventsEmitter = new StatusBarNotificationActivityStarter.LaunchEventsEmitter(); mNotificationActivityStarter = new StatusBarNotificationActivityStarter( getContext(), @@ -237,12 +237,13 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { mock(NotificationPresenter.class), mock(NotificationPanelViewController.class), mActivityLaunchAnimator, - notificationAnimationProvider + notificationAnimationProvider, + mLaunchEventsEmitter ); // set up dismissKeyguardThenExecute to synchronously invoke the OnDismissAction arg doAnswer(mCallOnDismiss).when(mActivityStarter).dismissKeyguardThenExecute( - any(ActivityStarter.OnDismissAction.class), any(), anyBoolean()); + any(OnDismissAction.class), any(), anyBoolean()); // set up addAfterKeyguardGoneRunnable to synchronously invoke the Runnable arg doAnswer(answerVoid(Runnable::run)) @@ -402,4 +403,40 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { // THEN display should try wake up for the full screen intent verify(mCentralSurfaces).wakeUpForFullScreenIntent(); } + + @Test + public void testNotifActivityStarterEventSourceStartEvent_onNotificationClicked() { + NotifActivityLaunchEvents.Listener listener = + mock(NotifActivityLaunchEvents.Listener.class); + mLaunchEventsEmitter.registerListener(listener); + mNotificationActivityStarter + .onNotificationClicked(mNotificationRow.getEntry().getSbn(), mNotificationRow); + verify(listener).onStartLaunchNotifActivity(mNotificationRow.getEntry()); + } + + @Test + public void testNotifActivityStarterEventSourceFinishEvent_dismissKeyguardCancelled() { + NotifActivityLaunchEvents.Listener listener = + mock(NotifActivityLaunchEvents.Listener.class); + mLaunchEventsEmitter.registerListener(listener); + // set up dismissKeyguardThenExecute to synchronously invoke the cancel runnable arg + doAnswer(answerVoid( + (OnDismissAction dismissAction, Runnable cancel, Boolean afterKeyguardGone) -> + cancel.run())) + .when(mActivityStarter) + .dismissKeyguardThenExecute(any(OnDismissAction.class), any(), anyBoolean()); + mNotificationActivityStarter + .onNotificationClicked(mNotificationRow.getEntry().getSbn(), mNotificationRow); + verify(listener).onFinishLaunchNotifActivity(mNotificationRow.getEntry()); + } + + @Test + public void testNotifActivityStarterEventSourceFinishEvent_postPanelCollapse() { + NotifActivityLaunchEvents.Listener listener = + mock(NotifActivityLaunchEvents.Listener.class); + mLaunchEventsEmitter.registerListener(listener); + mNotificationActivityStarter + .onNotificationClicked(mNotificationRow.getEntry().getSbn(), mNotificationRow); + verify(listener).onFinishLaunchNotifActivity(mNotificationRow.getEntry()); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/KeyguardQsUserSwitchControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/KeyguardQsUserSwitchControllerTest.kt index 4a579cb3fc4d..f58403d3651a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/KeyguardQsUserSwitchControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/KeyguardQsUserSwitchControllerTest.kt @@ -26,7 +26,6 @@ import androidx.test.filters.SmallTest import com.android.internal.logging.UiEventLogger import com.android.systemui.R import com.android.systemui.SysuiTestCase -import com.android.systemui.communal.CommunalStateController import com.android.systemui.keyguard.ScreenLifecycle import com.android.systemui.plugins.FalsingManager import com.android.systemui.qs.user.UserSwitchDialogController @@ -55,9 +54,6 @@ class KeyguardQsUserSwitchControllerTest : SysuiTestCase() { private lateinit var userSwitcherController: UserSwitcherController @Mock - private lateinit var communalStateController: CommunalStateController - - @Mock private lateinit var keyguardStateController: KeyguardStateController @Mock @@ -99,7 +95,6 @@ class KeyguardQsUserSwitchControllerTest : SysuiTestCase() { context.resources, screenLifecycle, userSwitcherController, - communalStateController, keyguardStateController, falsingManager, configurationController, diff --git a/packages/SystemUI/tests/src/com/android/systemui/wmshell/WMShellTest.java b/packages/SystemUI/tests/src/com/android/systemui/wmshell/WMShellTest.java index 7726938db3b0..185942e6fbc8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wmshell/WMShellTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wmshell/WMShellTest.java @@ -32,6 +32,7 @@ import com.android.systemui.model.SysUiState; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.policy.ConfigurationController; +import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.UserInfoController; import com.android.systemui.tracing.ProtoTracer; import com.android.wm.shell.ShellCommandHandler; @@ -66,6 +67,7 @@ public class WMShellTest extends SysuiTestCase { @Mock CommandQueue mCommandQueue; @Mock ConfigurationController mConfigurationController; + @Mock KeyguardStateController mKeyguardStateController; @Mock KeyguardUpdateMonitor mKeyguardUpdateMonitor; @Mock NavigationModeController mNavigationModeController; @Mock ScreenLifecycle mScreenLifecycle; @@ -90,9 +92,9 @@ public class WMShellTest extends SysuiTestCase { Optional.of(mSplitScreen), Optional.of(mOneHanded), Optional.of(mHideDisplayCutout), Optional.of(mShellCommandHandler), Optional.of(mCompatUI), Optional.of(mDragAndDrop), - mCommandQueue, mConfigurationController, mKeyguardUpdateMonitor, - mNavigationModeController, mScreenLifecycle, mSysUiState, mProtoTracer, - mWakefulnessLifecycle, mUserInfoController, mSysUiMainExecutor); + mCommandQueue, mConfigurationController, mKeyguardStateController, + mKeyguardUpdateMonitor, mNavigationModeController, mScreenLifecycle, mSysUiState, + mProtoTracer, mWakefulnessLifecycle, mUserInfoController, mSysUiMainExecutor); } @Test @@ -132,6 +134,6 @@ public class WMShellTest extends SysuiTestCase { public void initCompatUI_registersCallbacks() { mWMShell.initCompatUi(mCompatUI); - verify(mKeyguardUpdateMonitor).registerCallback(any(KeyguardUpdateMonitorCallback.class)); + verify(mKeyguardStateController).addCallback(any(KeyguardStateController.Callback.class)); } } diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java index 86777a2f62fd..e20b15a3e807 100644 --- a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java +++ b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java @@ -1327,14 +1327,13 @@ public class TouchExplorer extends BaseEventStreamTransformation if (mState.isServiceDetectingGestures() && mState.isTouchInteracting()) { // Cancel without deleting events. mHandler.removeCallbacks(mSendHoverEnterAndMoveDelayed); - mSendHoverEnterAndMoveDelayed.run(); - mSendHoverEnterAndMoveDelayed.clear(); - final MotionEvent prototype = mState.getLastReceivedEvent(); - final MotionEvent rawEvent = mState.getLastReceivedRawEvent(); final int pointerId = mReceivedPointerTracker.getPrimaryPointerId(); final int pointerIdBits = (1 << pointerId); final int policyFlags = mState.getLastReceivedPolicyFlags(); - mSendHoverExitDelayed.post(prototype, rawEvent, pointerIdBits, policyFlags); + mSendHoverEnterAndMoveDelayed.setPointerIdBits(pointerIdBits); + mSendHoverEnterAndMoveDelayed.setPolicyFlags(policyFlags); + mSendHoverEnterAndMoveDelayed.run(); + mSendHoverEnterAndMoveDelayed.clear(); } } diff --git a/services/backup/backuplib/java/com/android/server/backup/TransportManager.java b/services/backup/backuplib/java/com/android/server/backup/TransportManager.java index 21a22f44f3dd..930f49e4d117 100644 --- a/services/backup/backuplib/java/com/android/server/backup/TransportManager.java +++ b/services/backup/backuplib/java/com/android/server/backup/TransportManager.java @@ -16,6 +16,9 @@ package com.android.server.backup; +import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED; +import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED; + import android.annotation.Nullable; import android.annotation.UserIdInt; import android.annotation.WorkerThread; @@ -28,7 +31,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.os.Binder; import android.os.Bundle; import android.os.RemoteException; import android.util.ArrayMap; @@ -42,8 +44,8 @@ import com.android.internal.util.Preconditions; import com.android.server.backup.transport.BackupTransportClient; import com.android.server.backup.transport.OnTransportRegisteredListener; import com.android.server.backup.transport.TransportConnection; -import com.android.server.backup.transport.TransportConnectionManager; import com.android.server.backup.transport.TransportConnectionListener; +import com.android.server.backup.transport.TransportConnectionManager; import com.android.server.backup.transport.TransportNotAvailableException; import com.android.server.backup.transport.TransportNotRegisteredException; import com.android.server.backup.transport.TransportStats; @@ -58,6 +60,7 @@ import java.util.function.Predicate; /** Handles in-memory bookkeeping of all BackupTransport objects. */ public class TransportManager { private static final String TAG = "BackupTransportManager"; + private static final boolean MORE_DEBUG = false; @VisibleForTesting public static final String SERVICE_ACTION_TRANSPORT_HOST = "android.backup.TRANSPORT_HOST"; @@ -130,14 +133,61 @@ public class TransportManager { } } + void onPackageEnabled(String packageName) { + onPackageAdded(packageName); + } + + void onPackageDisabled(String packageName) { + onPackageRemoved(packageName); + } + @WorkerThread void onPackageChanged(String packageName, String... components) { + // Determine if the overall package has changed and not just its + // components - see {@link EXTRA_CHANGED_COMPONENT_NAME_LIST}. When we + // know a package was enabled/disabled we'll handle that directly and + // not continue with onPackageChanged. + if (components.length == 1 && components[0].equals(packageName)) { + int enabled; + try { + enabled = mPackageManager.getApplicationEnabledSetting(packageName); + } catch (IllegalArgumentException ex) { + // packageName doesn't exist: likely due to a race with it being uninstalled. + if (MORE_DEBUG) { + Slog.d(TAG, "Package " + packageName + " was changed, but no longer exists."); + } + return; + } + switch (enabled) { + case COMPONENT_ENABLED_STATE_ENABLED: { + if (MORE_DEBUG) { + Slog.d(TAG, "Package " + packageName + " was enabled."); + } + onPackageEnabled(packageName); + return; + } + case COMPONENT_ENABLED_STATE_DISABLED: { + if (MORE_DEBUG) { + Slog.d(TAG, "Package " + packageName + " was disabled."); + } + onPackageDisabled(packageName); + return; + } + default: { + Slog.w(TAG, "Package " + packageName + " enabled setting: " + enabled); + return; + } + } + } // Unfortunately this can't be atomic because we risk a deadlock if // registerTransportsFromPackage() is put inside the synchronized block Set<ComponentName> transportComponents = new ArraySet<>(components.length); for (String componentName : components) { transportComponents.add(new ComponentName(packageName, componentName)); } + if (transportComponents.isEmpty()) { + return; + } synchronized (mTransportLock) { mRegisteredTransportsDescriptionMap.keySet().removeIf(transportComponents::contains); } diff --git a/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchManagerService.java b/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchManagerService.java index daead0a5ff9d..b1f572d2a364 100644 --- a/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchManagerService.java +++ b/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchManagerService.java @@ -43,6 +43,8 @@ import com.android.server.infra.FrameworkResourcesServiceNameResolver; import com.android.server.wm.ActivityTaskManagerInternal; import java.io.FileDescriptor; +import java.util.ArrayList; +import java.util.List; import java.util.function.Consumer; /** @@ -62,7 +64,7 @@ public class CloudSearchManagerService extends public CloudSearchManagerService(Context context) { super(context, new FrameworkResourcesServiceNameResolver(context, - R.string.config_defaultCloudSearchService), null, + R.array.config_defaultCloudSearchServices, true), null, PACKAGE_UPDATE_POLICY_NO_REFRESH | PACKAGE_RESTART_POLICY_NO_REFRESH); mActivityTaskManagerInternal = LocalServices.getService(ActivityTaskManagerInternal.class); mContext = context; @@ -70,7 +72,25 @@ public class CloudSearchManagerService extends @Override protected CloudSearchPerUserService newServiceLocked(int resolvedUserId, boolean disabled) { - return new CloudSearchPerUserService(this, mLock, resolvedUserId); + return new CloudSearchPerUserService(this, mLock, resolvedUserId, ""); + } + + @Override + protected List<CloudSearchPerUserService> newServiceListLocked(int resolvedUserId, + boolean disabled, String[] serviceNames) { + if (serviceNames == null) { + return new ArrayList<>(); + } + List<CloudSearchPerUserService> serviceList = + new ArrayList<>(serviceNames.length); + for (int i = 0; i < serviceNames.length; i++) { + if (serviceNames[i] == null) { + continue; + } + serviceList.add(new CloudSearchPerUserService(this, mLock, resolvedUserId, + serviceNames[i])); + } + return serviceList; } @Override @@ -111,19 +131,28 @@ public class CloudSearchManagerService extends @NonNull ICloudSearchManagerCallback callBack) { searchRequest.setSource( mContext.getPackageManager().getNameForUid(Binder.getCallingUid())); - runForUserLocked("search", searchRequest.getRequestId(), (service) -> - service.onSearchLocked(searchRequest, callBack)); + runForUser("search", (service) -> { + synchronized (service.mLock) { + service.onSearchLocked(searchRequest, callBack); + } + }); } @Override public void returnResults(IBinder token, String requestId, SearchResponse response) { - runForUserLocked("returnResults", requestId, (service) -> - service.onReturnResultsLocked(token, requestId, response)); + runForUser("returnResults", (service) -> { + synchronized (service.mLock) { + service.onReturnResultsLocked(token, requestId, response); + } + }); } public void destroy(@NonNull SearchRequest searchRequest) { - runForUserLocked("destroyCloudSearchSession", searchRequest.getRequestId(), - (service) -> service.onDestroyLocked(searchRequest.getRequestId())); + runForUser("destroyCloudSearchSession", (service) -> { + synchronized (service.mLock) { + service.onDestroyLocked(searchRequest.getRequestId()); + } + }); } public void onShellCommand(@Nullable FileDescriptor in, @Nullable FileDescriptor out, @@ -134,8 +163,7 @@ public class CloudSearchManagerService extends .exec(this, in, out, err, args, callback, resultReceiver); } - private void runForUserLocked(@NonNull final String func, - @NonNull final String requestId, + private void runForUser(@NonNull final String func, @NonNull final Consumer<CloudSearchPerUserService> c) { ActivityManagerInternal am = LocalServices.getService(ActivityManagerInternal.class); final int userId = am.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), @@ -143,7 +171,7 @@ public class CloudSearchManagerService extends null, null); if (DEBUG) { - Slog.d(TAG, "runForUserLocked:" + func + " from pid=" + Binder.getCallingPid() + Slog.d(TAG, "runForUser:" + func + " from pid=" + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid()); } Context ctx = getContext(); @@ -160,8 +188,11 @@ public class CloudSearchManagerService extends final long origId = Binder.clearCallingIdentity(); try { synchronized (mLock) { - final CloudSearchPerUserService service = getServiceForUserLocked(userId); - c.accept(service); + final List<CloudSearchPerUserService> services = + getServiceListForUserLocked(userId); + for (int i = 0; i < services.size(); i++) { + c.accept(services.get(i)); + } } } finally { Binder.restoreCallingIdentity(origId); diff --git a/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchManagerServiceShellCommand.java b/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchManagerServiceShellCommand.java index 51f5fd9668cf..c64982d94d6d 100644 --- a/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchManagerServiceShellCommand.java +++ b/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchManagerServiceShellCommand.java @@ -54,7 +54,12 @@ public class CloudSearchManagerServiceShellCommand extends ShellCommand { return 0; } final int duration = Integer.parseInt(getNextArgRequired()); - mService.setTemporaryService(userId, serviceName, duration); + String[] services = serviceName.split(";"); + if (services.length == 0) { + return 0; + } else { + mService.setTemporaryServices(userId, services, duration); + } pw.println("CloudSearchService temporarily set to " + serviceName + " for " + duration + "ms"); break; diff --git a/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java b/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java index 32d66afb33b9..116c7391b388 100644 --- a/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java +++ b/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java @@ -49,6 +49,8 @@ public class CloudSearchPerUserService extends @GuardedBy("mLock") private final CircularQueue<String, CloudSearchCallbackInfo> mCallbackQueue = new CircularQueue<>(QUEUE_SIZE); + private final String mServiceName; + private final ComponentName mRemoteComponentName; @Nullable @GuardedBy("mLock") private RemoteCloudSearchService mRemoteService; @@ -60,8 +62,10 @@ public class CloudSearchPerUserService extends private boolean mZombie; protected CloudSearchPerUserService(CloudSearchManagerService master, - Object lock, int userId) { + Object lock, int userId, String serviceName) { super(master, lock, userId); + mServiceName = serviceName; + mRemoteComponentName = ComponentName.unflattenFromString(mServiceName); } @Override // from PerUserSystemService @@ -108,7 +112,7 @@ public class CloudSearchPerUserService extends ? searchRequest.getSearchConstraints().getString( SearchRequest.CONSTRAINT_SEARCH_PROVIDER_FILTER) : ""; - String remoteServicePackageName = getServiceComponentName().getPackageName(); + String remoteServicePackageName = mRemoteComponentName.getPackageName(); // By default, all providers are marked as wanted. boolean wantedProvider = true; if (filterList.length() > 0) { @@ -150,11 +154,19 @@ public class CloudSearchPerUserService extends /** * Used to return results back to the clients. */ + @GuardedBy("mLock") public void onReturnResultsLocked(@NonNull IBinder token, @NonNull String requestId, @NonNull SearchResponse response) { + if (mRemoteService == null) { + return; + } + ICloudSearchService serviceInterface = mRemoteService.getServiceInterface(); + if (serviceInterface == null || token != serviceInterface.asBinder()) { + return; + } if (mCallbackQueue.containsKey(requestId)) { - response.setSource(mRemoteService.getComponentName().getPackageName()); + response.setSource(mServiceName); final CloudSearchCallbackInfo sessionInfo = mCallbackQueue.getElement(requestId); try { if (response.getStatusCode() == SearchResponse.SEARCH_STATUS_OK) { @@ -163,6 +175,10 @@ public class CloudSearchPerUserService extends sessionInfo.mCallback.onSearchFailed(response); } } catch (RemoteException e) { + if (mMaster.debug) { + Slog.e(TAG, "Exception in posting results"); + e.printStackTrace(); + } onDestroyLocked(requestId); } } @@ -297,7 +313,7 @@ public class CloudSearchPerUserService extends @Nullable private RemoteCloudSearchService getRemoteServiceLocked() { if (mRemoteService == null) { - final String serviceName = getComponentNameLocked(); + final String serviceName = getComponentNameForMultipleLocked(mServiceName); if (serviceName == null) { if (mMaster.verbose) { Slog.v(TAG, "getRemoteServiceLocked(): not set"); diff --git a/services/companion/TEST_MAPPING b/services/companion/TEST_MAPPING index 4a37cb812981..38d937288569 100644 --- a/services/companion/TEST_MAPPING +++ b/services/companion/TEST_MAPPING @@ -7,6 +7,9 @@ "name": "CtsCompanionDeviceManagerUiAutomationTestCases" }, { + "name": "CtsCompanionDeviceManagerNoCompanionServicesTestCases" + }, + { "name": "CtsOsTestCases", "options": [ { diff --git a/services/core/java/com/android/server/NetworkTimeUpdateService.java b/services/core/java/com/android/server/NetworkTimeUpdateService.java index 1e534b7c1515..186ff6215c9c 100644 --- a/services/core/java/com/android/server/NetworkTimeUpdateService.java +++ b/services/core/java/com/android/server/NetworkTimeUpdateService.java @@ -17,6 +17,7 @@ package com.android.server; import android.annotation.NonNull; +import android.annotation.Nullable; import android.app.AlarmManager; import android.app.PendingIntent; import android.app.timedetector.NetworkTimeSuggestion; @@ -45,12 +46,12 @@ import android.util.LocalLog; import android.util.Log; import android.util.NtpTrustedTime; import android.util.NtpTrustedTime.TimeResult; -import android.util.TimeUtils; import com.android.internal.util.DumpUtils; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.time.Duration; /** * Monitors the network time. If looking up the network time fails for some reason, it tries a few @@ -191,6 +192,19 @@ public class NetworkTimeUpdateService extends Binder { return success; } + /** + * Overrides the NTP server config for tests. Passing {@code null} to a parameter clears the + * test value, i.e. so the normal value will be used next time. + */ + void setServerConfigForTests(@Nullable String hostname, @Nullable Duration timeout) { + mContext.enforceCallingPermission( + android.Manifest.permission.SET_TIME, "set NTP server config for tests"); + + mLocalLog.log("Setting server config for tests: hostname=" + hostname + + ", timeout=" + timeout); + mTime.setServerConfigForTests(hostname, timeout); + } + private void onPollNetworkTime(int event) { // If we don't have any default network, don't bother. if (mDefaultNetwork == null) return; @@ -349,17 +363,14 @@ public class NetworkTimeUpdateService extends Binder { @Override protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) { if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return; - pw.print("PollingIntervalMs: "); - TimeUtils.formatDuration(mPollingIntervalMs, pw); - pw.print("\nPollingIntervalShorterMs: "); - TimeUtils.formatDuration(mPollingIntervalShorterMs, pw); - pw.println("\nTryAgainTimesMax: " + mTryAgainTimesMax); - pw.println("\nTryAgainCounter: " + mTryAgainCounter); - NtpTrustedTime.TimeResult ntpResult = mTime.getCachedTimeResult(); - pw.println("NTP cache result: " + ntpResult); - if (ntpResult != null) { - pw.println("NTP result age: " + ntpResult.getAgeMillis()); - } + pw.println("mPollingIntervalMs=" + Duration.ofMillis(mPollingIntervalMs)); + pw.println("mPollingIntervalShorterMs=" + Duration.ofMillis(mPollingIntervalShorterMs)); + pw.println("mTryAgainTimesMax=" + mTryAgainTimesMax); + pw.println("mTryAgainCounter=" + mTryAgainCounter); + pw.println(); + pw.println("NtpTrustedTime:"); + mTime.dump(pw); + pw.println(); pw.println("Local logs:"); mLocalLog.dump(fd, pw, args); pw.println(); diff --git a/services/core/java/com/android/server/NetworkTimeUpdateServiceShellCommand.java b/services/core/java/com/android/server/NetworkTimeUpdateServiceShellCommand.java index dc93023d82c5..464af01a009a 100644 --- a/services/core/java/com/android/server/NetworkTimeUpdateServiceShellCommand.java +++ b/services/core/java/com/android/server/NetworkTimeUpdateServiceShellCommand.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.os.ShellCommand; import java.io.PrintWriter; +import java.time.Duration; import java.util.Objects; /** Implements the shell command interface for {@link NetworkTimeUpdateService}. */ @@ -40,6 +41,13 @@ class NetworkTimeUpdateServiceShellCommand extends ShellCommand { */ private static final String SHELL_COMMAND_FORCE_REFRESH = "force_refresh"; + /** + * A shell command that sets the NTP server config for tests. Config is cleared on reboot. + */ + private static final String SHELL_COMMAND_SET_SERVER_CONFIG = "set_server_config"; + private static final String SET_SERVER_CONFIG_HOSTNAME_ARG = "--hostname"; + private static final String SET_SERVER_CONFIG_TIMEOUT_ARG = "--timeout_millis"; + @NonNull private final NetworkTimeUpdateService mNetworkTimeUpdateService; @@ -58,6 +66,8 @@ class NetworkTimeUpdateServiceShellCommand extends ShellCommand { return runClearTime(); case SHELL_COMMAND_FORCE_REFRESH: return runForceRefresh(); + case SHELL_COMMAND_SET_SERVER_CONFIG: + return runSetServerConfig(); default: { return handleDefaultCommands(cmd); } @@ -75,6 +85,29 @@ class NetworkTimeUpdateServiceShellCommand extends ShellCommand { return 0; } + private int runSetServerConfig() { + String hostname = null; + Duration timeout = null; + String opt; + while ((opt = getNextArg()) != null) { + switch (opt) { + case SET_SERVER_CONFIG_HOSTNAME_ARG: { + hostname = getNextArgRequired(); + break; + } + case SET_SERVER_CONFIG_TIMEOUT_ARG: { + timeout = Duration.ofMillis(Integer.parseInt(getNextArgRequired())); + break; + } + default: { + throw new IllegalArgumentException("Unknown option: " + opt); + } + } + } + mNetworkTimeUpdateService.setServerConfigForTests(hostname, timeout); + return 0; + } + @Override public void onHelp() { final PrintWriter pw = getOutPrintWriter(); @@ -85,6 +118,12 @@ class NetworkTimeUpdateServiceShellCommand extends ShellCommand { pw.printf(" Clears the latest time.\n"); pw.printf(" %s\n", SHELL_COMMAND_FORCE_REFRESH); pw.printf(" Refreshes the latest time. Prints whether it was successful.\n"); + pw.printf(" %s\n", SHELL_COMMAND_SET_SERVER_CONFIG); + pw.printf(" Sets the NTP server config for tests. The config is not persisted.\n"); + pw.printf(" Options: [%s <hostname>] [%s <millis>]\n", + SET_SERVER_CONFIG_HOSTNAME_ARG, SET_SERVER_CONFIG_TIMEOUT_ARG); + pw.printf(" Each key/value is optional and must be specified to override the\n"); + pw.printf(" normal value, not specifying a key causes it to reset to the original.\n"); pw.println(); } } diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index d4764a61566e..9391b18acea6 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -176,9 +176,6 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.PrintWriter; -import java.math.BigInteger; -import java.security.GeneralSecurityException; -import java.security.spec.KeySpec; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -198,10 +195,6 @@ import java.util.concurrent.TimeoutException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.crypto.SecretKey; -import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.PBEKeySpec; - /** * Service responsible for various storage media. Connects to {@code vold} to * watch for and manage dynamically added storage, such as SD cards and USB mass @@ -3130,8 +3123,8 @@ class StorageManagerService extends IStorageManager.Stub } @Override - public void mountObb(String rawPath, String canonicalPath, String key, - IObbActionListener token, int nonce, ObbInfo obbInfo) { + public void mountObb(String rawPath, String canonicalPath, IObbActionListener token, + int nonce, ObbInfo obbInfo) { Objects.requireNonNull(rawPath, "rawPath cannot be null"); Objects.requireNonNull(canonicalPath, "canonicalPath cannot be null"); Objects.requireNonNull(token, "token cannot be null"); @@ -3140,7 +3133,7 @@ class StorageManagerService extends IStorageManager.Stub final int callingUid = Binder.getCallingUid(); final ObbState obbState = new ObbState(rawPath, canonicalPath, callingUid, token, nonce, null); - final ObbAction action = new MountObbAction(obbState, key, callingUid, obbInfo); + final ObbAction action = new MountObbAction(obbState, callingUid, obbInfo); mObbActionHandler.sendMessage(mObbActionHandler.obtainMessage(OBB_RUN_ACTION, action)); if (DEBUG_OBB) @@ -4586,13 +4579,11 @@ class StorageManagerService extends IStorageManager.Stub } class MountObbAction extends ObbAction { - private final String mKey; private final int mCallingUid; private ObbInfo mObbInfo; - MountObbAction(ObbState obbState, String key, int callingUid, ObbInfo obbInfo) { + MountObbAction(ObbState obbState, int callingUid, ObbInfo obbInfo) { super(obbState); - mKey = key; mCallingUid = callingUid; mObbInfo = obbInfo; } @@ -4615,29 +4606,8 @@ class StorageManagerService extends IStorageManager.Stub "Attempt to mount OBB which is already mounted: " + mObbInfo.filename); } - final String hashedKey; - final String binderKey; - if (mKey == null) { - hashedKey = "none"; - binderKey = ""; - } else { - try { - SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1"); - - KeySpec ks = new PBEKeySpec(mKey.toCharArray(), mObbInfo.salt, - PBKDF2_HASH_ROUNDS, CRYPTO_ALGORITHM_KEY_SIZE); - SecretKey key = factory.generateSecret(ks); - BigInteger bi = new BigInteger(key.getEncoded()); - hashedKey = bi.toString(16); - binderKey = hashedKey; - } catch (GeneralSecurityException e) { - throw new ObbException(ERROR_INTERNAL, e); - } - } - try { - mObbState.volId = mVold.createObb(mObbState.canonicalPath, binderKey, - mObbState.ownerGid); + mObbState.volId = mVold.createObb(mObbState.canonicalPath, mObbState.ownerGid); mVold.mount(mObbState.volId, 0, -1, null); if (DEBUG_OBB) diff --git a/services/core/java/com/android/server/am/ActivityManagerConstants.java b/services/core/java/com/android/server/am/ActivityManagerConstants.java index 5fe87199f1b8..18e0155cfd34 100644 --- a/services/core/java/com/android/server/am/ActivityManagerConstants.java +++ b/services/core/java/com/android/server/am/ActivityManagerConstants.java @@ -650,6 +650,38 @@ final class ActivityManagerConstants extends ContentObserver { // initialized in the constructor. public int CUR_MAX_EMPTY_PROCESSES; + + /** @see #mNoKillCachedProcessesUntilBootCompleted */ + private static final String KEY_NO_KILL_CACHED_PROCESSES_UNTIL_BOOT_COMPLETED = + "no_kill_cached_processes_until_boot_completed"; + + /** @see #mNoKillCachedProcessesPostBootCompletedDurationMillis */ + private static final String KEY_NO_KILL_CACHED_PROCESSES_POST_BOOT_COMPLETED_DURATION_MILLIS = + "no_kill_cached_processes_post_boot_completed_duration_millis"; + + /** @see #mNoKillCachedProcessesUntilBootCompleted */ + private static final boolean DEFAULT_NO_KILL_CACHED_PROCESSES_UNTIL_BOOT_COMPLETED = false; + + /** @see #mNoKillCachedProcessesPostBootCompletedDurationMillis */ + private static final long + DEFAULT_NO_KILL_CACHED_PROCESSES_POST_BOOT_COMPLETED_DURATION_MILLIS = 0; + + /** + * If true, do not kill excessive cached processes proactively, until user-0 is unlocked. + * @see #mNoKillCachedProcessesPostBootCompletedDurationMillis + */ + volatile boolean mNoKillCachedProcessesUntilBootCompleted = + DEFAULT_NO_KILL_CACHED_PROCESSES_UNTIL_BOOT_COMPLETED; + + /** + * Do not kill excessive cached processes proactively, for this duration after each user is + * unlocked. + * Note we don't proactively kill extra cached processes after this. The next oomadjuster pass + * will naturally do it. + */ + volatile long mNoKillCachedProcessesPostBootCompletedDurationMillis = + DEFAULT_NO_KILL_CACHED_PROCESSES_POST_BOOT_COMPLETED_DURATION_MILLIS; + // The number of empty apps at which we don't consider it necessary to do // memory trimming. public int CUR_TRIM_EMPTY_PROCESSES = computeEmptyProcessLimit(MAX_CACHED_PROCESSES) / 2; @@ -659,6 +691,14 @@ final class ActivityManagerConstants extends ContentObserver { public int CUR_TRIM_CACHED_PROCESSES = (MAX_CACHED_PROCESSES - computeEmptyProcessLimit(MAX_CACHED_PROCESSES)) / 3; + /** @see #mNoKillCachedProcessesUntilBootCompleted */ + private static final String KEY_MAX_EMPTY_TIME_MILLIS = + "max_empty_time_millis"; + + private static final long DEFAULT_MAX_EMPTY_TIME_MILLIS = 30 * 60 * 1000; + + volatile long mMaxEmptyTimeMillis = DEFAULT_MAX_EMPTY_TIME_MILLIS; + /** * Packages that can't be killed even if it's requested to be killed on imperceptible. */ @@ -869,6 +909,15 @@ final class ActivityManagerConstants extends ContentObserver { case KEY_DEFER_BOOT_COMPLETED_BROADCAST: updateDeferBootCompletedBroadcast(); break; + case KEY_NO_KILL_CACHED_PROCESSES_UNTIL_BOOT_COMPLETED: + updateNoKillCachedProcessesUntilBootCompleted(); + break; + case KEY_NO_KILL_CACHED_PROCESSES_POST_BOOT_COMPLETED_DURATION_MILLIS: + updateNoKillCachedProcessesPostBootCompletedDurationMillis(); + break; + case KEY_MAX_EMPTY_TIME_MILLIS: + updateMaxEmptyTimeMillis(); + break; default: break; } @@ -1288,6 +1337,27 @@ final class ActivityManagerConstants extends ContentObserver { DEFAULT_DEFER_BOOT_COMPLETED_BROADCAST); } + private void updateNoKillCachedProcessesUntilBootCompleted() { + mNoKillCachedProcessesUntilBootCompleted = DeviceConfig.getBoolean( + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, + KEY_NO_KILL_CACHED_PROCESSES_UNTIL_BOOT_COMPLETED, + DEFAULT_NO_KILL_CACHED_PROCESSES_UNTIL_BOOT_COMPLETED); + } + + private void updateNoKillCachedProcessesPostBootCompletedDurationMillis() { + mNoKillCachedProcessesPostBootCompletedDurationMillis = DeviceConfig.getLong( + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, + KEY_NO_KILL_CACHED_PROCESSES_POST_BOOT_COMPLETED_DURATION_MILLIS, + DEFAULT_NO_KILL_CACHED_PROCESSES_POST_BOOT_COMPLETED_DURATION_MILLIS); + } + + private void updateMaxEmptyTimeMillis() { + mMaxEmptyTimeMillis = DeviceConfig.getLong( + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, + KEY_MAX_EMPTY_TIME_MILLIS, + DEFAULT_MAX_EMPTY_TIME_MILLIS); + } + private long[] parseLongArray(@NonNull String key, @NonNull long[] def) { final String val = DeviceConfig.getString(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, key, null); @@ -1562,6 +1632,12 @@ final class ActivityManagerConstants extends ContentObserver { pw.print("="); pw.println(mComponentAliasOverrides); pw.print(" "); pw.print(KEY_DEFER_BOOT_COMPLETED_BROADCAST); pw.print("="); pw.println(mDeferBootCompletedBroadcast); + pw.print(" "); pw.print(KEY_NO_KILL_CACHED_PROCESSES_UNTIL_BOOT_COMPLETED); + pw.print("="); pw.println(mNoKillCachedProcessesUntilBootCompleted); + pw.print(" "); pw.print(KEY_NO_KILL_CACHED_PROCESSES_POST_BOOT_COMPLETED_DURATION_MILLIS); + pw.print("="); pw.println(mNoKillCachedProcessesPostBootCompletedDurationMillis); + pw.print(" "); pw.print(KEY_MAX_EMPTY_TIME_MILLIS); + pw.print("="); pw.println(mMaxEmptyTimeMillis); pw.println(); if (mOverrideMaxCachedProcesses >= 0) { diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 47f9fd535801..7054a8171572 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -16999,6 +16999,15 @@ public class ActivityManagerService extends IActivityManager.Stub @Override public void addPendingTopUid(int uid, int pid) { mPendingStartActivityUids.add(uid, pid); + + // If the next top activity is in cached and frozen mode, WM should raise its priority + // to unfreeze it. This is done by calling AMS.updateOomAdj that will lower its oom adj. + // However, WM cannot hold the AMS clock here so the updateOomAdj operation is performed + // in a separate thread asynchronously. Therefore WM can't guarantee AMS will unfreeze + // next top activity on time. This race will fail the following binder transactions WM + // sends to the activity. After this race issue between WM/ATMS and AMS is solved, this + // workaround can be removed. (b/213288355) + mOomAdjuster.mCachedAppOptimizer.unfreezeProcess(pid); } @Override diff --git a/services/core/java/com/android/server/am/AppExitInfoTracker.java b/services/core/java/com/android/server/am/AppExitInfoTracker.java index fc29982dc7f0..d84c1fcd54fb 100644 --- a/services/core/java/com/android/server/am/AppExitInfoTracker.java +++ b/services/core/java/com/android/server/am/AppExitInfoTracker.java @@ -1002,6 +1002,7 @@ public final class AppExitInfoTracker { info.setPackageName(app.info.packageName); info.setPackageList(app.getPackageList()); info.setReason(ApplicationExitInfo.REASON_UNKNOWN); + info.setSubReason(ApplicationExitInfo.SUBREASON_UNKNOWN); info.setStatus(0); info.setImportance(procStateToImportance(app.mState.getReportedProcState())); info.setPss(app.mProfile.getLastPss()); diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java index b18d390476f0..0c3b984aed73 100644 --- a/services/core/java/com/android/server/am/CachedAppOptimizer.java +++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java @@ -183,6 +183,8 @@ public final class CachedAppOptimizer { private final ActivityManagerGlobalLock mProcLock; + private final Object mFreezerLock = new Object(); + private final OnPropertiesChangedListener mOnFlagsChangedListener = new OnPropertiesChangedListener() { @Override @@ -949,8 +951,8 @@ public final class CachedAppOptimizer { } } - @GuardedBy({"mAm", "mProcLock"}) - void unfreezeAppLSP(ProcessRecord app) { + @GuardedBy({"mAm", "mProcLock", "mFreezerLock"}) + void unfreezeAppInternalLSP(ProcessRecord app) { final int pid = app.getPid(); final ProcessCachedOptimizerRecord opt = app.mOptRecord; if (opt.isPendingFreeze()) { @@ -1035,6 +1037,42 @@ public final class CachedAppOptimizer { } } + @GuardedBy({"mAm", "mProcLock"}) + void unfreezeAppLSP(ProcessRecord app) { + synchronized (mFreezerLock) { + unfreezeAppInternalLSP(app); + } + } + + /** + * This quick function works around the race condition between WM/ATMS and AMS, allowing + * the former to directly unfreeze a frozen process before the latter runs updateOomAdj. + * After the race issue is solved, this workaround can be removed. (b/213288355) + * @param pid pid of the process to be unfrozen + */ + @GuardedBy({"mFreezerLock"}) + void unfreezeProcess(int pid) { + synchronized (mFreezerLock) { + ProcessRecord app = mFrozenProcesses.get(pid); + if (app == null) { + return; + } + Slog.i(TAG_AM, "quick sync unfreeze " + pid); + try { + freezeBinder(pid, false); + } catch (RuntimeException e) { + Slog.e(TAG_AM, "Unable to quick unfreeze binder for " + pid); + return; + } + + try { + Process.setProcessFrozen(pid, app.uid, false); + } catch (Exception e) { + Slog.e(TAG_AM, "Unable to quick unfreeze " + pid); + } + } + } + /** * To be called when the given app is killed. */ @@ -1464,8 +1502,6 @@ public final class CachedAppOptimizer { return; } - Slog.d(TAG_AM, "froze " + pid + " " + name); - EventLog.writeEvent(EventLogTags.AM_FREEZE, pid, name); // See above for why we're not taking mPhenotypeFlagLock here diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index 6a211d31aa49..e0d333ee8f6a 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -750,7 +750,7 @@ public class OomAdjuster { } final long now = SystemClock.uptimeMillis(); final long nowElapsed = SystemClock.elapsedRealtime(); - final long oldTime = now - ProcessList.MAX_EMPTY_TIME; + final long oldTime = now - mConstants.mMaxEmptyTimeMillis; final boolean fullUpdate = processes == null; ActiveUids activeUids = uids; ArrayList<ProcessRecord> activeProcesses = fullUpdate ? mProcessList.getLruProcessesLOSP() @@ -1031,15 +1031,25 @@ public class OomAdjuster { } } + private long mNextNoKillDebugMessageTime; + @GuardedBy({"mService", "mProcLock"}) private boolean updateAndTrimProcessLSP(final long now, final long nowElapsed, final long oldTime, final ActiveUids activeUids) { ArrayList<ProcessRecord> lruList = mProcessList.getLruProcessesLOSP(); final int numLru = lruList.size(); - final int emptyProcessLimit = mConstants.CUR_MAX_EMPTY_PROCESSES; - final int cachedProcessLimit = mConstants.CUR_MAX_CACHED_PROCESSES - - emptyProcessLimit; + final boolean doKillExcessiveProcesses = shouldKillExcessiveProcesses(now); + if (!doKillExcessiveProcesses) { + if (mNextNoKillDebugMessageTime < now) { + Slog.d(TAG, "Not killing cached processes"); // STOPSHIP Remove it b/222365734 + mNextNoKillDebugMessageTime = now + 5000; // Every 5 seconds + } + } + final int emptyProcessLimit = doKillExcessiveProcesses + ? mConstants.CUR_MAX_EMPTY_PROCESSES : Integer.MAX_VALUE; + final int cachedProcessLimit = doKillExcessiveProcesses + ? (mConstants.CUR_MAX_CACHED_PROCESSES - emptyProcessLimit) : Integer.MAX_VALUE; int lastCachedGroup = 0; int lastCachedGroupUid = 0; int numCached = 0; @@ -1089,7 +1099,7 @@ public class OomAdjuster { case PROCESS_STATE_CACHED_EMPTY: if (numEmpty > mConstants.CUR_TRIM_EMPTY_PROCESSES && app.getLastActivityTime() < oldTime) { - app.killLocked("empty for " + ((oldTime + ProcessList.MAX_EMPTY_TIME + app.killLocked("empty for " + ((now - app.getLastActivityTime()) / 1000) + "s", "empty for too long", ApplicationExitInfo.REASON_OTHER, @@ -1258,6 +1268,25 @@ public class OomAdjuster { } } + /** + * Return true if we should kill excessive cached/empty processes. + */ + private boolean shouldKillExcessiveProcesses(long nowUptime) { + final long lastUserUnlockingUptime = mService.mUserController.getLastUserUnlockingUptime(); + + if (lastUserUnlockingUptime == 0) { + // No users have been unlocked. + return !mConstants.mNoKillCachedProcessesUntilBootCompleted; + } + final long noKillCachedProcessesPostBootCompletedDurationMillis = + mConstants.mNoKillCachedProcessesPostBootCompletedDurationMillis; + if ((lastUserUnlockingUptime + noKillCachedProcessesPostBootCompletedDurationMillis) + > nowUptime) { + return false; + } + return true; + } + private final ComputeOomAdjWindowCallback mTmpComputeOomAdjWindowCallback = new ComputeOomAdjWindowCallback(); diff --git a/services/core/java/com/android/server/am/PendingIntentRecord.java b/services/core/java/com/android/server/am/PendingIntentRecord.java index b1c91ba4a79d..81a8680cdbf0 100644 --- a/services/core/java/com/android/server/am/PendingIntentRecord.java +++ b/services/core/java/com/android/server/am/PendingIntentRecord.java @@ -368,8 +368,7 @@ public final class PendingIntentRecord extends IIntentSender.Stub { // Apply any launch flags from the ActivityOptions. This is to ensure that the caller // can specify a consistent launch mode even if the PendingIntent is immutable - final ActivityOptions opts = options != null ? ActivityOptions.fromBundle(options) - : null; + final ActivityOptions opts = ActivityOptions.fromBundle(options); if (opts != null) { finalIntent.addFlags(opts.getPendingIntentLaunchFlags()); } diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index 636b7f2abe50..6e14203774a1 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -293,9 +293,6 @@ public final class ProcessList { // without empty apps being able to push them out of memory. static final int MIN_CACHED_APPS = 2; - // We allow empty processes to stick around for at most 30 minutes. - static final long MAX_EMPTY_TIME = 30 * 60 * 1000; - // Threshold of number of cached+empty where we consider memory critical. static final int TRIM_CRITICAL_THRESHOLD = 3; diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 1095cf0a0d30..ad176556ba65 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -399,6 +399,9 @@ class UserController implements Handler.Callback { @GuardedBy("mLock") private @StopUserOnSwitch int mStopUserOnSwitch = STOP_USER_ON_SWITCH_DEFAULT; + /** @see #getLastUserUnlockingUptime */ + private volatile long mLastUserUnlockingUptime = 0; + UserController(ActivityManagerService service) { this(new Injector(service)); } @@ -661,6 +664,8 @@ class UserController implements Handler.Callback { uss.mUnlockProgress.setProgress(20); + mLastUserUnlockingUptime = SystemClock.uptimeMillis(); + // Dispatch unlocked to system services; when fully dispatched, // that calls through to the next "unlocked" phase mHandler.obtainMessage(USER_UNLOCK_MSG, userId, 0, uss).sendToTarget(); @@ -2753,6 +2758,7 @@ class UserController implements Handler.Callback { if (mSwitchingToSystemUserMessage != null) { pw.println(" mSwitchingToSystemUserMessage: " + mSwitchingToSystemUserMessage); } + pw.println(" mLastUserUnlockingUptime:" + mLastUserUnlockingUptime); } } @@ -3078,6 +3084,14 @@ class UserController implements Handler.Callback { } /** + * Uptime when any user was being unlocked most recently. 0 if no users have been unlocked + * yet. To avoid lock contention (since it's used by OomAdjuster), it's volatile internally. + */ + public long getLastUserUnlockingUptime() { + return mLastUserUnlockingUptime; + } + + /** * Helper class to store user journey and session id. * * <p> User journey tracks a chain of user lifecycle events occurring during different user diff --git a/services/core/java/com/android/server/app/GameManagerService.java b/services/core/java/com/android/server/app/GameManagerService.java index 3efd8ad0581b..4fa1ba1c8158 100644 --- a/services/core/java/com/android/server/app/GameManagerService.java +++ b/services/core/java/com/android/server/app/GameManagerService.java @@ -359,6 +359,7 @@ public final class GameManagerService extends IGameManagerService.Stub { public enum FrameRate { FPS_DEFAULT(0), FPS_30(30), + FPS_40(40), FPS_45(45), FPS_60(60), FPS_90(90), @@ -378,6 +379,8 @@ public final class GameManagerService extends IGameManagerService.Stub { switch (raw) { case "30": return FrameRate.FPS_30.fps; + case "40": + return FrameRate.FPS_40.fps; case "45": return FrameRate.FPS_45.fps; case "60": diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 82476d8d1df8..d01be5820d34 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -127,6 +127,7 @@ import android.os.Binder; import android.os.Build; import android.os.Bundle; import android.os.Handler; +import android.os.HwBinder; import android.os.IBinder; import android.os.Looper; import android.os.Message; @@ -10471,6 +10472,25 @@ public class AudioService extends IAudioService.Stub return mMediaFocusControl.sendFocusLoss(focusLoser); } + private static final String[] HAL_VERSIONS = new String[] {"7.1", "7.0", "6.0", "4.0", "2.0"}; + + /** @see AudioManager#getHalVersion */ + public @Nullable String getHalVersion() { + for (String version : HAL_VERSIONS) { + try { + HwBinder.getService( + String.format("android.hardware.audio@%s::IDevicesFactory", version), + "default"); + return version; + } catch (NoSuchElementException e) { + // Ignore, the specified HAL interface is not found. + } catch (RemoteException re) { + Log.e(TAG, "Remote exception when getting hardware audio service:", re); + } + } + return null; + } + /** see AudioManager.hasRegisteredDynamicPolicy */ public boolean hasRegisteredDynamicPolicy() { synchronized (mAudioPolicies) { diff --git a/services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java b/services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java index 62b701aff398..28c7cad3b184 100644 --- a/services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java +++ b/services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java @@ -18,6 +18,7 @@ package com.android.server.clipboard; import android.annotation.Nullable; import android.content.ClipData; +import android.os.SystemProperties; import android.system.ErrnoException; import android.system.Os; import android.system.OsConstants; @@ -39,6 +40,8 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> { private static final String PIPE_NAME = "pipe:clipboard"; private static final int HOST_PORT = 5000; private final Thread mHostMonitorThread; + private static final boolean LOG_CLIBOARD_ACCESS = + SystemProperties.getBoolean("ro.boot.qemu.log_clipboard_access", false); private FileDescriptor mPipe = null; private static byte[] createOpenHandshake() { @@ -51,8 +54,8 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> { return bits; } - private boolean isPipeOpened() { - return mPipe != null; + private synchronized FileDescriptor getPipeFD() { + return mPipe; } private synchronized boolean openPipe() { @@ -104,14 +107,16 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> { return msg; } - private void sendMessage(final byte[] msg) throws ErrnoException, InterruptedIOException { + private static void sendMessage( + final FileDescriptor fd, + final byte[] msg) throws ErrnoException, InterruptedIOException { final byte[] lengthBits = new byte[4]; final ByteBuffer bb = ByteBuffer.wrap(lengthBits); bb.order(ByteOrder.LITTLE_ENDIAN); bb.putInt(msg.length); - Os.write(mPipe, lengthBits, 0, lengthBits.length); - Os.write(mPipe, msg, 0, msg.length); + Os.write(fd, lengthBits, 0, lengthBits.length); + Os.write(fd, msg, 0, msg.length); } EmulatorClipboardMonitor(final Consumer<ClipData> setAndroidClipboard) { @@ -132,6 +137,9 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> { new String[]{"text/plain"}, new ClipData.Item(str)); + if (LOG_CLIBOARD_ACCESS) { + Slog.i(TAG, "Setting the guest clipboard to '" + str + "'"); + } setAndroidClipboard.accept(clip); } catch (ErrnoException | InterruptedIOException e) { closePipe(); @@ -156,13 +164,22 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> { } private void setHostClipboardImpl(final String value) { - try { - if (isPipeOpened()) { - sendMessage(value.getBytes()); - } - } catch (ErrnoException | InterruptedIOException e) { - Slog.e(TAG, "Failed to set host clipboard " + e.getMessage()); - } catch (IllegalArgumentException e) { + final FileDescriptor pipeFD = getPipeFD(); + + if (pipeFD != null) { + Thread t = new Thread(() -> { + if (LOG_CLIBOARD_ACCESS) { + Slog.i(TAG, "Setting the host clipboard to '" + value + "'"); + } + + try { + sendMessage(pipeFD, value.getBytes()); + } catch (ErrnoException | InterruptedIOException e) { + Slog.e(TAG, "Failed to set host clipboard " + e.getMessage()); + } catch (IllegalArgumentException e) { + } + }); + t.start(); } } } diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 682f0dfe067c..c0df095c3289 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -1320,6 +1320,7 @@ public class Vpn { .setLegacyTypeName("VPN") .setBypassableVpn(mConfig.allowBypass && !mLockdown) .setVpnRequiresValidation(mConfig.requiresInternetValidation) + .setLocalRoutesExcludedForVpn(mConfig.excludeLocalRoutes) .build(); capsBuilder.setOwnerUid(mOwnerUID); @@ -3386,6 +3387,7 @@ public class Vpn { mConfig.startTime = SystemClock.elapsedRealtime(); mConfig.proxyInfo = profile.proxy; mConfig.requiresInternetValidation = profile.requiresInternetValidation; + mConfig.excludeLocalRoutes = profile.excludeLocalRoutes; switch (profile.type) { case VpnProfile.TYPE_IKEV2_IPSEC_USER_PASS: diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index c0950bf13a1c..d249d578cf67 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -654,14 +654,17 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { protected int handleTextViewOn(HdmiCecMessage message) { assertRunOnServiceThread(); - // Note that <Text View On> (and <Image View On>) command won't be handled here in - // most cases. A dedicated microcontroller should be in charge while Android system - // is in sleep mode, and the command need not be passed up to this service. - // The only situation where the command reaches this handler is that sleep mode is - // implemented in such a way that Android system is not really put to standby mode - // but only the display is set to blank. Then the command leads to the effect of + // Note that if the device is in sleep mode, the <Text View On> (and <Image View On>) + // command won't be handled here in most cases. A dedicated microcontroller should be in + // charge while the Android system is in sleep mode, and the command doesn't need to be + // passed up to this service. + // The only situations where the command reaches this handler are + // 1. if sleep mode is implemented in such a way that Android system is not really put to + // standby mode but only the display is set to blank. Then the command leads to // turning on the display by the invocation of PowerManager.wakeUp(). - if (mService.isPowerStandbyOrTransient() && getAutoWakeup()) { + // 2. if the device is in dream mode, not sleep mode. Then this command leads to + // waking up the device from dream mode by the invocation of PowerManager.wakeUp(). + if (getAutoWakeup()) { mService.wakeUp(); } return Constants.HANDLED; diff --git a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java index 9e00f95c9c6f..34e3ce1ab641 100644 --- a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java +++ b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java @@ -48,6 +48,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; @@ -168,10 +169,10 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem private final SparseBooleanArray mDisabledByUserRestriction; /** - * Cache of services per user id. + * Cache of service list per user id. */ @GuardedBy("mLock") - private final SparseArray<S> mServicesCache = new SparseArray<>(); + private final SparseArray<List<S>> mServicesCacheList = new SparseArray<>(); /** * Value that determines whether the per-user service should be removed from the cache when its @@ -252,8 +253,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem mServiceNameResolver = serviceNameResolver; if (mServiceNameResolver != null) { mServiceNameResolver.setOnTemporaryServiceNameChangedCallback( - (u, s, t) -> onServiceNameChanged(u, s, t)); - + this::onServiceNameChanged); } if (disallowProperty == null) { mDisabledByUserRestriction = null; @@ -308,7 +308,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem @Override // from SystemService public void onUserStopped(@NonNull TargetUser user) { synchronized (mLock) { - removeCachedServiceLocked(user.getUserIdentifier()); + removeCachedServiceListLocked(user.getUserIdentifier()); } } @@ -386,21 +386,58 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem synchronized (mLock) { final S oldService = peekServiceForUserLocked(userId); if (oldService != null) { - oldService.removeSelfFromCacheLocked(); + oldService.removeSelfFromCache(); } mServiceNameResolver.setTemporaryService(userId, componentName, durationMs); } } /** + * Temporarily sets the service implementation. + * + * <p>Typically used by Shell command and/or CTS tests. + * + * @param componentNames list of the names of the new component + * @param durationMs how long the change will be valid (the service will be automatically + * reset + * to the default component after this timeout expires). + * @throws SecurityException if caller is not allowed to manage this service's settings. + * @throws IllegalArgumentException if value of {@code durationMs} is higher than + * {@link #getMaximumTemporaryServiceDurationMs()}. + */ + public final void setTemporaryServices(@UserIdInt int userId, @NonNull String[] componentNames, + int durationMs) { + Slog.i(mTag, "setTemporaryService(" + userId + ") to " + Arrays.toString(componentNames) + + " for " + durationMs + "ms"); + if (mServiceNameResolver == null) { + return; + } + enforceCallingPermissionForManagement(); + + Objects.requireNonNull(componentNames); + final int maxDurationMs = getMaximumTemporaryServiceDurationMs(); + if (durationMs > maxDurationMs) { + throw new IllegalArgumentException( + "Max duration is " + maxDurationMs + " (called with " + durationMs + ")"); + } + + synchronized (mLock) { + final S oldService = peekServiceForUserLocked(userId); + if (oldService != null) { + oldService.removeSelfFromCache(); + } + mServiceNameResolver.setTemporaryServices(userId, componentNames, durationMs); + } + } + + /** * Sets whether the default service should be used. * * <p>Typically used during CTS tests to make sure only the default service doesn't interfere * with the test results. * - * @throws SecurityException if caller is not allowed to manage this service's settings. - * * @return whether the enabled state changed. + * @throws SecurityException if caller is not allowed to manage this service's settings. */ public final boolean setDefaultServiceEnabled(@UserIdInt int userId, boolean enabled) { Slog.i(mTag, "setDefaultServiceEnabled() for userId " + userId + ": " + enabled); @@ -420,7 +457,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem final S oldService = peekServiceForUserLocked(userId); if (oldService != null) { - oldService.removeSelfFromCacheLocked(); + oldService.removeSelfFromCache(); } // Must update the service on cache so its initialization code is triggered @@ -501,6 +538,21 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem protected abstract S newServiceLocked(@UserIdInt int resolvedUserId, boolean disabled); /** + * Creates a new service list that will be added to the cache. + * + * @param resolvedUserId the resolved user id for the service. + * @param disabled whether the service is currently disabled (due to {@link UserManager} + * restrictions). + * @return a new instance. + */ + @Nullable + @GuardedBy("mLock") + protected List<S> newServiceListLocked(@UserIdInt int resolvedUserId, boolean disabled, + String[] serviceNames) { + throw new UnsupportedOperationException("newServiceListLocked not implemented. "); + } + + /** * Register the service for extra Settings changes (i.e., other than * {@link android.provider.Settings.Secure#USER_SETUP_COMPLETE} or * {@link #getServiceSettingsProperty()}, which are automatically handled). @@ -516,7 +568,6 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem * <p><b>NOTE: </p>it doesn't need to register for * {@link android.provider.Settings.Secure#USER_SETUP_COMPLETE} or * {@link #getServiceSettingsProperty()}. - * */ @SuppressWarnings("unused") protected void registerForExtraSettingsChanges(@NonNull ContentResolver resolver, @@ -527,7 +578,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem * Callback for Settings changes that were registered though * {@link #registerForExtraSettingsChanges(ContentResolver, ContentObserver)}. * - * @param userId user associated with the change + * @param userId user associated with the change * @param property Settings property changed. */ protected void onSettingsChanged(@UserIdInt int userId, @NonNull String property) { @@ -539,18 +590,35 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem @GuardedBy("mLock") @NonNull protected S getServiceForUserLocked(@UserIdInt int userId) { + List<S> services = getServiceListForUserLocked(userId); + return services == null || services.size() == 0 ? null : services.get(0); + } + + /** + * Gets the service instance list for a user, creating instances if not present in the cache. + */ + @GuardedBy("mLock") + protected List<S> getServiceListForUserLocked(@UserIdInt int userId) { final int resolvedUserId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), userId, false, false, null, null); - S service = mServicesCache.get(resolvedUserId); - if (service == null) { + List<S> services = mServicesCacheList.get(resolvedUserId); + if (services == null || services.size() == 0) { final boolean disabled = isDisabledLocked(userId); - service = newServiceLocked(resolvedUserId, disabled); + if (mServiceNameResolver != null && mServiceNameResolver.isConfiguredInMultipleMode()) { + services = newServiceListLocked(resolvedUserId, disabled, + mServiceNameResolver.getServiceNameList(userId)); + } else { + services = new ArrayList<>(); + services.add(newServiceLocked(resolvedUserId, disabled)); + } if (!disabled) { - onServiceEnabledLocked(service, resolvedUserId); + for (int i = 0; i < services.size(); i++) { + onServiceEnabledLocked(services.get(i), resolvedUserId); + } } - mServicesCache.put(userId, service); + mServicesCacheList.put(userId, services); } - return service; + return services; } /** @@ -560,9 +628,20 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem @GuardedBy("mLock") @Nullable protected S peekServiceForUserLocked(@UserIdInt int userId) { + List<S> serviceList = peekServiceListForUserLocked(userId); + return serviceList == null || serviceList.size() == 0 ? null : serviceList.get(0); + } + + /** + * Gets the <b>existing</b> service instance for a user, returning {@code null} if not already + * present in the cache. + */ + @GuardedBy("mLock") + @Nullable + protected List<S> peekServiceListForUserLocked(@UserIdInt int userId) { final int resolvedUserId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), userId, false, false, null, null); - return mServicesCache.get(resolvedUserId); + return mServicesCacheList.get(resolvedUserId); } /** @@ -570,36 +649,59 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem */ @GuardedBy("mLock") protected void updateCachedServiceLocked(@UserIdInt int userId) { - updateCachedServiceLocked(userId, isDisabledLocked(userId)); + updateCachedServiceListLocked(userId, isDisabledLocked(userId)); } /** * Checks whether the service is disabled (through {@link UserManager} restrictions) for the * given user. */ + @GuardedBy("mLock") protected boolean isDisabledLocked(@UserIdInt int userId) { - return mDisabledByUserRestriction == null ? false : mDisabledByUserRestriction.get(userId); + return mDisabledByUserRestriction != null && mDisabledByUserRestriction.get(userId); } /** * Updates a cached service for a given user. * - * @param userId user handle. + * @param userId user handle. * @param disabled whether the user is disabled. * @return service for the user. */ @GuardedBy("mLock") protected S updateCachedServiceLocked(@UserIdInt int userId, boolean disabled) { final S service = getServiceForUserLocked(userId); - if (service != null) { - service.updateLocked(disabled); - if (!service.isEnabledLocked()) { - removeCachedServiceLocked(userId); - } else { - onServiceEnabledLocked(service, userId); + updateCachedServiceListLocked(userId, disabled); + return service; + } + + /** + * Updates a cached service for a given user. + * + * @param userId user handle. + * @param disabled whether the user is disabled. + * @return service for the user. + */ + @GuardedBy("mLock") + protected List<S> updateCachedServiceListLocked(@UserIdInt int userId, boolean disabled) { + final List<S> services = getServiceListForUserLocked(userId); + if (services == null) { + return null; + } + for (int i = 0; i < services.size(); i++) { + S service = services.get(i); + if (service != null) { + synchronized (service.mLock) { + service.updateLocked(disabled); + if (!service.isEnabledLocked()) { + removeCachedServiceListLocked(userId); + } else { + onServiceEnabledLocked(services.get(i), userId); + } + } } } - return service; + return services; } /** @@ -619,28 +721,32 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem * <p>By default doesn't do anything, but can be overridden by subclasses. */ @SuppressWarnings("unused") + @GuardedBy("mLock") protected void onServiceEnabledLocked(@NonNull S service, @UserIdInt int userId) { } /** - * Removes a cached service for a given user. + * Removes a cached service list for a given user. * * @return the removed service. */ @GuardedBy("mLock") @NonNull - protected final S removeCachedServiceLocked(@UserIdInt int userId) { - final S service = peekServiceForUserLocked(userId); - if (service != null) { - mServicesCache.delete(userId); - onServiceRemoved(service, userId); + protected final List<S> removeCachedServiceListLocked(@UserIdInt int userId) { + final List<S> services = peekServiceListForUserLocked(userId); + if (services != null) { + mServicesCacheList.delete(userId); + for (int i = 0; i < services.size(); i++) { + onServiceRemoved(services.get(i), userId); + } } - return service; + return services; } /** * Called before the package that provides the service for the given user is being updated. */ + @GuardedBy("mLock") protected void onServicePackageUpdatingLocked(@UserIdInt int userId) { if (verbose) Slog.v(mTag, "onServicePackageUpdatingLocked(" + userId + ")"); } @@ -648,6 +754,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem /** * Called after the package that provides the service for the given user is being updated. */ + @GuardedBy("mLock") protected void onServicePackageUpdatedLocked(@UserIdInt int userId) { if (verbose) Slog.v(mTag, "onServicePackageUpdated(" + userId + ")"); } @@ -655,6 +762,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem /** * Called after the package data that provides the service for the given user is cleared. */ + @GuardedBy("mLock") protected void onServicePackageDataClearedLocked(@UserIdInt int userId) { if (verbose) Slog.v(mTag, "onServicePackageDataCleared(" + userId + ")"); } @@ -662,6 +770,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem /** * Called after the package that provides the service for the given user is restarted. */ + @GuardedBy("mLock") protected void onServicePackageRestartedLocked(@UserIdInt int userId) { if (verbose) Slog.v(mTag, "onServicePackageRestarted(" + userId + ")"); } @@ -679,14 +788,31 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem * <p>By default, it calls {@link #updateCachedServiceLocked(int)}; subclasses must either call * that same method, or {@code super.onServiceNameChanged()}. * - * @param userId user handle. + * @param userId user handle. * @param serviceName the new service name. * @param isTemporary whether the new service is temporary. */ protected void onServiceNameChanged(@UserIdInt int userId, @Nullable String serviceName, boolean isTemporary) { synchronized (mLock) { - updateCachedServiceLocked(userId); + updateCachedServiceListLocked(userId, isDisabledLocked(userId)); + } + } + + /** + * Called when the service name list has changed (typically when using temporary services). + * + * <p>By default, it calls {@link #updateCachedServiceLocked(int)}; subclasses must either call + * that same method, or {@code super.onServiceNameChanged()}. + * + * @param userId user handle. + * @param serviceNames the new service name list. + * @param isTemporary whether the new service is temporary. + */ + protected void onServiceNameListChanged(@UserIdInt int userId, @Nullable String[] serviceNames, + boolean isTemporary) { + synchronized (mLock) { + updateCachedServiceListLocked(userId, isDisabledLocked(userId)); } } @@ -695,9 +821,12 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem */ @GuardedBy("mLock") protected void visitServicesLocked(@NonNull Visitor<S> visitor) { - final int size = mServicesCache.size(); + final int size = mServicesCacheList.size(); for (int i = 0; i < size; i++) { - visitor.visit(mServicesCache.valueAt(i)); + List<S> services = mServicesCacheList.valueAt(i); + for (int j = 0; j < services.size(); j++) { + visitor.visit(services.get(j)); + } } } @@ -706,7 +835,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem */ @GuardedBy("mLock") protected void clearCacheLocked() { - mServicesCache.clear(); + mServicesCacheList.clear(); } /** @@ -757,6 +886,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem } // TODO(b/117779333): support proto + @GuardedBy("mLock") protected void dumpLocked(@NonNull String prefix, @NonNull PrintWriter pw) { boolean realDebug = debug; boolean realVerbose = verbose; @@ -765,40 +895,64 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem try { // Temporarily turn on full logging; debug = verbose = true; - final int size = mServicesCache.size(); - pw.print(prefix); pw.print("Debug: "); pw.print(realDebug); - pw.print(" Verbose: "); pw.println(realVerbose); - pw.print("Package policy flags: "); pw.println(mServicePackagePolicyFlags); + final int size = mServicesCacheList.size(); + pw.print(prefix); + pw.print("Debug: "); + pw.print(realDebug); + pw.print(" Verbose: "); + pw.println(realVerbose); + pw.print("Package policy flags: "); + pw.println(mServicePackagePolicyFlags); if (mUpdatingPackageNames != null) { - pw.print("Packages being updated: "); pw.println(mUpdatingPackageNames); + pw.print("Packages being updated: "); + pw.println(mUpdatingPackageNames); } dumpSupportedUsers(pw, prefix); if (mServiceNameResolver != null) { - pw.print(prefix); pw.print("Name resolver: "); - mServiceNameResolver.dumpShort(pw); pw.println(); + pw.print(prefix); + pw.print("Name resolver: "); + mServiceNameResolver.dumpShort(pw); + pw.println(); final List<UserInfo> users = getSupportedUsers(); for (int i = 0; i < users.size(); i++) { final int userId = users.get(i).id; - pw.print(prefix2); pw.print(userId); pw.print(": "); - mServiceNameResolver.dumpShort(pw, userId); pw.println(); + pw.print(prefix2); + pw.print(userId); + pw.print(": "); + mServiceNameResolver.dumpShort(pw, userId); + pw.println(); } } - pw.print(prefix); pw.print("Users disabled by restriction: "); + pw.print(prefix); + pw.print("Users disabled by restriction: "); pw.println(mDisabledByUserRestriction); - pw.print(prefix); pw.print("Allow instant service: "); pw.println(mAllowInstantService); + pw.print(prefix); + pw.print("Allow instant service: "); + pw.println(mAllowInstantService); final String settingsProperty = getServiceSettingsProperty(); if (settingsProperty != null) { - pw.print(prefix); pw.print("Settings property: "); pw.println(settingsProperty); + pw.print(prefix); + pw.print("Settings property: "); + pw.println(settingsProperty); } - pw.print(prefix); pw.print("Cached services: "); + pw.print(prefix); + pw.print("Cached services: "); if (size == 0) { pw.println("none"); } else { pw.println(size); for (int i = 0; i < size; i++) { - pw.print(prefix); pw.print("Service at "); pw.print(i); pw.println(": "); - final S service = mServicesCache.valueAt(i); - service.dumpLocked(prefix2, pw); + pw.print(prefix); + pw.print("Service at "); + pw.print(i); + pw.println(": "); + final List<S> services = mServicesCacheList.valueAt(i); + for (int j = 0; j < services.size(); j++) { + S service = services.get(i); + synchronized (service.mLock) { + service.dumpLocked(prefix2, pw); + } + } pw.println(); } } @@ -820,7 +974,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem final int userId = getChangingUserId(); synchronized (mLock) { if (mUpdatingPackageNames == null) { - mUpdatingPackageNames = new SparseArray<String>(mServicesCache.size()); + mUpdatingPackageNames = new SparseArray<String>(mServicesCacheList.size()); } mUpdatingPackageNames.put(userId, packageName); onServicePackageUpdatingLocked(userId); @@ -835,7 +989,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem + " because package " + activePackageName + " is being updated"); } - removeCachedServiceLocked(userId); + removeCachedServiceListLocked(userId); if ((mServicePackagePolicyFlags & PACKAGE_UPDATE_POLICY_REFRESH_EAGER) != 0) { @@ -901,7 +1055,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem if (Intent.ACTION_PACKAGE_RESTARTED.equals(action)) { handleActiveServiceRestartedLocked(activePackageName, userId); } else { - removeCachedServiceLocked(userId); + removeCachedServiceListLocked(userId); } } else { handlePackageUpdateLocked(pkg); @@ -930,7 +1084,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem private void handleActiveServiceRemoved(@UserIdInt int userId) { synchronized (mLock) { - removeCachedServiceLocked(userId); + removeCachedServiceListLocked(userId); } final String serviceSettingsProperty = getServiceSettingsProperty(); if (serviceSettingsProperty != null) { @@ -939,6 +1093,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem } } + @GuardedBy("mLock") private void handleActiveServiceRestartedLocked(String activePackageName, @UserIdInt int userId) { if ((mServicePackagePolicyFlags & PACKAGE_RESTART_POLICY_NO_REFRESH) != 0) { @@ -952,7 +1107,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem + " because package " + activePackageName + " is being restarted"); } - removeCachedServiceLocked(userId); + removeCachedServiceListLocked(userId); if ((mServicePackagePolicyFlags & PACKAGE_RESTART_POLICY_REFRESH_EAGER) != 0) { if (debug) { @@ -966,14 +1121,27 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem @Override public void onPackageModified(String packageName) { - if (verbose) Slog.v(mTag, "onPackageModified(): " + packageName); + synchronized (mLock) { + if (verbose) Slog.v(mTag, "onPackageModified(): " + packageName); - if (mServiceNameResolver == null) { - return; + if (mServiceNameResolver == null) { + return; + } + + final int userId = getChangingUserId(); + final String[] serviceNames = mServiceNameResolver.getDefaultServiceNameList( + userId); + if (serviceNames != null) { + for (int i = 0; i < serviceNames.length; i++) { + peekAndUpdateCachedServiceLocked(packageName, userId, serviceNames[i]); + } + } } + } - final int userId = getChangingUserId(); - final String serviceName = mServiceNameResolver.getDefaultServiceName(userId); + @GuardedBy("mLock") + private void peekAndUpdateCachedServiceLocked(String packageName, int userId, + String serviceName) { if (serviceName == null) { return; } @@ -997,6 +1165,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem } } + @GuardedBy("mLock") private String getActiveServicePackageNameLocked() { final int userId = getChangingUserId(); final S service = peekServiceForUserLocked(userId); @@ -1017,7 +1186,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem }; // package changes - monitor.register(getContext(), null, UserHandle.ALL, true); + monitor.register(getContext(), null, UserHandle.ALL, true); } /** diff --git a/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java b/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java index 757a5cca0817..b8f1db402a55 100644 --- a/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java +++ b/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java @@ -43,14 +43,13 @@ import java.io.PrintWriter; * * @param <M> "main" service class. * @param <S> "real" service class. - * * @hide */ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSystemService<S, M>, M extends AbstractMasterSystemService<M, S>> { - protected final @UserIdInt int mUserId; - protected final Object mLock; + @UserIdInt protected final int mUserId; + public final Object mLock; protected final String mTag = getClass().getSimpleName(); protected final M mMaster; @@ -91,14 +90,14 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst * <p><b>MUST</b> be overridden by subclasses that bind to an * {@link com.android.internal.infra.AbstractRemoteService}. * - * @throws NameNotFoundException if the service does not exist. - * @throws SecurityException if the service does not have the proper permissions to be bound to. - * @throws UnsupportedOperationException if subclass binds to a remote service but does not - * overrides it. - * * @return new {@link ServiceInfo}, + * @throws NameNotFoundException if the service does not exist. + * @throws SecurityException if the service does not have the proper permissions to + * be bound to. + * @throws UnsupportedOperationException if subclass binds to a remote service but does not + * overrides it. */ - protected @NonNull ServiceInfo newServiceInfoLocked( + @NonNull protected ServiceInfo newServiceInfoLocked( @SuppressWarnings("unused") @NonNull ComponentName serviceComponent) throws NameNotFoundException { throw new UnsupportedOperationException("not overridden"); @@ -137,7 +136,6 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst * previous state. * * @param disabled whether the service is disabled (due to {@link UserManager} restrictions). - * * @return whether the disabled state changed. */ @GuardedBy("mLock") @@ -154,18 +152,49 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst updateIsSetupComplete(mUserId); mDisabled = disabled; - updateServiceInfoLocked(); + if (mMaster.mServiceNameResolver != null + && mMaster.mServiceNameResolver.isConfiguredInMultipleMode()) { + updateServiceInfoListLocked(); + } else { + updateServiceInfoLocked(); + } return wasEnabled != isEnabledLocked(); } /** * Updates the internal reference to the service info, and returns the service's component. */ + @GuardedBy("mLock") protected final ComponentName updateServiceInfoLocked() { - ComponentName serviceComponent = null; - if (mMaster.mServiceNameResolver != null) { - ServiceInfo serviceInfo = null; + ComponentName[] componentNames = updateServiceInfoListLocked(); + return componentNames == null || componentNames.length == 0 ? null : componentNames[0]; + } + + /** + * Updates the internal reference to the service info, and returns the service's component. + */ + @GuardedBy("mLock") + protected final ComponentName[] updateServiceInfoListLocked() { + if (mMaster.mServiceNameResolver == null) { + return null; + } + if (!mMaster.mServiceNameResolver.isConfiguredInMultipleMode()) { final String componentName = getComponentNameLocked(); + return new ComponentName[] { getServiceComponent(componentName) }; + } + final String[] componentNames = mMaster.mServiceNameResolver.getServiceNameList( + mUserId); + ComponentName[] serviceComponents = new ComponentName[componentNames.length]; + for (int i = 0; i < componentNames.length; i++) { + serviceComponents[i] = getServiceComponent(componentNames[i]); + } + return serviceComponents; + } + + private ComponentName getServiceComponent(String componentName) { + synchronized (mLock) { + ServiceInfo serviceInfo = null; + ComponentName serviceComponent = null; if (!TextUtils.isEmpty(componentName)) { try { serviceComponent = ComponentName.unflattenFromString(componentName); @@ -196,14 +225,14 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst Slog.e(mTag, "Bad ServiceInfo for '" + componentName + "': " + e); mServiceInfo = null; } + return serviceComponent; } - return serviceComponent; } /** * Gets the user associated with this service. */ - public final @UserIdInt int getUserId() { + @UserIdInt public final int getUserId() { return mUserId; } @@ -229,15 +258,34 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst /** * Gets the current name of the service, which is either the default service or the - * {@link AbstractMasterSystemService#setTemporaryService(int, String, int) temporary one}. + * {@link AbstractMasterSystemService#setTemporaryService(int, String, int) temporary one}. */ - protected final @Nullable String getComponentNameLocked() { + @Nullable + @GuardedBy("mLock") + protected final String getComponentNameLocked() { return mMaster.mServiceNameResolver.getServiceName(mUserId); } /** + * Gets the current name of the service, which is either the default service or the + * {@link AbstractMasterSystemService#setTemporaryService(int, String, int) temporary one}. + */ + @Nullable + @GuardedBy("mLock") + protected final String getComponentNameForMultipleLocked(String serviceName) { + String[] services = mMaster.mServiceNameResolver.getServiceNameList(mUserId); + for (int i = 0; i < services.length; i++) { + if (serviceName.equals(services[i])) { + return services[i]; + } + } + return null; + } + + /** * Checks whether the current service for the user was temporarily set. */ + @GuardedBy("mLock") public final boolean isTemporaryServiceSetLocked() { return mMaster.mServiceNameResolver.isTemporary(mUserId); } @@ -245,6 +293,7 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst /** * Resets the temporary service implementation to the default component. */ + @GuardedBy("mLock") protected final void resetTemporaryServiceLocked() { mMaster.mServiceNameResolver.resetTemporaryService(mUserId); } @@ -268,6 +317,7 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst return mServiceInfo == null ? null : mServiceInfo.getComponentName(); } } + /** * Gets the name of the of the app this service binds to, or {@code null} if the service is * disabled. @@ -303,8 +353,10 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst /** * Removes the service from the main service's cache. */ - protected final void removeSelfFromCacheLocked() { - mMaster.removeCachedServiceLocked(mUserId); + protected final void removeSelfFromCache() { + synchronized (mMaster.mLock) { + mMaster.removeCachedServiceListLocked(mUserId); + } } /** @@ -327,6 +379,7 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst * Gets the target SDK level of the service this service binds to, * or {@code 0} if the service is disabled. */ + @GuardedBy("mLock") public final int getTargedSdkLocked() { return mServiceInfo == null ? 0 : mServiceInfo.applicationInfo.targetSdkVersion; } @@ -334,6 +387,7 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst /** * Gets whether the device already finished setup. */ + @GuardedBy("mLock") protected final boolean isSetupCompletedLocked() { return mSetupComplete; } @@ -348,19 +402,32 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst // TODO(b/117779333): support proto @GuardedBy("mLock") protected void dumpLocked(@NonNull String prefix, @NonNull PrintWriter pw) { - pw.print(prefix); pw.print("User: "); pw.println(mUserId); + pw.print(prefix); + pw.print("User: "); + pw.println(mUserId); if (mServiceInfo != null) { - pw.print(prefix); pw.print("Service Label: "); pw.println(getServiceLabelLocked()); - pw.print(prefix); pw.print("Target SDK: "); pw.println(getTargedSdkLocked()); + pw.print(prefix); + pw.print("Service Label: "); + pw.println(getServiceLabelLocked()); + pw.print(prefix); + pw.print("Target SDK: "); + pw.println(getTargedSdkLocked()); } if (mMaster.mServiceNameResolver != null) { - pw.print(prefix); pw.print("Name resolver: "); - mMaster.mServiceNameResolver.dumpShort(pw, mUserId); pw.println(); + pw.print(prefix); + pw.print("Name resolver: "); + mMaster.mServiceNameResolver.dumpShort(pw, mUserId); + pw.println(); } - pw.print(prefix); pw.print("Disabled by UserManager: "); pw.println(mDisabled); - pw.print(prefix); pw.print("Setup complete: "); pw.println(mSetupComplete); + pw.print(prefix); + pw.print("Disabled by UserManager: "); + pw.println(mDisabled); + pw.print(prefix); + pw.print("Setup complete: "); + pw.println(mSetupComplete); if (mServiceInfo != null) { - pw.print(prefix); pw.print("Service UID: "); + pw.print(prefix); + pw.print("Service UID: "); pw.println(mServiceInfo.applicationInfo.uid); } pw.println(); diff --git a/services/core/java/com/android/server/infra/FrameworkResourcesServiceNameResolver.java b/services/core/java/com/android/server/infra/FrameworkResourcesServiceNameResolver.java index 35d59561fdeb..db2cb52d778e 100644 --- a/services/core/java/com/android/server/infra/FrameworkResourcesServiceNameResolver.java +++ b/services/core/java/com/android/server/infra/FrameworkResourcesServiceNameResolver.java @@ -15,6 +15,7 @@ */ package com.android.server.infra; +import android.annotation.ArrayRes; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.StringRes; @@ -33,6 +34,7 @@ import android.util.TimeUtils; import com.android.internal.annotations.GuardedBy; import java.io.PrintWriter; +import java.util.Arrays; /** * Gets the service name using a framework resources, temporarily changing the service if necessary @@ -47,20 +49,20 @@ public final class FrameworkResourcesServiceNameResolver implements ServiceNameR /** Handler message to {@link #resetTemporaryService(int)} */ private static final int MSG_RESET_TEMPORARY_SERVICE = 0; - private final @NonNull Context mContext; - private final @NonNull Object mLock = new Object(); - private final @StringRes int mResourceId; - private @Nullable NameResolverListener mOnSetCallback; - + @NonNull private final Context mContext; + @NonNull private final Object mLock = new Object(); + @StringRes private final int mStringResourceId; + @ArrayRes private final int mArrayResourceId; + private final boolean mIsMultiple; /** - * Map of temporary service name set by {@link #setTemporaryService(int, String, int)}, + * Map of temporary service name list set by {@link #setTemporaryServices(int, String[], int)}, * keyed by {@code userId}. * - * <p>Typically used by Shell command and/or CTS tests. + * <p>Typically used by Shell command and/or CTS tests to configure temporary services if + * mIsMultiple is true. */ @GuardedBy("mLock") - private final SparseArray<String> mTemporaryServiceNames = new SparseArray<>(); - + private final SparseArray<String[]> mTemporaryServiceNamesList = new SparseArray<>(); /** * Map of default services that have been disabled by * {@link #setDefaultServiceEnabled(int, boolean)},keyed by {@code userId}. @@ -69,7 +71,7 @@ public final class FrameworkResourcesServiceNameResolver implements ServiceNameR */ @GuardedBy("mLock") private final SparseBooleanArray mDefaultServicesDisabled = new SparseBooleanArray(); - + @Nullable private NameResolverListener mOnSetCallback; /** * When the temporary service will expire (and reset back to the default). */ @@ -85,7 +87,22 @@ public final class FrameworkResourcesServiceNameResolver implements ServiceNameR public FrameworkResourcesServiceNameResolver(@NonNull Context context, @StringRes int resourceId) { mContext = context; - mResourceId = resourceId; + mStringResourceId = resourceId; + mArrayResourceId = -1; + mIsMultiple = false; + } + + public FrameworkResourcesServiceNameResolver(@NonNull Context context, + @ArrayRes int resourceId, boolean isMultiple) { + if (!isMultiple) { + throw new UnsupportedOperationException("Please use " + + "FrameworkResourcesServiceNameResolver(context, @StringRes int) constructor " + + "if single service mode is requested."); + } + mContext = context; + mStringResourceId = -1; + mArrayResourceId = resourceId; + mIsMultiple = true; } @Override @@ -96,22 +113,31 @@ public final class FrameworkResourcesServiceNameResolver implements ServiceNameR } @Override + public String getServiceName(@UserIdInt int userId) { + String[] serviceNames = getServiceNameList(userId); + return (serviceNames == null || serviceNames.length == 0) ? null : serviceNames[0]; + } + + @Override public String getDefaultServiceName(@UserIdInt int userId) { - synchronized (mLock) { - final String name = mContext.getString(mResourceId); - return TextUtils.isEmpty(name) ? null : name; - } + String[] serviceNames = getDefaultServiceNameList(userId); + return (serviceNames == null || serviceNames.length == 0) ? null : serviceNames[0]; } + /** + * Gets the default list of the service names for the given user. + * + * <p>Typically implemented by services which want to provide multiple backends. + */ @Override - public String getServiceName(@UserIdInt int userId) { + public String[] getServiceNameList(int userId) { synchronized (mLock) { - final String temporaryName = mTemporaryServiceNames.get(userId); - if (temporaryName != null) { + String[] temporaryNames = mTemporaryServiceNamesList.get(userId); + if (temporaryNames != null) { // Always log it, as it should only be used on CTS or during development - Slog.w(TAG, "getServiceName(): using temporary name " + temporaryName - + " for user " + userId); - return temporaryName; + Slog.w(TAG, "getServiceName(): using temporary name " + + Arrays.toString(temporaryNames) + " for user " + userId); + return temporaryNames; } final boolean disabled = mDefaultServicesDisabled.get(userId); if (disabled) { @@ -120,22 +146,50 @@ public final class FrameworkResourcesServiceNameResolver implements ServiceNameR + "user " + userId); return null; } - return getDefaultServiceName(userId); + return getDefaultServiceNameList(userId); + + } + } + + /** + * Gets the default list of the service names for the given user. + * + * <p>Typically implemented by services which want to provide multiple backends. + */ + @Override + public String[] getDefaultServiceNameList(int userId) { + synchronized (mLock) { + if (mIsMultiple) { + return mContext.getResources().getStringArray(mArrayResourceId); + } else { + final String name = mContext.getString(mStringResourceId); + return TextUtils.isEmpty(name) ? new String[0] : new String[] { name }; + } } } @Override + public boolean isConfiguredInMultipleMode() { + return mIsMultiple; + } + + @Override public boolean isTemporary(@UserIdInt int userId) { synchronized (mLock) { - return mTemporaryServiceNames.get(userId) != null; + return mTemporaryServiceNamesList.get(userId) != null; } } @Override public void setTemporaryService(@UserIdInt int userId, @NonNull String componentName, int durationMs) { + setTemporaryServices(userId, new String[]{componentName}, durationMs); + } + + @Override + public void setTemporaryServices(int userId, @NonNull String[] componentNames, int durationMs) { synchronized (mLock) { - mTemporaryServiceNames.put(userId, componentName); + mTemporaryServiceNamesList.put(userId, componentNames); if (mTemporaryHandler == null) { mTemporaryHandler = new Handler(Looper.getMainLooper(), null, true) { @@ -155,8 +209,10 @@ public final class FrameworkResourcesServiceNameResolver implements ServiceNameR } mTemporaryServiceExpiration = SystemClock.elapsedRealtime() + durationMs; mTemporaryHandler.sendEmptyMessageDelayed(MSG_RESET_TEMPORARY_SERVICE, durationMs); - notifyTemporaryServiceNameChangedLocked(userId, componentName, - /* isTemporary= */ true); + for (int i = 0; i < componentNames.length; i++) { + notifyTemporaryServiceNameChangedLocked(userId, componentNames[i], + /* isTemporary= */ true); + } } } @@ -164,8 +220,8 @@ public final class FrameworkResourcesServiceNameResolver implements ServiceNameR public void resetTemporaryService(@UserIdInt int userId) { synchronized (mLock) { Slog.i(TAG, "resetting temporary service for user " + userId + " from " - + mTemporaryServiceNames.get(userId)); - mTemporaryServiceNames.remove(userId); + + Arrays.toString(mTemporaryServiceNamesList.get(userId))); + mTemporaryServiceNamesList.remove(userId); if (mTemporaryHandler != null) { mTemporaryHandler.removeMessages(MSG_RESET_TEMPORARY_SERVICE); mTemporaryHandler = null; @@ -207,16 +263,21 @@ public final class FrameworkResourcesServiceNameResolver implements ServiceNameR @Override public String toString() { - return "FrameworkResourcesServiceNamer[temps=" + mTemporaryServiceNames + "]"; + synchronized (mLock) { + return "FrameworkResourcesServiceNamer[temps=" + mTemporaryServiceNamesList + "]"; + } } // TODO(b/117779333): support proto @Override public void dumpShort(@NonNull PrintWriter pw) { synchronized (mLock) { - pw.print("FrameworkResourcesServiceNamer: resId="); pw.print(mResourceId); - pw.print(", numberTemps="); pw.print(mTemporaryServiceNames.size()); - pw.print(", enabledDefaults="); pw.print(mDefaultServicesDisabled.size()); + pw.print("FrameworkResourcesServiceNamer: resId="); + pw.print(mStringResourceId); + pw.print(", numberTemps="); + pw.print(mTemporaryServiceNamesList.size()); + pw.print(", enabledDefaults="); + pw.print(mDefaultServicesDisabled.size()); } } @@ -224,13 +285,17 @@ public final class FrameworkResourcesServiceNameResolver implements ServiceNameR @Override public void dumpShort(@NonNull PrintWriter pw, @UserIdInt int userId) { synchronized (mLock) { - final String temporaryName = mTemporaryServiceNames.get(userId); - if (temporaryName != null) { - pw.print("tmpName="); pw.print(temporaryName); + final String[] temporaryNames = mTemporaryServiceNamesList.get(userId); + if (temporaryNames != null) { + pw.print("tmpName="); + pw.print(Arrays.toString(temporaryNames)); final long ttl = mTemporaryServiceExpiration - SystemClock.elapsedRealtime(); - pw.print(" (expires in "); TimeUtils.formatDuration(ttl, pw); pw.print("), "); + pw.print(" (expires in "); + TimeUtils.formatDuration(ttl, pw); + pw.print("), "); } - pw.print("defaultName="); pw.print(getDefaultServiceName(userId)); + pw.print("defaultName="); + pw.print(getDefaultServiceName(userId)); final boolean disabled = mDefaultServicesDisabled.get(userId); pw.println(disabled ? " (disabled)" : " (enabled)"); } diff --git a/services/core/java/com/android/server/infra/ServiceNameResolver.java b/services/core/java/com/android/server/infra/ServiceNameResolver.java index e20c45992e05..7d85fdb45266 100644 --- a/services/core/java/com/android/server/infra/ServiceNameResolver.java +++ b/services/core/java/com/android/server/infra/ServiceNameResolver.java @@ -34,7 +34,7 @@ public interface ServiceNameResolver { /** * Listener for name changes. */ - public interface NameResolverListener { + interface NameResolverListener { /** * The name change callback. @@ -64,6 +64,30 @@ public interface ServiceNameResolver { String getDefaultServiceName(@UserIdInt int userId); /** + * Gets the default list of names of the services for the given user. + * + * <p>Typically implemented by reading a Settings property or framework resource. + */ + @Nullable + default String[] getDefaultServiceNameList(@UserIdInt int userId) { + if (isConfiguredInMultipleMode()) { + throw new UnsupportedOperationException("getting default service list not supported"); + } else { + return new String[] { getDefaultServiceName(userId) }; + } + } + + /** + * Returns whether the resolver is configured to connect to multiple backend services. + * The default return type is false. + * + * <p>Typically implemented by reading a Settings property or framework resource. + */ + default boolean isConfiguredInMultipleMode() { + return false; + } + + /** * Gets the current name of the service for the given user * * @return either the temporary name (set by @@ -76,6 +100,18 @@ public interface ServiceNameResolver { } /** + * Gets the current name of the service for the given user + * + * @return either the temporary name (set by + * {@link #setTemporaryService(int, String, int)}, or the + * {@link #getDefaultServiceName(int) default name}. + */ + @Nullable + default String[] getServiceNameList(@UserIdInt int userId) { + return getDefaultServiceNameList(userId); + } + + /** * Checks whether the current service is temporary for the given user. */ default boolean isTemporary(@SuppressWarnings("unused") @UserIdInt int userId) { @@ -85,11 +121,11 @@ public interface ServiceNameResolver { /** * Temporarily sets the service implementation for the given user. * - * @param userId user handle + * @param userId user handle * @param componentName name of the new component - * @param durationMs how long the change will be valid (the service will be automatically reset - * to the default component after this timeout expires). - * + * @param durationMs how long the change will be valid (the service will be automatically + * reset + * to the default component after this timeout expires). * @throws UnsupportedOperationException if not implemented. */ default void setTemporaryService(@UserIdInt int userId, @NonNull String componentName, @@ -98,10 +134,24 @@ public interface ServiceNameResolver { } /** + * Temporarily sets the service implementation for the given user. + * + * @param userId user handle + * @param componentNames list of the names of the new component + * @param durationMs how long the change will be valid (the service will be automatically + * reset + * to the default component after this timeout expires). + * @throws UnsupportedOperationException if not implemented. + */ + default void setTemporaryServices(@UserIdInt int userId, @NonNull String[] componentNames, + int durationMs) { + throw new UnsupportedOperationException("temporary user not supported"); + } + + /** * Resets the temporary service implementation to the default component for the given user. * * @param userId user handle - * * @throws UnsupportedOperationException if not implemented. */ default void resetTemporaryService(@UserIdInt int userId) { @@ -114,11 +164,11 @@ public interface ServiceNameResolver { * <p>Typically used during CTS tests to make sure only the default service doesn't interfere * with the test results. * - * @param userId user handle + * @param userId user handle * @param enabled whether the default service should be used when the temporary service is not - * set. If the service enabled state is already that value, the command is ignored and this - * method return {@code false}. - * + * set. If the service enabled state is already that value, the command is + * ignored and this + * method return {@code false}. * @return whether the enabled state changed. * @throws UnsupportedOperationException if not implemented. */ @@ -133,7 +183,6 @@ public interface ServiceNameResolver { * with the test results. * * @param userId user handle - * * @throws UnsupportedOperationException if not implemented. */ default boolean isDefaultServiceEnabled(@UserIdInt int userId) { diff --git a/services/core/java/com/android/server/input/GestureMonitorSpyWindow.java b/services/core/java/com/android/server/input/GestureMonitorSpyWindow.java index dbd3f3529208..d238dae634ad 100644 --- a/services/core/java/com/android/server/input/GestureMonitorSpyWindow.java +++ b/services/core/java/com/android/server/input/GestureMonitorSpyWindow.java @@ -19,6 +19,7 @@ package com.android.server.input; import static android.os.InputConstants.DEFAULT_DISPATCHING_TIMEOUT_MILLIS; import android.os.IBinder; +import android.os.InputConfig; import android.view.InputApplicationHandle; import android.view.InputChannel; import android.view.InputMonitor; @@ -56,18 +57,13 @@ class GestureMonitorSpyWindow { mWindowHandle.name = name; mWindowHandle.token = mClientChannel.getToken(); mWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY; - mWindowHandle.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL; mWindowHandle.dispatchingTimeoutMillis = DEFAULT_DISPATCHING_TIMEOUT_MILLIS; - mWindowHandle.visible = true; - mWindowHandle.focusable = false; - mWindowHandle.hasWallpaper = false; - mWindowHandle.paused = false; mWindowHandle.ownerPid = pid; mWindowHandle.ownerUid = uid; - mWindowHandle.inputFeatures = WindowManager.LayoutParams.INPUT_FEATURE_SPY; mWindowHandle.scaleFactor = 1.0f; - mWindowHandle.trustedOverlay = true; mWindowHandle.replaceTouchableRegionWithCrop(null /* use this surface's bounds */); + mWindowHandle.inputConfig = + InputConfig.NOT_FOCUSABLE | InputConfig.SPY | InputConfig.TRUSTED_OVERLAY; final SurfaceControl.Transaction t = new SurfaceControl.Transaction(); t.setInputWindowInfo(mInputSurface, mWindowHandle); diff --git a/services/core/java/com/android/server/inputmethod/HandwritingEventReceiverSurface.java b/services/core/java/com/android/server/inputmethod/HandwritingEventReceiverSurface.java index 3c454080ef1c..1a19385e71c5 100644 --- a/services/core/java/com/android/server/inputmethod/HandwritingEventReceiverSurface.java +++ b/services/core/java/com/android/server/inputmethod/HandwritingEventReceiverSurface.java @@ -19,6 +19,7 @@ package com.android.server.inputmethod; import static android.os.InputConstants.DEFAULT_DISPATCHING_TIMEOUT_MILLIS; import android.annotation.NonNull; +import android.os.InputConfig; import android.os.Process; import android.view.InputApplicationHandle; import android.view.InputChannel; @@ -56,20 +57,17 @@ final class HandwritingEventReceiverSurface { mWindowHandle.name = name; mWindowHandle.token = mClientChannel.getToken(); mWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY; - mWindowHandle.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL - | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE; mWindowHandle.dispatchingTimeoutMillis = DEFAULT_DISPATCHING_TIMEOUT_MILLIS; - mWindowHandle.visible = true; - mWindowHandle.focusable = false; - mWindowHandle.hasWallpaper = false; - mWindowHandle.paused = false; mWindowHandle.ownerPid = Process.myPid(); mWindowHandle.ownerUid = Process.myUid(); - mWindowHandle.inputFeatures = WindowManager.LayoutParams.INPUT_FEATURE_SPY - | WindowManager.LayoutParams.INPUT_FEATURE_INTERCEPTS_STYLUS; mWindowHandle.scaleFactor = 1.0f; - mWindowHandle.trustedOverlay = true; mWindowHandle.replaceTouchableRegionWithCrop(null /* use this surface's bounds */); + mWindowHandle.inputConfig = + InputConfig.NOT_FOCUSABLE + | InputConfig.NOT_TOUCHABLE + | InputConfig.SPY + | InputConfig.INTERCEPTS_STYLUS + | InputConfig.TRUSTED_OVERLAY; final SurfaceControl.Transaction t = new SurfaceControl.Transaction(); t.setInputWindowInfo(mInputSurface, mWindowHandle); @@ -85,7 +83,7 @@ final class HandwritingEventReceiverSurface { void startIntercepting(int imePid, int imeUid) { mWindowHandle.ownerPid = imePid; mWindowHandle.ownerUid = imeUid; - mWindowHandle.inputFeatures &= ~WindowManager.LayoutParams.INPUT_FEATURE_SPY; + mWindowHandle.inputConfig &= ~InputConfig.SPY; new SurfaceControl.Transaction() .setInputWindowInfo(mInputSurface, mWindowHandle) diff --git a/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java b/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java index 6cb3b3b6740d..e6fd40902386 100644 --- a/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java +++ b/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java @@ -32,6 +32,7 @@ import android.view.inputmethod.InputBinding; import android.view.inputmethod.InputMethodSubtype; import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; +import com.android.internal.inputmethod.InputMethodNavButtonFlags; import com.android.internal.view.IInlineSuggestionsRequestCallback; import com.android.internal.view.IInputContext; import com.android.internal.view.IInputMethod; @@ -108,10 +109,10 @@ final class IInputMethodInvoker { @AnyThread void initializeInternal(IBinder token, IInputMethodPrivilegedOperations privOps, int configChanges, boolean stylusHwSupported, - boolean shouldShowImeSwitcherWhenImeIsShown) { + @InputMethodNavButtonFlags int navButtonFlags) { try { mTarget.initializeInternal(token, privOps, configChanges, stylusHwSupported, - shouldShowImeSwitcherWhenImeIsShown); + navButtonFlags); } catch (RemoteException e) { logRemoteException(e); } @@ -147,20 +148,19 @@ final class IInputMethodInvoker { @AnyThread void startInput(IBinder startInputToken, IInputContext inputContext, EditorInfo attribute, - boolean restarting, boolean shouldShowImeSwitcherWhenImeIsShown) { + boolean restarting, @InputMethodNavButtonFlags int navButtonFlags) { try { mTarget.startInput(startInputToken, inputContext, attribute, restarting, - shouldShowImeSwitcherWhenImeIsShown); + navButtonFlags); } catch (RemoteException e) { logRemoteException(e); } } @AnyThread - void onShouldShowImeSwitcherWhenImeIsShownChanged(boolean shouldShowImeSwitcherWhenImeIsShown) { + void onNavButtonFlagsChanged(@InputMethodNavButtonFlags int navButtonFlags) { try { - mTarget.onShouldShowImeSwitcherWhenImeIsShownChanged( - shouldShowImeSwitcherWhenImeIsShown); + mTarget.onNavButtonFlagsChanged(navButtonFlags); } catch (RemoteException e) { logRemoteException(e); } diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index efe99d7611f9..1f9d08063714 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -121,6 +121,7 @@ import android.util.PrintWriterPrinter; import android.util.Printer; import android.util.Slog; import android.util.SparseArray; +import android.util.SparseBooleanArray; import android.util.proto.ProtoOutputStream; import android.view.IWindowManager; import android.view.InputChannel; @@ -155,6 +156,7 @@ import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; import com.android.internal.inputmethod.ImeTracing; import com.android.internal.inputmethod.InputBindResult; import com.android.internal.inputmethod.InputMethodDebug; +import com.android.internal.inputmethod.InputMethodNavButtonFlags; import com.android.internal.inputmethod.SoftInputShowHideReason; import com.android.internal.inputmethod.StartInputFlags; import com.android.internal.inputmethod.StartInputReason; @@ -274,6 +276,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub final InputMethodSettings mSettings; final SettingsObserver mSettingsObserver; final IWindowManager mIWindowManager; + private final SparseBooleanArray mLoggedDeniedGetInputMethodWindowVisibleHeightForUid = + new SparseBooleanArray(0); final WindowManagerInternal mWindowManagerInternal; final PackageManagerInternal mPackageManagerInternal; final InputManagerInternal mInputManagerInternal; @@ -332,6 +336,10 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub @GuardedBy("ImfLock.class") private final HandwritingModeController mHwController; + @GuardedBy("ImfLock.class") + @Nullable + private OverlayableSystemBooleanResourceWrapper mImeDrawsImeNavBarRes; + static class SessionState { final ClientState client; final IInputMethodInvoker method; @@ -1378,6 +1386,13 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub clearPackageChangeState(); } + @Override + public void onUidRemoved(int uid) { + synchronized (ImfLock.class) { + mLoggedDeniedGetInputMethodWindowVisibleHeightForUid.delete(uid); + } + } + private void clearPackageChangeState() { // No need to lock them because we access these fields only on getRegisteredHandler(). mChangedPackages.clear(); @@ -1713,11 +1728,43 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub } @GuardedBy("ImfLock.class") + private void recreateImeDrawsImeNavBarResIfNecessary(@UserIdInt int targetUserId) { + // Currently, com.android.internal.R.bool.config_imeDrawsImeNavBar is overlaid only for the + // profile parent user. + // TODO(b/221443458): See if we can make OverlayManager be aware of profile groups. + final int profileParentUserId = mUserManagerInternal.getProfileParentId(targetUserId); + if (mImeDrawsImeNavBarRes != null + && mImeDrawsImeNavBarRes.getUserId() != profileParentUserId) { + mImeDrawsImeNavBarRes.close(); + mImeDrawsImeNavBarRes = null; + } + if (mImeDrawsImeNavBarRes == null) { + final Context userContext; + if (mContext.getUserId() == profileParentUserId) { + userContext = mContext; + } else { + userContext = mContext.createContextAsUser(UserHandle.of(profileParentUserId), + 0 /* flags */); + } + mImeDrawsImeNavBarRes = OverlayableSystemBooleanResourceWrapper.create(userContext, + com.android.internal.R.bool.config_imeDrawsImeNavBar, mHandler, resource -> { + synchronized (ImfLock.class) { + if (resource == mImeDrawsImeNavBarRes) { + sendOnNavButtonFlagsChangedLocked(); + } + } + }); + } + } + + @GuardedBy("ImfLock.class") private void switchUserOnHandlerLocked(@UserIdInt int newUserId, IInputMethodClient clientToBeReset) { if (DEBUG) Slog.d(TAG, "Switching user stage 1/3. newUserId=" + newUserId + " currentUserId=" + mSettings.getCurrentUserId()); + recreateImeDrawsImeNavBarResIfNecessary(newUserId); + // ContentObserver should be registered again when the user is changed mSettingsObserver.registerContentObserverLocked(newUserId); @@ -1822,6 +1869,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub }); } + recreateImeDrawsImeNavBarResIfNecessary(currentUserId); + mMyPackageMonitor.register(mContext, null, UserHandle.ALL, true); mSettingsObserver.registerContentObserverLocked(currentUserId); @@ -2402,12 +2451,12 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub true /* direct */); } - final boolean shouldShowImeSwitcherWhenImeIsShown = - shouldShowImeSwitcherWhenImeIsShownLocked(); + @InputMethodNavButtonFlags + final int navButtonFlags = getInputMethodNavButtonFlagsLocked(); final SessionState session = mCurClient.curSession; setEnabledSessionLocked(session); session.method.startInput(startInputToken, mCurInputContext, mCurAttribute, restarting, - shouldShowImeSwitcherWhenImeIsShown); + navButtonFlags); if (mShowRequested) { if (DEBUG) Slog.v(TAG, "Attach new input asks to show input"); showCurrentInputLocked(mCurFocusedWindow, getAppShowFlagsLocked(), null, @@ -2671,7 +2720,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub + mCurTokenDisplayId); } inputMethod.initializeInternal(token, new InputMethodPrivilegedOperationsImpl(this, token), - configChanges, supportStylusHw, shouldShowImeSwitcherWhenImeIsShownLocked()); + configChanges, supportStylusHw, getInputMethodNavButtonFlagsLocked()); } @AnyThread @@ -2928,9 +2977,15 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub } @GuardedBy("ImfLock.class") - boolean shouldShowImeSwitcherWhenImeIsShownLocked() { - return shouldShowImeSwitcherLocked( + @InputMethodNavButtonFlags + private int getInputMethodNavButtonFlagsLocked() { + final boolean canImeDrawsImeNavBar = + mImeDrawsImeNavBarRes != null && mImeDrawsImeNavBarRes.get(); + final boolean shouldShowImeSwitcherWhenImeIsShown = shouldShowImeSwitcherLocked( InputMethodService.IME_ACTIVE | InputMethodService.IME_VISIBLE); + return (canImeDrawsImeNavBar ? InputMethodNavButtonFlags.IME_DRAWS_IME_NAV_BAR : 0) + | (shouldShowImeSwitcherWhenImeIsShown + ? InputMethodNavButtonFlags.SHOW_IME_SWITCHER_WHEN_IME_IS_SHOWN : 0); } @GuardedBy("ImfLock.class") @@ -3193,7 +3248,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub // the same enabled IMEs list. mSwitchingController.resetCircularListLocked(mContext); - sendShouldShowImeSwitcherWhenImeIsShownLocked(); + sendOnNavButtonFlagsChangedLocked(); } @GuardedBy("ImfLock.class") @@ -4150,13 +4205,26 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub * @return {@link WindowManagerInternal#getInputMethodWindowVisibleHeight(int)} */ @Override - public int getInputMethodWindowVisibleHeight() { - // TODO(yukawa): Should we verify the display ID? - final int curTokenDisplayId; - synchronized (ImfLock.class) { - curTokenDisplayId = mCurTokenDisplayId; - } - return mWindowManagerInternal.getInputMethodWindowVisibleHeight(curTokenDisplayId); + @Deprecated + public int getInputMethodWindowVisibleHeight(@NonNull IInputMethodClient client) { + int callingUid = Binder.getCallingUid(); + return Binder.withCleanCallingIdentity(() -> { + final int curTokenDisplayId; + synchronized (ImfLock.class) { + if (!canInteractWithImeLocked(callingUid, client, + "getInputMethodWindowVisibleHeight")) { + if (!mLoggedDeniedGetInputMethodWindowVisibleHeightForUid.get(callingUid)) { + EventLog.writeEvent(0x534e4554, "204906124", callingUid, ""); + mLoggedDeniedGetInputMethodWindowVisibleHeightForUid.put(callingUid, true); + } + return 0; + } + // This should probably use the caller's display id, but because this is unsupported + // and maintained only for compatibility, there's no point in fixing it. + curTokenDisplayId = mCurTokenDisplayId; + } + return mWindowManagerInternal.getInputMethodWindowVisibleHeight(curTokenDisplayId); + }); } @Override @@ -4657,7 +4725,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub case MSG_HARD_KEYBOARD_SWITCH_CHANGED: mMenuController.handleHardKeyboardStatusChange(msg.arg1 == 1); synchronized (ImfLock.class) { - sendShouldShowImeSwitcherWhenImeIsShownLocked(); + sendOnNavButtonFlagsChangedLocked(); } return true; case MSG_SYSTEM_UNLOCK_USER: { @@ -4927,7 +4995,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub // the same enabled IMEs list. mSwitchingController.resetCircularListLocked(mContext); - sendShouldShowImeSwitcherWhenImeIsShownLocked(); + sendOnNavButtonFlagsChangedLocked(); // Notify InputMethodListListeners of the new installed InputMethods. final List<InputMethodInfo> inputMethodList = new ArrayList<>(mMethodList); @@ -4936,14 +5004,13 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub } @GuardedBy("ImfLock.class") - void sendShouldShowImeSwitcherWhenImeIsShownLocked() { + void sendOnNavButtonFlagsChangedLocked() { final IInputMethodInvoker curMethod = mBindingController.getCurMethod(); if (curMethod == null) { // No need to send the data if the IME is not yet bound. return; } - curMethod.onShouldShowImeSwitcherWhenImeIsShownChanged( - shouldShowImeSwitcherWhenImeIsShownLocked()); + curMethod.onNavButtonFlagsChanged(getInputMethodNavButtonFlagsLocked()); } @GuardedBy("ImfLock.class") diff --git a/services/core/java/com/android/server/inputmethod/InputMethodMenuController.java b/services/core/java/com/android/server/inputmethod/InputMethodMenuController.java index 98bde11ad517..c255fe14c03e 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodMenuController.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodMenuController.java @@ -203,7 +203,7 @@ final class InputMethodMenuController { attrs.setTitle("Select input method"); w.setAttributes(attrs); mService.updateSystemUiLocked(); - mService.sendShouldShowImeSwitcherWhenImeIsShownLocked(); + mService.sendOnNavButtonFlagsChangedLocked(); mSwitchingDialog.show(); } } @@ -239,7 +239,7 @@ final class InputMethodMenuController { mSwitchingDialogTitleView = null; mService.updateSystemUiLocked(); - mService.sendShouldShowImeSwitcherWhenImeIsShownLocked(); + mService.sendOnNavButtonFlagsChangedLocked(); mDialogBuilder = null; mIms = null; } diff --git a/services/core/java/com/android/server/inputmethod/OverlayableSystemBooleanResourceWrapper.java b/services/core/java/com/android/server/inputmethod/OverlayableSystemBooleanResourceWrapper.java new file mode 100644 index 000000000000..33e7a7621340 --- /dev/null +++ b/services/core/java/com/android/server/inputmethod/OverlayableSystemBooleanResourceWrapper.java @@ -0,0 +1,159 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.inputmethod; + +import static android.content.Intent.ACTION_OVERLAY_CHANGED; + +import android.annotation.AnyThread; +import android.annotation.BoolRes; +import android.annotation.NonNull; +import android.annotation.UserHandleAware; +import android.annotation.UserIdInt; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.content.pm.PackageManager; +import android.os.Handler; +import android.os.PatternMatcher; +import android.util.Slog; + +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Consumer; + +/** + * A wrapper object for any boolean resource defined in {@code "android"} package, in a way that is + * aware of per-user Runtime Resource Overlay (RRO). + */ +final class OverlayableSystemBooleanResourceWrapper implements AutoCloseable { + private static final String TAG = "OverlayableSystemBooleanResourceWrapper"; + + private static final String SYSTEM_PACKAGE_NAME = "android"; + + @UserIdInt + private final int mUserId; + @NonNull + private final AtomicBoolean mValueRef; + @NonNull + private final AtomicReference<Runnable> mCleanerRef; + + /** + * Creates {@link OverlayableSystemBooleanResourceWrapper} for the given boolean resource ID + * with a value change callback for the user associated with the {@link Context}. + * + * @param userContext The {@link Context} to be used to access the resource. This needs to be + * associated with the right user because the Runtime Resource Overlay (RRO) + * is per-user configuration. + * @param boolResId The resource ID to be queried. + * @param handler {@link Handler} to be used to dispatch {@code callback}. + * @param callback The callback to be notified when the specified value might be updated. + * The callback needs to take care of spurious wakeup. The value returned from + * {@link #get()} may look to be exactly the same as the previously read value + * e.g. when the value is changed from {@code false} to {@code true} to + * {@code false} in a very short period of time, because {@link #get()} always + * does volatile-read. + * @return New {@link OverlayableSystemBooleanResourceWrapper}. + */ + @NonNull + @UserHandleAware + static OverlayableSystemBooleanResourceWrapper create(@NonNull Context userContext, + @BoolRes int boolResId, @NonNull Handler handler, + @NonNull Consumer<OverlayableSystemBooleanResourceWrapper> callback) { + + // Note that we cannot fully trust this initial value due to the dead time between obtaining + // the value here and setting up a broadcast receiver for change callback below. + // We will refresh the value again later after setting up the change callback anyway. + final AtomicBoolean valueRef = new AtomicBoolean(evaluate(userContext, boolResId)); + + final AtomicReference<Runnable> cleanerRef = new AtomicReference<>(); + + final OverlayableSystemBooleanResourceWrapper object = + new OverlayableSystemBooleanResourceWrapper(userContext.getUserId(), valueRef, + cleanerRef); + + final IntentFilter intentFilter = new IntentFilter(ACTION_OVERLAY_CHANGED); + intentFilter.addDataScheme(IntentFilter.SCHEME_PACKAGE); + intentFilter.addDataSchemeSpecificPart(SYSTEM_PACKAGE_NAME, PatternMatcher.PATTERN_LITERAL); + + final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + final boolean newValue = evaluate(userContext, boolResId); + if (newValue != valueRef.getAndSet(newValue)) { + callback.accept(object); + } + } + }; + userContext.registerReceiver(broadcastReceiver, intentFilter, + null /* broadcastPermission */, handler, + Context.RECEIVER_NOT_EXPORTED); + cleanerRef.set(() -> userContext.unregisterReceiver(broadcastReceiver)); + + // Make sure that the initial observable value is obtained after the change callback is set. + valueRef.set(evaluate(userContext, boolResId)); + return object; + } + + private OverlayableSystemBooleanResourceWrapper(@UserIdInt int userId, + @NonNull AtomicBoolean valueRef, @NonNull AtomicReference<Runnable> cleanerRef) { + mUserId = userId; + mValueRef = valueRef; + mCleanerRef = cleanerRef; + } + + /** + * @return The boolean resource value. + */ + @AnyThread + boolean get() { + return mValueRef.get(); + } + + /** + * @return The user ID associated with this resource reader. + */ + @AnyThread + @UserIdInt + int getUserId() { + return mUserId; + } + + @AnyThread + private static boolean evaluate(@NonNull Context context, @BoolRes int boolResId) { + try { + return context.getPackageManager() + .getResourcesForApplication(SYSTEM_PACKAGE_NAME) + .getBoolean(boolResId); + } catch (PackageManager.NameNotFoundException e) { + Slog.e(TAG, "getResourcesForApplication(\"" + SYSTEM_PACKAGE_NAME + "\") failed", e); + return false; + } + } + + /** + * Cleans up the callback. + */ + @AnyThread + @Override + public void close() { + final Runnable cleaner = mCleanerRef.getAndSet(null); + if (cleaner != null) { + cleaner.run(); + } + } +} diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 48ad22cb12ff..9f573c2ec7a8 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -1011,10 +1011,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { final IntentFilter packageFilter = new IntentFilter(); packageFilter.addAction(ACTION_PACKAGE_ADDED); packageFilter.addDataScheme("package"); - mContext.registerReceiver(mPackageReceiver, packageFilter, null, mHandler); + mContext.registerReceiverForAllUsers(mPackageReceiver, packageFilter, null, mHandler); // listen for UID changes to update policy - mContext.registerReceiver( + mContext.registerReceiverForAllUsers( mUidRemovedReceiver, new IntentFilter(ACTION_UID_REMOVED), null, mHandler); // listen for user changes to update policy diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index c4731aa7b522..d65dc13b72e3 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -3746,6 +3746,10 @@ public class NotificationManagerService extends SystemService { if (!hadChannel && hasChannel && !hasRequestedNotificationPermission && startingTaskId != ActivityTaskManager.INVALID_TASK_ID) { hasRequestedNotificationPermission = true; + if (mPermissionPolicyInternal == null) { + mPermissionPolicyInternal = + LocalServices.getService(PermissionPolicyInternal.class); + } mHandler.post(new ShowNotificationPermissionPromptRunnable(pkg, UserHandle.getUserId(uid), startingTaskId, mPermissionPolicyInternal)); @@ -3764,19 +3768,7 @@ public class NotificationManagerService extends SystemService { try { int uid = mPackageManager.getPackageUid(pkg, 0, UserHandle.getUserId(Binder.getCallingUid())); - List<ActivityManager.AppTask> tasks = mAtm.getAppTasks(pkg, uid); - for (int i = 0; i < tasks.size(); i++) { - ActivityManager.RecentTaskInfo task = tasks.get(i).getTaskInfo(); - if (mPermissionPolicyInternal == null) { - mPermissionPolicyInternal = - LocalServices.getService(PermissionPolicyInternal.class); - } - if (mPermissionPolicyInternal != null - && mPermissionPolicyInternal.canShowPermissionPromptForTask(task)) { - taskId = task.taskId; - break; - } - } + taskId = mAtm.getTaskToShowPermissionDialogOn(pkg, uid); } catch (RemoteException e) { // Do nothing } @@ -4068,13 +4060,12 @@ public class NotificationManagerService extends SystemService { @Override public ParceledListSlice<NotificationChannel> getNotificationChannelsBypassingDnd( - String pkg, int userId) { + String pkg, int uid) { checkCallerIsSystem(); - if (!areNotificationsEnabledForPackage(pkg, - mPackageManagerInternal.getPackageUid(pkg, 0, userId))) { + if (!areNotificationsEnabledForPackage(pkg, uid)) { return ParceledListSlice.emptyList(); } - return mPreferencesHelper.getNotificationChannelsBypassingDnd(pkg, userId); + return mPreferencesHelper.getNotificationChannelsBypassingDnd(pkg, uid); } @Override diff --git a/services/core/java/com/android/server/notification/PermissionHelper.java b/services/core/java/com/android/server/notification/PermissionHelper.java index 6b9e374771ff..e551f1056b24 100644 --- a/services/core/java/com/android/server/notification/PermissionHelper.java +++ b/services/core/java/com/android/server/notification/PermissionHelper.java @@ -35,6 +35,7 @@ import android.util.ArrayMap; import android.util.Pair; import android.util.Slog; +import com.android.internal.util.ArrayUtils; import com.android.server.pm.permission.PermissionManagerServiceInternal; import java.util.Collections; @@ -178,13 +179,16 @@ public final class PermissionHelper { boolean userSet, boolean reviewRequired) { assertFlag(); final long callingId = Binder.clearCallingIdentity(); - // Do not change fixed permissions, and do not change non-user set permissions that are - // granted by default, or granted by role. - if (isPermissionFixed(packageName, userId) - || (isPermissionGrantedByDefaultOrRole(packageName, userId) && !userSet)) { - return; - } try { + // Do not change the permission if the package doesn't request it, do not change fixed + // permissions, and do not change non-user set permissions that are granted by default, + // or granted by role. + if (!packageRequestsNotificationPermission(packageName, userId) + || isPermissionFixed(packageName, userId) + || (isPermissionGrantedByDefaultOrRole(packageName, userId) && !userSet)) { + return; + } + boolean currentlyGranted = mPmi.checkPermission(packageName, NOTIFICATION_PERMISSION, userId) != PackageManager.PERMISSION_DENIED; if (grant && !reviewRequired && !currentlyGranted) { @@ -278,6 +282,19 @@ public final class PermissionHelper { } } + private boolean packageRequestsNotificationPermission(String packageName, + @UserIdInt int userId) { + assertFlag(); + try { + String[] permissions = mPackageManager.getPackageInfo(packageName, GET_PERMISSIONS, + userId).requestedPermissions; + return ArrayUtils.contains(permissions, NOTIFICATION_PERMISSION); + } catch (RemoteException e) { + Slog.e(TAG, "Could not reach system server", e); + } + return false; + } + private void assertFlag() { if (!mMigrationEnabled) { throw new IllegalStateException("Method called without checking flag value"); diff --git a/services/core/java/com/android/server/notification/PreferencesHelper.java b/services/core/java/com/android/server/notification/PreferencesHelper.java index 11858904a69a..1f7d65e6c604 100644 --- a/services/core/java/com/android/server/notification/PreferencesHelper.java +++ b/services/core/java/com/android/server/notification/PreferencesHelper.java @@ -1669,14 +1669,14 @@ public class PreferencesHelper implements RankingConfig { } /** - * Gets all notification channels associated with the given pkg and userId that can bypass dnd + * Gets all notification channels associated with the given pkg and uid that can bypass dnd */ public ParceledListSlice<NotificationChannel> getNotificationChannelsBypassingDnd(String pkg, - int userId) { + int uid) { List<NotificationChannel> channels = new ArrayList<>(); synchronized (mPackagePreferences) { final PackagePreferences r = mPackagePreferences.get( - packagePreferencesKey(pkg, userId)); + packagePreferencesKey(pkg, uid)); if (r != null) { for (NotificationChannel channel : r.channels.values()) { if (channelIsLiveLocked(r, channel) && channel.canBypassDnd()) { diff --git a/services/core/java/com/android/server/notification/ZenModeFiltering.java b/services/core/java/com/android/server/notification/ZenModeFiltering.java index 2a6dd8410acb..b0d40efed690 100644 --- a/services/core/java/com/android/server/notification/ZenModeFiltering.java +++ b/services/core/java/com/android/server/notification/ZenModeFiltering.java @@ -112,7 +112,7 @@ public class ZenModeFiltering { } if (zen == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS) { if (consolidatedPolicy.allowRepeatCallers() - && REPEAT_CALLERS.isRepeat(context, extras)) { + && REPEAT_CALLERS.isRepeat(context, extras, null)) { ZenLog.traceMatchesCallFilter(true, "repeat caller"); return true; } @@ -229,7 +229,8 @@ public class ZenModeFiltering { } if (isCall(record)) { if (policy.allowRepeatCallers() - && REPEAT_CALLERS.isRepeat(mContext, extras(record))) { + && REPEAT_CALLERS.isRepeat( + mContext, extras(record), record.getPhoneNumbers())) { ZenLog.traceNotIntercepted(record, "repeatCaller"); return false; } @@ -350,6 +351,9 @@ public class ZenModeFiltering { private final ArrayMap<String, Long> mOtherCalls = new ArrayMap<>(); private int mThresholdMinutes; + // Record all people URIs in the extras bundle as well as the provided phoneNumbers set + // as callers. The phoneNumbers set is used to pass in any additional phone numbers + // associated with the people URIs as separately retrieved from contacts. private synchronized void recordCall(Context context, Bundle extras, ArraySet<String> phoneNumbers) { setThresholdMinutes(context); @@ -362,7 +366,13 @@ public class ZenModeFiltering { recordCallers(extraPeople, phoneNumbers, now); } - private synchronized boolean isRepeat(Context context, Bundle extras) { + // Determine whether any people in the provided extras bundle or phone number set is + // a repeat caller. The extras bundle contains the people associated with a specific + // notification, and will suffice for most callers; the phoneNumbers array may be used + // to additionally check any specific phone numbers previously retrieved from contacts + // associated with the people in the extras bundle. + private synchronized boolean isRepeat(Context context, Bundle extras, + ArraySet<String> phoneNumbers) { setThresholdMinutes(context); if (mThresholdMinutes <= 0 || extras == null) return false; final String[] extraPeople = ValidateNotificationPeople.getExtraPeople(extras); @@ -370,7 +380,7 @@ public class ZenModeFiltering { final long now = System.currentTimeMillis(); cleanUp(mTelCalls, now); cleanUp(mOtherCalls, now); - return checkCallers(context, extraPeople); + return checkCallers(context, extraPeople, phoneNumbers); } private synchronized void cleanUp(ArrayMap<String, Long> calls, long now) { @@ -433,7 +443,31 @@ public class ZenModeFiltering { } } - private synchronized boolean checkCallers(Context context, String[] people) { + // helper function to check mTelCalls array for a number, and also check its decoded + // version + private synchronized boolean checkForNumber(String number, String defaultCountryCode) { + if (mTelCalls.containsKey(number)) { + // check directly via map first + return true; + } else { + // see if a number that matches via areSameNumber exists + String numberToCheck = Uri.decode(number); + if (numberToCheck != null) { + for (String prev : mTelCalls.keySet()) { + if (PhoneNumberUtils.areSamePhoneNumber( + numberToCheck, prev, defaultCountryCode)) { + return true; + } + } + } + } + return false; + } + + // Check whether anyone in the provided array of people URIs or phone number set matches a + // previously recorded phone call. + private synchronized boolean checkCallers(Context context, String[] people, + ArraySet<String> phoneNumbers) { // get the default country code for checking telephone numbers final String defaultCountryCode = context.getSystemService(TelephonyManager.class).getNetworkCountryIso(); @@ -443,20 +477,8 @@ public class ZenModeFiltering { final Uri uri = Uri.parse(person); if ("tel".equals(uri.getScheme())) { String number = uri.getSchemeSpecificPart(); - if (mTelCalls.containsKey(number)) { - // check directly via map first + if (checkForNumber(number, defaultCountryCode)) { return true; - } else { - // see if a number that matches via areSameNumber exists - String numberToCheck = Uri.decode(number); - if (numberToCheck != null) { - for (String prev : mTelCalls.keySet()) { - if (PhoneNumberUtils.areSamePhoneNumber( - numberToCheck, prev, defaultCountryCode)) { - return true; - } - } - } } } else { if (mOtherCalls.containsKey(person)) { @@ -464,6 +486,17 @@ public class ZenModeFiltering { } } } + + // also check any passed-in phone numbers + if (phoneNumbers != null) { + for (String num : phoneNumbers) { + if (checkForNumber(num, defaultCountryCode)) { + return true; + } + } + } + + // no matches return false; } } diff --git a/services/core/java/com/android/server/pm/AppDataHelper.java b/services/core/java/com/android/server/pm/AppDataHelper.java index 0b0d1458c8de..c24bfec5fb43 100644 --- a/services/core/java/com/android/server/pm/AppDataHelper.java +++ b/services/core/java/com/android/server/pm/AppDataHelper.java @@ -218,8 +218,9 @@ final class AppDataHelper { final String seInfo = pkgSeInfo + seInfoUser; final int targetSdkVersion = pkg.getTargetSdkVersion(); + final boolean usesSdk = !pkg.getUsesSdkLibraries().isEmpty(); final CreateAppDataArgs args = Installer.buildCreateAppDataArgs(volumeUuid, packageName, - userId, flags, appId, seInfo, targetSdkVersion); + userId, flags, appId, seInfo, targetSdkVersion, usesSdk); args.previousAppId = previousAppId; return batch.createAppData(args).whenComplete((ceDataInode, e) -> { diff --git a/services/core/java/com/android/server/pm/DeletePackageHelper.java b/services/core/java/com/android/server/pm/DeletePackageHelper.java index 5b7cf2dc8559..87a83effee1a 100644 --- a/services/core/java/com/android/server/pm/DeletePackageHelper.java +++ b/services/core/java/com/android/server/pm/DeletePackageHelper.java @@ -66,6 +66,8 @@ import com.android.server.pm.pkg.PackageStateInternal; import com.android.server.pm.pkg.PackageUserState; import com.android.server.wm.ActivityTaskManagerInternal; +import dalvik.system.VMRuntime; + import java.util.Collections; import java.util.List; @@ -245,8 +247,11 @@ final class DeletePackageHelper { info.sendSystemPackageUpdatedBroadcasts(disabledSystemPs.getAppId()); } } - // Force a gc here. - Runtime.getRuntime().gc(); + + // Force a gc to clear up things. + // Ask for a background one, it's fine to go on and not block here. + VMRuntime.getRuntime().requestConcurrentGC(); + // Delete the resources here after sending the broadcast to let // other processes clean up before deleting resources. synchronized (mPm.mInstallLock) { diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index a780f3c7eac5..6e4d19f8d277 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -86,6 +86,7 @@ import static com.android.server.pm.PackageManagerServiceUtils.compareSignatures import static com.android.server.pm.PackageManagerServiceUtils.compressedFileExists; import static com.android.server.pm.PackageManagerServiceUtils.deriveAbiOverride; import static com.android.server.pm.PackageManagerServiceUtils.logCriticalInfo; +import static com.android.server.pm.SharedUidMigration.BEST_EFFORT; import android.annotation.NonNull; import android.annotation.Nullable; @@ -287,6 +288,12 @@ final class InstallPackageHelper { SharedUserSetting sharedUserSetting = mPm.mSettings.getSharedUserSettingLPr(pkgSetting); if (sharedUserSetting != null) { sharedUserSetting.addPackage(pkgSetting); + if (parsedPackage.isLeavingSharedUid() + && SharedUidMigration.applyStrategy(BEST_EFFORT) + && sharedUserSetting.isSingleUser()) { + // Attempt the transparent shared UID migration + mPm.mSettings.convertSharedUserSettingsLPw(sharedUserSetting); + } } if (reconciledPkg.mInstallArgs != null && reconciledPkg.mInstallArgs.mForceQueryableOverride) { @@ -2216,23 +2223,8 @@ final class InstallPackageHelper { } incrementalStorages.add(storage); } - int previousAppId = 0; - if (reconciledPkg.mScanResult.needsNewAppId()) { - // Only set previousAppId if the app is migrating out of shared UID - previousAppId = reconciledPkg.mScanResult.mPreviousAppId; - - if (pkg.shouldInheritKeyStoreKeys()) { - // Migrate keystore data - mAppDataHelper.migrateKeyStoreData( - previousAppId, reconciledPkg.mPkgSetting.getAppId()); - } - - if (reconciledPkg.mInstallResult.mRemovedInfo.mRemovedAppId == previousAppId) { - // If the previous app ID is removed, clear the keys - mAppDataHelper.clearKeystoreData(UserHandle.USER_ALL, previousAppId); - } - } - mAppDataHelper.prepareAppDataPostCommitLIF(pkg, previousAppId); + // Hardcode previousAppId to 0 to disable any data migration (http://b/221088088) + mAppDataHelper.prepareAppDataPostCommitLIF(pkg, 0); if (reconciledPkg.mPrepareResult.mClearCodeCache) { mAppDataHelper.clearAppDataLIF(pkg, UserHandle.USER_ALL, FLAG_STORAGE_DE | FLAG_STORAGE_CE | FLAG_STORAGE_EXTERNAL @@ -2988,7 +2980,6 @@ final class InstallPackageHelper { * APK will be installed and the package will be disabled. To recover from this situation, * the user will need to go into system settings and re-enable the package. */ - @GuardedBy({"mPm.mLock", "mPm.mInstallLock"}) boolean enableCompressedPackage(AndroidPackage stubPkg, @NonNull PackageSetting stubPkgSetting) { final int parseFlags = mPm.getDefParseFlags() | ParsingPackageUtils.PARSE_CHATTY @@ -2998,8 +2989,8 @@ final class InstallPackageHelper { try (PackageFreezer freezer = mPm.freezePackage(stubPkg.getPackageName(), "setEnabledSetting")) { pkg = installStubPackageLI(stubPkg, parseFlags, 0 /*scanFlags*/); + mAppDataHelper.prepareAppDataAfterInstallLIF(pkg); synchronized (mPm.mLock) { - mAppDataHelper.prepareAppDataAfterInstallLIF(pkg); try { mSharedLibraries.updateSharedLibrariesLPw( pkg, stubPkgSetting, null, null, @@ -3027,8 +3018,7 @@ final class InstallPackageHelper { installPackageFromSystemLIF(stubPkg.getPath(), mPm.mUserManager.getUserIds() /*allUserHandles*/, null /*origUserHandles*/, - true /*writeSettings*/, - Process.INVALID_UID /*previousAppId*/); + true /*writeSettings*/); } catch (PackageManagerException pme) { // Serious WTF; we have to be able to install the stub Slog.wtf(TAG, "Failed to restore system package:" + stubPkg.getPackageName(), @@ -3056,7 +3046,7 @@ final class InstallPackageHelper { return true; } - @GuardedBy({"mPm.mLock", "mPm.mInstallLock"}) + @GuardedBy("mPm.mInstallLock") private AndroidPackage installStubPackageLI(AndroidPackage stubPkg, @ParsingPackageUtils.ParseFlags int parseFlags, @PackageManagerService.ScanFlags int scanFlags) @@ -3149,27 +3139,26 @@ final class InstallPackageHelper { mPm.mSettings.enableSystemPackageLPw(disabledPs.getPkg().getPackageName()); // Remove any native libraries from the upgraded package. PackageManagerServiceUtils.removeNativeBinariesLI(deletedPs); - - // Install the system package - if (DEBUG_REMOVE) Slog.d(TAG, "Re-installing system package: " + disabledPs); - try { - synchronized (mPm.mInstallLock) { - final int[] origUsers = outInfo == null ? null : outInfo.mOrigUsers; - final int previousAppId = disabledPs.getAppId() != deletedPs.getAppId() - ? deletedPs.getAppId() : Process.INVALID_UID; - installPackageFromSystemLIF(disabledPs.getPathString(), allUserHandles, - origUsers, writeSettings, previousAppId); - } - } catch (PackageManagerException e) { - Slog.w(TAG, "Failed to restore system package:" + deletedPs.getPackageName() + ": " - + e.getMessage()); - // TODO(b/194319951): can we avoid this; throw would come from scan... - throw new SystemDeleteException(e); - } finally { - if (disabledPs.getPkg().isStub()) { - // We've re-installed the stub; make sure it's disabled here. If package was - // originally enabled, we'll install the compressed version of the application - // and re-enable it afterward. + } + // Install the system package + if (DEBUG_REMOVE) Slog.d(TAG, "Re-installing system package: " + disabledPs); + try { + synchronized (mPm.mInstallLock) { + final int[] origUsers = outInfo == null ? null : outInfo.mOrigUsers; + installPackageFromSystemLIF(disabledPs.getPathString(), allUserHandles, + origUsers, writeSettings); + } + } catch (PackageManagerException e) { + Slog.w(TAG, "Failed to restore system package:" + deletedPs.getPackageName() + ": " + + e.getMessage()); + // TODO(b/194319951): can we avoid this; throw would come from scan... + throw new SystemDeleteException(e); + } finally { + if (disabledPs.getPkg().isStub()) { + // We've re-installed the stub; make sure it's disabled here. If package was + // originally enabled, we'll install the compressed version of the application + // and re-enable it afterward. + synchronized (mPm.mLock) { disableStubPackage(action, deletedPs, allUserHandles); } } @@ -3197,10 +3186,10 @@ final class InstallPackageHelper { /** * Installs a package that's already on the system partition. */ - @GuardedBy({"mPm.mLock", "mPm.mInstallLock"}) + @GuardedBy("mPm.mInstallLock") private void installPackageFromSystemLIF(@NonNull String codePathString, @NonNull int[] allUserHandles, @Nullable int[] origUserHandles, - boolean writeSettings, int previousAppId) + boolean writeSettings) throws PackageManagerException { final File codePath = new File(codePathString); @ParsingPackageUtils.ParseFlags int parseFlags = @@ -3223,13 +3212,12 @@ final class InstallPackageHelper { mAppDataHelper.prepareAppDataAfterInstallLIF(pkg); - setPackageInstalledForSystemPackage(pkg, allUserHandles, - origUserHandles, writeSettings, previousAppId); + setPackageInstalledForSystemPackage(pkg, allUserHandles, origUserHandles, writeSettings); } private void setPackageInstalledForSystemPackage(@NonNull AndroidPackage pkg, @NonNull int[] allUserHandles, @Nullable int[] origUserHandles, - boolean writeSettings, int previousAppId) { + boolean writeSettings) { // writer synchronized (mPm.mLock) { PackageSetting ps = mPm.mSettings.getPackageLPr(pkg.getPackageName()); @@ -3263,7 +3251,7 @@ final class InstallPackageHelper { // The method below will take care of removing obsolete permissions and granting // install permissions. - mPm.mPermissionManager.onPackageInstalled(pkg, previousAppId, + mPm.mPermissionManager.onPackageInstalled(pkg, Process.INVALID_UID, PermissionManagerServiceInternal.PackageInstalledParams.DEFAULT, UserHandle.USER_ALL); for (final int userId : allUserHandles) { @@ -3701,7 +3689,14 @@ final class InstallPackageHelper { } disabledPkgSetting = mPm.mSettings.getDisabledSystemPkgLPr( parsedPackage.getPackageName()); - if (parsedPackage.getSharedUserId() != null && !parsedPackage.isLeavingSharedUid()) { + + boolean ignoreSharedUserId = false; + if (installedPkgSetting == null) { + // We can directly ignore sharedUserSetting for new installs + ignoreSharedUserId = parsedPackage.isLeavingSharedUid(); + } + + if (!ignoreSharedUserId && parsedPackage.getSharedUserId() != null) { sharedUserSetting = mPm.mSettings.getSharedUserLPw( parsedPackage.getSharedUserId(), 0 /*pkgFlags*/, 0 /*pkgPrivateFlags*/, true /*create*/); diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java index 742cc0237cec..76b9830cbde9 100644 --- a/services/core/java/com/android/server/pm/Installer.java +++ b/services/core/java/com/android/server/pm/Installer.java @@ -92,6 +92,7 @@ public class Installer extends SystemService { public static final int FLAG_STORAGE_DE = IInstalld.FLAG_STORAGE_DE; public static final int FLAG_STORAGE_CE = IInstalld.FLAG_STORAGE_CE; public static final int FLAG_STORAGE_EXTERNAL = IInstalld.FLAG_STORAGE_EXTERNAL; + public static final int FLAG_STORAGE_SDK = IInstalld.FLAG_STORAGE_SDK; public static final int FLAG_CLEAR_CACHE_ONLY = IInstalld.FLAG_CLEAR_CACHE_ONLY; public static final int FLAG_CLEAR_CODE_CACHE_ONLY = IInstalld.FLAG_CLEAR_CODE_CACHE_ONLY; @@ -190,12 +191,16 @@ public class Installer extends SystemService { // We explicitly do NOT set previousAppId because the default value should always be 0. // Manually override previousAppId after building CreateAppDataArgs for specific behaviors. static CreateAppDataArgs buildCreateAppDataArgs(String uuid, String packageName, - int userId, int flags, int appId, String seInfo, int targetSdkVersion) { + int userId, int flags, int appId, String seInfo, int targetSdkVersion, + boolean usesSdk) { final CreateAppDataArgs args = new CreateAppDataArgs(); args.uuid = uuid; args.packageName = packageName; args.userId = userId; args.flags = flags; + if (usesSdk) { + args.flags |= FLAG_STORAGE_SDK; + } args.appId = appId; args.seInfo = seInfo; args.targetSdkVersion = targetSdkVersion; @@ -215,6 +220,8 @@ public class Installer extends SystemService { if (!checkBeforeRemote()) { return buildPlaceholderCreateAppDataResult(); } + // Hardcode previousAppId to 0 to disable any data migration (http://b/221088088) + args.previousAppId = 0; try { return mInstalld.createAppData(args); } catch (Exception e) { @@ -229,6 +236,10 @@ public class Installer extends SystemService { Arrays.fill(results, buildPlaceholderCreateAppDataResult()); return results; } + // Hardcode previousAppId to 0 to disable any data migration (http://b/221088088) + for (final CreateAppDataArgs arg : args) { + arg.previousAppId = 0; + } try { return mInstalld.createAppDataBatched(args); } catch (Exception e) { diff --git a/services/core/java/com/android/server/pm/IntentResolverInterceptor.java b/services/core/java/com/android/server/pm/IntentResolverInterceptor.java new file mode 100644 index 000000000000..0ee07b650cf5 --- /dev/null +++ b/services/core/java/com/android/server/pm/IntentResolverInterceptor.java @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.pm; + +import static com.android.server.wm.ActivityInterceptorCallback.INTENT_RESOLVER_ORDERED_ID; + +import android.Manifest; +import android.annotation.Nullable; +import android.annotation.RequiresPermission; +import android.app.ActivityTaskManager; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.res.Resources; +import android.os.RemoteException; +import android.provider.DeviceConfig; +import android.util.Slog; + +import com.android.internal.R; +import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; +import com.android.server.LocalServices; +import com.android.server.wm.ActivityInterceptorCallback; +import com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo; +import com.android.server.wm.ActivityTaskManagerInternal; + +/** + * Service to register an {@code ActivityInterceptorCallback} that modifies any {@code Intent} + * that's being used to launch a user-space {@code ChooserActivity}, by adding + * EXTRA_PERMISSION_TOKEN, a Binder representing a single-use-only permission to invoke the + * #startActivityAsCaller() API (which normally isn't available in user-space); and setting the + * destination component to the delegated component when appropriate. + */ +public final class IntentResolverInterceptor { + private static final String TAG = "IntentResolverIntercept"; + + private final Context mContext; + private boolean mUseDelegateChooser; + + private final ActivityInterceptorCallback mActivityInterceptorCallback = + new ActivityInterceptorCallback() { + @Nullable + @Override + public ActivityInterceptResult intercept(ActivityInterceptorInfo info) { + if (mUseDelegateChooser && isChooserActivity(info)) { + return new ActivityInterceptResult( + modifyChooserIntent(info.intent), + info.checkedOptions); + } + return null; + } + }; + + public IntentResolverInterceptor(Context context) { + mContext = context; + } + + /** + * Start listening for intents and USE_DELEGATE_CHOOSER property changes. + */ + @RequiresPermission(Manifest.permission.READ_DEVICE_CONFIG) + public void registerListeners() { + LocalServices.getService(ActivityTaskManagerInternal.class) + .registerActivityStartInterceptor(INTENT_RESOLVER_ORDERED_ID, + mActivityInterceptorCallback); + + DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_SYSTEMUI, + mContext.getMainExecutor(), properties -> updateUseDelegateChooser()); + updateUseDelegateChooser(); + } + + @RequiresPermission(Manifest.permission.READ_DEVICE_CONFIG) + private void updateUseDelegateChooser() { + mUseDelegateChooser = DeviceConfig.getBoolean( + DeviceConfig.NAMESPACE_SYSTEMUI, + SystemUiDeviceConfigFlags.USE_DELEGATE_CHOOSER, + false); + } + + private Intent modifyChooserIntent(Intent intent) { + intent.setComponent(getUnbundledChooserComponentName()); + addStartActivityPermissionTokenToIntent(intent, getUnbundledChooserComponentName()); + return intent; + } + + private static boolean isChooserActivity(ActivityInterceptorInfo info) { + ComponentName targetComponent = new ComponentName(info.aInfo.packageName, info.aInfo.name); + + return targetComponent.equals(getSystemChooserComponentName()) + || targetComponent.equals(getUnbundledChooserComponentName()); + } + + private static Intent addStartActivityPermissionTokenToIntent( + Intent intent, ComponentName grantee) { + try { + intent.putExtra( + ActivityTaskManager.EXTRA_PERMISSION_TOKEN, + ActivityTaskManager.getService().requestStartActivityPermissionToken(grantee)); + } catch (RemoteException e) { + Slog.w(TAG, "Failed to add permission token to chooser intent"); + } + return intent; + } + + private static ComponentName getSystemChooserComponentName() { + return new ComponentName("android", "com.android.internal.app.ChooserActivity"); + } + + private static ComponentName getUnbundledChooserComponentName() { + return ComponentName.unflattenFromString( + Resources.getSystem().getString(R.string.config_chooserActivity)); + } +} diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index 6b3ce773fb63..e9896617d8e8 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -1109,13 +1109,11 @@ public class LauncherAppsService extends SystemService { // Note the target activity doesn't have to be exported. // Flag for bubble - if (startActivityOptions != null) { - ActivityOptions options = ActivityOptions.fromBundle(startActivityOptions); - if (options.isApplyActivityFlagsForBubbles()) { - // Flag for bubble to make behaviour match documentLaunchMode=always. - intents[0].addFlags(FLAG_ACTIVITY_NEW_DOCUMENT); - intents[0].addFlags(FLAG_ACTIVITY_MULTIPLE_TASK); - } + ActivityOptions options = ActivityOptions.fromBundle(startActivityOptions); + if (options != null && options.isApplyActivityFlagsForBubbles()) { + // Flag for bubble to make behaviour match documentLaunchMode=always. + intents[0].addFlags(FLAG_ACTIVITY_NEW_DOCUMENT); + intents[0].addFlags(FLAG_ACTIVITY_MULTIPLE_TASK); } intents[0].addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index 55fc78599661..67d3f9588e3b 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -2860,6 +2860,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { inheritFileLocked(mResolvedBaseFile); // Collect the requiredSplitTypes from base CollectionUtils.addAll(requiredSplitTypes, existing.getBaseRequiredSplitTypes()); + } else { + // Installing base.apk. Make sure the app is restarted. + params.setDontKillApp(false); } // Inherit splits if not overridden. @@ -3556,6 +3559,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } @Override + public int getInstallFlags() { + return params.installFlags; + } + + @Override public DataLoaderParamsParcel getDataLoaderParams() { mContext.enforceCallingOrSelfPermission(Manifest.permission.USE_INSTALLER_V2, null); return params.dataLoaderParams != null ? params.dataLoaderParams.getData() : null; diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index f07418f6007f..a70cff98ed93 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -958,6 +958,7 @@ public class PackageManagerService extends IPackageManager.Stub private final ResolveIntentHelper mResolveIntentHelper; private final DexOptHelper mDexOptHelper; private final SuspendPackageHelper mSuspendPackageHelper; + private final IntentResolverInterceptor mIntentResolverInterceptor; /** * Invalidate the package info cache, which includes updating the cached computer. @@ -1712,6 +1713,8 @@ public class PackageManagerService extends IPackageManager.Stub mSharedLibraries.setDeletePackageHelper(mDeletePackageHelper); + mIntentResolverInterceptor = null; + registerObservers(false); invalidatePackageInfoCache(); } @@ -2240,6 +2243,8 @@ public class PackageManagerService extends IPackageManager.Stub mServiceStartWithDelay = SystemClock.uptimeMillis() + (60 * 1000L); + mIntentResolverInterceptor = new IntentResolverInterceptor(mContext); + Slog.i(TAG, "Fix for b/169414761 is applied"); } @@ -6397,6 +6402,11 @@ public class PackageManagerService extends IPackageManager.Stub // Prune unused static shared libraries which have been cached a period of time schedulePruneUnusedStaticSharedLibraries(false /* delay */); + + // TODO(b/222706900): Remove this intent interceptor before T launch + if (mIntentResolverInterceptor != null) { + mIntentResolverInterceptor.registerListeners(); + } } /** diff --git a/services/core/java/com/android/server/pm/PackageSetting.java b/services/core/java/com/android/server/pm/PackageSetting.java index f06ae1e06187..2bae00f91b82 100644 --- a/services/core/java/com/android/server/pm/PackageSetting.java +++ b/services/core/java/com/android/server/pm/PackageSetting.java @@ -477,6 +477,7 @@ public class PackageSetting extends SettingBase implements PackageStateInternal public void setSharedUserAppId(int sharedUserAppId) { mSharedUserAppId = sharedUserAppId; + onChanged(); } @Override diff --git a/services/core/java/com/android/server/pm/RemovePackageHelper.java b/services/core/java/com/android/server/pm/RemovePackageHelper.java index 4d1519c361c9..88df843ec8c5 100644 --- a/services/core/java/com/android/server/pm/RemovePackageHelper.java +++ b/services/core/java/com/android/server/pm/RemovePackageHelper.java @@ -284,7 +284,11 @@ final class RemovePackageHelper { List<AndroidPackage> sharedUserPkgs = sus != null ? sus.getPackages() : Collections.emptyList(); mPermissionManager.onPackageUninstalled(packageName, deletedPs.getAppId(), - deletedPs.getPkg(), sharedUserPkgs, UserHandle.USER_ALL); + deletedPkg, sharedUserPkgs, UserHandle.USER_ALL); + // After permissions are handled, check if the shared user can be migrated + if (sus != null) { + mPm.mSettings.checkAndConvertSharedUserSettingsLPw(sus); + } } mPm.clearPackagePreferredActivitiesLPw( deletedPs.getPackageName(), changedUsers, UserHandle.USER_ALL); diff --git a/services/core/java/com/android/server/pm/ScanPackageUtils.java b/services/core/java/com/android/server/pm/ScanPackageUtils.java index 33f0b54fb2de..4e8313bf1891 100644 --- a/services/core/java/com/android/server/pm/ScanPackageUtils.java +++ b/services/core/java/com/android/server/pm/ScanPackageUtils.java @@ -165,25 +165,15 @@ final class ScanPackageUtils { } } - int previousAppId = Process.INVALID_UID; - if (pkgSetting != null && oldSharedUserSetting != sharedUserSetting) { - if (oldSharedUserSetting != null && sharedUserSetting == null) { - previousAppId = pkgSetting.getAppId(); - // Log that something is leaving shareduid and keep going - Slog.i(TAG, - "Package " + parsedPackage.getPackageName() + " shared user changed from " - + oldSharedUserSetting.name + " to " + "<nothing>."); - } else { - PackageManagerService.reportSettingsProblem(Log.WARN, - "Package " + parsedPackage.getPackageName() + " shared user changed from " - + (oldSharedUserSetting != null - ? oldSharedUserSetting.name : "<nothing>") - + " to " - + (sharedUserSetting != null ? sharedUserSetting.name : "<nothing>") - + "; replacing with new"); - pkgSetting = null; - } + PackageManagerService.reportSettingsProblem(Log.WARN, + "Package " + parsedPackage.getPackageName() + " shared user changed from " + + (oldSharedUserSetting != null + ? oldSharedUserSetting.name : "<nothing>") + + " to " + + (sharedUserSetting != null ? sharedUserSetting.name : "<nothing>") + + "; replacing with new"); + pkgSetting = null; } String[] usesSdkLibraries = null; @@ -474,8 +464,8 @@ final class ScanPackageUtils { return new ScanResult(request, true, pkgSetting, changedAbiCodePath, !createNewPackage /* existingSettingCopied */, - previousAppId, sdkLibraryInfo, staticSharedLibraryInfo, - dynamicSharedLibraryInfos); + Process.INVALID_UID /* previousAppId */ , sdkLibraryInfo, + staticSharedLibraryInfo, dynamicSharedLibraryInfos); } /** diff --git a/services/core/java/com/android/server/pm/ScanResult.java b/services/core/java/com/android/server/pm/ScanResult.java index f77be1f9b2d3..e2860ca327e7 100644 --- a/services/core/java/com/android/server/pm/ScanResult.java +++ b/services/core/java/com/android/server/pm/ScanResult.java @@ -70,7 +70,9 @@ final class ScanResult { mPkgSetting = pkgSetting; mChangedAbiCodePath = changedAbiCodePath; mExistingSettingCopied = existingSettingCopied; - mPreviousAppId = previousAppId; + // Hardcode mPreviousAppId to INVALID_UID (http://b/221088088) + // This will disable all migration code paths in PMS and PermMS + mPreviousAppId = Process.INVALID_UID; mSdkSharedLibraryInfo = sdkSharedLibraryInfo; mStaticSharedLibraryInfo = staticSharedLibraryInfo; mDynamicSharedLibraryInfos = dynamicSharedLibraryInfos; diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index d3665749a7f8..021c3db35756 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -29,6 +29,7 @@ import static android.os.Process.PACKAGE_INFO_GID; import static android.os.Process.SYSTEM_UID; import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME; +import static com.android.server.pm.SharedUidMigration.BEST_EFFORT; import android.annotation.NonNull; import android.annotation.Nullable; @@ -1424,6 +1425,35 @@ public final class Settings implements Watchable, Snappable { } } + /** + * Transparently convert a SharedUserSetting into PackageSettings without changing appId. + * The sharedUser passed to this method has to be {@link SharedUserSetting#isSingleUser()}. + */ + void convertSharedUserSettingsLPw(SharedUserSetting sharedUser) { + final PackageSetting ps = sharedUser.getPackageSettings().valueAt(0); + replaceAppIdLPw(sharedUser.getAppId(), ps); + + // Unlink the SharedUserSetting + ps.setSharedUserAppId(INVALID_UID); + if (!sharedUser.getDisabledPackageSettings().isEmpty()) { + final PackageSetting disabledPs = sharedUser.getDisabledPackageSettings().valueAt(0); + disabledPs.setSharedUserAppId(INVALID_UID); + } + mSharedUsers.remove(sharedUser.getName()); + } + + /** + * Check and convert eligible SharedUserSettings to PackageSettings. + */ + void checkAndConvertSharedUserSettingsLPw(SharedUserSetting sharedUser) { + if (!sharedUser.isSingleUser()) return; + final AndroidPackage pkg = sharedUser.getPackageSettings().valueAt(0).getPkg(); + if (pkg != null && pkg.isLeavingSharedUid() + && SharedUidMigration.applyStrategy(BEST_EFFORT)) { + convertSharedUserSettingsLPw(sharedUser); + } + } + PreferredIntentResolver editPreferredActivitiesLPw(int userId) { PreferredIntentResolver pir = mPreferredActivities.get(userId); if (pir == null) { @@ -4190,10 +4220,11 @@ public final class Settings implements Watchable, Snappable { // Accumulate all required args and call the installer after mPackages lock // has been released final String seInfo = AndroidPackageUtils.getSeInfo(ps.getPkg(), ps); + final boolean usesSdk = !ps.getPkg().getUsesSdkLibraries().isEmpty(); final CreateAppDataArgs args = Installer.buildCreateAppDataArgs( ps.getVolumeUuid(), ps.getPackageName(), userHandle, StorageManager.FLAG_STORAGE_CE | StorageManager.FLAG_STORAGE_DE, - ps.getAppId(), seInfo, ps.getPkg().getTargetSdkVersion()); + ps.getAppId(), seInfo, ps.getPkg().getTargetSdkVersion(), usesSdk); batch.createAppData(args); } else { // Make sure the app is excluded from storage mapping for this user diff --git a/services/core/java/com/android/server/pm/SharedUidMigration.java b/services/core/java/com/android/server/pm/SharedUidMigration.java new file mode 100644 index 000000000000..e44ef662efff --- /dev/null +++ b/services/core/java/com/android/server/pm/SharedUidMigration.java @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.pm; + +import android.annotation.IntDef; +import android.content.pm.PackageManager; +import android.os.Build; +import android.os.SystemProperties; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * A utility class hosting code configuring shared UID migration behavior. + */ +public final class SharedUidMigration { + + /** + * The system property key used to configure the shared UID migration strategy. + */ + public static final String PROPERTY_KEY = "persist.debug.pm.shared_uid_migration_strategy"; + + /** + * Only leave shared UID for newly installed packages. + */ + public static final int NEW_INSTALL_ONLY = 1; + /** + * Opportunistically migrate any single-package shared UID group. + */ + public static final int BEST_EFFORT = 2; + /** + * Run appId transitions when the device reboots. + */ + public static final int TRANSITION_AT_BOOT = 3; + /** + * Run appId transitions as soon as the upgrade is installed. + */ + public static final int LIVE_TRANSITION = 4; + + @IntDef({ + NEW_INSTALL_ONLY, + BEST_EFFORT, + TRANSITION_AT_BOOT, + LIVE_TRANSITION, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface Strategy {} + + @Strategy + private static final int DEFAULT = BEST_EFFORT; + + /** + * Whether shared UID migration is fully disabled. Disabled means the sharedUserMaxSdkVersion + * attribute will be directly ignored in the parsing phase. + */ + public static boolean isDisabled() { + return !PackageManager.ENABLE_SHARED_UID_MIGRATION; + } + + /** + * If the system is userdebug, returns the strategy to use by getting the system property + * {@link #PROPERTY_KEY}, or else returns the default strategy enabled in the build. + */ + public static int getCurrentStrategy() { + if (!Build.IS_USERDEBUG) { + return DEFAULT; + } + + final int s = SystemProperties.getInt(PROPERTY_KEY, DEFAULT); + // No transition strategies can be used (http://b/221088088) + if (s > BEST_EFFORT || s < NEW_INSTALL_ONLY) { + return DEFAULT; + } + return s; + } + + /** + * Should the strategy be used based on the current active strategy. + */ + public static boolean applyStrategy(@Strategy int strategy) { + return !isDisabled() && getCurrentStrategy() >= strategy; + } + + private SharedUidMigration() {} +} diff --git a/services/core/java/com/android/server/pm/SharedUserSetting.java b/services/core/java/com/android/server/pm/SharedUserSetting.java index 4d0bbc6fe437..23f0de8a5f71 100644 --- a/services/core/java/com/android/server/pm/SharedUserSetting.java +++ b/services/core/java/com/android/server/pm/SharedUserSetting.java @@ -221,6 +221,25 @@ public final class SharedUserSetting extends SettingBase implements SharedUserAp } /** + * A shared user is considered "single user" if there is exactly one single package + * currently using it. In the case when that package is also a system app, the APK on + * the system partition has to also leave shared UID. + */ + public boolean isSingleUser() { + if (mPackages.size() != 1) { + return false; + } + if (mDisabledPackages.size() > 1) { + return false; + } + if (mDisabledPackages.size() == 1) { + final AndroidPackage pkg = mDisabledPackages.valueAt(0).getPkg(); + return pkg != null && pkg.isLeavingSharedUid(); + } + return true; + } + + /** * Determine the targetSdkVersion for a sharedUser and update pkg.applicationInfo.seInfo * to ensure that all apps within the sharedUser share an SELinux domain. Use the lowest * targetSdkVersion of all apps within the shared user, which corresponds to the least diff --git a/services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java b/services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java index 63469cb24f2f..124df47345ae 100644 --- a/services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java +++ b/services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java @@ -122,6 +122,12 @@ public class PackageInfoUtils { info.isStub = pkg.isStub(); info.coreApp = pkg.isCoreApp(); + if (!pkgSetting.hasSharedUser()) { + // It is possible that this shared UID app has left + info.sharedUserId = null; + info.sharedUserLabel = 0; + } + if ((flags & PackageManager.GET_ACTIVITIES) != 0) { final int N = pkg.getActivities().size(); if (N > 0) { diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java index 9961ae51b92d..90842619c31e 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -1403,7 +1403,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt } } else { if (ps.getUserStateOrDefault(userId).isInstantApp() && !bp.isInstant()) { - throw new SecurityException("Cannot grant non-ephemeral permission" + permName + throw new SecurityException("Cannot grant non-ephemeral permission " + permName + " for package " + packageName); } @@ -3532,8 +3532,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt final Boolean granted = SystemConfig.getInstance().getOemPermissions(pkg.getPackageName()).get(permission); if (granted == null) { - throw new IllegalStateException("OEM permission" + permission + " requested by package " - + pkg.getPackageName() + " must be explicitly declared granted or not"); + throw new IllegalStateException("OEM permission " + permission + + " requested by package " + pkg.getPackageName() + + " must be explicitly declared granted or not"); } return Boolean.TRUE == granted; } diff --git a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java index ed1ab01e1d12..3eaca9dddcc4 100644 --- a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java +++ b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java @@ -91,6 +91,7 @@ import com.android.internal.R; import com.android.internal.os.ClassLoaderFactory; import com.android.internal.util.ArrayUtils; import com.android.internal.util.XmlUtils; +import com.android.server.pm.SharedUidMigration; import com.android.server.pm.permission.CompatibilityPermissionInfo; import com.android.server.pm.pkg.component.ComponentMutateUtils; import com.android.server.pm.pkg.component.ComponentParseUtils; @@ -1047,8 +1048,11 @@ public class ParsingPackageUtils { } } - int maxSdkVersion = anInteger(0, R.styleable.AndroidManifest_sharedUserMaxSdkVersion, sa); - boolean leaving = (maxSdkVersion != 0) && (maxSdkVersion < Build.VERSION.RESOURCES_SDK_INT); + boolean leaving = false; + if (!SharedUidMigration.isDisabled()) { + int max = anInteger(0, R.styleable.AndroidManifest_sharedUserMaxSdkVersion, sa); + leaving = (max != 0) && (max < Build.VERSION.RESOURCES_SDK_INT); + } return input.success(pkg .setLeavingSharedUid(leaving) diff --git a/services/core/java/com/android/server/policy/KeyCombinationManager.java b/services/core/java/com/android/server/policy/KeyCombinationManager.java index 68e078c519ba..9213c87f12ec 100644 --- a/services/core/java/com/android/server/policy/KeyCombinationManager.java +++ b/services/core/java/com/android/server/policy/KeyCombinationManager.java @@ -48,7 +48,7 @@ public class KeyCombinationManager { // The rule has been triggered by current keys. @GuardedBy("mLock") private TwoKeysCombinationRule mTriggeredRule; - private final Handler mHandler = new Handler(); + private final Handler mHandler; // Keys in a key combination must be pressed within this interval of each other. private static final long COMBINE_KEY_DELAY_MILLIS = 150; @@ -93,6 +93,11 @@ public class KeyCombinationManager { return false; } + // The excessive delay before it dispatching to client. + long getKeyInterceptDelayMs() { + return COMBINE_KEY_DELAY_MILLIS; + } + abstract void execute(); abstract void cancel(); @@ -103,7 +108,8 @@ public class KeyCombinationManager { } } - public KeyCombinationManager() { + public KeyCombinationManager(Handler handler) { + mHandler = handler; } void addRule(TwoKeysCombinationRule rule) { @@ -195,10 +201,18 @@ public class KeyCombinationManager { */ long getKeyInterceptTimeout(int keyCode) { synchronized (mLock) { - if (forAllActiveRules((rule) -> rule.shouldInterceptKey(keyCode))) { - return mDownTimes.get(keyCode) + COMBINE_KEY_DELAY_MILLIS; + if (mDownTimes.get(keyCode) == 0) { + return 0; + } + long delayMs = 0; + for (final TwoKeysCombinationRule rule : mActiveRules) { + if (rule.shouldInterceptKey(keyCode)) { + delayMs = Math.max(delayMs, rule.getKeyInterceptDelayMs()); + } } - return 0; + // Make sure the delay is less than COMBINE_KEY_DELAY_MILLIS. + delayMs = Math.min(delayMs, COMBINE_KEY_DELAY_MILLIS); + return mDownTimes.get(keyCode) + delayMs; } } diff --git a/services/core/java/com/android/server/policy/PermissionPolicyInternal.java b/services/core/java/com/android/server/policy/PermissionPolicyInternal.java index 20b7ccd39287..92b9944b74cf 100644 --- a/services/core/java/com/android/server/policy/PermissionPolicyInternal.java +++ b/services/core/java/com/android/server/policy/PermissionPolicyInternal.java @@ -57,6 +57,7 @@ public abstract class PermissionPolicyInternal { * prompt should be shown if the app targets S-, is currently running in a visible, focused * task, has the REVIEW_REQUIRED flag set on its implicit notification permission, and has * created at least one notification channel (even if it has since been deleted). + * * @param packageName The package whose permission is being checked * @param userId The user for whom the package is being started * @param taskId The task the notification prompt should be attached to @@ -66,10 +67,22 @@ public abstract class PermissionPolicyInternal { /** * Determine if a particular task is in the proper state to show a system-triggered permission - * prompt. A prompt can be shown if the task is focused, visible, and running. + * prompt. A prompt can be shown if the task is focused, visible, and running and + * 1. The intent is a launcher intent (action is ACTION_MAIN, category is LAUNCHER), or + * 2. The activity belongs to the same package as the one which launched the task originally, + * and the task was started with a launcher intent + * * @param taskInfo The task to be checked + * @param currPkg The package of the current top visible activity + * @param intent The intent of the current top visible activity + */ + public abstract boolean shouldShowNotificationDialogForTask(@Nullable TaskInfo taskInfo, + @Nullable String currPkg, @Nullable Intent intent); + + /** + * @return true if an intent will resolve to a permission request dialog activity */ - public abstract boolean canShowPermissionPromptForTask(@Nullable TaskInfo taskInfo); + public abstract boolean isIntentToPermissionDialog(@NonNull Intent intent); /** * @return Whether the policy is initialized for a user. diff --git a/services/core/java/com/android/server/policy/PermissionPolicyService.java b/services/core/java/com/android/server/policy/PermissionPolicyService.java index f2ce0d4c49d3..70ef3d364277 100644 --- a/services/core/java/com/android/server/policy/PermissionPolicyService.java +++ b/services/core/java/com/android/server/policy/PermissionPolicyService.java @@ -21,6 +21,8 @@ import static android.app.AppOpsManager.MODE_ALLOWED; import static android.app.AppOpsManager.MODE_FOREGROUND; import static android.app.AppOpsManager.MODE_IGNORED; import static android.app.AppOpsManager.OP_NONE; +import static android.content.pm.PackageManager.ACTION_REQUEST_PERMISSIONS; +import static android.content.pm.PackageManager.ACTION_REQUEST_PERMISSIONS_FOR_OTHER; import static android.content.pm.PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION; import static android.content.pm.PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED; import static android.content.pm.PackageManager.FLAG_PERMISSION_REVOKED_COMPAT; @@ -54,6 +56,8 @@ import android.content.pm.PackageManagerInternal.PackageListObserver; import android.content.pm.PermissionInfo; import android.os.Build; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager; @@ -109,6 +113,7 @@ public final class PermissionPolicyService extends SystemService { private static final String SYSTEM_PKG = "android"; private static final boolean DEBUG = false; private static final long USER_SENSITIVE_UPDATE_DELAY_MS = 60000; + private static final long ACTIVITY_START_DELAY_MS = 200; private final Object mLock = new Object(); @@ -149,6 +154,7 @@ public final class PermissionPolicyService extends SystemService { private List<String> mAppOpPermissions; private Context mContext; + private Handler mHandler; private PackageManagerInternal mPackageManagerInternal; private NotificationManagerInternal mNotificationManager; private final KeyguardManager mKeyguardManager; @@ -158,6 +164,7 @@ public final class PermissionPolicyService extends SystemService { super(context); mContext = context; + mHandler = new Handler(Looper.getMainLooper()); mPackageManager = context.getPackageManager(); mKeyguardManager = context.getSystemService(KeyguardManager.class); LocalServices.addService(PermissionPolicyInternal.class, new Internal()); @@ -1016,7 +1023,7 @@ public final class PermissionPolicyService extends SystemService { ActivityInterceptorInfo info) { String action = info.intent.getAction(); ActivityInterceptResult result = null; - if (!PackageManager.ACTION_REQUEST_PERMISSIONS_FOR_OTHER.equals(action) + if (!ACTION_REQUEST_PERMISSIONS_FOR_OTHER.equals(action) && !PackageManager.ACTION_REQUEST_PERMISSIONS.equals(action)) { return null; } @@ -1033,7 +1040,7 @@ public final class PermissionPolicyService extends SystemService { && !mContinueNotifGrantMessageUids.contains(info.realCallingUid)) { return result; } - if (PackageManager.ACTION_REQUEST_PERMISSIONS_FOR_OTHER.equals(action)) { + if (ACTION_REQUEST_PERMISSIONS_FOR_OTHER.equals(action)) { String otherPkg = info.intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME); if (otherPkg == null || (mPackageManager.getPermissionFlags( POST_NOTIFICATIONS, otherPkg, UserHandle.of(info.userId)) @@ -1052,8 +1059,8 @@ public final class PermissionPolicyService extends SystemService { public void onActivityLaunched(TaskInfo taskInfo, ActivityInfo activityInfo, ActivityInterceptorInfo info) { super.onActivityLaunched(taskInfo, activityInfo, info); - if (!shouldShowNotificationDialogOrClearFlags(info.intent, - info.checkedOptions)) { + if (!shouldShowNotificationDialogOrClearFlags(taskInfo, + activityInfo.packageName, info.intent, info.checkedOptions, true)) { return; } UserHandle user = UserHandle.of(taskInfo.userId); @@ -1085,7 +1092,7 @@ public final class PermissionPolicyService extends SystemService { return false; } - if (PackageManager.ACTION_REQUEST_PERMISSIONS_FOR_OTHER.equals(intent.getAction()) + if (ACTION_REQUEST_PERMISSIONS_FOR_OTHER.equals(intent.getAction()) && (callingUid != Process.SYSTEM_UID || !SYSTEM_PKG.equals(callingPackage))) { return false; } @@ -1104,18 +1111,48 @@ public final class PermissionPolicyService extends SystemService { launchNotificationPermissionRequestDialog(packageName, user, taskId); } + @Override + public boolean isIntentToPermissionDialog(@NonNull Intent intent) { + return Objects.equals(intent.getPackage(), + mPackageManager.getPermissionControllerPackageName()) + && (Objects.equals(intent.getAction(), ACTION_REQUEST_PERMISSIONS_FOR_OTHER) + || Objects.equals(intent.getAction(), ACTION_REQUEST_PERMISSIONS)); + } + + @Override + public boolean shouldShowNotificationDialogForTask(TaskInfo taskInfo, String currPkg, + Intent intent) { + return shouldShowNotificationDialogOrClearFlags( + taskInfo, currPkg, intent, null, false); + } + /** - * Determine if we should show a notification dialog, or clear the REVIEW_REQUIRED flag, - * from a particular package for a particular intent. Returns true if: + * Determine if a particular task is in the proper state to show a system-triggered + * permission prompt. A prompt can be shown if the task is just starting, or the task is + * currently focused, visible, and running, and, * 1. The isEligibleForLegacyPermissionPrompt ActivityOption is set, or - * 2. The intent is a launcher intent (action is ACTION_MAIN, category is LAUNCHER) + * 2. The intent is a launcher intent (action is ACTION_MAIN, category is LAUNCHER), or + * 3. The activity belongs to the same package as the one which launched the task + * originally, and the task was started with a launcher intent + * @param taskInfo The task to be checked + * @param currPkg The package of the current top visible activity + * @param intent The intent of the current top visible activity */ - private boolean shouldShowNotificationDialogOrClearFlags(Intent intent, - ActivityOptions options) { - if ((options != null && options.isEligibleForLegacyPermissionPrompt())) { - return true; + private boolean shouldShowNotificationDialogOrClearFlags(TaskInfo taskInfo, String currPkg, + Intent intent, ActivityOptions options, boolean activityStart) { + if (intent == null || currPkg == null || taskInfo == null + || (!(taskInfo.isFocused && taskInfo.isVisible && taskInfo.isRunning) + && !activityStart)) { + return false; } + return isLauncherIntent(intent) + || (options != null && options.isEligibleForLegacyPermissionPrompt()) + || (currPkg.equals(taskInfo.baseActivity.getPackageName()) + && isLauncherIntent(taskInfo.baseIntent)); + } + + private boolean isLauncherIntent(Intent intent) { return Intent.ACTION_MAIN.equals(intent.getAction()) && intent.getCategories() != null && (intent.getCategories().contains(Intent.CATEGORY_LAUNCHER) @@ -1144,14 +1181,15 @@ public final class PermissionPolicyService extends SystemService { Intent grantPermission = mPackageManager .buildRequestPermissionsIntent(new String[] { POST_NOTIFICATIONS }); grantPermission.setAction( - PackageManager.ACTION_REQUEST_PERMISSIONS_FOR_OTHER); + ACTION_REQUEST_PERMISSIONS_FOR_OTHER); grantPermission.putExtra(Intent.EXTRA_PACKAGE_NAME, pkgName); ActivityOptions options = new ActivityOptions(new Bundle()); options.setTaskOverlay(true, false); options.setLaunchTaskId(taskId); try { - mContext.startActivityAsUser(grantPermission, options.toBundle(), user); + mHandler.postDelayed(() -> mContext.startActivityAsUser( + grantPermission, options.toBundle(), user), ACTIVITY_START_DELAY_MS); } catch (Exception e) { Log.e(LOG_TAG, "couldn't start grant permission dialog" + "for other package " + pkgName, e); @@ -1170,12 +1208,6 @@ public final class PermissionPolicyService extends SystemService { } } - @Override - public boolean canShowPermissionPromptForTask(@Nullable TaskInfo taskInfo) { - return taskInfo != null && taskInfo.isFocused && taskInfo.isVisible - && taskInfo.isRunning; - } - /** * Check if the intent action is removed for the calling package (often based on target SDK * version). If the action is removed, we'll silently cancel the activity launch. diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index cc93d4c1c3ff..e79148d52715 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -2124,7 +2124,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } private void initKeyCombinationRules() { - mKeyCombinationManager = new KeyCombinationManager(); + mKeyCombinationManager = new KeyCombinationManager(mHandler); final boolean screenshotChordEnabled = mContext.getResources().getBoolean( com.android.internal.R.bool.config_enableScreenshotChord); @@ -2215,11 +2215,20 @@ public class PhoneWindowManager implements WindowManagerPolicy { mBackKeyHandled = true; interceptAccessibilityGestureTv(); } - @Override void cancel() { cancelAccessibilityGestureTv(); } + @Override + long getKeyInterceptDelayMs() { + // Use a timeout of 0 to prevent additional latency in processing of + // this key. This will potentially cause some unwanted UI actions if the + // user does end up triggering the key combination later, but in most + // cases, the user will simply hit a single key, and this will allow us + // to process it without first waiting to see if the combination is + // going to be triggered. + return 0; + } }); mKeyCombinationManager.addRule( @@ -2229,11 +2238,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { mBackKeyHandled = true; interceptBugreportGestureTv(); } - @Override void cancel() { cancelBugreportGestureTv(); } + @Override + long getKeyInterceptDelayMs() { + return 0; + } }); } } diff --git a/services/core/java/com/android/server/vibrator/VibrationSettings.java b/services/core/java/com/android/server/vibrator/VibrationSettings.java index b05b44bcb1d2..77da75118958 100644 --- a/services/core/java/com/android/server/vibrator/VibrationSettings.java +++ b/services/core/java/com/android/server/vibrator/VibrationSettings.java @@ -355,8 +355,10 @@ final class VibrationSettings { } } - if (!shouldVibrateForRingerModeLocked(usage)) { - return Vibration.Status.IGNORED_FOR_RINGER_MODE; + if (!attrs.isFlagSet(VibrationAttributes.FLAG_BYPASS_INTERRUPTION_POLICY)) { + if (!shouldVibrateForRingerModeLocked(usage)) { + return Vibration.Status.IGNORED_FOR_RINGER_MODE; + } } } return null; @@ -386,12 +388,12 @@ final class VibrationSettings { * Return {@code true} if the device should vibrate for current ringer mode. * * <p>This checks the current {@link AudioManager#getRingerModeInternal()} against user settings - * for ringtone usage only. All other usages are allowed by this method. + * for ringtone and notification usages. All other usages are allowed by this method. */ @GuardedBy("mLock") private boolean shouldVibrateForRingerModeLocked(@VibrationAttributes.Usage int usageHint) { - if (usageHint != USAGE_RINGTONE) { - // Only ringtone vibrations are disabled when phone is on silent mode. + if ((usageHint != USAGE_RINGTONE) && (usageHint != USAGE_NOTIFICATION)) { + // Only ringtone and notification vibrations are disabled when phone is on silent mode. return true; } // If audio manager was not loaded yet then assume most restrictive mode. diff --git a/services/core/java/com/android/server/vibrator/VibratorManagerService.java b/services/core/java/com/android/server/vibrator/VibratorManagerService.java index 9ec1079e46cc..1260e5dbc9f7 100644 --- a/services/core/java/com/android/server/vibrator/VibratorManagerService.java +++ b/services/core/java/com/android/server/vibrator/VibratorManagerService.java @@ -464,10 +464,9 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { && shouldCancelVibration( mCurrentExternalVibration.externalVibration.getVibrationAttributes(), usageFilter)) { - endVibrationLocked(mCurrentExternalVibration, Vibration.Status.CANCELLED); mCurrentExternalVibration.externalVibration.mute(); - mCurrentExternalVibration = null; - setExternalControl(false); + endExternalVibrateLocked(Vibration.Status.CANCELLED, + /* continueExternalControl= */ false); } } finally { Binder.restoreCallingIdentity(ident); @@ -1283,7 +1282,7 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { } /** Holder for a {@link ExternalVibration}. */ - private final class ExternalVibrationHolder { + private final class ExternalVibrationHolder implements IBinder.DeathRecipient { public final ExternalVibration externalVibration; public int scale; @@ -1308,6 +1307,18 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { mEndTimeDebug = System.currentTimeMillis(); } + public void binderDied() { + synchronized (mLock) { + if (mCurrentExternalVibration != null) { + if (DEBUG) { + Slog.d(TAG, "External vibration finished because binder died"); + } + endExternalVibrateLocked(Vibration.Status.CANCELLED, + /* continueExternalControl= */ false); + } + } + } + public Vibration.DebugInfo getDebugInfo() { return new Vibration.DebugInfo( mStartTimeDebug, mEndTimeDebug, /* effect= */ null, /* originalEffect= */ null, @@ -1450,10 +1461,36 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { } } + /** + * Ends the external vibration, and clears related service state. + * + * @param status the status to end the associated Vibration with + * @param continueExternalControl indicates whether external control will continue. If not, the + * HAL will have external control turned off. + */ + @GuardedBy("mLock") + private void endExternalVibrateLocked(Vibration.Status status, + boolean continueExternalControl) { + Trace.traceBegin(Trace.TRACE_TAG_VIBRATOR, "endExternalVibrateLocked"); + try { + if (mCurrentExternalVibration == null) { + return; + } + endVibrationLocked(mCurrentExternalVibration, status); + mCurrentExternalVibration.externalVibration.unlinkToDeath( + mCurrentExternalVibration); + mCurrentExternalVibration = null; + if (!continueExternalControl) { + setExternalControl(false); + } + } finally { + Trace.traceEnd(Trace.TRACE_TAG_VIBRATOR); + } + } + /** Implementation of {@link IExternalVibratorService} to be triggered on external control. */ @VisibleForTesting final class ExternalVibratorService extends IExternalVibratorService.Stub { - ExternalVibrationDeathRecipient mCurrentExternalDeathRecipient; @Override public int onExternalVibrationStart(ExternalVibration vib) { @@ -1469,7 +1506,7 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { return IExternalVibratorService.SCALE_MUTE; } - ExternalVibrationHolder cancelingExternalVibration = null; + boolean alreadyUnderExternalControl = false; boolean waitForCompletion = false; int scale; synchronized (mLock) { @@ -1504,13 +1541,13 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { // // Note that this doesn't support multiple concurrent external controls, as we // would need to mute the old one still if it came from a different controller. + alreadyUnderExternalControl = true; mCurrentExternalVibration.externalVibration.mute(); - endVibrationLocked(mCurrentExternalVibration, Vibration.Status.CANCELLED); - cancelingExternalVibration = mCurrentExternalVibration; + endExternalVibrateLocked(Vibration.Status.CANCELLED, + /* continueExternalControl= */ true); } mCurrentExternalVibration = new ExternalVibrationHolder(vib); - mCurrentExternalDeathRecipient = new ExternalVibrationDeathRecipient(); - vib.linkToDeath(mCurrentExternalDeathRecipient); + vib.linkToDeath(mCurrentExternalVibration); mCurrentExternalVibration.scale = mVibrationScaler.getExternalVibrationScale( vib.getVibrationAttributes().getUsage()); scale = mCurrentExternalVibration.scale; @@ -1520,14 +1557,13 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { if (!mVibrationThread.waitForThreadIdle(VIBRATION_CANCEL_WAIT_MILLIS)) { Slog.e(TAG, "Timed out waiting for vibration to cancel"); synchronized (mLock) { - stopExternalVibrateLocked(Vibration.Status.IGNORED_ERROR_CANCELLING); + endExternalVibrateLocked(Vibration.Status.IGNORED_ERROR_CANCELLING, + /* continueExternalControl= */ false); } return IExternalVibratorService.SCALE_MUTE; } } - if (cancelingExternalVibration == null) { - // We only need to set external control if it was not already set by another - // external vibration. + if (!alreadyUnderExternalControl) { if (DEBUG) { Slog.d(TAG, "Vibrator going under external control."); } @@ -1547,29 +1583,12 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { if (DEBUG) { Slog.e(TAG, "Stopping external vibration" + vib); } - stopExternalVibrateLocked(Vibration.Status.FINISHED); + endExternalVibrateLocked(Vibration.Status.FINISHED, + /* continueExternalControl= */ false); } } } - @GuardedBy("mLock") - private void stopExternalVibrateLocked(Vibration.Status status) { - Trace.traceBegin(Trace.TRACE_TAG_VIBRATOR, "stopExternalVibrateLocked"); - try { - if (mCurrentExternalVibration == null) { - return; - } - endVibrationLocked(mCurrentExternalVibration, status); - mCurrentExternalVibration.externalVibration.unlinkToDeath( - mCurrentExternalDeathRecipient); - mCurrentExternalDeathRecipient = null; - mCurrentExternalVibration = null; - setExternalControl(false); - } finally { - Trace.traceEnd(Trace.TRACE_TAG_VIBRATOR); - } - } - private boolean hasExternalControlCapability() { for (int i = 0; i < mVibrators.size(); i++) { if (mVibrators.valueAt(i).hasCapability(IVibrator.CAP_EXTERNAL_CONTROL)) { @@ -1578,19 +1597,6 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { } return false; } - - private class ExternalVibrationDeathRecipient implements IBinder.DeathRecipient { - public void binderDied() { - synchronized (mLock) { - if (mCurrentExternalVibration != null) { - if (DEBUG) { - Slog.d(TAG, "External vibration finished because binder died"); - } - stopExternalVibrateLocked(Vibration.Status.CANCELLED); - } - } - } - } } /** Provide limited functionality from {@link VibratorManagerService} as shell commands. */ diff --git a/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java b/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java index f9689a8a2bca..d4648a4f313c 100644 --- a/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java +++ b/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java @@ -27,6 +27,7 @@ import android.graphics.RectF; import android.graphics.Region; import android.os.Handler; import android.os.IBinder; +import android.os.InputConfig; import android.os.Looper; import android.os.Message; import android.util.Slog; @@ -153,7 +154,8 @@ public final class AccessibilityWindowsPopulator extends WindowInfosListener { final List<InputWindowHandle> tempVisibleWindows = new ArrayList<>(); for (InputWindowHandle window : windowHandles) { - if (window.visible && window.getWindow() != null) { + final boolean visible = (window.inputConfig & InputConfig.NOT_VISIBLE) == 0; + if (visible && window.getWindow() != null) { tempVisibleWindows.add(window); } } @@ -641,7 +643,8 @@ public final class AccessibilityWindowsPopulator extends WindowInfosListener { final RecentsAnimationController controller = service.getRecentsAnimationController(); instance.mIgnoreDuetoRecentsAnimation = windowState != null && controller != null && controller.shouldIgnoreForAccessibility(windowState); - instance.mIsTrustedOverlay = inputWindowHandle.trustedOverlay; + instance.mIsTrustedOverlay = + (inputWindowHandle.inputConfig & InputConfig.TRUSTED_OVERLAY) != 0; // TODO (b/199358388) : gets the letterbox bounds of the window from other way. if (windowState != null && windowState.areAppWindowBoundsLetterboxed()) { diff --git a/services/core/java/com/android/server/wm/ActivityInterceptorCallback.java b/services/core/java/com/android/server/wm/ActivityInterceptorCallback.java index 06c58baee1f9..1d65cbb70ffe 100644 --- a/services/core/java/com/android/server/wm/ActivityInterceptorCallback.java +++ b/services/core/java/com/android/server/wm/ActivityInterceptorCallback.java @@ -58,6 +58,7 @@ public abstract class ActivityInterceptorCallback { @IntDef(suffix = { "_ORDERED_ID" }, value = { FIRST_ORDERED_ID, PERMISSION_POLICY_ORDERED_ID, + INTENT_RESOLVER_ORDERED_ID, VIRTUAL_DEVICE_SERVICE_ORDERED_ID, LAST_ORDERED_ID // Update this when adding new ids }) @@ -75,6 +76,11 @@ public abstract class ActivityInterceptorCallback { public static final int PERMISSION_POLICY_ORDERED_ID = 1; /** + * The identifier for {@link com.android.server.pm.IntentResolverInterceptor}. + */ + public static final int INTENT_RESOLVER_ORDERED_ID = 2; + + /** * The identifier for {@link com.android.server.companion.virtual.VirtualDeviceManagerService} * interceptor. */ diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index c5e938f38d2f..89f29b3b2288 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -2452,7 +2452,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // either way, abort and reset the sequence. if (parcelable == null || mTransferringSplashScreenState != TRANSFER_SPLASH_SCREEN_COPYING - || mStartingWindow == null) { + || mStartingWindow == null + || finishing) { if (parcelable != null) { parcelable.clearIfNeeded(); } diff --git a/services/core/java/com/android/server/wm/ActivityRecordInputSink.java b/services/core/java/com/android/server/wm/ActivityRecordInputSink.java index 19d5449254ff..8622bd32fc68 100644 --- a/services/core/java/com/android/server/wm/ActivityRecordInputSink.java +++ b/services/core/java/com/android/server/wm/ActivityRecordInputSink.java @@ -19,6 +19,7 @@ package com.android.server.wm; import android.app.compat.CompatChanges; import android.compat.annotation.ChangeId; import android.os.IBinder; +import android.os.InputConfig; import android.os.InputConstants; import android.os.Looper; import android.os.Process; @@ -111,13 +112,12 @@ class ActivityRecordInputSink { mActivityRecord.getDisplayId()); inputWindowHandle.replaceTouchableRegionWithCrop = true; inputWindowHandle.name = mName; + inputWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_INPUT_CONSUMER; inputWindowHandle.ownerUid = Process.myUid(); inputWindowHandle.ownerPid = Process.myPid(); - inputWindowHandle.layoutParamsFlags = - WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL - | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH; inputWindowHandle.dispatchingTimeoutMillis = InputConstants.DEFAULT_DISPATCHING_TIMEOUT_MILLIS; + inputWindowHandle.inputConfig = InputConfig.NOT_FOCUSABLE; return inputWindowHandle; } @@ -169,5 +169,4 @@ class ActivityRecordInputSink { finishInputEvent(event, true); } } - } diff --git a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java index c5fcd12efa78..cdeb86c3ee77 100644 --- a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java +++ b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java @@ -355,10 +355,10 @@ class ActivityStartInterceptor { * @return The intercepting intent if needed. */ private Intent interceptWithConfirmCredentialsIfNeeded(ActivityInfo aInfo, int userId) { - if (!mService.mAmInternal.shouldConfirmCredentials(userId)) { + if ((aInfo.flags & ActivityInfo.FLAG_SHOW_WHEN_LOCKED) != 0 + || !mService.mAmInternal.shouldConfirmCredentials(userId)) { return null; } - // TODO(b/28935539): should allow certain activities to bypass work challenge final IntentSender target = createIntentSenderForOriginalIntent(mCallingUid, FLAG_CANCEL_CURRENT | FLAG_ONE_SHOT | FLAG_IMMUTABLE); final KeyguardManager km = (KeyguardManager) mServiceContext diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index fd2afd47bec4..ac121a13f308 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -1816,7 +1816,8 @@ class ActivityStarter { } if (mTargetRootTask == null) { - mTargetRootTask = getLaunchRootTask(mStartActivity, mLaunchFlags, targetTask, mOptions); + mTargetRootTask = getOrCreateRootTask(mStartActivity, mLaunchFlags, targetTask, + mOptions); } if (newTask) { final Task taskToAffiliate = (mLaunchTaskBehind && mSourceRecord != null) @@ -1925,7 +1926,7 @@ class ActivityStarter { } else if (mInTask != null) { return mInTask; } else { - final Task rootTask = getLaunchRootTask(mStartActivity, mLaunchFlags, null /* task */, + final Task rootTask = getOrCreateRootTask(mStartActivity, mLaunchFlags, null /* task */, mOptions); final ActivityRecord top = rootTask.getTopNonFinishingActivity(); if (top != null) { @@ -2233,7 +2234,7 @@ class ActivityStarter { if (targetTask.getRootTask() == null) { // Target root task got cleared when we all activities were removed above. // Go ahead and reset it. - mTargetRootTask = getLaunchRootTask(mStartActivity, mLaunchFlags, + mTargetRootTask = getOrCreateRootTask(mStartActivity, mLaunchFlags, null /* task */, mOptions); mTargetRootTask.addChild(targetTask, !mLaunchTaskBehind /* toTop */, (mStartActivity.info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0); @@ -2695,10 +2696,11 @@ class ActivityStarter { // launched into the same root task. mTargetRootTask = Task.fromWindowContainerToken(mSourceRecord.mLaunchRootTask); } else { - final Task launchRootTask = - getLaunchRootTask(mStartActivity, mLaunchFlags, intentTask, mOptions); + final Task rootTask = + getOrCreateRootTask(mStartActivity, mLaunchFlags, intentTask, mOptions); + // TODO(b/184806710): #getOrCreateRootTask should never return null? mTargetRootTask = - launchRootTask != null ? launchRootTask : intentActivity.getRootTask(); + rootTask != null ? rootTask : intentActivity.getRootTask(); } } @@ -2929,7 +2931,7 @@ class ActivityStarter { return launchFlags; } - private Task getLaunchRootTask(ActivityRecord r, int launchFlags, Task task, + private Task getOrCreateRootTask(ActivityRecord r, int launchFlags, Task task, ActivityOptions aOptions) { // We are reusing a task, keep the root task! if (mReuseTask != null) { @@ -2938,7 +2940,7 @@ class ActivityStarter { final boolean onTop = (aOptions == null || !aOptions.getAvoidMoveToFront()) && !mLaunchTaskBehind; - return mRootWindowContainer.getLaunchRootTask(r, aOptions, task, mSourceRootTask, onTop, + return mRootWindowContainer.getOrCreateRootTask(r, aOptions, task, mSourceRootTask, onTop, mLaunchParams, launchFlags); } diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java index cecfccd1f836..01dfb91d12be 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java @@ -680,4 +680,15 @@ public abstract class ActivityTaskManagerInternal { /** Get the app tasks for a package */ public abstract List<ActivityManager.AppTask> getAppTasks(String pkgName, int uid); + + /** + * Determine if there exists a task which meets the criteria set by the PermissionPolicyService + * to show a system-owned permission dialog over, for a given package + * @see PermissionPolicyInternal.shouldShowNotificationDialogForTask + * + * @param pkgName The package whose activity must be top + * @param uid The uid that must have a top activity + * @return a task ID if a valid task ID is found. Otherwise, return INVALID_TASK_ID + */ + public abstract int getTaskToShowPermissionDialogOn(String pkgName, int uid); } diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index bfccdf97c680..6d8b3b1d63dd 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -6754,5 +6754,13 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } return tasks; } + + @Override + public int getTaskToShowPermissionDialogOn(String pkgName, int uid) { + synchronized (ActivityTaskManagerService.this.mGlobalLock) { + return ActivityTaskManagerService.this.mRootWindowContainer + .getTaskToShowPermissionDialogOn(pkgName, uid); + } + } } } diff --git a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java index 5573f161d1c1..64f426187fd2 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java +++ b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java @@ -954,7 +954,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { // This is the first time we failed -- restart process and // retry. r.launchFailed = true; - proc.removeActivity(r, true /* keepAssociation */); + r.detachFromProcess(); throw e; } } finally { @@ -1046,6 +1046,9 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { // If a dead object exception was thrown -- fall through to // restart the application. knownToBeDead = true; + // Remove the process record so it won't be considered as alive. + mService.mProcessNames.remove(wpc.mName, wpc.mUid); + mService.mProcessMap.remove(wpc.getPid()); } r.notifyUnknownVisibilityLaunchedForKeyguardTransition(); @@ -1436,20 +1439,20 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { final Rect bounds = options.getLaunchBounds(); task.setBounds(bounds); - Task launchRootTask = - mRootWindowContainer.getLaunchRootTask(null, options, task, ON_TOP); + Task targetRootTask = + mRootWindowContainer.getOrCreateRootTask(null, options, task, ON_TOP); - if (launchRootTask != currentRootTask) { - moveHomeRootTaskToFrontIfNeeded(flags, launchRootTask.getDisplayArea(), reason); - task.reparent(launchRootTask, ON_TOP, REPARENT_KEEP_ROOT_TASK_AT_FRONT, + if (targetRootTask != currentRootTask) { + moveHomeRootTaskToFrontIfNeeded(flags, targetRootTask.getDisplayArea(), reason); + task.reparent(targetRootTask, ON_TOP, REPARENT_KEEP_ROOT_TASK_AT_FRONT, !ANIMATE, DEFER_RESUME, reason); - currentRootTask = launchRootTask; + currentRootTask = targetRootTask; reparented = true; // task.reparent() should already placed the task on top, // still need moveTaskToFrontLocked() below for any transition settings. } - if (launchRootTask.shouldResizeRootTaskWithLaunchBounds()) { - launchRootTask.resize(bounds, !PRESERVE_WINDOWS, !DEFER_RESUME); + if (targetRootTask.shouldResizeRootTaskWithLaunchBounds()) { + targetRootTask.resize(bounds, !PRESERVE_WINDOWS, !DEFER_RESUME); } else { // WM resizeTask must be done after the task is moved to the correct stack, // because Task's setBounds() also updates dim layer's bounds, but that has @@ -1693,7 +1696,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { */ boolean restoreRecentTaskLocked(Task task, ActivityOptions aOptions, boolean onTop) { final Task rootTask = - mRootWindowContainer.getLaunchRootTask(null, aOptions, task, onTop); + mRootWindowContainer.getOrCreateRootTask(null, aOptions, task, onTop); final WindowContainer parent = task.getParent(); if (parent == rootTask || task == rootTask) { diff --git a/services/core/java/com/android/server/wm/AsyncRotationController.java b/services/core/java/com/android/server/wm/AsyncRotationController.java index 9e889ad11b8e..220d9ec8febb 100644 --- a/services/core/java/com/android/server/wm/AsyncRotationController.java +++ b/services/core/java/com/android/server/wm/AsyncRotationController.java @@ -329,8 +329,12 @@ class AsyncRotationController extends FadeAnimationController implements Consume void hideImmediately(WindowToken windowToken) { final boolean original = mHideImmediately; mHideImmediately = true; + final Operation op = new Operation(Operation.ACTION_FADE); + mTargetWindowTokens.put(windowToken, op); fadeWindowToken(false /* show */, windowToken, ANIMATION_TYPE_FIXED_TRANSFORM); + op.mLeash = windowToken.getAnimationLeash(); mHideImmediately = original; + if (DEBUG) Slog.d(TAG, "hideImmediately " + windowToken.getTopChild()); } /** Returns {@code true} if the window will rotate independently. */ diff --git a/services/core/java/com/android/server/wm/DragState.java b/services/core/java/com/android/server/wm/DragState.java index 00380bb6e84e..c47d778c60bc 100644 --- a/services/core/java/com/android/server/wm/DragState.java +++ b/services/core/java/com/android/server/wm/DragState.java @@ -44,6 +44,7 @@ import android.hardware.input.InputManager; import android.os.Binder; import android.os.Build; import android.os.IBinder; +import android.os.InputConfig; import android.os.Process; import android.os.RemoteException; import android.os.UserHandle; @@ -127,7 +128,7 @@ class DragState { @Nullable private ValueAnimator mAnimator; private final Interpolator mCubicEaseOutInterpolator = new DecelerateInterpolator(1.5f); - private Point mDisplaySize = new Point(); + private final Point mDisplaySize = new Point(); // A surface used to catch input events for the drag-and-drop operation. SurfaceControl mInputSurface; @@ -160,8 +161,7 @@ class DragState { private void showInputSurface() { if (mInputSurface == null) { - mInputSurface = mService.makeSurfaceBuilder( - mService.mRoot.getDisplayContent(mDisplayContent.getDisplayId()).getSession()) + mInputSurface = mService.makeSurfaceBuilder(mDisplayContent.getSession()) .setContainerLayer() .setName("Drag and Drop Input Consumer") .setCallsite("DragState.showInputSurface") @@ -174,17 +174,18 @@ class DragState { return; } - mTransaction.show(mInputSurface); - mTransaction.setInputWindowInfo(mInputSurface, h); - mTransaction.setLayer(mInputSurface, Integer.MAX_VALUE); - + // Crop the input surface to the display size. mTmpClipRect.set(0, 0, mDisplaySize.x, mDisplaySize.y); - mTransaction.setWindowCrop(mInputSurface, mTmpClipRect); + + mTransaction.show(mInputSurface) + .setInputWindowInfo(mInputSurface, h) + .setLayer(mInputSurface, Integer.MAX_VALUE) + .setCrop(mInputSurface, mTmpClipRect); // syncInputWindows here to ensure the input window info is sent before the // transferTouchFocus is called. - mTransaction.syncInputWindows(); - mTransaction.apply(true); + mTransaction.syncInputWindows() + .apply(true /*sync*/); } /** @@ -361,29 +362,20 @@ class DragState { display.getDisplayId()); mDragWindowHandle.name = "drag"; mDragWindowHandle.token = mClientChannel.getToken(); - mDragWindowHandle.layoutParamsFlags = 0; mDragWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_DRAG; mDragWindowHandle.dispatchingTimeoutMillis = DEFAULT_DISPATCHING_TIMEOUT_MILLIS; - mDragWindowHandle.visible = true; - // Allows the system to consume keys when dragging is active. This can also be used to - // modify the drag state on key press. Example, cancel drag on escape key. - mDragWindowHandle.focusable = true; - mDragWindowHandle.hasWallpaper = false; - mDragWindowHandle.paused = false; mDragWindowHandle.ownerPid = Process.myPid(); mDragWindowHandle.ownerUid = Process.myUid(); - mDragWindowHandle.inputFeatures = 0; mDragWindowHandle.scaleFactor = 1.0f; + // Keep the default behavior of this window to be focusable, which allows the system + // to consume keys when dragging is active. This can also be used to modify the drag + // state on key press. For example, cancel drag on escape key. + mDragWindowHandle.inputConfig = InputConfig.PREVENT_SPLITTING; + // The drag window cannot receive new touches. mDragWindowHandle.touchableRegion.setEmpty(); - // The drag window covers the entire display - mDragWindowHandle.frameLeft = 0; - mDragWindowHandle.frameTop = 0; - mDragWindowHandle.frameRight = mDisplaySize.x; - mDragWindowHandle.frameBottom = mDisplaySize.y; - // Pause rotations before a drag. ProtoLog.d(WM_DEBUG_ORIENTATION, "Pausing rotation during drag"); mService.mRoot.forAllDisplays(dc -> { diff --git a/services/core/java/com/android/server/wm/InputConfigAdapter.java b/services/core/java/com/android/server/wm/InputConfigAdapter.java new file mode 100644 index 000000000000..2dcde4ee2ba8 --- /dev/null +++ b/services/core/java/com/android/server/wm/InputConfigAdapter.java @@ -0,0 +1,138 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wm; + +import android.os.InputConfig; +import android.view.InputWindowHandle.InputConfigFlags; +import android.view.WindowManager.LayoutParams; + +import java.util.List; + +/** + * A helper to determine the {@link InputConfigFlags} that control the behavior of an input window + * from several WM attributes. + */ +class InputConfigAdapter { + private InputConfigAdapter() {} + + /** Describes a mapping from a flag value to a {@link InputConfigFlags} value. */ + private static class FlagMapping { + final int mFlag; + final int mInputConfig; + final boolean mInverted; + + FlagMapping(int flag, int inputConfig, boolean inverted) { + mFlag = flag; + mInputConfig = inputConfig; + mInverted = inverted; + } + } + + /** + * A mapping from {@link LayoutParams.InputFeatureFlags} to {@link InputConfigFlags} for + * input configurations that can be mapped directly from a corresponding LayoutParams input + * feature. + */ + private static final List<FlagMapping> INPUT_FEATURE_TO_CONFIG_MAP = List.of( + new FlagMapping( + LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL, + InputConfig.NO_INPUT_CHANNEL, false /* inverted */), + new FlagMapping( + LayoutParams.INPUT_FEATURE_DISABLE_USER_ACTIVITY, + InputConfig.DISABLE_USER_ACTIVITY, false /* inverted */), + new FlagMapping( + LayoutParams.INPUT_FEATURE_SPY, + InputConfig.SPY, false /* inverted */)); + + @InputConfigFlags + private static final int INPUT_FEATURE_TO_CONFIG_MASK = + computeMask(INPUT_FEATURE_TO_CONFIG_MAP); + + /** + * A mapping from {@link LayoutParams.Flags} to {@link InputConfigFlags} for input + * configurations that can be mapped directly from a corresponding LayoutParams flag. + * + * NOTE: The layout params flag {@link LayoutParams#FLAG_NOT_FOCUSABLE} is not handled by this + * adapter, and must be handled explicitly. + */ + private static final List<FlagMapping> LAYOUT_PARAM_FLAG_TO_CONFIG_MAP = List.of( + new FlagMapping( + LayoutParams.FLAG_NOT_TOUCHABLE, + InputConfig.NOT_TOUCHABLE, false /* inverted */), + new FlagMapping( + LayoutParams.FLAG_SPLIT_TOUCH, + InputConfig.PREVENT_SPLITTING, true /* inverted */), + new FlagMapping( + LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH, + InputConfig.WATCH_OUTSIDE_TOUCH, false /* inverted */), + new FlagMapping( + LayoutParams.FLAG_SLIPPERY, + InputConfig.SLIPPERY, false /* inverted */)); + + @InputConfigFlags + private static final int LAYOUT_PARAM_FLAG_TO_CONFIG_MASK = + computeMask(LAYOUT_PARAM_FLAG_TO_CONFIG_MAP); + + /** + * Returns a mask of all the input config flags configured by + * {@link #getInputConfigFromWindowParams(int, int, int)}. + */ + @InputConfigFlags + static int getMask() { + return LAYOUT_PARAM_FLAG_TO_CONFIG_MASK | INPUT_FEATURE_TO_CONFIG_MASK + | InputConfig.IS_WALLPAPER; + } + + /** + * Get the {@link InputConfigFlags} value that provides the input window behavior specified by + * the given WindowManager attributes. + * + * Use {@link #getMask()} to get the mask of all the input config flags set by this method. + * + * @param type the window type + * @param flags the window flags + * @param inputFeatures the input feature flags + */ + @InputConfigFlags + static int getInputConfigFromWindowParams(@LayoutParams.WindowType int type, + @LayoutParams.Flags int flags, @LayoutParams.InputFeatureFlags int inputFeatures) { + return (type == LayoutParams.TYPE_WALLPAPER ? InputConfig.IS_WALLPAPER : 0) + | applyMapping(flags, LAYOUT_PARAM_FLAG_TO_CONFIG_MAP) + | applyMapping(inputFeatures, INPUT_FEATURE_TO_CONFIG_MAP); + } + + @InputConfigFlags + private static int applyMapping(int flags, List<FlagMapping> flagToConfigMap) { + int inputConfig = 0; + for (final FlagMapping mapping : flagToConfigMap) { + final boolean flagSet = (flags & mapping.mFlag) != 0; + if (flagSet != mapping.mInverted) { + inputConfig |= mapping.mInputConfig; + } + } + return inputConfig; + } + + @InputConfigFlags + private static int computeMask(List<FlagMapping> flagToConfigMap) { + int mask = 0; + for (final FlagMapping mapping : flagToConfigMap) { + mask |= mapping.mInputConfig; + } + return mask; + } +} diff --git a/services/core/java/com/android/server/wm/InputConsumerImpl.java b/services/core/java/com/android/server/wm/InputConsumerImpl.java index cbd5646968d7..59be3e05f2c0 100644 --- a/services/core/java/com/android/server/wm/InputConsumerImpl.java +++ b/services/core/java/com/android/server/wm/InputConsumerImpl.java @@ -22,6 +22,7 @@ import android.graphics.Point; import android.graphics.Rect; import android.os.Binder; import android.os.IBinder; +import android.os.InputConfig; import android.os.Process; import android.os.RemoteException; import android.os.UserHandle; @@ -70,19 +71,14 @@ class InputConsumerImpl implements IBinder.DeathRecipient { mWindowHandle.name = name; mWindowHandle.token = mClientChannel.getToken(); mWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_INPUT_CONSUMER; - mWindowHandle.layoutParamsFlags = 0; mWindowHandle.dispatchingTimeoutMillis = DEFAULT_DISPATCHING_TIMEOUT_MILLIS; - mWindowHandle.visible = true; - mWindowHandle.focusable = false; - mWindowHandle.hasWallpaper = false; - mWindowHandle.paused = false; mWindowHandle.ownerPid = Process.myPid(); mWindowHandle.ownerUid = Process.myUid(); - mWindowHandle.inputFeatures = 0; mWindowHandle.scaleFactor = 1.0f; - mWindowHandle.trustedOverlay = true; + mWindowHandle.inputConfig = InputConfig.NOT_FOCUSABLE | InputConfig.TRUSTED_OVERLAY; - mInputSurface = mService.makeSurfaceBuilder(mService.mRoot.getDisplayContent(displayId).getSession()) + mInputSurface = mService.makeSurfaceBuilder( + mService.mRoot.getDisplayContent(displayId).getSession()) .setContainerLayer() .setName("Input Consumer " + name) .setCallsite("InputConsumerImpl") diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java index c4f685b69061..8038f4404799 100644 --- a/services/core/java/com/android/server/wm/InputMonitor.java +++ b/services/core/java/com/android/server/wm/InputMonitor.java @@ -21,7 +21,6 @@ import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static android.view.WindowManager.INPUT_CONSUMER_PIP; import static android.view.WindowManager.INPUT_CONSUMER_RECENTS_ANIMATION; import static android.view.WindowManager.INPUT_CONSUMER_WALLPAPER; -import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE; import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL; import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL; @@ -53,6 +52,7 @@ import android.annotation.Nullable; import android.graphics.Region; import android.os.Handler; import android.os.IBinder; +import android.os.InputConfig; import android.os.Trace; import android.os.UserHandle; import android.util.ArrayMap; @@ -61,6 +61,7 @@ import android.util.Slog; import android.view.InputChannel; import android.view.InputWindowHandle; import android.view.SurfaceControl; +import android.view.WindowManager; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.protolog.common.ProtoLog; @@ -221,15 +222,13 @@ final class InputMonitor { inputChannel, clientPid, clientUser, mDisplayId); switch (name) { case INPUT_CONSUMER_WALLPAPER: - consumer.mWindowHandle.hasWallpaper = true; + consumer.mWindowHandle.inputConfig |= InputConfig.DUPLICATE_TOUCH_TO_WALLPAPER; break; case INPUT_CONSUMER_PIP: - // The touchable region of the Pip input window is cropped to the bounds of the - // stack, and we need FLAG_NOT_TOUCH_MODAL to ensure other events fall through - consumer.mWindowHandle.layoutParamsFlags |= FLAG_NOT_TOUCH_MODAL; + // This is a valid consumer type, but we don't need any additional configurations. break; case INPUT_CONSUMER_RECENTS_ANIMATION: - consumer.mWindowHandle.focusable = true; + consumer.mWindowHandle.inputConfig &= ~InputConfig.NOT_FOCUSABLE; break; default: throw new IllegalArgumentException("Illegal input consumer : " + name @@ -247,11 +246,24 @@ final class InputMonitor { inputWindowHandle.setToken(w.mInputChannelToken); inputWindowHandle.setDispatchingTimeoutMillis(w.getInputDispatchingTimeoutMillis()); inputWindowHandle.setTouchOcclusionMode(w.getTouchOcclusionMode()); - inputWindowHandle.setInputFeatures(w.mAttrs.inputFeatures); inputWindowHandle.setPaused(w.mActivityRecord != null && w.mActivityRecord.paused); - inputWindowHandle.setVisible(w.isVisible()); inputWindowHandle.setWindowToken(w.mClient); + // Update layout params flags to force the window to be not touch modal. We do this to + // restrict the window's touchable region to the task even if it requests touches outside + // its window bounds. An example is a dialog in primary split should get touches outside its + // window within the primary task but should not get any touches going to the secondary + // task. + int flags = w.mAttrs.flags; + if (w.mAttrs.isModal()) { + flags = flags | FLAG_NOT_TOUCH_MODAL; + } + inputWindowHandle.setLayoutParamsFlags(flags); + inputWindowHandle.setInputConfigMasked( + InputConfigAdapter.getInputConfigFromWindowParams( + w.mAttrs.type, flags, w.mAttrs.inputFeatures), + InputConfigAdapter.getMask()); + final boolean focusable = w.canReceiveKeys() && (mService.mPerDisplayFocusEnabled || mDisplayContent.isOnTop()); inputWindowHandle.setFocusable(focusable); @@ -270,17 +282,6 @@ final class InputMonitor { // what is on screen to what is actually being touched in the UI. inputWindowHandle.setScaleFactor(w.mGlobalScale != 1f ? (1f / w.mGlobalScale) : 1f); - // Update layout params flags to force the window to be not touch modal. We do this to - // restrict the window's touchable region to the task even if it request touches outside its - // window bounds. An example is a dialog in primary split should get touches outside its - // window within the primary task but should not get any touches going to the secondary - // task. - int flags = w.mAttrs.flags; - if (w.mAttrs.isModal()) { - flags = flags | FLAG_NOT_TOUCH_MODAL; - } - inputWindowHandle.setLayoutParamsFlags(flags); - boolean useSurfaceBoundsAsTouchRegion = false; SurfaceControl touchableRegionCrop = null; final Task task = w.getTask(); @@ -590,6 +591,8 @@ final class InputMonitor { if (mAddWallpaperInputConsumerHandle) { if (w.mAttrs.type == TYPE_WALLPAPER && w.isVisible()) { + mWallpaperInputConsumer.mWindowHandle + .replaceTouchableRegionWithCrop(null /* use this surface's bounds */); // Add the wallpaper input consumer above the first visible wallpaper. mWallpaperInputConsumer.show(mInputTransaction, w); mAddWallpaperInputConsumerHandle = false; @@ -631,24 +634,27 @@ final class InputMonitor { static void populateOverlayInputInfo(InputWindowHandleWrapper inputWindowHandle, WindowState w) { - populateOverlayInputInfo(inputWindowHandle, w.isVisible()); + populateOverlayInputInfo(inputWindowHandle); inputWindowHandle.setTouchOcclusionMode(w.getTouchOcclusionMode()); } // This would reset InputWindowHandle fields to prevent it could be found by input event. // We need to check if any new field of InputWindowHandle could impact the result. @VisibleForTesting - static void populateOverlayInputInfo(InputWindowHandleWrapper inputWindowHandle, - boolean isVisible) { + static void populateOverlayInputInfo(InputWindowHandleWrapper inputWindowHandle) { inputWindowHandle.setDispatchingTimeoutMillis(0); // It should never receive input. - inputWindowHandle.setVisible(isVisible); inputWindowHandle.setFocusable(false); - inputWindowHandle.setInputFeatures(INPUT_FEATURE_NO_INPUT_CHANNEL); // The input window handle without input channel must not have a token. inputWindowHandle.setToken(null); inputWindowHandle.setScaleFactor(1f); - inputWindowHandle.setLayoutParamsFlags( - FLAG_NOT_TOUCH_MODAL | FLAG_NOT_TOUCHABLE | FLAG_NOT_FOCUSABLE); + final int defaultType = WindowManager.LayoutParams.TYPE_APPLICATION; + inputWindowHandle.setLayoutParamsType(defaultType); + inputWindowHandle.setInputConfigMasked( + InputConfigAdapter.getInputConfigFromWindowParams( + defaultType, + FLAG_NOT_TOUCHABLE, + INPUT_FEATURE_NO_INPUT_CHANNEL), + InputConfigAdapter.getMask()); inputWindowHandle.clearTouchableRegion(); inputWindowHandle.setTouchableRegionCrop(null); } @@ -666,7 +672,7 @@ final class InputMonitor { inputWindowHandle.setName(name); inputWindowHandle.setLayoutParamsType(TYPE_SECURE_SYSTEM_OVERLAY); inputWindowHandle.setTrustedOverlay(true); - populateOverlayInputInfo(inputWindowHandle, true /* isVisible */); + populateOverlayInputInfo(inputWindowHandle); setInputWindowInfoIfNeeded(t, sc, inputWindowHandle); } diff --git a/services/core/java/com/android/server/wm/InputWindowHandleWrapper.java b/services/core/java/com/android/server/wm/InputWindowHandleWrapper.java index 142d2933f046..301c1846249f 100644 --- a/services/core/java/com/android/server/wm/InputWindowHandleWrapper.java +++ b/services/core/java/com/android/server/wm/InputWindowHandleWrapper.java @@ -20,10 +20,13 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.graphics.Region; import android.os.IBinder; +import android.os.InputConfig; import android.view.IWindow; import android.view.InputApplicationHandle; import android.view.InputWindowHandle; +import android.view.InputWindowHandle.InputConfigFlags; import android.view.SurfaceControl; +import android.view.WindowManager; import java.util.Objects; @@ -31,8 +34,10 @@ import java.util.Objects; * The wrapper of {@link InputWindowHandle} with field change detection to reduce unnecessary * updates to surface, e.g. if there are no changes, then skip invocation of * {@link SurfaceControl.Transaction#setInputWindowInfo(SurfaceControl, InputWindowHandle)}. + * It also sets the {@link InputConfigFlags} values for the input window. */ class InputWindowHandleWrapper { + /** The wrapped handle should not be directly exposed to avoid untracked changes. */ private final @NonNull InputWindowHandle mHandle; @@ -65,7 +70,20 @@ class InputWindowHandleWrapper { } boolean isFocusable() { - return mHandle.focusable; + return (mHandle.inputConfig & InputConfig.NOT_FOCUSABLE) == 0; + } + + boolean isPaused() { + return (mHandle.inputConfig & InputConfig.PAUSE_DISPATCHING) != 0; + } + + boolean isTrustedOverlay() { + return (mHandle.inputConfig & InputConfig.TRUSTED_OVERLAY) != 0; + } + + boolean hasWallpaper() { + return (mHandle.inputConfig & InputConfig.DUPLICATE_TOUCH_TO_WALLPAPER) + != 0; } InputApplicationHandle getInputApplicationHandle() { @@ -96,7 +114,7 @@ class InputWindowHandleWrapper { mChanged = true; } - void setLayoutParamsFlags(int flags) { + void setLayoutParamsFlags(@WindowManager.LayoutParams.Flags int flags) { if (mHandle.layoutParamsFlags == flags) { return; } @@ -136,19 +154,11 @@ class InputWindowHandleWrapper { mChanged = true; } - void setVisible(boolean visible) { - if (mHandle.visible == visible) { - return; - } - mHandle.visible = visible; - mChanged = true; - } - void setFocusable(boolean focusable) { - if (mHandle.focusable == focusable) { + if (isFocusable() == focusable) { return; } - mHandle.focusable = focusable; + mHandle.setInputConfig(InputConfig.NOT_FOCUSABLE, !focusable); mChanged = true; } @@ -161,26 +171,27 @@ class InputWindowHandleWrapper { } void setHasWallpaper(boolean hasWallpaper) { - if (mHandle.hasWallpaper == hasWallpaper) { + if (this.hasWallpaper() == hasWallpaper) { return; } - mHandle.hasWallpaper = hasWallpaper; + mHandle.setInputConfig(InputConfig.DUPLICATE_TOUCH_TO_WALLPAPER, + hasWallpaper); mChanged = true; } void setPaused(boolean paused) { - if (mHandle.paused == paused) { + if (isPaused() == paused) { return; } - mHandle.paused = paused; + mHandle.setInputConfig(InputConfig.PAUSE_DISPATCHING, paused); mChanged = true; } void setTrustedOverlay(boolean trustedOverlay) { - if (mHandle.trustedOverlay == trustedOverlay) { + if (isTrustedOverlay() == trustedOverlay) { return; } - mHandle.trustedOverlay = trustedOverlay; + mHandle.setInputConfig(InputConfig.TRUSTED_OVERLAY, trustedOverlay); mChanged = true; } @@ -208,14 +219,6 @@ class InputWindowHandleWrapper { mChanged = true; } - void setInputFeatures(int features) { - if (mHandle.inputFeatures == features) { - return; - } - mHandle.inputFeatures = features; - mChanged = true; - } - void setDisplayId(int displayId) { if (mHandle.displayId == displayId) { return; @@ -276,8 +279,14 @@ class InputWindowHandleWrapper { mChanged = true; } - boolean isTrustedOverlay() { - return mHandle.trustedOverlay; + void setInputConfigMasked(@InputConfigFlags int inputConfig, @InputConfigFlags int mask) { + final int inputConfigMasked = inputConfig & mask; + if (inputConfigMasked == (mHandle.inputConfig & mask)) { + return; + } + mHandle.inputConfig &= ~mask; + mHandle.inputConfig |= inputConfigMasked; + mChanged = true; } @Override diff --git a/services/core/java/com/android/server/wm/Letterbox.java b/services/core/java/com/android/server/wm/Letterbox.java index 4b98013a99cc..40df02c176e5 100644 --- a/services/core/java/com/android/server/wm/Letterbox.java +++ b/services/core/java/com/android/server/wm/Letterbox.java @@ -24,6 +24,7 @@ import android.graphics.Color; import android.graphics.Point; import android.graphics.Rect; import android.os.IBinder; +import android.os.InputConfig; import android.os.Process; import android.view.GestureDetector; import android.view.InputChannel; @@ -290,16 +291,12 @@ public class Letterbox { win.getDisplayId()); mWindowHandle.name = name; mWindowHandle.token = mToken; - mWindowHandle.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE - | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL - | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH - | WindowManager.LayoutParams.FLAG_SLIPPERY; mWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_INPUT_CONSUMER; mWindowHandle.dispatchingTimeoutMillis = DEFAULT_DISPATCHING_TIMEOUT_MILLIS; - mWindowHandle.visible = true; mWindowHandle.ownerPid = Process.myPid(); mWindowHandle.ownerUid = Process.myUid(); mWindowHandle.scaleFactor = 1.0f; + mWindowHandle.inputConfig = InputConfig.NOT_FOCUSABLE | InputConfig.SLIPPERY; } void updateTouchableRegion(Rect frame) { diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index b9cd657da0e2..235533341433 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -149,6 +149,7 @@ import com.android.server.LocalServices; import com.android.server.am.ActivityManagerService; import com.android.server.am.AppTimeTracker; import com.android.server.am.UserState; +import com.android.server.policy.PermissionPolicyInternal; import com.android.server.policy.WindowManagerPolicy; import java.io.FileDescriptor; @@ -2727,9 +2728,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> return false; } - Task getLaunchRootTask(@Nullable ActivityRecord r, @Nullable ActivityOptions options, + Task getOrCreateRootTask(@Nullable ActivityRecord r, @Nullable ActivityOptions options, @Nullable Task candidateTask, boolean onTop) { - return getLaunchRootTask(r, options, candidateTask, null /* sourceTask */, onTop, + return getOrCreateRootTask(r, options, candidateTask, null /* sourceTask */, onTop, null /* launchParams */, 0 /* launchFlags */); } @@ -2744,63 +2745,68 @@ class RootWindowContainer extends WindowContainer<DisplayContent> * @param launchFlags The launch flags for this launch. * @param realCallingPid The pid from {@link ActivityStarter#setRealCallingPid} * @param realCallingUid The uid from {@link ActivityStarter#setRealCallingUid} - * @return The root task to use for the launch or INVALID_TASK_ID. + * @return The root task to use for the launch. */ - Task getLaunchRootTask(@Nullable ActivityRecord r, + Task getOrCreateRootTask(@Nullable ActivityRecord r, @Nullable ActivityOptions options, @Nullable Task candidateTask, @Nullable Task sourceTask, boolean onTop, @Nullable LaunchParamsController.LaunchParams launchParams, int launchFlags) { - int taskId = INVALID_TASK_ID; - int displayId = INVALID_DISPLAY; - TaskDisplayArea taskDisplayArea = null; - - // We give preference to the launch preference in activity options. + // First preference goes to the launch root task set in the activity options. if (options != null) { - taskId = options.getLaunchTaskId(); - displayId = options.getLaunchDisplayId(); - final WindowContainerToken daToken = options.getLaunchTaskDisplayArea(); - taskDisplayArea = daToken != null - ? (TaskDisplayArea) WindowContainer.fromBinder(daToken.asBinder()) : null; - - final Task rootTask = Task.fromWindowContainerToken(options.getLaunchRootTask()); - if (rootTask != null) { - return rootTask; + final Task candidateRoot = Task.fromWindowContainerToken(options.getLaunchRootTask()); + if (canLaunchOnDisplay(r, candidateRoot)) { + return candidateRoot; } } - // First preference for root task goes to the task Id set in the activity options. Use - // the root task associated with that if possible. - if (taskId != INVALID_TASK_ID) { - // Temporarily set the task id to invalid in case in re-entry. - options.setLaunchTaskId(INVALID_TASK_ID); - final Task task = anyTaskForId(taskId, - MATCH_ATTACHED_TASK_OR_RECENT_TASKS_AND_RESTORE, options, onTop); - options.setLaunchTaskId(taskId); - if (task != null) { - return task.getRootTask(); + // Next preference goes to the task id set in the activity options. + if (options != null) { + final int candidateTaskId = options.getLaunchTaskId(); + if (candidateTaskId != INVALID_TASK_ID) { + // Temporarily set the task id to invalid in case in re-entry. + options.setLaunchTaskId(INVALID_TASK_ID); + final Task task = anyTaskForId(candidateTaskId, + MATCH_ATTACHED_TASK_OR_RECENT_TASKS_AND_RESTORE, options, onTop); + options.setLaunchTaskId(candidateTaskId); + if (canLaunchOnDisplay(r, task)) { + return task.getRootTask(); + } } } - final int activityType = resolveActivityType(r, options, candidateTask); - Task rootTask = null; - - // Next preference for root task goes to the taskDisplayArea candidate. - if (launchParams != null && launchParams.mPreferredTaskDisplayArea != null - && canLaunchOnDisplay(r, launchParams.mPreferredTaskDisplayArea.getDisplayId())) { + // Next preference goes to the TaskDisplayArea candidate from launchParams + // or activity options. + TaskDisplayArea taskDisplayArea = null; + if (launchParams != null && launchParams.mPreferredTaskDisplayArea != null) { taskDisplayArea = launchParams.mPreferredTaskDisplayArea; + } else if (options != null) { + final WindowContainerToken daToken = options.getLaunchTaskDisplayArea(); + taskDisplayArea = daToken != null + ? (TaskDisplayArea) WindowContainer.fromBinder(daToken.asBinder()) : null; + if (taskDisplayArea == null) { + final int launchDisplayId = options.getLaunchDisplayId(); + if (launchDisplayId != INVALID_DISPLAY) { + final DisplayContent displayContent = getDisplayContent(launchDisplayId); + if (displayContent != null) { + taskDisplayArea = displayContent.getDefaultTaskDisplayArea(); + } + } + } } - if (taskDisplayArea == null && displayId != INVALID_DISPLAY - && canLaunchOnDisplay(r, displayId)) { - taskDisplayArea = getDisplayContent(displayId).getDefaultTaskDisplayArea(); - } + + final int activityType = resolveActivityType(r, options, candidateTask); if (taskDisplayArea != null) { - return taskDisplayArea.getOrCreateRootTask(r, options, candidateTask, - sourceTask, launchParams, launchFlags, activityType, onTop); + if (canLaunchOnDisplay(r, taskDisplayArea.getDisplayId())) { + return taskDisplayArea.getOrCreateRootTask(r, options, candidateTask, + sourceTask, launchParams, launchFlags, activityType, onTop); + } else { + taskDisplayArea = null; + } } // Give preference to the root task and display of the input task and activity if they // match the mode we want to launch into. - TaskDisplayArea container = null; + Task rootTask = null; if (candidateTask != null) { rootTask = candidateTask.getRootTask(); } @@ -2810,10 +2816,11 @@ class RootWindowContainer extends WindowContainer<DisplayContent> int windowingMode = launchParams != null ? launchParams.mWindowingMode : WindowConfiguration.WINDOWING_MODE_UNDEFINED; if (rootTask != null) { - container = rootTask.getDisplayArea(); - if (container != null && canLaunchOnDisplay(r, container.mDisplayContent.mDisplayId)) { + taskDisplayArea = rootTask.getDisplayArea(); + if (taskDisplayArea != null + && canLaunchOnDisplay(r, taskDisplayArea.mDisplayContent.mDisplayId)) { if (windowingMode == WindowConfiguration.WINDOWING_MODE_UNDEFINED) { - windowingMode = container.resolveWindowingMode(r, options, candidateTask); + windowingMode = taskDisplayArea.resolveWindowingMode(r, options, candidateTask); } // Always allow organized tasks that created by organizer since the activity type // of an organized task is decided by the activity type of its top child, which @@ -2822,19 +2829,32 @@ class RootWindowContainer extends WindowContainer<DisplayContent> || rootTask.mCreatedByOrganizer) { return rootTask; } + } else { + taskDisplayArea = null; } + } - if (container == null - || !canLaunchOnDisplay(r, container.mDisplayContent.mDisplayId)) { - container = getDefaultTaskDisplayArea(); - if (windowingMode == WindowConfiguration.WINDOWING_MODE_UNDEFINED) { - windowingMode = container.resolveWindowingMode(r, options, candidateTask); - } + // Falling back to default task container + if (taskDisplayArea == null) { + taskDisplayArea = getDefaultTaskDisplayArea(); + } + return taskDisplayArea.getOrCreateRootTask(r, options, candidateTask, sourceTask, + launchParams, launchFlags, activityType, onTop); + } + + private boolean canLaunchOnDisplay(ActivityRecord r, Task task) { + if (task == null) { + Slog.w(TAG, "canLaunchOnDisplay(), invalid task: " + task); + return false; + } + + if (!task.isAttached()) { + Slog.w(TAG, "canLaunchOnDisplay(), Task is not attached: " + task); + return false; } - return container.getOrCreateRootTask(r, options, candidateTask, sourceTask, launchParams, - launchFlags, activityType, onTop); + return canLaunchOnDisplay(r, task.getTaskDisplayArea().getDisplayId()); } /** @return true if activity record is null or can be launched on provided display. */ @@ -2842,7 +2862,11 @@ class RootWindowContainer extends WindowContainer<DisplayContent> if (r == null) { return true; } - return r.canBeLaunchedOnDisplay(displayId); + if (!r.canBeLaunchedOnDisplay(displayId)) { + Slog.w(TAG, "Not allow to launch " + r + " on display " + displayId); + return false; + } + return true; } int resolveActivityType(@Nullable ActivityRecord r, @Nullable ActivityOptions options, @@ -3212,12 +3236,12 @@ class RootWindowContainer extends WindowContainer<DisplayContent> if (aOptions != null) { // Resolve the root task the task should be placed in now based on options // and reparent if needed. - final Task launchRootTask = - getLaunchRootTask(null, aOptions, task, onTop); - if (launchRootTask != null && task.getRootTask() != launchRootTask) { + final Task targetRootTask = + getOrCreateRootTask(null, aOptions, task, onTop); + if (targetRootTask != null && task.getRootTask() != targetRootTask) { final int reparentMode = onTop ? REPARENT_MOVE_ROOT_TASK_TO_FRONT : REPARENT_LEAVE_ROOT_TASK_IN_PLACE; - task.reparent(launchRootTask, onTop, reparentMode, ANIMATE, DEFER_RESUME, + task.reparent(targetRootTask, onTop, reparentMode, ANIMATE, DEFER_RESUME, "anyTaskForId"); } } @@ -3309,6 +3333,36 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } /** + * Iterate over all task fragments, to see if there exists one that meets the + * PermissionPolicyService's criteria to show a permission dialog. + */ + public int getTaskToShowPermissionDialogOn(String pkgName, int uid) { + PermissionPolicyInternal pPi = mService.getPermissionPolicyInternal(); + if (pPi == null) { + return INVALID_TASK_ID; + } + + final int[] validTaskId = {INVALID_TASK_ID}; + forAllLeafTaskFragments(fragment -> { + ActivityRecord record = fragment.getActivity((r) -> { + // skip hidden (or about to hide) apps, or the permission dialog + return r.canBeTopRunning() && r.isVisibleRequested() + && !pPi.isIntentToPermissionDialog(r.intent); + }); + if (record != null && record.isUid(uid) + && Objects.equals(pkgName, record.packageName) + && pPi.shouldShowNotificationDialogForTask(record.getTask().getTaskInfo(), + pkgName, record.intent)) { + validTaskId[0] = record.getTask().mTaskId; + return true; + } + return false; + }); + + return validTaskId[0]; + } + + /** * Dumps the activities matching the given {@param name} in the either the focused root task * or all visible root tasks if {@param dumpVisibleRootTasksOnly} is true. */ diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 7fe34f47c53c..923ac41cec77 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -504,13 +504,6 @@ class Task extends TaskFragment { */ boolean mInRemoveTask; - // When non-null, this is a transaction that will get applied on the next frame returned after - // a relayout is requested from the client. While this is only valid on a leaf task; since the - // transaction can effect an ancestor task, this also needs to keep track of the ancestor task - // that this transaction manipulates because deferUntilFrame acts on individual surfaces. - SurfaceControl.Transaction mMainWindowSizeChangeTransaction; - Task mMainWindowSizeChangeTask; - private final AnimatingActivityRegistry mAnimatingActivityRegistry = new AnimatingActivityRegistry(); @@ -4390,17 +4383,16 @@ class Task extends TaskFragment { leaf.setMainWindowSizeChangeTransaction(t, origin); return; } - mMainWindowSizeChangeTransaction = t; - mMainWindowSizeChangeTask = t == null ? null : origin; - } - - SurfaceControl.Transaction getMainWindowSizeChangeTransaction() { - return mMainWindowSizeChangeTransaction; + final WindowState w = getTopVisibleAppMainWindow(); + if (w != null) { + w.applyWithNextDraw((d) -> { + d.merge(t); + }); + } else { + t.apply(); + } } - Task getMainWindowSizeChangeTask() { - return mMainWindowSizeChangeTask; - } void setActivityWindowingMode(int windowingMode) { PooledConsumer c = PooledLambda.obtainConsumer(ActivityRecord::setWindowingMode, diff --git a/services/core/java/com/android/server/wm/TaskPositioner.java b/services/core/java/com/android/server/wm/TaskPositioner.java index 348cfb62582e..47c397d12720 100644 --- a/services/core/java/com/android/server/wm/TaskPositioner.java +++ b/services/core/java/com/android/server/wm/TaskPositioner.java @@ -40,6 +40,7 @@ import android.graphics.Point; import android.graphics.Rect; import android.os.Binder; import android.os.IBinder; +import android.os.InputConfig; import android.os.Process; import android.os.RemoteException; import android.os.Trace; @@ -219,30 +220,17 @@ class TaskPositioner implements IBinder.DeathRecipient { displayContent.getDisplayId()); mDragWindowHandle.name = TAG; mDragWindowHandle.token = mClientChannel.getToken(); - mDragWindowHandle.layoutParamsFlags = 0; mDragWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_DRAG; mDragWindowHandle.dispatchingTimeoutMillis = DEFAULT_DISPATCHING_TIMEOUT_MILLIS; - mDragWindowHandle.visible = true; - // When dragging the window around, we do not want to steal focus for the window. - mDragWindowHandle.focusable = false; - mDragWindowHandle.hasWallpaper = false; - mDragWindowHandle.paused = false; mDragWindowHandle.ownerPid = Process.myPid(); mDragWindowHandle.ownerUid = Process.myUid(); - mDragWindowHandle.inputFeatures = 0; mDragWindowHandle.scaleFactor = 1.0f; + // When dragging the window around, we do not want to steal focus for the window. + mDragWindowHandle.inputConfig = InputConfig.NOT_FOCUSABLE; // The drag window cannot receive new touches. mDragWindowHandle.touchableRegion.setEmpty(); - // The drag window covers the entire display. - final Rect displayBounds = mTmpRect; - displayContent.getBounds(mTmpRect); - mDragWindowHandle.frameLeft = displayBounds.left; - mDragWindowHandle.frameTop = displayBounds.top; - mDragWindowHandle.frameRight = displayBounds.right; - mDragWindowHandle.frameBottom = displayBounds.bottom; - // Pause rotations before a drag. ProtoLog.d(WM_DEBUG_ORIENTATION, "Pausing rotation during re-position"); mDisplayContent.getDisplayRotation().pause(); @@ -250,6 +238,8 @@ class TaskPositioner implements IBinder.DeathRecipient { // Notify InputMonitor to take mDragWindowHandle. mService.mTaskPositioningController.showInputSurface(win.getDisplayId()); + final Rect displayBounds = mTmpRect; + displayContent.getBounds(displayBounds); final DisplayMetrics displayMetrics = displayContent.getDisplayMetrics(); mMinVisibleWidth = dipToPixel(MINIMUM_VISIBLE_WIDTH_IN_DP, displayMetrics); mMinVisibleHeight = dipToPixel(MINIMUM_VISIBLE_HEIGHT_IN_DP, displayMetrics); diff --git a/services/core/java/com/android/server/wm/TaskPositioningController.java b/services/core/java/com/android/server/wm/TaskPositioningController.java index 8f24f2615fac..68bf2b2424e7 100644 --- a/services/core/java/com/android/server/wm/TaskPositioningController.java +++ b/services/core/java/com/android/server/wm/TaskPositioningController.java @@ -83,17 +83,18 @@ class TaskPositioningController { return; } - mTransaction.show(mInputSurface); - mTransaction.setInputWindowInfo(mInputSurface, h); - mTransaction.setLayer(mInputSurface, Integer.MAX_VALUE); - final Display display = dc.getDisplay(); final Point p = new Point(); display.getRealSize(p); - mTmpClipRect.set(0, 0, p.x, p.y); - mTransaction.setWindowCrop(mInputSurface, mTmpClipRect); - mTransaction.syncInputWindows().apply(); + + mTransaction.show(mInputSurface) + .setInputWindowInfo(mInputSurface, h) + .setLayer(mInputSurface, Integer.MAX_VALUE) + .setPosition(mInputSurface, 0, 0) + .setCrop(mInputSurface, mTmpClipRect) + .syncInputWindows() + .apply(); } boolean startMovingTask(IWindow window, float startX, float startY) { diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index 29d17429fa6a..b096bf1412cb 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -1526,6 +1526,9 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe if (task != null && task.voiceSession != null) { flags |= FLAG_IS_VOICE_INTERACTION; } + if (task != null && task.isTranslucent(null)) { + flags |= FLAG_TRANSLUCENT; + } final ActivityRecord record = wc.asActivityRecord(); if (record != null) { if (record.mUseTransferredAnimation) { diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 56014adb705d..dab02dec5f7d 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -73,6 +73,7 @@ import android.annotation.Nullable; import android.content.Context; import android.content.pm.ActivityInfo; import android.content.res.Configuration; +import android.graphics.Color; import android.graphics.Point; import android.graphics.Rect; import android.os.Debug; @@ -3807,7 +3808,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< private void setTaskBackgroundColor(@ColorInt int backgroundColor) { TaskDisplayArea taskDisplayArea = getTaskDisplayArea(); - if (taskDisplayArea != null) { + if (taskDisplayArea != null && backgroundColor != Color.TRANSPARENT) { taskDisplayArea.setBackgroundColor(backgroundColor); // Atomic counter to make sure the clearColor callback is only called one. diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 555128bc1374..49d9b65dde68 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -141,6 +141,7 @@ import static com.android.server.wm.WindowManagerServiceDumpProto.HARD_KEYBOARD_ import static com.android.server.wm.WindowManagerServiceDumpProto.INPUT_METHOD_WINDOW; import static com.android.server.wm.WindowManagerServiceDumpProto.POLICY; import static com.android.server.wm.WindowManagerServiceDumpProto.ROOT_WINDOW_CONTAINER; +import static com.android.server.wm.WindowManagerServiceDumpProto.WINDOW_FRAMES_VALID; import android.Manifest; import android.Manifest.permission; @@ -191,6 +192,7 @@ import android.os.Handler; import android.os.HandlerExecutor; import android.os.IBinder; import android.os.IRemoteCallback; +import android.os.InputConfig; import android.os.Looper; import android.os.Message; import android.os.Parcel; @@ -6437,9 +6439,13 @@ public class WindowManagerService extends IWindowManager.Stub imeWindow.writeIdentifierToProto(proto, INPUT_METHOD_WINDOW); } proto.write(DISPLAY_FROZEN, mDisplayFrozen); - final DisplayContent defaultDisplayContent = getDefaultDisplayContentLocked(); proto.write(FOCUSED_DISPLAY_ID, topFocusedDisplayContent.getDisplayId()); proto.write(HARD_KEYBOARD_AVAILABLE, mHardKeyboardAvailable); + + // This is always true for now since we still update the window frames at the server side. + // Once we move the window layout to the client side, this can be false when we are waiting + // for the frames. + proto.write(WINDOW_FRAMES_VALID, true); } private void dumpWindowsLocked(PrintWriter pw, boolean dumpAll, @@ -8447,43 +8453,48 @@ public class WindowManagerService extends IWindowManager.Stub } private void updateInputChannel(IBinder channelToken, int callingUid, int callingPid, - int displayId, SurfaceControl surface, String name, - InputApplicationHandle applicationHandle, int flags, - int privateFlags, int type, Region region, IWindow window) { - InputWindowHandle h = new InputWindowHandle(applicationHandle, displayId); + int displayId, SurfaceControl surface, String name, + InputApplicationHandle applicationHandle, int flags, + int privateFlags, int type, Region region, IWindow window) { + final InputWindowHandle h = new InputWindowHandle(applicationHandle, displayId); h.token = channelToken; h.setWindowToken(window); h.name = name; flags = sanitizeFlagSlippery(flags, name, callingUid, callingPid); - final int sanitizedFlags = flags & (FLAG_NOT_TOUCHABLE - | FLAG_SLIPPERY | LayoutParams.FLAG_NOT_FOCUSABLE); - h.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | sanitizedFlags; + final int sanitizedLpFlags = + (flags & (FLAG_NOT_TOUCHABLE | FLAG_SLIPPERY | LayoutParams.FLAG_NOT_FOCUSABLE)) + | LayoutParams.FLAG_NOT_TOUCH_MODAL; h.layoutParamsType = type; - h.dispatchingTimeoutMillis = DEFAULT_DISPATCHING_TIMEOUT_MILLIS; - h.focusable = (flags & LayoutParams.FLAG_NOT_FOCUSABLE) == 0; - h.hasWallpaper = false; - h.paused = false; + h.layoutParamsFlags = sanitizedLpFlags; + + // Do not allow any input features to be set without sanitizing them first. + h.inputConfig = InputConfigAdapter.getInputConfigFromWindowParams( + type, sanitizedLpFlags, 0 /*inputFeatures*/); + + if ((flags & LayoutParams.FLAG_NOT_FOCUSABLE) != 0) { + h.inputConfig |= InputConfig.NOT_FOCUSABLE; + } + + // Check private trusted overlay flag to set trustedOverlay field of input window handle. + if ((privateFlags & PRIVATE_FLAG_TRUSTED_OVERLAY) != 0) { + h.inputConfig |= InputConfig.TRUSTED_OVERLAY; + } + + h.dispatchingTimeoutMillis = DEFAULT_DISPATCHING_TIMEOUT_MILLIS; h.ownerUid = callingUid; h.ownerPid = callingPid; - // Do not allow any input features to be set without sanitizing them first. - h.inputFeatures = 0; - if (region == null) { - h.replaceTouchableRegionWithCrop(null); + h.replaceTouchableRegionWithCrop = true; } else { h.touchableRegion.set(region); - h.replaceTouchableRegionWithCrop = false; - h.setTouchableRegionCrop(surface); } + h.setTouchableRegionCrop(null /* use the input surface's bounds */); - // Check private trusted overlay flag to set trustedOverlay field of input window handle. - h.trustedOverlay = (privateFlags & PRIVATE_FLAG_TRUSTED_OVERLAY) != 0; - - SurfaceControl.Transaction t = mTransactionFactory.get(); + final SurfaceControl.Transaction t = mTransactionFactory.get(); t.setInputWindowInfo(surface, h); t.apply(); t.close(); diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 8ee6feb26a53..db687f627bfa 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1190,6 +1190,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mActivityRecord != null ? mActivityRecord.getInputApplicationHandle(false /* update */) : null, getDisplayId())); + mInputWindowHandle.setFocusable(false); mInputWindowHandle.setOwnerPid(s.mPid); mInputWindowHandle.setOwnerUid(s.mUid); mInputWindowHandle.setName(getName()); @@ -5987,15 +5988,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP finishDrawing(null); mWmService.mH.removeMessages(WINDOW_STATE_BLAST_SYNC_TIMEOUT, this); if (!useBLASTSync()) return; - - final Task task = getTask(); - if (task != null) { - final SurfaceControl.Transaction t = task.getMainWindowSizeChangeTransaction(); - if (t != null) { - mSyncTransaction.merge(t); - } - task.setMainWindowSizeChangeTransaction(null); - } } @Override @@ -6032,10 +6024,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP if (mRedrawForSyncReported) { return false; } - final Task task = getTask(); - if (task != null && task.getMainWindowSizeChangeTransaction() != null) { - return true; - } return useBLASTSync(); } diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index c17961e8a564..285a6d5bdf5f 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -442,50 +442,6 @@ class WindowStateAnimator { return mService.useBLASTSync() && mWin.useBLASTSync(); } - private boolean shouldConsumeMainWindowSizeTransaction() { - // We only consume the transaction when the client is calling relayout - // because this is the only time we know the frameNumber will be valid - // due to the client renderer being paused. Put otherwise, only when - // mInRelayout is true can we guarantee the next frame will contain - // the most recent configuration. - if (!mWin.mInRelayout) return false; - // Since we can only do this for one window, we focus on the main application window - if (mAttrType != TYPE_BASE_APPLICATION) return false; - final Task task = mWin.getTask(); - if (task == null) return false; - if (task.getMainWindowSizeChangeTransaction() == null) return false; - // Likewise we only focus on the task root, since we can only use one window - if (!mWin.mActivityRecord.isRootOfTask()) return false; - return true; - } - - void setSurfaceBoundariesLocked(SurfaceControl.Transaction t) { - if (mSurfaceController == null) { - return; - } - - final WindowState w = mWin; - final Task task = w.getTask(); - if (shouldConsumeMainWindowSizeTransaction()) { - if (isInBlastSync()) { - // If we're in a sync transaction, there's no need to call defer transaction. - // The sync transaction will contain the buffer so the bounds change transaction - // will only be applied with the buffer. - t.merge(task.getMainWindowSizeChangeTransaction()); - task.setMainWindowSizeChangeTransaction(null); - } else { - mWin.applyWithNextDraw(finishedFrame -> { - final SurfaceControl.Transaction sizeChangedTransaction = - task.getMainWindowSizeChangeTransaction(); - if (sizeChangedTransaction != null) { - finishedFrame.merge(sizeChangedTransaction); - task.setMainWindowSizeChangeTransaction(null); - } - }); - } - } - } - void prepareSurfaceLocked(SurfaceControl.Transaction t) { final WindowState w = mWin; if (!hasSurface()) { @@ -501,8 +457,6 @@ class WindowStateAnimator { computeShownFrameLocked(); - setSurfaceBoundariesLocked(t); - if (w.isParentWindowHidden() || !w.isOnScreen()) { hide(t, "prepareSurfaceLocked"); mWallpaperControllerLocked.hideWallpapers(w); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 236f663a9dd0..5388f171854d 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -87,6 +87,7 @@ import static android.app.admin.DevicePolicyManager.PRIVATE_DNS_MODE_UNKNOWN; import static android.app.admin.DevicePolicyManager.PRIVATE_DNS_SET_ERROR_FAILURE_SETTING; import static android.app.admin.DevicePolicyManager.PRIVATE_DNS_SET_NO_ERROR; import static android.app.admin.DevicePolicyManager.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER; +import static android.app.admin.DevicePolicyManager.STATE_USER_SETUP_FINALIZED; import static android.app.admin.DevicePolicyManager.STATE_USER_UNMANAGED; import static android.app.admin.DevicePolicyManager.STATUS_ACCOUNTS_NOT_EMPTY; import static android.app.admin.DevicePolicyManager.STATUS_CANNOT_ADD_MANAGED_PROFILE; @@ -9183,10 +9184,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } @Override - public void setUserProvisioningState(int newState, int userHandle) { + public void setUserProvisioningState(int newState, int userId) { if (!mHasFeature) { logMissingFeatureAction("Cannot set provisioning state " + newState + " for user " - + userHandle); + + userId); return; } @@ -9196,12 +9197,24 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { final CallerIdentity caller = getCallerIdentity(); final long id = mInjector.binderClearCallingIdentity(); try { - if (userHandle != mOwners.getDeviceOwnerUserId() && !mOwners.hasProfileOwner(userHandle) - && getManagedUserId(userHandle) == -1 - && newState != STATE_USER_UNMANAGED) { - // No managed device, user or profile, so setting provisioning state makes no sense. - throw new IllegalStateException("Not allowed to change provisioning state unless a " - + "device or profile owner is set."); + int deviceOwnerUserId = mOwners.getDeviceOwnerUserId(); + // NOTE: multiple if statements are nested below so it can log more info on error + if (userId != deviceOwnerUserId) { + boolean hasProfileOwner = mOwners.hasProfileOwner(userId); + if (!hasProfileOwner) { + int managedUserId = getManagedUserId(userId); + if (managedUserId == -1 && newState != STATE_USER_UNMANAGED) { + // No managed device, user or profile, so setting provisioning state makes + // no sense. + String error = "Not allowed to change provisioning state unless a " + + "device or profile owner is set."; + Slogf.w(LOG_TAG, "setUserProvisioningState(newState=%d, userId=%d) failed: " + + "deviceOwnerId=%d, hasProfileOwner=%b, managedUserId=%d, err=%s", + newState, userId, deviceOwnerUserId, hasProfileOwner, + managedUserId, error); + throw new IllegalStateException(error); + } + } } synchronized (getLockObject()) { @@ -9211,9 +9224,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { if (isAdb(caller)) { // ADB shell can only move directly from un-managed to finalized as part of // directly setting profile-owner or device-owner. - if (getUserProvisioningState(userHandle) + if (getUserProvisioningState(userId) != DevicePolicyManager.STATE_USER_UNMANAGED - || newState != DevicePolicyManager.STATE_USER_SETUP_FINALIZED) { + || newState != STATE_USER_SETUP_FINALIZED) { throw new IllegalStateException("Not allowed to change provisioning state " + "unless current provisioning state is unmanaged, and new state" + "is finalized."); @@ -9221,14 +9234,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { transitionCheckNeeded = false; } - final DevicePolicyData policyData = getUserData(userHandle); + final DevicePolicyData policyData = getUserData(userId); if (transitionCheckNeeded) { // Optional state transition check for non-ADB case. checkUserProvisioningStateTransition(policyData.mUserProvisioningState, newState); } policyData.mUserProvisioningState = newState; - saveSettingsLocked(userHandle); + saveSettingsLocked(userId); } } finally { mInjector.binderRestoreCallingIdentity(id); @@ -9247,7 +9260,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { case DevicePolicyManager.STATE_USER_SETUP_INCOMPLETE: case DevicePolicyManager.STATE_USER_SETUP_COMPLETE: // Can only move to finalized from these states. - if (newState == DevicePolicyManager.STATE_USER_SETUP_FINALIZED) { + if (newState == STATE_USER_SETUP_FINALIZED) { return; } break; @@ -9259,7 +9272,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { return; } break; - case DevicePolicyManager.STATE_USER_SETUP_FINALIZED: + case STATE_USER_SETUP_FINALIZED: // Cannot transition out of finalized. break; case DevicePolicyManager.STATE_USER_PROFILE_FINALIZED: @@ -18080,7 +18093,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { final CallerIdentity caller = getCallerIdentity(); Preconditions.checkCallAuthorization( - hasCallingOrSelfPermission(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS)); + hasCallingOrSelfPermission(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) + || (hasCallingOrSelfPermission(permission.PROVISION_DEMO_DEVICE) + && provisioningParams.isDemoDevice())); provisioningParams.logParams(callerPackage); @@ -18117,8 +18132,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } disallowAddUser(); - setAdminCanGrantSensorsPermissionForUserUnchecked(deviceOwnerUserId, - provisioningParams.canDeviceOwnerGrantSensorsPermissions()); + setAdminCanGrantSensorsPermissionForUserUnchecked( + deviceOwnerUserId, provisioningParams.canDeviceOwnerGrantSensorsPermissions()); + setDemoDeviceStateUnchecked(deviceOwnerUserId, provisioningParams.isDemoDevice()); onProvisionFullyManagedDeviceCompleted(provisioningParams); sendProvisioningCompletedBroadcast( deviceOwnerUserId, @@ -18317,6 +18333,19 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } } + private void setDemoDeviceStateUnchecked(@UserIdInt int userId, boolean isDemoDevice) { + Slogf.d(LOG_TAG, "setDemoDeviceStateUnchecked(%d, %b)", + userId, isDemoDevice); + if (!isDemoDevice) { + return; + } + synchronized (getLockObject()) { + mInjector.settingsGlobalPutStringForUser( + Settings.Global.DEVICE_DEMO_MODE, Integer.toString(/* value= */ 1), userId); + } + setUserProvisioningState(STATE_USER_SETUP_FINALIZED, userId); + } + private void updateAdminCanGrantSensorsPermissionCache(@UserIdInt int userId) { synchronized (getLockObject()) { diff --git a/services/robotests/backup/src/com/android/server/backup/TransportManagerTest.java b/services/robotests/backup/src/com/android/server/backup/TransportManagerTest.java index b7f8c00896d4..8a9845b1c2d2 100644 --- a/services/robotests/backup/src/com/android/server/backup/TransportManagerTest.java +++ b/services/robotests/backup/src/com/android/server/backup/TransportManagerTest.java @@ -16,6 +16,10 @@ package com.android.server.backup; +import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT; +import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED; +import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED; + import static com.android.server.backup.testing.TransportData.genericTransport; import static com.android.server.backup.testing.TransportTestUtils.mockTransport; import static com.android.server.backup.testing.TransportTestUtils.setUpTransportsForTransportManager; @@ -312,6 +316,86 @@ public class TransportManagerTest { } @Test + public void testOnPackageChanged_whenPackageChanged_packageDisabledUnregistersTransport() + throws Exception { + TransportManager transportManager = + createTransportManagerWithRegisteredTransports(mTransportA1, mTransportB1); + reset(mListener); + + mContext.getPackageManager() + .setApplicationEnabledSetting( + PACKAGE_A, + Integer.valueOf(COMPONENT_ENABLED_STATE_DISABLED), + 0 /*flags*/); + transportManager.onPackageChanged(PACKAGE_A, PACKAGE_A); + + assertRegisteredTransports(transportManager, singletonList(mTransportB1)); + verify(mListener, never()).onTransportRegistered(any(), any()); + } + + @Test + public void testOnPackageChanged_whenPackageChanged_packageEnabledRegistersTransport() + throws Exception { + TransportManager transportManager = + createTransportManagerWithRegisteredTransports(mTransportA1, mTransportB1); + reset(mListener); + + mContext.getPackageManager() + .setApplicationEnabledSetting( + PACKAGE_A, + Integer.valueOf(COMPONENT_ENABLED_STATE_DISABLED), + 0 /*flags*/); + transportManager.onPackageChanged(PACKAGE_A, PACKAGE_A); + + assertRegisteredTransports(transportManager, singletonList(mTransportB1)); + verify(mListener, never()).onTransportRegistered(any(), any()); + + mContext.getPackageManager() + .setApplicationEnabledSetting( + PACKAGE_A, + Integer.valueOf(COMPONENT_ENABLED_STATE_ENABLED), + 0 /*flags*/); + transportManager.onPackageChanged(PACKAGE_A, PACKAGE_A); + + assertRegisteredTransports(transportManager, asList(mTransportA1, mTransportB1)); + verify(mListener) + .onTransportRegistered(mTransportA1.transportName, mTransportA1.transportDirName); + } + + @Test + public void testOnPackageChanged_whenPackageChanged_unknownComponentStateIsIgnored() + throws Exception { + TransportManager transportManager = + createTransportManagerWithRegisteredTransports(mTransportA1, mTransportB1); + reset(mListener); + + mContext.getPackageManager() + .setApplicationEnabledSetting( + PACKAGE_A, + Integer.valueOf(COMPONENT_ENABLED_STATE_DEFAULT), + 0 /*flags*/); + transportManager.onPackageChanged(PACKAGE_A, PACKAGE_A); + + assertRegisteredTransports(transportManager, asList(mTransportA1, mTransportB1)); + verify(mListener, never()).onTransportRegistered(any(), any()); + } + + @Test + public void testOnPackageChanged_whenPackageChanged_unknownPackageExceptionIsIgnored() + throws Exception { + TransportManager transportManager = + createTransportManagerWithRegisteredTransports(mTransportA1, mTransportB1); + reset(mListener); + + // empty packageName triggers Robolectric ApplicationPackageManager to throw + // exception as if package does not exist. + transportManager.onPackageChanged("", ""); + + assertRegisteredTransports(transportManager, asList(mTransportA1, mTransportB1)); + verify(mListener, never()).onTransportRegistered(any(), any()); + } + + @Test public void testRegisterAndSelectTransport_whenTransportRegistered() throws Exception { TransportManager transportManager = createTransportManagerWithRegisteredTransports(null, mTransportA1); diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowApplicationPackageManager.java b/services/robotests/src/com/android/server/testing/shadows/ShadowApplicationPackageManager.java index aea36e555ad7..4a9948668bc4 100644 --- a/services/robotests/src/com/android/server/testing/shadows/ShadowApplicationPackageManager.java +++ b/services/robotests/src/com/android/server/testing/shadows/ShadowApplicationPackageManager.java @@ -16,6 +16,7 @@ package com.android.server.testing.shadows; +import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT; import static android.content.pm.PackageManager.NameNotFoundException; import android.app.ApplicationPackageManager; @@ -44,6 +45,7 @@ public class ShadowApplicationPackageManager private static final List<PackageInfo> sInstalledPackages = new ArrayList<>(); private static final Map<String, Integer> sPackageUids = new ArrayMap<>(); private static final Map<Integer, Map<String, Integer>> sUserPackageUids = new ArrayMap<>(); + private static final Map<String, Integer> sPackageAppEnabledStates = new ArrayMap<>(); /** * Registers the package {@code packageName} to be returned when invoking {@link @@ -53,6 +55,7 @@ public class ShadowApplicationPackageManager public static void addInstalledPackage(String packageName, PackageInfo packageInfo) { sPackageInfos.put(packageName, packageInfo); sInstalledPackages.add(packageInfo); + sPackageAppEnabledStates.put(packageName, Integer.valueOf(COMPONENT_ENABLED_STATE_DEFAULT)); } /** @@ -77,6 +80,22 @@ public class ShadowApplicationPackageManager } @Override + protected int getApplicationEnabledSetting(String packageName) { + if (packageName.isEmpty()) { + throw new IllegalArgumentException("Robo: Package '' does not exist."); + } + if (!sPackageAppEnabledStates.containsKey(packageName)) { + return COMPONENT_ENABLED_STATE_DEFAULT; + } + return sPackageAppEnabledStates.get(packageName); + } + + @Override + protected void setApplicationEnabledSetting(String packageName, int newState, int flags) { + sPackageAppEnabledStates.put(packageName, Integer.valueOf(newState)); // flags unused here. + } + + @Override protected PackageInfo getPackageInfoAsUser(String packageName, int flags, int userId) throws NameNotFoundException { if (!sPackageInfos.containsKey(packageName)) { @@ -115,6 +134,7 @@ public class ShadowApplicationPackageManager public static void reset() { sPackageInfos.clear(); sInstalledPackages.clear(); + sPackageAppEnabledStates.clear(); org.robolectric.shadows.ShadowApplicationPackageManager.reset(); } } diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java index a9812ab9bb03..d104871f488a 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java @@ -89,6 +89,7 @@ public class HdmiCecLocalDeviceTvTest { private ArrayList<HdmiCecLocalDevice> mLocalDevices = new ArrayList<>(); private int mTvPhysicalAddress; private int mTvLogicalAddress; + private boolean mWokenUp; @Mock private AudioManager mAudioManager; @@ -104,6 +105,11 @@ public class HdmiCecLocalDeviceTvTest { new HdmiControlService(InstrumentationRegistry.getTargetContext(), Collections.emptyList()) { @Override + void wakeUp() { + mWokenUp = true; + super.wakeUp(); + } + @Override boolean isControlEnabled() { return true; } @@ -308,6 +314,22 @@ public class HdmiCecLocalDeviceTvTest { } @Test + public void handleTextViewOn_Dreaming() { + mHdmiCecLocalDeviceTv.mService.getHdmiCecConfig().setIntValue( + HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY, + HdmiControlManager.TV_WAKE_ON_ONE_TOUCH_PLAY_ENABLED); + mTestLooper.dispatchAll(); + mPowerManager.setInteractive(true); + mWokenUp = false; + HdmiCecMessage textViewOn = HdmiCecMessageBuilder.buildTextViewOn(ADDR_PLAYBACK_1, + mTvLogicalAddress); + assertThat(mHdmiCecLocalDeviceTv.dispatchMessage(textViewOn)).isEqualTo(Constants.HANDLED); + mTestLooper.dispatchAll(); + assertThat(mPowerManager.isInteractive()).isTrue(); + assertThat(mWokenUp).isTrue(); + } + + @Test public void tvSendStandbyOnSleep_Enabled() { mHdmiCecLocalDeviceTv.mService.getHdmiCecConfig().setIntValue( HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP, diff --git a/services/tests/servicestests/src/com/android/server/vibrator/VibrationSettingsTest.java b/services/tests/servicestests/src/com/android/server/vibrator/VibrationSettingsTest.java index 3cda2a554e48..ec16188bfc1d 100644 --- a/services/tests/servicestests/src/com/android/server/vibrator/VibrationSettingsTest.java +++ b/services/tests/servicestests/src/com/android/server/vibrator/VibrationSettingsTest.java @@ -288,7 +288,7 @@ public class VibrationSettingsTest { } @Test - public void shouldIgnoreVibration_withRingerModeSilent_ignoresRingtoneOnly() { + public void shouldIgnoreVibration_withRingerModeSilent_ignoresRingtoneAndNotification() { // Vibrating settings on are overruled by ringer mode. setUserSetting(Settings.System.HAPTIC_FEEDBACK_ENABLED, 1); setUserSetting(Settings.System.VIBRATE_WHEN_RINGING, 1); @@ -296,7 +296,7 @@ public class VibrationSettingsTest { setRingerMode(AudioManager.RINGER_MODE_SILENT); for (int usage : ALL_USAGES) { - if (usage == USAGE_RINGTONE) { + if (usage == USAGE_RINGTONE || usage == USAGE_NOTIFICATION) { assertVibrationIgnoredForUsage(usage, Vibration.Status.IGNORED_FOR_RINGER_MODE); } else { assertVibrationNotIgnoredForUsage(usage); @@ -305,6 +305,16 @@ public class VibrationSettingsTest { } @Test + public void shouldIgnoreVibration_withRingerModeSilentAndBypassFlag_allowsAllVibrations() { + setRingerMode(AudioManager.RINGER_MODE_SILENT); + + for (int usage : ALL_USAGES) { + assertVibrationNotIgnoredForUsageAndFlags(usage, + VibrationAttributes.FLAG_BYPASS_INTERRUPTION_POLICY); + } + } + + @Test public void shouldIgnoreVibration_withRingerModeVibrate_allowsAllVibrations() { setRingerMode(AudioManager.RINGER_MODE_VIBRATE); diff --git a/services/tests/servicestests/src/com/android/server/vibrator/VibratorManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/vibrator/VibratorManagerServiceTest.java index e46e28199d5a..92736c517782 100644 --- a/services/tests/servicestests/src/com/android/server/vibrator/VibratorManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/vibrator/VibratorManagerServiceTest.java @@ -1136,19 +1136,23 @@ public class VibratorManagerServiceTest { } @Test - public void onExternalVibration_setsExternalControl() { + public void onExternalVibration_setsExternalControl() throws Exception { mockVibrators(1); mVibratorProviders.get(1).setCapabilities(IVibrator.CAP_EXTERNAL_CONTROL); createSystemReadyService(); + IBinder binderToken = mock(IBinder.class); ExternalVibration externalVibration = new ExternalVibration(UID, PACKAGE_NAME, AUDIO_ATTRS, - mock(IExternalVibrationController.class)); + mock(IExternalVibrationController.class), binderToken); int scale = mExternalVibratorService.onExternalVibrationStart(externalVibration); mExternalVibratorService.onExternalVibrationStop(externalVibration); assertNotEquals(IExternalVibratorService.SCALE_MUTE, scale); assertEquals(Arrays.asList(false, true, false), mVibratorProviders.get(1).getExternalControlStates()); + + verify(binderToken).linkToDeath(any(), eq(0)); + verify(binderToken).unlinkToDeath(any(), eq(0)); } @Test @@ -1160,17 +1164,19 @@ public class VibratorManagerServiceTest { setUserSetting(Settings.System.VIBRATE_WHEN_RINGING, 1); createSystemReadyService(); + IBinder firstToken = mock(IBinder.class); + IBinder secondToken = mock(IBinder.class); IExternalVibrationController firstController = mock(IExternalVibrationController.class); IExternalVibrationController secondController = mock(IExternalVibrationController.class); ExternalVibration firstVibration = new ExternalVibration(UID, PACKAGE_NAME, AUDIO_ATTRS, - firstController); + firstController, firstToken); int firstScale = mExternalVibratorService.onExternalVibrationStart(firstVibration); AudioAttributes ringtoneAudioAttrs = new AudioAttributes.Builder() .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE) .build(); ExternalVibration secondVibration = new ExternalVibration(UID, PACKAGE_NAME, - ringtoneAudioAttrs, secondController); + ringtoneAudioAttrs, secondController, secondToken); int secondScale = mExternalVibratorService.onExternalVibrationStart(secondVibration); assertNotEquals(IExternalVibratorService.SCALE_MUTE, firstScale); @@ -1180,6 +1186,17 @@ public class VibratorManagerServiceTest { // Set external control called only once. assertEquals(Arrays.asList(false, true), mVibratorProviders.get(1).getExternalControlStates()); + + mExternalVibratorService.onExternalVibrationStop(secondVibration); + mExternalVibratorService.onExternalVibrationStop(firstVibration); + assertEquals(Arrays.asList(false, true, false), + mVibratorProviders.get(1).getExternalControlStates()); + + verify(firstToken).linkToDeath(any(), eq(0)); + verify(firstToken).unlinkToDeath(any(), eq(0)); + + verify(secondToken).linkToDeath(any(), eq(0)); + verify(secondToken).unlinkToDeath(any(), eq(0)); } @Test 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 71f8b8de032b..d752322f567a 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -18,6 +18,7 @@ package com.android.server.notification; import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND; import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE; +import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.app.AppOpsManager.MODE_ALLOWED; import static android.app.AppOpsManager.MODE_IGNORED; import static android.app.Notification.FLAG_AUTO_CANCEL; @@ -432,8 +433,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { when(mUgmInternal.newUriPermissionOwner(anyString())).thenReturn(mPermOwner); when(mPackageManager.getPackagesForUid(mUid)).thenReturn(new String[]{PKG}); when(mPackageManagerClient.getPackagesForUid(anyInt())).thenReturn(new String[]{PKG}); - when(mPermissionPolicyInternal.canShowPermissionPromptForTask( - any(ActivityManager.RecentTaskInfo.class))).thenReturn(false); + when(mAtm.getTaskToShowPermissionDialogOn(anyString(), anyInt())) + .thenReturn(INVALID_TASK_ID); mContext.addMockSystemService(AppOpsManager.class, mock(AppOpsManager.class)); when(mUm.getProfileIds(0, false)).thenReturn(new int[]{0}); @@ -971,8 +972,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testCreateNotificationChannels_FirstChannelWithFgndTaskStartsPermDialog() throws Exception { - when(mPermissionPolicyInternal.canShowPermissionPromptForTask(any( - ActivityManager.RecentTaskInfo.class))).thenReturn(true); + when(mAtm.getTaskToShowPermissionDialogOn(anyString(), anyInt())).thenReturn(TEST_TASK_ID); final NotificationChannel channel = new NotificationChannel("id", "name", IMPORTANCE_DEFAULT); mBinderService.createNotificationChannels(PKG_NO_CHANNELS, @@ -985,8 +985,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testCreateNotificationChannels_SecondChannelWithFgndTaskDoesntStartPermDialog() throws Exception { - when(mPermissionPolicyInternal.canShowPermissionPromptForTask(any( - ActivityManager.RecentTaskInfo.class))).thenReturn(true); + when(mAtm.getTaskToShowPermissionDialogOn(anyString(), anyInt())).thenReturn(TEST_TASK_ID); assertTrue(mBinderService.getNumNotificationChannelsForPackage(PKG, mUid, true) > 0); final NotificationChannel channel = @@ -1001,8 +1000,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testCreateNotificationChannels_FirstChannelWithBgndTaskDoesntStartPermDialog() throws Exception { reset(mPermissionPolicyInternal); - when(mPermissionPolicyInternal.canShowPermissionPromptForTask(any( - ActivityManager.RecentTaskInfo.class))).thenReturn(false); + when(mAtm.getTaskToShowPermissionDialogOn(anyString(), anyInt())).thenReturn(TEST_TASK_ID); final NotificationChannel channel = new NotificationChannel("id", "name", IMPORTANCE_DEFAULT); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/PermissionHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/PermissionHelperTest.java index a24ba0d1e1c2..50151bfb7191 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/PermissionHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/PermissionHelperTest.java @@ -89,6 +89,10 @@ public class PermissionHelperTest extends UiServiceTestCase { public void setUp() throws Exception { MockitoAnnotations.initMocks(this); mPermissionHelper = new PermissionHelper(mPmi, mPackageManager, mPermManager, true); + PackageInfo testPkgInfo = new PackageInfo(); + testPkgInfo.requestedPermissions = new String[]{ Manifest.permission.POST_NOTIFICATIONS }; + when(mPackageManager.getPackageInfo(anyString(), anyLong(), anyInt())) + .thenReturn(testPkgInfo); } // TODO (b/194833441): Remove when the migration is enabled @@ -384,6 +388,22 @@ public class PermissionHelperTest extends UiServiceTestCase { } @Test + public void testSetNotificationPermission_doesntRequestNotChanged() throws Exception { + when(mPmi.checkPermission(anyString(), anyString(), anyInt())) + .thenReturn(PERMISSION_GRANTED); + PackageInfo testPkgInfo = new PackageInfo(); + testPkgInfo.requestedPermissions = new String[]{ Manifest.permission.RECORD_AUDIO }; + when(mPackageManager.getPackageInfo(anyString(), anyLong(), anyInt())) + .thenReturn(testPkgInfo); + mPermissionHelper.setNotificationPermission("pkg", 10, false, false); + + verify(mPmi, never()).checkPermission( + eq("pkg"), eq(Manifest.permission.POST_NOTIFICATIONS), eq(10)); + verify(mPermManager, never()).revokeRuntimePermission( + eq("pkg"), eq(Manifest.permission.POST_NOTIFICATIONS), eq(10), anyString()); + } + + @Test public void testIsPermissionFixed() throws Exception { when(mPermManager.getPermissionFlags(anyString(), eq(Manifest.permission.POST_NOTIFICATIONS), diff --git a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java index 8f1eed89647c..7d5a0d0bf84d 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java @@ -1870,46 +1870,46 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testGetChannelsBypassingDndCount_noChannelsBypassing() throws Exception { assertEquals(0, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1, - USER.getIdentifier()).getList().size()); + UID_N_MR1).getList().size()); } @Test - public void testGetChannelsBypassingDnd_noChannelsForUserIdBypassing() + public void testGetChannelsBypassingDnd_noChannelsForUidBypassing() throws Exception { - int user = 9; + int uid = 222; NotificationChannel channel = new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_MAX); channel.setBypassDnd(true); mHelper.createNotificationChannel(PKG_N_MR1, 111, channel, true, true); assertEquals(0, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1, - user).getList().size()); + uid).getList().size()); } @Test public void testGetChannelsBypassingDndCount_oneChannelBypassing_groupBlocked() { - int user = USER.getIdentifier(); + int uid = UID_N_MR1; NotificationChannelGroup ncg = new NotificationChannelGroup("group1", "name1"); NotificationChannel channel1 = new NotificationChannel("id1", "name1", NotificationManager.IMPORTANCE_MAX); channel1.setBypassDnd(true); channel1.setGroup(ncg.getId()); - mHelper.createNotificationChannelGroup(PKG_N_MR1, user, ncg, /* fromTargetApp */ true); - mHelper.createNotificationChannel(PKG_N_MR1, user, channel1, true, /*has DND access*/ true); + mHelper.createNotificationChannelGroup(PKG_N_MR1, uid, ncg, /* fromTargetApp */ true); + mHelper.createNotificationChannel(PKG_N_MR1, uid, channel1, true, /*has DND access*/ true); assertEquals(1, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1, - user).getList().size()); + uid).getList().size()); // disable group ncg.setBlocked(true); - mHelper.createNotificationChannelGroup(PKG_N_MR1, user, ncg, /* fromTargetApp */ false); + mHelper.createNotificationChannelGroup(PKG_N_MR1, uid, ncg, /* fromTargetApp */ false); assertEquals(0, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1, - user).getList().size()); + uid).getList().size()); } @Test public void testGetChannelsBypassingDndCount_multipleChannelsBypassing() { - int user = USER.getIdentifier(); + int uid = UID_N_MR1; NotificationChannel channel1 = new NotificationChannel("id1", "name1", NotificationManager.IMPORTANCE_MAX); NotificationChannel channel2 = new NotificationChannel("id2", "name2", @@ -1920,22 +1920,22 @@ public class PreferencesHelperTest extends UiServiceTestCase { channel2.setBypassDnd(true); channel3.setBypassDnd(true); // has DND access, so can set bypassDnd attribute - mHelper.createNotificationChannel(PKG_N_MR1, user, channel1, true, /*has DND access*/ true); - mHelper.createNotificationChannel(PKG_N_MR1, user, channel2, true, true); - mHelper.createNotificationChannel(PKG_N_MR1, user, channel3, true, true); + mHelper.createNotificationChannel(PKG_N_MR1, uid, channel1, true, /*has DND access*/ true); + mHelper.createNotificationChannel(PKG_N_MR1, uid, channel2, true, true); + mHelper.createNotificationChannel(PKG_N_MR1, uid, channel3, true, true); assertEquals(3, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1, - user).getList().size()); + uid).getList().size()); // setBypassDnd false for some channels channel1.setBypassDnd(false); channel2.setBypassDnd(false); assertEquals(1, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1, - user).getList().size()); + uid).getList().size()); // setBypassDnd false for rest of the channels channel3.setBypassDnd(false); assertEquals(0, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1, - user).getList().size()); + uid).getList().size()); } @Test diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java index abcc8c1e99cb..8ac729e29424 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java @@ -121,7 +121,7 @@ public class ZenModeFilteringTest extends UiServiceTestCase { // Create a notification record with the people String array as the // bundled extras, and the numbers ArraySet as additional phone numbers. - private NotificationRecord getRecordWithPeopleInfo(String[] people, + private NotificationRecord getCallRecordWithPeopleInfo(String[] people, ArraySet<String> numbers) { // set up notification record NotificationRecord r = mock(NotificationRecord.class); @@ -131,6 +131,8 @@ public class ZenModeFilteringTest extends UiServiceTestCase { when(sbn.getNotification()).thenReturn(notification); when(r.getSbn()).thenReturn(sbn); when(r.getPhoneNumbers()).thenReturn(numbers); + when(r.getCriticality()).thenReturn(CriticalNotificationExtractor.NORMAL); + when(r.isCategory(CATEGORY_CALL)).thenReturn(true); return r; } @@ -350,11 +352,41 @@ public class ZenModeFilteringTest extends UiServiceTestCase { } @Test + public void testRepeatCallers_checksPhoneNumbers() { + // set up telephony manager behavior + when(mTelephonyManager.getNetworkCountryIso()).thenReturn("us"); + + // first, record a phone call from a telephone number + String[] callNumber = new String[]{"tel:12345678910"}; + mZenModeFiltering.recordCall(getCallRecordWithPeopleInfo(callNumber, null)); + + // set up policy to only allow repeat callers + Policy policy = new Policy( + PRIORITY_CATEGORY_REPEAT_CALLERS, 0, 0, 0, CONVERSATION_SENDERS_NONE); + + // make sure that a record with the phone number in extras is correctly allowed through + NotificationRecord r = getCallRecordWithPeopleInfo(callNumber, null); + assertFalse(mZenModeFiltering.shouldIntercept(ZEN_MODE_IMPORTANT_INTERRUPTIONS, policy, r)); + + // make sure that a record with the phone number in the phone numbers array is also + // allowed through + NotificationRecord r2 = getCallRecordWithPeopleInfo(new String[]{"some_contact_uri"}, + new ArraySet<>(new String[]{"12345678910"})); + assertFalse(mZenModeFiltering.shouldIntercept( + ZEN_MODE_IMPORTANT_INTERRUPTIONS, policy, r2)); + + // A record with the phone number in neither of the above should be intercepted + NotificationRecord r3 = getCallRecordWithPeopleInfo(new String[]{"tel:10987654321"}, + new ArraySet<>(new String[]{"15555555555"})); + assertTrue(mZenModeFiltering.shouldIntercept(ZEN_MODE_IMPORTANT_INTERRUPTIONS, policy, r3)); + } + + @Test public void testMatchesCallFilter_repeatCallers_directMatch() { // after calls given an email with an exact string match, make sure that // matchesCallFilter returns the right thing String[] mailSource = new String[]{"mailto:hello.world"}; - mZenModeFiltering.recordCall(getRecordWithPeopleInfo(mailSource, null)); + mZenModeFiltering.recordCall(getCallRecordWithPeopleInfo(mailSource, null)); // set up policy to only allow repeat callers Policy policy = new Policy( @@ -377,7 +409,7 @@ public class ZenModeFilteringTest extends UiServiceTestCase { when(mTelephonyManager.getNetworkCountryIso()).thenReturn("us"); String[] telSource = new String[]{"tel:+1-617-555-1212"}; - mZenModeFiltering.recordCall(getRecordWithPeopleInfo(telSource, null)); + mZenModeFiltering.recordCall(getCallRecordWithPeopleInfo(telSource, null)); // set up policy to only allow repeat callers Policy policy = new Policy( @@ -421,7 +453,7 @@ public class ZenModeFilteringTest extends UiServiceTestCase { when(mTelephonyManager.getNetworkCountryIso()).thenReturn("us"); String[] telSource = new String[]{"tel:%2B16175551212"}; - mZenModeFiltering.recordCall(getRecordWithPeopleInfo(telSource, null)); + mZenModeFiltering.recordCall(getCallRecordWithPeopleInfo(telSource, null)); // set up policy to only allow repeat callers Policy policy = new Policy( @@ -468,7 +500,7 @@ public class ZenModeFilteringTest extends UiServiceTestCase { String[] contactSource = new String[]{"content://contacts/lookup/uri-here"}; ArraySet<String> contactNumbers = new ArraySet<>( new String[]{"1-617-555-1212", "1-617-555-3434"}); - NotificationRecord record = getRecordWithPeopleInfo(contactSource, contactNumbers); + NotificationRecord record = getCallRecordWithPeopleInfo(contactSource, contactNumbers); record.mergePhoneNumbers(contactNumbers); mZenModeFiltering.recordCall(record); diff --git a/services/tests/wmtests/src/com/android/server/policy/KeyCombinationTests.java b/services/tests/wmtests/src/com/android/server/policy/KeyCombinationTests.java index 75479de26b1d..cf571815b4cb 100644 --- a/services/tests/wmtests/src/com/android/server/policy/KeyCombinationTests.java +++ b/services/tests/wmtests/src/com/android/server/policy/KeyCombinationTests.java @@ -36,6 +36,9 @@ import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + /** * Test class for {@link KeyCombinationManager}. * @@ -47,16 +50,18 @@ import org.junit.Test; public class KeyCombinationTests { private KeyCombinationManager mKeyCombinationManager; - private boolean mAction1Triggered = false; - private boolean mAction2Triggered = false; - private boolean mAction3Triggered = false; + private final CountDownLatch mAction1Triggered = new CountDownLatch(1); + private final CountDownLatch mAction2Triggered = new CountDownLatch(1); + private final CountDownLatch mAction3Triggered = new CountDownLatch(1); private boolean mPreCondition = true; private static final long SCHEDULE_TIME = 300; + private Handler mHandler; @Before public void setUp() { - mKeyCombinationManager = new KeyCombinationManager(); + mHandler = new Handler(Looper.getMainLooper()); + mKeyCombinationManager = new KeyCombinationManager(mHandler); initKeyCombinationRules(); } @@ -67,7 +72,7 @@ public class KeyCombinationTests { KEYCODE_POWER) { @Override void execute() { - mAction1Triggered = true; + mAction1Triggered.countDown(); } @Override @@ -86,12 +91,17 @@ public class KeyCombinationTests { @Override void execute() { - mAction2Triggered = true; + mAction2Triggered.countDown(); } @Override void cancel() { } + + @Override + long getKeyInterceptDelayMs() { + return 0; + } }); // Rule 3 : power + volume_up schedule and trigger action after timeout. @@ -100,10 +110,9 @@ public class KeyCombinationTests { final Runnable mAction = new Runnable() { @Override public void run() { - mAction3Triggered = true; + mAction3Triggered.countDown(); } }; - final Handler mHandler = new Handler(Looper.getMainLooper()); @Override void execute() { @@ -149,60 +158,74 @@ public class KeyCombinationTests { } @Test - public void testTriggerRule() { + public void testTriggerRule() throws InterruptedException { final long eventTime = SystemClock.uptimeMillis(); pressKeys(eventTime, KEYCODE_POWER, eventTime, KEYCODE_VOLUME_DOWN); - assertTrue(mAction1Triggered); + assertTrue(mAction1Triggered.await(SCHEDULE_TIME, TimeUnit.MILLISECONDS)); pressKeys(eventTime, KEYCODE_VOLUME_UP, eventTime, KEYCODE_VOLUME_DOWN); - assertTrue(mAction2Triggered); + assertTrue(mAction2Triggered.await(SCHEDULE_TIME, TimeUnit.MILLISECONDS)); pressKeys(eventTime, KEYCODE_POWER, eventTime, KEYCODE_VOLUME_UP, SCHEDULE_TIME + 50); - assertTrue(mAction3Triggered); + assertTrue(mAction3Triggered.await(SCHEDULE_TIME, TimeUnit.MILLISECONDS)); } /** * Nothing should happen if there is no definition. */ @Test - public void testNotTrigger_NoRule() { + public void testNotTrigger_NoRule() throws InterruptedException { final long eventTime = SystemClock.uptimeMillis(); pressKeys(eventTime, KEYCODE_BACK, eventTime, KEYCODE_VOLUME_DOWN); - assertFalse(mAction1Triggered); - assertFalse(mAction2Triggered); - assertFalse(mAction3Triggered); + assertFalse(mAction1Triggered.await(SCHEDULE_TIME, TimeUnit.MILLISECONDS)); + assertFalse(mAction2Triggered.await(SCHEDULE_TIME, TimeUnit.MILLISECONDS)); + assertFalse(mAction3Triggered.await(SCHEDULE_TIME, TimeUnit.MILLISECONDS)); } /** * Nothing should happen if the interval of press time is too long. */ @Test - public void testNotTrigger_Interval() { + public void testNotTrigger_Interval() throws InterruptedException { final long eventTime = SystemClock.uptimeMillis(); final long earlyEventTime = eventTime - 200; // COMBINE_KEY_DELAY_MILLIS = 150; pressKeys(earlyEventTime, KEYCODE_POWER, eventTime, KEYCODE_VOLUME_DOWN); - assertFalse(mAction1Triggered); + assertFalse(mAction1Triggered.await(SCHEDULE_TIME, TimeUnit.MILLISECONDS)); } /** * Nothing should happen if the condition is false. */ @Test - public void testNotTrigger_Condition() { + public void testNotTrigger_Condition() throws InterruptedException { final long eventTime = SystemClock.uptimeMillis(); // we won't trigger action 2 because the condition is false. mPreCondition = false; pressKeys(eventTime, KEYCODE_VOLUME_UP, eventTime, KEYCODE_VOLUME_DOWN); - assertFalse(mAction2Triggered); + assertFalse(mAction2Triggered.await(SCHEDULE_TIME, TimeUnit.MILLISECONDS)); } /** * Nothing should happen if the keys released too early. */ @Test - public void testNotTrigger_EarlyRelease() { + public void testNotTrigger_EarlyRelease() throws InterruptedException { final long eventTime = SystemClock.uptimeMillis(); pressKeys(eventTime, KEYCODE_POWER, eventTime, KEYCODE_VOLUME_UP); - assertFalse(mAction3Triggered); + assertFalse(mAction3Triggered.await(SCHEDULE_TIME, TimeUnit.MILLISECONDS)); + } + + /** + * The KeyInterceptTimeout should return the max timeout value. + */ + @Test + public void testKeyInterceptTimeout() { + final long eventTime = SystemClock.uptimeMillis(); + final KeyEvent firstKeyDown = new KeyEvent(eventTime, eventTime, ACTION_DOWN, + KEYCODE_VOLUME_UP, 0 /* repeat */, 0 /* metaState */); + // Press KEYCODE_VOLUME_UP would activate rule2 and rule3, + // and rule2's intercept delay is 0. + mKeyCombinationManager.interceptKey(firstKeyDown, true); + assertTrue(mKeyCombinationManager.getKeyInterceptTimeout(KEYCODE_VOLUME_UP) > eventTime); } -} +}
\ No newline at end of file diff --git a/services/tests/wmtests/src/com/android/server/policy/OWNERS b/services/tests/wmtests/src/com/android/server/policy/OWNERS new file mode 100644 index 000000000000..27891dcf64da --- /dev/null +++ b/services/tests/wmtests/src/com/android/server/policy/OWNERS @@ -0,0 +1 @@ +include /services/core/java/com/android/server/policy/OWNERS diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java index 6fe2d337e4a0..f9aa4b17bc2c 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java @@ -308,12 +308,12 @@ public class ActivityStarterTests extends WindowTestsBase { } private ActivityStarter prepareStarter(@Intent.Flags int launchFlags) { - return prepareStarter(launchFlags, true /* mockGetLaunchStack */, LAUNCH_MULTIPLE); + return prepareStarter(launchFlags, true /* mockGetRootTask */, LAUNCH_MULTIPLE); } private ActivityStarter prepareStarter(@Intent.Flags int launchFlags, - boolean mockGetLaunchStack) { - return prepareStarter(launchFlags, mockGetLaunchStack, LAUNCH_MULTIPLE); + boolean mockGetRootTask) { + return prepareStarter(launchFlags, mockGetRootTask, LAUNCH_MULTIPLE); } private void setupImeWindow() { @@ -326,20 +326,20 @@ public class ActivityStarterTests extends WindowTestsBase { * Creates a {@link ActivityStarter} with default parameters and necessary mocks. * * @param launchFlags The intent flags to launch activity. - * @param mockGetLaunchStack Whether to mock {@link RootWindowContainer#getLaunchRootTask} for + * @param mockGetRootTask Whether to mock {@link RootWindowContainer#getOrCreateRootTask} for * always launching to the testing stack. Set to false when allowing * the activity can be launched to any stack that is decided by real * implementation. * @return A {@link ActivityStarter} with default setup. */ private ActivityStarter prepareStarter(@Intent.Flags int launchFlags, - boolean mockGetLaunchStack, int launchMode) { + boolean mockGetRootTask, int launchMode) { // always allow test to start activity. doReturn(true).when(mSupervisor).checkStartAnyActivityPermission( any(), any(), any(), anyInt(), anyInt(), anyInt(), any(), any(), anyBoolean(), anyBoolean(), any(), any(), any()); - if (mockGetLaunchStack) { + if (mockGetRootTask) { // Instrument the stack and task used. final Task stack = mRootWindowContainer.getDefaultTaskDisplayArea() .createRootTask(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, @@ -347,9 +347,9 @@ public class ActivityStarterTests extends WindowTestsBase { // Direct starter to use spy stack. doReturn(stack).when(mRootWindowContainer) - .getLaunchRootTask(any(), any(), any(), anyBoolean()); - doReturn(stack).when(mRootWindowContainer).getLaunchRootTask(any(), any(), any(), any(), - anyBoolean(), any(), anyInt()); + .getOrCreateRootTask(any(), any(), any(), anyBoolean()); + doReturn(stack).when(mRootWindowContainer).getOrCreateRootTask(any(), any(), any(), + any(), anyBoolean(), any(), anyInt()); } // Set up mock package manager internal and make sure no unmocked methods are called @@ -434,7 +434,7 @@ public class ActivityStarterTests extends WindowTestsBase { public void testSplitScreenDeliverToTop() { final ActivityStarter starter = prepareStarter( FLAG_ACTIVITY_RESET_TASK_IF_NEEDED | FLAG_ACTIVITY_SINGLE_TOP, - false /* mockGetLaunchStack */); + false /* mockGetRootTask */); final Pair<ActivityRecord, ActivityRecord> activities = createActivitiesInSplit(); final ActivityRecord splitPrimaryFocusActivity = activities.first; final ActivityRecord splitSecondReusableActivity = activities.second; @@ -790,7 +790,7 @@ public class ActivityStarterTests extends WindowTestsBase { finishingTopActivity.finishing = true; // Launch the bottom task of the target root task. - prepareStarter(FLAG_ACTIVITY_NEW_TASK, false /* mockGetLaunchStack */) + prepareStarter(FLAG_ACTIVITY_NEW_TASK, false /* mockGetRootTask */) .setReason("testBringTaskToFrontWhenFocusedTaskIsFinishing") .setIntent(activity.intent.addFlags( FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK)) @@ -809,7 +809,7 @@ public class ActivityStarterTests extends WindowTestsBase { @Test public void testDeliverIntentToTopActivityOfNonTopDisplay() { final ActivityStarter starter = prepareStarter(FLAG_ACTIVITY_NEW_TASK, - false /* mockGetLaunchStack */); + false /* mockGetRootTask */); // Create a secondary display at bottom. final TestDisplayContent secondaryDisplay = @@ -849,7 +849,7 @@ public class ActivityStarterTests extends WindowTestsBase { @Test public void testBringTaskToFrontOnSecondaryDisplay() { final ActivityStarter starter = prepareStarter(FLAG_ACTIVITY_NEW_TASK, - false /* mockGetLaunchStack */); + false /* mockGetRootTask */); // Create a secondary display with an activity. final TestDisplayContent secondaryDisplay = @@ -943,7 +943,7 @@ public class ActivityStarterTests extends WindowTestsBase { @Test public void testReparentTopFocusedActivityToSecondaryDisplay() { final ActivityStarter starter = prepareStarter(FLAG_ACTIVITY_NEW_TASK, - false /* mockGetLaunchStack */); + false /* mockGetRootTask */); // Create a secondary display at bottom. final TestDisplayContent secondaryDisplay = addNewDisplayContentAt(POSITION_BOTTOM); @@ -1076,7 +1076,7 @@ public class ActivityStarterTests extends WindowTestsBase { @Test public void testTargetStackInSplitScreen() { final ActivityStarter starter = - prepareStarter(FLAG_ACTIVITY_LAUNCH_ADJACENT, false /* mockGetLaunchStack */); + prepareStarter(FLAG_ACTIVITY_LAUNCH_ADJACENT, false /* mockGetRootTask */); final ActivityRecord top = new ActivityBuilder(mAtm).setCreateTask(true).build(); final ActivityOptions options = ActivityOptions.makeBasic(); final ActivityRecord[] outActivity = new ActivityRecord[1]; diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java index 12f987dfcd8d..3d95ec599b1b 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -1370,7 +1370,9 @@ public class DisplayContentTests extends WindowTestsBase { ROTATION_0 /* oldRotation */, ROTATION_90 /* newRotation */, false /* forceUpdate */)); - assertNotNull(mDisplayContent.getAsyncRotationController()); + final AsyncRotationController asyncRotationController = + mDisplayContent.getAsyncRotationController(); + assertNotNull(asyncRotationController); assertTrue(mStatusBarWindow.isAnimating(PARENTS, ANIMATION_TYPE_FIXED_TRANSFORM)); assertTrue(mNavBarWindow.isAnimating(PARENTS, ANIMATION_TYPE_FIXED_TRANSFORM)); // Notification shade may have its own view animation in real case so do not fade out it. @@ -1443,6 +1445,7 @@ public class DisplayContentTests extends WindowTestsBase { mDisplayContent.setImeLayeringTarget(mAppWindow); LocalServices.getService(WindowManagerInternal.class).onToggleImeRequested(true /* show */, app.token, app.token, mDisplayContent.mDisplayId); + assertTrue(asyncRotationController.isTargetToken(mImeWindow.mToken)); assertTrue(mImeWindow.mToken.hasFixedRotationTransform()); assertTrue(mImeWindow.isAnimating(PARENTS, ANIMATION_TYPE_FIXED_TRANSFORM)); diff --git a/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java index acceadf8c499..99ba3b806d61 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java @@ -949,7 +949,7 @@ public class RootWindowContainerTests extends WindowTestsBase { LaunchParamsController.LaunchParams launchParams = new LaunchParamsController.LaunchParams(); launchParams.mPreferredTaskDisplayArea = taskDisplayArea; - Task root = mRootWindowContainer.getLaunchRootTask(null /* r */, null /* options */, + Task root = mRootWindowContainer.getOrCreateRootTask(null /* r */, null /* options */, null /* candidateTask */, null /* sourceTask */, true /* onTop */, launchParams, 0 /* launchParams */); assertEquals(taskDisplayArea, root.getTaskDisplayArea()); @@ -957,7 +957,7 @@ public class RootWindowContainerTests extends WindowTestsBase { // Making sure still getting the root task from the preferred TDA when passing in a // launching activity. ActivityRecord r = new ActivityBuilder(mAtm).build(); - root = mRootWindowContainer.getLaunchRootTask(r, null /* options */, + root = mRootWindowContainer.getOrCreateRootTask(r, null /* options */, null /* candidateTask */, null /* sourceTask */, true /* onTop */, launchParams, 0 /* launchParams */); assertEquals(taskDisplayArea, root.getTaskDisplayArea()); diff --git a/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java b/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java index 46ef7ed092de..5ea8fd373f0b 100644 --- a/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java +++ b/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java @@ -17,6 +17,7 @@ package com.android.server.wm; import android.annotation.NonNull; +import android.annotation.Nullable; import android.graphics.ColorSpace; import android.graphics.GraphicBuffer; import android.graphics.Matrix; @@ -135,6 +136,12 @@ public class StubTransaction extends SurfaceControl.Transaction { } @Override + @NonNull + public SurfaceControl.Transaction setCrop(@NonNull SurfaceControl sc, @Nullable Rect crop) { + return this; + } + + @Override public SurfaceControl.Transaction setCornerRadius(SurfaceControl sc, float cornerRadius) { return this; } diff --git a/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java index 8474c3829827..c4547f654c33 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java @@ -32,6 +32,7 @@ import static android.view.WindowManager.TRANSIT_OPEN; import static android.view.WindowManager.TRANSIT_TO_BACK; import static android.window.TransitionInfo.FLAG_IS_WALLPAPER; import static android.window.TransitionInfo.FLAG_SHOW_WALLPAPER; +import static android.window.TransitionInfo.FLAG_TRANSLUCENT; import static android.window.TransitionInfo.isIndependent; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; @@ -328,6 +329,7 @@ public class TransitionTests extends WindowTestsBase { final ActivityRecord act = createActivityRecord(tasks[i]); // alternate so that the transition doesn't get promoted to the display area act.mVisibleRequested = (i % 2) == 0; // starts invisible + act.visibleIgnoringKeyguard = (i % 2) == 0; if (i == showWallpaperTask) { doReturn(true).when(act).showWallpaper(); } @@ -490,6 +492,86 @@ public class TransitionTests extends WindowTestsBase { } @Test + public void testOpenOpaqueTask() { + final Transition transition = createTestTransition(TRANSIT_OPEN); + ArrayMap<WindowContainer, Transition.ChangeInfo> changes = transition.mChanges; + ArraySet<WindowContainer> participants = transition.mParticipants; + + final Task newTask = createTask(mDisplayContent); + doReturn(false).when(newTask).isTranslucent(any()); + final Task oldTask = createTask(mDisplayContent); + doReturn(false).when(oldTask).isTranslucent(any()); + + final ActivityRecord closing = createActivityRecord(oldTask); + closing.setOccludesParent(true); + final ActivityRecord opening = createActivityRecord(newTask); + opening.setOccludesParent(false); + // Start states. + changes.put(newTask, new Transition.ChangeInfo(false /* vis */, true /* exChg */)); + changes.put(oldTask, new Transition.ChangeInfo(true /* vis */, false /* exChg */)); + changes.put(opening, new Transition.ChangeInfo(false /* vis */, true /* exChg */)); + changes.put(closing, new Transition.ChangeInfo(true /* vis */, false /* exChg */)); + fillChangeMap(changes, newTask); + // End states. + closing.mVisibleRequested = true; + opening.mVisibleRequested = true; + + final int transit = transition.mType; + int flags = 0; + + // Check basic both tasks participating + participants.add(oldTask); + participants.add(newTask); + ArrayList<WindowContainer> targets = Transition.calculateTargets(participants, changes); + TransitionInfo info = Transition.calculateTransitionInfo(transit, flags, targets, changes); + assertEquals(2, info.getChanges().size()); + assertEquals(transit, info.getType()); + + assertTrue((info.getChanges().get(0).getFlags() & FLAG_TRANSLUCENT) == 0); + assertTrue((info.getChanges().get(1).getFlags() & FLAG_TRANSLUCENT) == 0); + } + + @Test + public void testOpenTranslucentTask() { + final Transition transition = createTestTransition(TRANSIT_OPEN); + ArrayMap<WindowContainer, Transition.ChangeInfo> changes = transition.mChanges; + ArraySet<WindowContainer> participants = transition.mParticipants; + + final Task newTask = createTask(mDisplayContent); + doReturn(true).when(newTask).isTranslucent(any()); + final Task oldTask = createTask(mDisplayContent); + doReturn(false).when(oldTask).isTranslucent(any()); + + final ActivityRecord closing = createActivityRecord(oldTask); + closing.setOccludesParent(true); + final ActivityRecord opening = createActivityRecord(newTask); + opening.setOccludesParent(false); + // Start states. + changes.put(newTask, new Transition.ChangeInfo(false /* vis */, true /* exChg */)); + changes.put(oldTask, new Transition.ChangeInfo(true /* vis */, false /* exChg */)); + changes.put(opening, new Transition.ChangeInfo(false /* vis */, true /* exChg */)); + changes.put(closing, new Transition.ChangeInfo(true /* vis */, false /* exChg */)); + fillChangeMap(changes, newTask); + // End states. + closing.mVisibleRequested = true; + opening.mVisibleRequested = true; + + final int transit = transition.mType; + int flags = 0; + + // Check basic both tasks participating + participants.add(oldTask); + participants.add(newTask); + ArrayList<WindowContainer> targets = Transition.calculateTargets(participants, changes); + TransitionInfo info = Transition.calculateTransitionInfo(transit, flags, targets, changes); + assertEquals(2, info.getChanges().size()); + assertEquals(transit, info.getType()); + + assertTrue((info.getChanges().get(0).getFlags() & FLAG_TRANSLUCENT) != 0); + assertTrue((info.getChanges().get(1).getFlags() & FLAG_TRANSLUCENT) == 0); + } + + @Test public void testTimeout() { final TransitionController controller = new TransitionController(mAtm, mock(TaskSnapshotController.class)); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java index e70dd08af8a1..e4f691b338e1 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java @@ -29,6 +29,8 @@ import static android.view.Surface.ROTATION_90; import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW; import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM; import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; +import static android.view.WindowManager.LayoutParams.FLAG_SPLIT_TOUCH; +import static android.view.WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ABOVE_SUB_PANEL; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG; @@ -81,6 +83,7 @@ import android.graphics.Matrix; import android.graphics.Point; import android.graphics.Rect; import android.os.IBinder; +import android.os.InputConfig; import android.os.RemoteException; import android.platform.test.annotations.Presubmit; import android.util.ArraySet; @@ -754,10 +757,15 @@ public class WindowStateTests extends WindowTestsBase { assertFalse(win0.canReceiveTouchInput()); } + private boolean testFlag(int flags, int test) { + return (flags & test) == test; + } + @Test public void testUpdateInputWindowHandle() { final WindowState win = createWindow(null, TYPE_APPLICATION, "win"); win.mAttrs.inputFeatures = WindowManager.LayoutParams.INPUT_FEATURE_DISABLE_USER_ACTIVITY; + win.mAttrs.flags = FLAG_WATCH_OUTSIDE_TOUCH | FLAG_SPLIT_TOUCH; final InputWindowHandle handle = new InputWindowHandle( win.mInputWindowHandle.getInputApplicationHandle(), win.getDisplayId()); final InputWindowHandleWrapper handleWrapper = new InputWindowHandleWrapper(handle); @@ -767,13 +775,14 @@ public class WindowStateTests extends WindowTestsBase { mDisplayContent.getInputMonitor().populateInputWindowHandle(handleWrapper, win); assertTrue(handleWrapper.isChanged()); + assertTrue(testFlag(handle.inputConfig, InputConfig.WATCH_OUTSIDE_TOUCH)); + assertFalse(testFlag(handle.inputConfig, InputConfig.PREVENT_SPLITTING)); + assertTrue(testFlag(handle.inputConfig, InputConfig.DISABLE_USER_ACTIVITY)); // The window of standard resizable task should not use surface crop as touchable region. assertFalse(handle.replaceTouchableRegionWithCrop); assertEquals(inputChannelToken, handle.token); assertEquals(win.mActivityRecord.getInputApplicationHandle(false /* update */), handle.inputApplicationHandle); - assertEquals(win.mAttrs.inputFeatures, handle.inputFeatures); - assertEquals(win.isVisible(), handle.visible); final SurfaceControl sc = mock(SurfaceControl.class); final SurfaceControl.Transaction transaction = mSystemServicesTestRule.mTransaction; @@ -799,15 +808,13 @@ public class WindowStateTests extends WindowTestsBase { assertEquals(rotatedBounds, handle.touchableRegion.getBounds()); // Populate as an overlay to disable the input of window. - InputMonitor.populateOverlayInputInfo(handleWrapper, false /* isVisible */); + InputMonitor.populateOverlayInputInfo(handleWrapper); // The overlay attributes should be set. assertTrue(handleWrapper.isChanged()); - assertFalse(handle.focusable); - assertFalse(handle.visible); + assertFalse(handleWrapper.isFocusable()); assertNull(handle.token); assertEquals(0L, handle.dispatchingTimeoutMillis); - assertEquals(WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL, - handle.inputFeatures); + assertTrue(testFlag(handle.inputConfig, InputConfig.NO_INPUT_CHANNEL)); } @Test diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 1999cfc706b4..b290669e103e 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -640,7 +640,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser Slog.e(TAG, "unknown state " + state); return; } - removeMessages(MSG_UPDATE_STATE); + if (configured == 0) removeMessages(MSG_UPDATE_STATE); if (connected == 1) removeMessages(MSG_FUNCTION_SWITCH_TIMEOUT); Message msg = Message.obtain(this, MSG_UPDATE_STATE); msg.arg1 = connected; diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java index 84bd98347dab..a597fc69a340 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java @@ -97,6 +97,7 @@ final class HotwordDetectionConnection { private static final Duration MAX_UPDATE_TIMEOUT_DURATION = Duration.ofMillis(MAX_UPDATE_TIMEOUT_MILLIS); private static final long RESET_DEBUG_HOTWORD_LOGGING_TIMEOUT_MILLIS = 60 * 60 * 1000; // 1 hour + private static final int MAX_ISOLATED_PROCESS_NUMBER = 10; private final Executor mAudioCopyExecutor = Executors.newCachedThreadPool(); // TODO: This may need to be a Handler(looper) @@ -772,7 +773,8 @@ final class HotwordDetectionConnection { ServiceConnection createLocked() { ServiceConnection connection = new ServiceConnection(mContext, mIntent, mBindingFlags, mUser, - IHotwordDetectionService.Stub::asInterface, ++mRestartCount); + IHotwordDetectionService.Stub::asInterface, + mRestartCount++ % MAX_ISOLATED_PROCESS_NUMBER); connection.connect(); updateAudioFlinger(connection, mAudioFlinger); diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 0aaafef492bf..b6cacaf9f289 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -1976,7 +1976,7 @@ public class SubscriptionManager { */ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public void addSubscriptionInfoRecord(@NonNull String uniqueId, @Nullable String displayName, - int slotIndex, int subscriptionType) { + int slotIndex, @SubscriptionType int subscriptionType) { if (VDBG) { logd("[addSubscriptionInfoRecord]+ uniqueId:" + uniqueId + ", displayName:" + displayName + ", slotIndex:" + slotIndex @@ -2012,7 +2012,8 @@ public class SubscriptionManager { * @hide */ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) - public void removeSubscriptionInfoRecord(@NonNull String uniqueId, int subscriptionType) { + public void removeSubscriptionInfoRecord(@NonNull String uniqueId, + @SubscriptionType int subscriptionType) { if (VDBG) { logd("[removeSubscriptionInfoRecord]+ uniqueId:" + uniqueId + ", subscriptionType: " + subscriptionType); diff --git a/telephony/java/android/telephony/data/DataServiceCallback.java b/telephony/java/android/telephony/data/DataServiceCallback.java index ec734716f6e4..b8c5b4e3628a 100644 --- a/telephony/java/android/telephony/data/DataServiceCallback.java +++ b/telephony/java/android/telephony/data/DataServiceCallback.java @@ -50,12 +50,13 @@ public class DataServiceCallback { */ @Retention(RetentionPolicy.SOURCE) @IntDef({RESULT_SUCCESS, RESULT_ERROR_UNSUPPORTED, RESULT_ERROR_INVALID_ARG, RESULT_ERROR_BUSY, - RESULT_ERROR_ILLEGAL_STATE}) + RESULT_ERROR_ILLEGAL_STATE, RESULT_ERROR_TEMPORARILY_UNAVAILABLE, + RESULT_ERROR_RADIO_NOT_AVAILABLE}) public @interface ResultCode {} /** Request is completed successfully */ public static final int RESULT_SUCCESS = 0; - /** Request is not support */ + /** Request is not supported */ public static final int RESULT_ERROR_UNSUPPORTED = 1; /** Request contains invalid arguments */ public static final int RESULT_ERROR_INVALID_ARG = 2; @@ -68,6 +69,11 @@ public class DataServiceCallback { * @hide */ public static final int RESULT_ERROR_TEMPORARILY_UNAVAILABLE = 5; + /** + * Request failed to complete due to radio not available. + * @hide + */ + public static final int RESULT_ERROR_RADIO_NOT_AVAILABLE = 6; private final IDataServiceCallback mCallback; @@ -255,6 +261,8 @@ public class DataServiceCallback { return "RESULT_ERROR_ILLEGAL_STATE"; case RESULT_ERROR_TEMPORARILY_UNAVAILABLE: return "RESULT_ERROR_TEMPORARILY_UNAVAILABLE"; + case RESULT_ERROR_RADIO_NOT_AVAILABLE: + return "RESULT_ERROR_RADIO_NOT_AVAILABLE"; default: return "Unknown(" + resultCode + ")"; } diff --git a/telephony/java/com/android/internal/telephony/TelephonyIntents.java b/telephony/java/com/android/internal/telephony/TelephonyIntents.java index b905212a9100..546d2ce0e115 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyIntents.java +++ b/telephony/java/com/android/internal/telephony/TelephonyIntents.java @@ -424,4 +424,24 @@ public class TelephonyIntents { */ @Deprecated public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "defaultNetworkAvailable"; + + /** + * <p>Broadcast sent to show Emergency notification due to Voice Over Wifi availability + * + * <p class="note"> + * You can <em>not</em> receive this through components declared + * in manifests, only by explicitly registering for it with + * {@link android.content.Context#registerReceiver(android.content.BroadcastReceiver, + * android.content.IntentFilter) Context.registerReceiver()}. + * + * <p class="note"> + * Requires no permission. + * + * <p class="note">This is a protected intent that can only be sent + * by the system. + * + * @hide + */ + public static final String ACTION_VOWIFI_ENABLED + = "com.android.internal.telephony.ACTION_VOWIFI_ENABLED"; } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt index 71e576a2e5ac..7f4966375b98 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt @@ -44,7 +44,6 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -@FlakyTest(bugId = 219749605) class LaunchAppShowImeAndDialogThemeAppTest(private val testSpec: FlickerTestParameter) { private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation() private val testApp = ImeAppAutoFocusHelper(instrumentation, testSpec.startRotation) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt index a9564fdd2332..e7a33543a86b 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt @@ -46,6 +46,7 @@ import com.android.server.wm.traces.common.FlickerComponentName import com.android.server.wm.traces.common.WindowManagerConditionsFactory import org.junit.Assume.assumeFalse import org.junit.Assume.assumeTrue +import org.junit.Before import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith @@ -61,8 +62,7 @@ import org.junit.runners.Parameterized @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) @Group2 -@FlakyTest(bugId = 219757170) -class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { +open class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation() private val testApp = ImeAppAutoFocusHelper(instrumentation, testSpec.startRotation) @@ -72,6 +72,11 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { WindowManagerConditionsFactory.isHomeActivityVisible() )) + @Before + open fun before() { + assumeFalse(isShellTransitionsEnabled) + } + @FlickerBuilderProvider fun buildFlicker(): FlickerBuilder { return FlickerBuilder(instrumentation).apply { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest_ShellTransit.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest_ShellTransit.kt new file mode 100644 index 000000000000..7ffa51320487 --- /dev/null +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest_ShellTransit.kt @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wm.flicker.ime + +import android.platform.test.annotations.Postsubmit +import androidx.test.filters.FlakyTest +import androidx.test.filters.RequiresDevice +import com.android.server.wm.flicker.FlickerParametersRunnerFactory +import com.android.server.wm.flicker.FlickerTestParameter +import com.android.server.wm.flicker.annotation.Group2 +import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled +import org.junit.Assume +import org.junit.Before +import org.junit.FixMethodOrder +import org.junit.runner.RunWith +import org.junit.runners.MethodSorters +import org.junit.runners.Parameterized + +/** + * Test IME window opening transitions. + * To run this test: `atest FlickerTests:ReOpenImeWindowTest` + */ +@RequiresDevice +@RunWith(Parameterized::class) +@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Group2 +@FlakyTest(bugId = 221854428) +class ReOpenImeWindowTest_ShellTransit(private val testSpec: FlickerTestParameter) + : ReOpenImeWindowTest(testSpec) { + @Before + override fun before() { + Assume.assumeTrue(isShellTransitionsEnabled) + } +} diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp index 42715f9c3592..8d35eeec2a93 100644 --- a/tools/aapt2/ResourceParser.cpp +++ b/tools/aapt2/ResourceParser.cpp @@ -1038,6 +1038,13 @@ bool static ParseGroupImpl(xml::XmlPullParser* parser, ParsedResource* out_resou continue; } + if (maybe_name.value().substr(0, std::strlen("removed_")) == "removed_") { + // Skip resources that have been removed from the framework, but leave a hole so that + // other staged resources don't shift and break apps previously compiled against them + next_id.id++; + continue; + } + ParsedResource& entry_res = out_resource->child_resources.emplace_back(ParsedResource{ .name = ResourceName{{}, *parsed_type, maybe_name.value().to_string()}, .source = item_source, |